commit: 8a77107795dec3091f09a1a064fed25eac68ebb6 Author: Nils Freydank <holgersson <AT> posteo <DOT> de> AuthorDate: Tue Sep 7 07:21:37 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Sep 7 18:28:29 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a771077
app-office/libreoffice: Update live ebuild Upstream uses media-libs/zxing-cpp now instead of qrcodegen. This bump reflects this change plus some other bumps like skia and some housekeeping. Thanks alot for the hints via bug reports by a fellow user! Thanks-To: jospezial Closes: https://bugs.gentoo.org/792093 Closes: https://bugs.gentoo.org/792096 Closes: https://bugs.gentoo.org/792099 Package-Manager: Portage-3.0.22, Repoman-3.0.3 Signed-off-by: Nils Freydank <holgersson <AT> posteo.de> Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> app-office/libreoffice/Manifest | 1 + .../libreoffice/files/libreoffice-7.2.0.4-qt5detect.patch | 13 +++++++++++++ app-office/libreoffice/libreoffice-9999.ebuild | 11 ++++------- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 20d2cb48790..639c9655e71 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -23,3 +23,4 @@ DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd234 DIST libreoffice-help-7.1.3.2.tar.xz 111785416 BLAKE2B 12d97764976ae0e4736638e9b758c5920d38d608e66fc3343d74178a935632396e1e07fbb98b6f380fd103c3f5e2edf917726a760420f6dfd3d2e42aaa215096 SHA512 576dbea391777a907275b630ed704dd3d9ad0627f8a18da1cbd23fe28df04c3a509583c2404f810df3aaac15ef0881e2c1e0a55c9f31618715586628873367eb DIST libreoffice-help-7.1.5.2.tar.xz 111785852 BLAKE2B 18962fe9260f6cf8ec7b1676f077b9f43e0277769b31b8e2c22cf83ac2963f3e92448901bc12f56dfb579da8a8a1ce20d6bd34c4bc3449f7e0972c03d22f63be SHA512 c669b6c4bfc3c6f46e4ee0bf86b158054f7178b9785273d9aba8183236b2ff6dbaf5584d5e4fb09bba3a8d010373599e7473a4ba15c229087c689198ceeee1c7 DIST skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz 10420480 BLAKE2B 83bcc9ff3a3a916ccb92f49ef69f99386e89b636d37679ab17735625c56c4bb31ca89a7034d9282c905b405e0b31215de5fd3734061d323d48db440e4ad52643 SHA512 8e5c37b895d7f5fe15f491005ac46b39efe3bfb3af5dc805bf1226b2112496bdb9e433cc3b313f8fc185fe1f898d126b8a557d23485615cdbe917f0b76855f3d +DIST skia-m94-975fcdd755dfc5d57cddbb25857e0c4ac29abe98.tar.xz 11672176 BLAKE2B 64d7821656002d23be839079dedffe1132497992aaef97ec734d6e430f2eda69f5344ca7fe75dd68fee847fa4c6638b4fc28194a951b91498ece5c6d4bcf3e44 SHA512 ae66fa7caeb5a328d96cd1c35eb8700080be5d3e3764e35b8056b03948e44b8bb8266284c87b44f9200accb95dbb8a2771a6e5ba067d34a7fbd33b1ababf19f8 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 new file mode 100644 index 00000000000..c905fabf5b3 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-7.2.0.4-qt5detect.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index 971d7ad440c5..adb01509ab29 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -12683,7 +12683,7 @@ then + + dnl Check for Meta Object Compiler + +- AC_PATH_PROGS( MOC5, [moc-qt5 moc], no, [`dirname $qt5_libdir`/bin:$QT5DIR/bin:$PATH]) ++ AC_PATH_PROGS( MOC5, [moc-qt5 moc], no, [$QT5DIR/bin]) + if test "$MOC5" = "no"; then + AC_MSG_ERROR([Qt Meta Object Compiler not found. Please specify + the root of your Qt installation by exporting QT5DIR before running "configure".]) diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index 45f856b59db..6ca28c7797e 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -47,9 +47,7 @@ ADDONS_SRC=( # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c "${ADDONS_URI}/dtoa-20180411.tgz" # not packaged in Gentoo, https://skia.org/ - "${ADDONS_URI}/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz" - # QR code generating library for >=libreoffice-6.4, bug #691740 - "${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz" + "${ADDONS_URI}/skia-m94-975fcdd755dfc5d57cddbb25857e0c4ac29abe98.tar.xz" "base? ( ${ADDONS_URI}/commons-logging-1.2-src.tar.gz ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip @@ -136,7 +134,6 @@ COMMON_DEPEND="${PYTHON_DEPS} >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC - >=games-engines/box2d-2.4.1:0 dev-lang/perl >=dev-libs/boost-1.72.0:=[nls] dev-libs/expat @@ -152,6 +149,7 @@ COMMON_DEPEND="${PYTHON_DEPS} dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] + >=games-engines/box2d-2.4.1:0 media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig @@ -165,6 +163,7 @@ COMMON_DEPEND="${PYTHON_DEPS} >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf + media-libs/zxing-cpp >=net-libs/neon-0.31.1:= net-misc/curl sci-mathematics/lpsolve @@ -291,7 +290,7 @@ PATCHES=( # not upstreamable stuff "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" "${FILESDIR}/${PN}-6.1-nomancompress.patch" - "${FILESDIR}/${PN}-7.0.3.1-qt5detect.patch" + "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch" ) S="${WORKDIR}/${PN}-${MY_PV}" @@ -463,7 +462,6 @@ src_configure() { # --without-system-sane: just sane.h header that is used for scan in writer, # not linked or anything else, worthless to depend on # --disable-pdfium: not yet packaged - # --without-system-qrcodegen: has no real build system and LO is the only user local myeconfargs=( --with-system-dicts --with-system-epoxy @@ -507,7 +505,6 @@ src_configure() { --without-system-jfreereport --without-system_apache_commons --without-system-sane - --without-system-qrcodegen $(use_enable base report-builder) $(use_enable bluetooth sdremote-bluetooth) $(use_enable coinmp)
