summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNils Freydank <holgersson@posteo.de>2021-09-07 09:21:37 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2021-09-07 20:28:29 +0200
commit8a77107795dec3091f09a1a064fed25eac68ebb6 (patch)
treefe0c92cd1c80e33cf333e9846c145018a38b6de9 /app-office/libreoffice/files
parentnet-dns/c-ares: remove vulnerable version, bug #807775 (diff)
downloadgentoo-8a77107795dec3091f09a1a064fed25eac68ebb6.tar.gz
gentoo-8a77107795dec3091f09a1a064fed25eac68ebb6.tar.bz2
gentoo-8a77107795dec3091f09a1a064fed25eac68ebb6.zip
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@posteo.de> Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'app-office/libreoffice/files')
-rw-r--r--app-office/libreoffice/files/libreoffice-7.2.0.4-qt5detect.patch13
1 files changed, 13 insertions, 0 deletions
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 000000000000..c905fabf5b30
--- /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".])