| 1 |
commit: 8a77107795dec3091f09a1a064fed25eac68ebb6 |
| 2 |
Author: Nils Freydank <holgersson <AT> posteo <DOT> de> |
| 3 |
AuthorDate: Tue Sep 7 07:21:37 2021 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 7 18:28:29 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a771077 |
| 7 |
|
| 8 |
app-office/libreoffice: Update live ebuild |
| 9 |
|
| 10 |
Upstream uses media-libs/zxing-cpp now instead of qrcodegen. |
| 11 |
|
| 12 |
This bump reflects this change plus some other bumps like skia and some |
| 13 |
housekeeping. Thanks alot for the hints via bug reports by a fellow |
| 14 |
user! |
| 15 |
|
| 16 |
Thanks-To: jospezial |
| 17 |
Closes: https://bugs.gentoo.org/792093 |
| 18 |
Closes: https://bugs.gentoo.org/792096 |
| 19 |
Closes: https://bugs.gentoo.org/792099 |
| 20 |
Package-Manager: Portage-3.0.22, Repoman-3.0.3 |
| 21 |
Signed-off-by: Nils Freydank <holgersson <AT> posteo.de> |
| 22 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 23 |
|
| 24 |
app-office/libreoffice/Manifest | 1 + |
| 25 |
.../libreoffice/files/libreoffice-7.2.0.4-qt5detect.patch | 13 +++++++++++++ |
| 26 |
app-office/libreoffice/libreoffice-9999.ebuild | 11 ++++------- |
| 27 |
3 files changed, 18 insertions(+), 7 deletions(-) |
| 28 |
|
| 29 |
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest |
| 30 |
index 20d2cb48790..639c9655e71 100644 |
| 31 |
--- a/app-office/libreoffice/Manifest |
| 32 |
+++ b/app-office/libreoffice/Manifest |
| 33 |
@@ -23,3 +23,4 @@ DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd234 |
| 34 |
DIST libreoffice-help-7.1.3.2.tar.xz 111785416 BLAKE2B 12d97764976ae0e4736638e9b758c5920d38d608e66fc3343d74178a935632396e1e07fbb98b6f380fd103c3f5e2edf917726a760420f6dfd3d2e42aaa215096 SHA512 576dbea391777a907275b630ed704dd3d9ad0627f8a18da1cbd23fe28df04c3a509583c2404f810df3aaac15ef0881e2c1e0a55c9f31618715586628873367eb |
| 35 |
DIST libreoffice-help-7.1.5.2.tar.xz 111785852 BLAKE2B 18962fe9260f6cf8ec7b1676f077b9f43e0277769b31b8e2c22cf83ac2963f3e92448901bc12f56dfb579da8a8a1ce20d6bd34c4bc3449f7e0972c03d22f63be SHA512 c669b6c4bfc3c6f46e4ee0bf86b158054f7178b9785273d9aba8183236b2ff6dbaf5584d5e4fb09bba3a8d010373599e7473a4ba15c229087c689198ceeee1c7 |
| 36 |
DIST skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz 10420480 BLAKE2B 83bcc9ff3a3a916ccb92f49ef69f99386e89b636d37679ab17735625c56c4bb31ca89a7034d9282c905b405e0b31215de5fd3734061d323d48db440e4ad52643 SHA512 8e5c37b895d7f5fe15f491005ac46b39efe3bfb3af5dc805bf1226b2112496bdb9e433cc3b313f8fc185fe1f898d126b8a557d23485615cdbe917f0b76855f3d |
| 37 |
+DIST skia-m94-975fcdd755dfc5d57cddbb25857e0c4ac29abe98.tar.xz 11672176 BLAKE2B 64d7821656002d23be839079dedffe1132497992aaef97ec734d6e430f2eda69f5344ca7fe75dd68fee847fa4c6638b4fc28194a951b91498ece5c6d4bcf3e44 SHA512 ae66fa7caeb5a328d96cd1c35eb8700080be5d3e3764e35b8056b03948e44b8bb8266284c87b44f9200accb95dbb8a2771a6e5ba067d34a7fbd33b1ababf19f8 |
| 38 |
|
| 39 |
diff --git a/app-office/libreoffice/files/libreoffice-7.2.0.4-qt5detect.patch b/app-office/libreoffice/files/libreoffice-7.2.0.4-qt5detect.patch |
| 40 |
new file mode 100644 |
| 41 |
index 00000000000..c905fabf5b3 |
| 42 |
--- /dev/null |
| 43 |
+++ b/app-office/libreoffice/files/libreoffice-7.2.0.4-qt5detect.patch |
| 44 |
@@ -0,0 +1,13 @@ |
| 45 |
+diff --git a/configure.ac b/configure.ac |
| 46 |
+index 971d7ad440c5..adb01509ab29 100644 |
| 47 |
+--- a/configure.ac |
| 48 |
++++ b/configure.ac |
| 49 |
+@@ -12683,7 +12683,7 @@ then |
| 50 |
+ |
| 51 |
+ dnl Check for Meta Object Compiler |
| 52 |
+ |
| 53 |
+- AC_PATH_PROGS( MOC5, [moc-qt5 moc], no, [`dirname $qt5_libdir`/bin:$QT5DIR/bin:$PATH]) |
| 54 |
++ AC_PATH_PROGS( MOC5, [moc-qt5 moc], no, [$QT5DIR/bin]) |
| 55 |
+ if test "$MOC5" = "no"; then |
| 56 |
+ AC_MSG_ERROR([Qt Meta Object Compiler not found. Please specify |
| 57 |
+ the root of your Qt installation by exporting QT5DIR before running "configure".]) |
| 58 |
|
| 59 |
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild |
| 60 |
index 45f856b59db..6ca28c7797e 100644 |
| 61 |
--- a/app-office/libreoffice/libreoffice-9999.ebuild |
| 62 |
+++ b/app-office/libreoffice/libreoffice-9999.ebuild |
| 63 |
@@ -47,9 +47,7 @@ ADDONS_SRC=( |
| 64 |
# not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c |
| 65 |
"${ADDONS_URI}/dtoa-20180411.tgz" |
| 66 |
# not packaged in Gentoo, https://skia.org/ |
| 67 |
- "${ADDONS_URI}/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz" |
| 68 |
- # QR code generating library for >=libreoffice-6.4, bug #691740 |
| 69 |
- "${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz" |
| 70 |
+ "${ADDONS_URI}/skia-m94-975fcdd755dfc5d57cddbb25857e0c4ac29abe98.tar.xz" |
| 71 |
"base? ( |
| 72 |
${ADDONS_URI}/commons-logging-1.2-src.tar.gz |
| 73 |
${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip |
| 74 |
@@ -136,7 +134,6 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 75 |
>=dev-cpp/clucene-2.3.3.4-r2 |
| 76 |
>=dev-cpp/libcmis-0.5.2 |
| 77 |
dev-db/unixODBC |
| 78 |
- >=games-engines/box2d-2.4.1:0 |
| 79 |
dev-lang/perl |
| 80 |
>=dev-libs/boost-1.72.0:=[nls] |
| 81 |
dev-libs/expat |
| 82 |
@@ -152,6 +149,7 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 83 |
dev-libs/nss |
| 84 |
>=dev-libs/redland-1.0.16 |
| 85 |
>=dev-libs/xmlsec-1.2.28[nss] |
| 86 |
+ >=games-engines/box2d-2.4.1:0 |
| 87 |
media-gfx/fontforge |
| 88 |
media-gfx/graphite2 |
| 89 |
media-libs/fontconfig |
| 90 |
@@ -165,6 +163,7 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 91 |
>=media-libs/libpng-1.4:0= |
| 92 |
>=media-libs/libvisio-0.1.0 |
| 93 |
media-libs/libzmf |
| 94 |
+ media-libs/zxing-cpp |
| 95 |
>=net-libs/neon-0.31.1:= |
| 96 |
net-misc/curl |
| 97 |
sci-mathematics/lpsolve |
| 98 |
@@ -291,7 +290,7 @@ PATCHES=( |
| 99 |
# not upstreamable stuff |
| 100 |
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" |
| 101 |
"${FILESDIR}/${PN}-6.1-nomancompress.patch" |
| 102 |
- "${FILESDIR}/${PN}-7.0.3.1-qt5detect.patch" |
| 103 |
+ "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch" |
| 104 |
) |
| 105 |
|
| 106 |
S="${WORKDIR}/${PN}-${MY_PV}" |
| 107 |
@@ -463,7 +462,6 @@ src_configure() { |
| 108 |
# --without-system-sane: just sane.h header that is used for scan in writer, |
| 109 |
# not linked or anything else, worthless to depend on |
| 110 |
# --disable-pdfium: not yet packaged |
| 111 |
- # --without-system-qrcodegen: has no real build system and LO is the only user |
| 112 |
local myeconfargs=( |
| 113 |
--with-system-dicts |
| 114 |
--with-system-epoxy |
| 115 |
@@ -507,7 +505,6 @@ src_configure() { |
| 116 |
--without-system-jfreereport |
| 117 |
--without-system_apache_commons |
| 118 |
--without-system-sane |
| 119 |
- --without-system-qrcodegen |
| 120 |
$(use_enable base report-builder) |
| 121 |
$(use_enable bluetooth sdremote-bluetooth) |
| 122 |
$(use_enable coinmp) |
Archives