| 1 |
commit: ac8e15beacefb21f215f9f25e282da204e4ef435 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 31 21:44:10 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 31 21:45:19 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac8e15be |
| 7 |
|
| 8 |
app-office/libreoffice: use upstream gpgme 1.18.0 patch |
| 9 |
|
| 10 |
At least for 7.3.x. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/865321 |
| 13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 14 |
|
| 15 |
.../files/libreoffice-7.3.5.2-gpgme-1.18.0.patch | 48 ++++++++++++++++++++++ |
| 16 |
app-office/libreoffice/libreoffice-7.3.5.2.ebuild | 6 +-- |
| 17 |
app-office/libreoffice/libreoffice-7.3.9999.ebuild | 6 +-- |
| 18 |
app-office/libreoffice/libreoffice-9999.ebuild | 3 -- |
| 19 |
4 files changed, 54 insertions(+), 9 deletions(-) |
| 20 |
|
| 21 |
diff --git a/app-office/libreoffice/files/libreoffice-7.3.5.2-gpgme-1.18.0.patch b/app-office/libreoffice/files/libreoffice-7.3.5.2-gpgme-1.18.0.patch |
| 22 |
new file mode 100644 |
| 23 |
index 000000000000..d8dae52d9b09 |
| 24 |
--- /dev/null |
| 25 |
+++ b/app-office/libreoffice/files/libreoffice-7.3.5.2-gpgme-1.18.0.patch |
| 26 |
@@ -0,0 +1,48 @@ |
| 27 |
+https://bugs.gentoo.org/865321 |
| 28 |
+https://lists.freedesktop.org/archives/libreoffice/2022-August/089261.html |
| 29 |
+https://github.com/LibreOffice/core/commit/aa0b2b756c17d43d2e8c828a909ee2815e332377 |
| 30 |
+ |
| 31 |
+From: Rene Engelhard <rene@××××××.org> |
| 32 |
+Date: Wed, 24 Aug 2022 09:55:33 +0200 |
| 33 |
+Subject: [PATCH] Make configure work with gpgme >= 1.18 |
| 34 |
+MIME-Version: 1.0 |
| 35 |
+Content-Type: text/plain; charset=UTF-8 |
| 36 |
+Content-Transfer-Encoding: 8bit |
| 37 |
+ |
| 38 |
+Sam James wrote: |
| 39 |
+> gpgme-1.18.0 dropped a bunch of internal symbols, |
| 40 |
+> including progress_callback (see e.g. callbacks.h |
| 41 |
+> which has a comment at the top saying it's internal). |
| 42 |
+ |
| 43 |
+Plausibly the workaround to not link against older KDE-specific distro |
| 44 |
+packages is not needed anymore. |
| 45 |
+ |
| 46 |
+Check for main as a workaround as we do for other C++ libraries, too. |
| 47 |
+ |
| 48 |
+Change-Id: I57065a5b5b23b9eadb73b01e4f3a289552c3bde4 |
| 49 |
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138667 |
| 50 |
+Tested-by: Jenkins |
| 51 |
+Reviewed-by: Sam James <sam@g.o> |
| 52 |
+Reviewed-by: René Engelhard <rene@××××××.org> |
| 53 |
+(cherry picked from commit b4a94d681a99a6a3eeb6aaa4d2f4dfab8f7c000b) |
| 54 |
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138553 |
| 55 |
+Tested-by: René Engelhard <rene@××××××.org> |
| 56 |
+--- a/configure.ac |
| 57 |
++++ b/configure.ac |
| 58 |
+@@ -12537,12 +12537,11 @@ elif test \( \( "$_os" = "Linux" -o "$_os" = "Darwin" \) -a "$ENABLE_NSS" = TRUE |
| 59 |
+ # C++ library doesn't come with fancy gpgmepp-config, check for headers the old-fashioned way |
| 60 |
+ AC_CHECK_HEADER(gpgme++/gpgmepp_version.h, [ GPGMEPP_CFLAGS=-I/usr/include/gpgme++ ], |
| 61 |
+ [AC_MSG_ERROR([gpgmepp headers not found, install gpgmepp >= 1.14 development package])], []) |
| 62 |
+- # progress_callback is the only func with plain C linkage |
| 63 |
+- # checking for it also filters out older, KDE-dependent libgpgmepp versions |
| 64 |
+- AC_CHECK_LIB(gpgmepp, progress_callback, [ GPGMEPP_LIBS=-lgpgmepp ], |
| 65 |
+- [AC_MSG_ERROR(gpgmepp not found or not functional)], []) |
| 66 |
+ AC_CHECK_HEADER(gpgme.h, [], |
| 67 |
+ [AC_MSG_ERROR([gpgme headers not found, install gpgme development package])], []) |
| 68 |
++ AC_CHECK_LIB(gpgmepp, main, [], |
| 69 |
++ [AC_MSG_ERROR(gpgmepp not found or not functional)], []) |
| 70 |
++ GPGMEPP_LIBS=-lgpgmepp |
| 71 |
+ else |
| 72 |
+ AC_MSG_RESULT([internal]) |
| 73 |
+ BUILD_TYPE="$BUILD_TYPE LIBGPGERROR LIBASSUAN GPGMEPP" |
| 74 |
+ |
| 75 |
|
| 76 |
diff --git a/app-office/libreoffice/libreoffice-7.3.5.2.ebuild b/app-office/libreoffice/libreoffice-7.3.5.2.ebuild |
| 77 |
index 26b88244df96..d45c3048f25c 100644 |
| 78 |
--- a/app-office/libreoffice/libreoffice-7.3.5.2.ebuild |
| 79 |
+++ b/app-office/libreoffice/libreoffice-7.3.5.2.ebuild |
| 80 |
@@ -293,6 +293,9 @@ PATCHES=( |
| 81 |
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" |
| 82 |
"${FILESDIR}/${PN}-6.1-nomancompress.patch" |
| 83 |
"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch" |
| 84 |
+ |
| 85 |
+ # Upstream |
| 86 |
+ "${FILESDIR}/${PN}-7.3.5.2-gpgme-1.18.0.patch" |
| 87 |
) |
| 88 |
|
| 89 |
S="${WORKDIR}/${PN}-${MY_PV}" |
| 90 |
@@ -565,9 +568,6 @@ src_configure() { |
| 91 |
myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) ) |
| 92 |
fi |
| 93 |
|
| 94 |
- # Workaround to fix build w/ gpgme 1.18.0, bug #865321 |
| 95 |
- export ac_cv_lib_gpgmepp_progress_callback=yes |
| 96 |
- |
| 97 |
is-flagq "-flto*" && myeconfargs+=( --enable-lto ) |
| 98 |
|
| 99 |
MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \ |
| 100 |
|
| 101 |
diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild b/app-office/libreoffice/libreoffice-7.3.9999.ebuild |
| 102 |
index dd4c5cd297b3..4969bd6b6a3e 100644 |
| 103 |
--- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild |
| 104 |
+++ b/app-office/libreoffice/libreoffice-7.3.9999.ebuild |
| 105 |
@@ -293,6 +293,9 @@ PATCHES=( |
| 106 |
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" |
| 107 |
"${FILESDIR}/${PN}-6.1-nomancompress.patch" |
| 108 |
"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch" |
| 109 |
+ |
| 110 |
+ # Upstream |
| 111 |
+ "${FILESDIR}/${PN}-7.3.5.2-gpgme-1.18.0.patch" |
| 112 |
) |
| 113 |
|
| 114 |
S="${WORKDIR}/${PN}-${MY_PV}" |
| 115 |
@@ -565,9 +568,6 @@ src_configure() { |
| 116 |
myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) ) |
| 117 |
fi |
| 118 |
|
| 119 |
- # Workaround to fix build w/ gpgme 1.18.0, bug #865321 |
| 120 |
- export ac_cv_lib_gpgmepp_progress_callback=yes |
| 121 |
- |
| 122 |
is-flagq "-flto*" && myeconfargs+=( --enable-lto ) |
| 123 |
|
| 124 |
MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \ |
| 125 |
|
| 126 |
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild |
| 127 |
index 6c215e444452..f791cbf01383 100644 |
| 128 |
--- a/app-office/libreoffice/libreoffice-9999.ebuild |
| 129 |
+++ b/app-office/libreoffice/libreoffice-9999.ebuild |
| 130 |
@@ -565,9 +565,6 @@ src_configure() { |
| 131 |
myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) ) |
| 132 |
fi |
| 133 |
|
| 134 |
- # Workaround to fix build w/ gpgme 1.18.0, bug #865321 |
| 135 |
- export ac_cv_lib_gpgmepp_progress_callback=yes |
| 136 |
- |
| 137 |
is-flagq "-flto*" && myeconfargs+=( --enable-lto ) |
| 138 |
|
| 139 |
MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \ |
Archives