gentoo auto-resync : 01:09:2022 - 19:24:10

6 files changed, 64 insertions, 21 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 6c2b62538888..f5accae56b95 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index e9288e2bf331..fd75ec6d486c 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -4,6 +4,7 @@ AUX libreoffice-7.2.0.4-qt5detect.patch 536 BLAKE2B fd77876d1ca3973ad30c9ebb60bf
 AUX libreoffice-7.2.6.2-poppler-22.03.0.patch 1361 BLAKE2B da788c4de7203ab20337a1d92cb4478f7a7db3f54e05054e5943d8acf78eb0907f9510c6bdf5bfc5466171322af98f55fe68ee0678e2a08856f6247b1981840b SHA512 f2cb95d52a97b1f3dc985e391df333159b2754ba3a386b71479c584363022c54b09125bfedaf61c72f056e12677a4dd1eac1d3074adaadc084243ddea05392c6
 AUX libreoffice-7.3.3.2-Add-missing-nSize-set-for-Poppler-22.04.0.patch 1122 BLAKE2B 7f6c0d006fda26d868f2b4a193c8280ac3048233a2e796d1a10ec7210e68ecc391d6c4aa88a28c42bfb053fe418abe5fbbb1c3eeb8521990f692fb94387c334e SHA512 3abdc14a55cea3829cac8c652fcbe6cbbbae45b1ba8e02bf8654f8b8c45780d73eb094968985fe98e10b014c2e2b8b3fd82a830af297902644e2ceffe3a02ad1
 AUX libreoffice-7.3.3.2-Import-FreeBSD-patch-for-Poppler-22.04.0-build.patch 2462 BLAKE2B bb49834014847b2cba163cbb946d865f3dee13a3a9fc04fa74ff9526ae089f8213ae2f094170d41e909ae77d93e468cbf06eefdd05262a305d52a3300a2b4b88 SHA512 d47885a5476bb81243a93729f176902144134c66914ad7e8ec9032c85bb9b5f19040236da883d7cc0dec14d05af32771be06c3a686d0b9587721b8aed65aa5ad
+AUX libreoffice-7.3.5.2-gpgme-1.18.0.patch 2290 BLAKE2B ff65e3bb94e000c9963300580378213e7768748012f5ece1f761eb95ee9cda1dd5582c47abd7a2ca10c0266ab26ce4cc1aa4a683d8791c6940ca9d8758cac446 SHA512 b631300030d0fa9434ca97bf79ebfb8d497568f02aff58b9438840f1166b7d6d9c0d3ce7a4ad67dedfe5ee7588adb4027ef17dd6054a6c29f28278615ae0c019
 AUX libreoffice.confd 228 BLAKE2B 7b9ed0d08b91b6e78dd3a2ac242cac48ef141c25bf25713b5fa6c4fdea3d5b0e16b4073a864fbec328edf4008729869fba5236e9cc113ba9bd3d6de5c10153c3 SHA512 6718cfd481b4349d70b718d4811f80ac0eff60d465b9f9eeff8ab9641de1fecb6197023f98bb1fca77a57b48ae2d8e38803f3af3a51191b1df71aa8cc5d33661
 AUX libreoffice.initd 507 BLAKE2B d49fd0f48254160fff3eb90a75294c6cf044805352a982ab3d2127426a18a6171e5043c071b59581a1f927a7c499c8abb58820081c6ba6e285097c883917f0e3 SHA512 fee4720898510b1aa07a9ed597d041d1e1edfb8f8b8e9596ef4254d4d3c1e8a959bbd65202a377289910ed28283f9c8a4bdc893d2d0835f37ee28cd3c7cb010d
 DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 BLAKE2B ccfdf6b7f88f22d3ec7898c529c374f13059979450aabdccc9781ca91dd27d0119dfec3d33dda073c2973fa4a8aacae13924c9a67e38a1422c48bfee41b6f3e8 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a
@@ -38,7 +39,7 @@ DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 BLAKE2B
 DIST skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz 11826600 BLAKE2B 2985ba0318fd72ac216fda33c6961eaa8ee649d2a850eb736accbd91fbc9cee7dc4e5752b2696a35204770a188412e2ecd0cc128cec324c682f9bc35e68358b3 SHA512 fbf5cfef66991565dbad928091a4e795a5b5b79a1e062a98ab9135b9972827de703c449507957294e7471c422c2e2ed239d6df61ffb9b9581a9ca3d848687a76
 EBUILD libreoffice-7.3.3.2-r3.ebuild 20228 BLAKE2B cb29a34f5c74e4edd871f36b469242de2bfe4b29c31eb61248855cf29925c5d2303e9fa0bc6e64d09833f9a44e70ebc9c140fe60b0bf33e25a815365d4fdb9be SHA512 b0ea4d4225cf32915a6c57a9644439b841b3c171680dbe187592cd9c12522e98c085f23e3594a37b5d18afe118b0137c68e66790408a1fadaedeb30a0ae552b8
 EBUILD libreoffice-7.3.4.2-r1.ebuild 19845 BLAKE2B 3bfd2994d25e0be0e751ac273b311cc6172cd117526acbb149dde34c114767c8860d79f1f4616d60256e4052d69f80779dc9607ef77fe08ab9ed3b75f047216a SHA512 2902c88f6dad6b37e8de0770d556cd6c55e04431f85daf6a889c3b4a9d6d282882da48670a951cd2500f7cd5ddf6de1da0aee77e8cb389d497c4353cea7d4006
-EBUILD libreoffice-7.3.5.2.ebuild 19583 BLAKE2B a7759e72c84d0dc68e8d7f479de6d88ba72e4abac35cd01de742877038f0b3ec2867ced7986220f24dee2988a80a6fd6be8961263fa850242c45b1c0acbdf79c SHA512 44323e404bb8ef58a3f48834a0a16a6e5c370d80ba337f939511b37cf7d54104c37fa8ffd8135a771f34616b0b95a0b74a68f7a154605654f1b3b8929f845bfb
-EBUILD libreoffice-7.3.9999.ebuild 19558 BLAKE2B 905f222b9f98240dab53a97f133be46a85633f9a6e58e761d4249027061fa0dcfc63a533736b2f1ef779398f3091fa7384456f72ef02a9b284c6825e8c8a7952 SHA512 c63e0ba7d53a4ac3dbd37fa8f62f1d2cab777cb4c3c942a95a1565636c8ccd33549fe3997babdc38fa575b6d64243e55c07b695da58771fa9426688883fda10d
-EBUILD libreoffice-9999.ebuild 19561 BLAKE2B 4c82edf0dccb6b79c51befce0f1b7cb6d87062f50af856214335d8515315c2cee595ffa60b0d0f77405eb97e3796d9a19b952747b0a389d92382de619846605c SHA512 777bc54200ffc6aaac80b72f56902b5c09101bbd00d62508e3b6b11f701aed4c541252926b90c4f91e6c0f58ec32796d4e48e1d7004ba34797648c5b5db3b37c
+EBUILD libreoffice-7.3.5.2.ebuild 19485 BLAKE2B 923b123949c4beed98b7f8fb42713b95bbea5ae53dcc3a6cc9b68224cdd4982553d0ed0b7ab4200924e9ce2dd3614072ee7a2be622f262f6b442ba6ec80509da SHA512 98c90984e22b1ec45396cc8cc4f48bdc21cfd74c0f946084a113ce6bbbb6b7910682c8649172834f89b3384a482050e1ed8fe5a0e8b0705db4d0f8dbab931dea
+EBUILD libreoffice-7.3.9999.ebuild 19460 BLAKE2B 7248df0a3c14b9f8d906a604d28da23f792752204eeb7023fbbfee6234b744cfd553e59a1c0a5bd13fe765488ee276bfba7cc209a405e195e6e3fa86c95b1185 SHA512 9a830c095364c73ef632efc2ff191e6f2d5cec855bcdd3da926b6da462279be46c2d671c21ff0122aa0129b8b0abd70d094851feda0efe43d710f0416c8a8c97
+EBUILD libreoffice-9999.ebuild 19402 BLAKE2B 5df5971e4858fdf107ef6d67fb994c1edcf6a6e2754beb6dd9ea53637508aaf92a1f8556e82d96f558af333f64d5cf70167e97f2a0ca1cb2c46f60ba4141b740 SHA512 3b4ef56789ce84254e29b50a32d21fadd20c1d437df6e25eaca3a6c4f8afb08cecff1e93fb8ad6b0805fe20d3c7003fe21018f4131d2293828577018ca6cef5e
 MISC metadata.xml 1233 BLAKE2B f93989caf1340cda4c3327a3d3d033d224050848b32b9d80e0b093b024bf124d238f1aae9852d1a6173e8aee79314517dd12e589079e58378e5f63626a80957c SHA512 3af0cefdceeba7a45658a2151b0534f44b9dfe6d3af8374f3061cb098f607a36a2fe134e3c0280ce6d807b523f68e708b51e6f1b4178292a528405e18f12d686
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
new file mode 100644
index 000000000000..d8dae52d9b09
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-7.3.5.2-gpgme-1.18.0.patch
@@ -0,0 +1,48 @@
+https://bugs.gentoo.org/865321
+https://lists.freedesktop.org/archives/libreoffice/2022-August/089261.html
+https://github.com/LibreOffice/core/commit/aa0b2b756c17d43d2e8c828a909ee2815e332377
+
+From: Rene Engelhard <rene@debian.org>
+Date: Wed, 24 Aug 2022 09:55:33 +0200
+Subject: [PATCH] Make configure work with gpgme >= 1.18
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Sam James wrote:
+> gpgme-1.18.0 dropped a bunch of internal symbols,
+> including progress_callback (see e.g. callbacks.h
+> which has a comment at the top saying it's internal).
+
+Plausibly the workaround to not link against older KDE-specific distro
+packages is not needed anymore.
+
+Check for main as a workaround as we do for other C++ libraries, too.
+
+Change-Id: I57065a5b5b23b9eadb73b01e4f3a289552c3bde4
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138667
+Tested-by: Jenkins
+Reviewed-by: Sam James <sam@gentoo.org>
+Reviewed-by: René Engelhard <rene@debian.org>
+(cherry picked from commit b4a94d681a99a6a3eeb6aaa4d2f4dfab8f7c000b)
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138553
+Tested-by: René Engelhard <rene@debian.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -12537,12 +12537,11 @@ elif test \( \( "$_os" = "Linux" -o "$_os" = "Darwin" \) -a "$ENABLE_NSS" = TRUE
+         # C++ library doesn't come with fancy gpgmepp-config, check for headers the old-fashioned way
+         AC_CHECK_HEADER(gpgme++/gpgmepp_version.h, [ GPGMEPP_CFLAGS=-I/usr/include/gpgme++ ],
+             [AC_MSG_ERROR([gpgmepp headers not found, install gpgmepp >= 1.14 development package])], [])
+-        # progress_callback is the only func with plain C linkage
+-        # checking for it also filters out older, KDE-dependent libgpgmepp versions
+-        AC_CHECK_LIB(gpgmepp, progress_callback, [ GPGMEPP_LIBS=-lgpgmepp ],
+-            [AC_MSG_ERROR(gpgmepp not found or not functional)], [])
+         AC_CHECK_HEADER(gpgme.h, [],
+             [AC_MSG_ERROR([gpgme headers not found, install gpgme development package])], [])
++        AC_CHECK_LIB(gpgmepp, main, [],
++            [AC_MSG_ERROR(gpgmepp not found or not functional)], [])
++	GPGMEPP_LIBS=-lgpgmepp
+     else
+         AC_MSG_RESULT([internal])
+         BUILD_TYPE="$BUILD_TYPE LIBGPGERROR LIBASSUAN GPGMEPP"
+
diff --git a/app-office/libreoffice/libreoffice-7.3.5.2.ebuild b/app-office/libreoffice/libreoffice-7.3.5.2.ebuild
index 26b88244df96..07c41dd1473e 100644
--- a/app-office/libreoffice/libreoffice-7.3.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.5.2.ebuild
@@ -293,6 +293,9 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
 	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
 	"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
+
+	# Upstream
+	"${FILESDIR}/${PN}-7.3.5.2-gpgme-1.18.0.patch"
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"
@@ -565,9 +568,6 @@ src_configure() {
 			myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
 	fi
 
-	# Workaround to fix build w/ gpgme 1.18.0, bug #865321
-	export ac_cv_lib_gpgmepp_progress_callback=yes
-
 	is-flagq "-flto*" && myeconfargs+=( --enable-lto )
 
 	MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
@@ -585,12 +585,11 @@ src_compile() {
 }
 
 src_test() {
-	make unitcheck || die
-	make slowcheck || die
+	emake unitcheck
+	emake slowcheck
 }
 
 src_install() {
-	# This is not Makefile so no buildserver
 	emake DESTDIR="${D}" distro-pack-install -o build -o check
 
 	# bug 593514
diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
index dd4c5cd297b3..69651435d7d7 100644
--- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
@@ -293,6 +293,9 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
 	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
 	"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
+
+	# Upstream
+	"${FILESDIR}/${PN}-7.3.5.2-gpgme-1.18.0.patch"
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"
@@ -565,9 +568,6 @@ src_configure() {
 			myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
 	fi
 
-	# Workaround to fix build w/ gpgme 1.18.0, bug #865321
-	export ac_cv_lib_gpgmepp_progress_callback=yes
-
 	is-flagq "-flto*" && myeconfargs+=( --enable-lto )
 
 	MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
@@ -585,12 +585,11 @@ src_compile() {
 }
 
 src_test() {
-	make unitcheck || die
-	make slowcheck || die
+	emake unitcheck
+	emake slowcheck
 }
 
 src_install() {
-	# This is not Makefile so no buildserver
 	emake DESTDIR="${D}" distro-pack-install -o build -o check
 
 	# bug 593514
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 6c215e444452..f7ff3494a447 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -565,9 +565,6 @@ src_configure() {
 			myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
 	fi
 
-	# Workaround to fix build w/ gpgme 1.18.0, bug #865321
-	export ac_cv_lib_gpgmepp_progress_callback=yes
-
 	is-flagq "-flto*" && myeconfargs+=( --enable-lto )
 
 	MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
@@ -585,12 +582,11 @@ src_compile() {
 }
 
 src_test() {
-	make unitcheck || die
-	make slowcheck || die
+	emake unitcheck
+	emake slowcheck
 }
 
 src_install() {
-	# This is not Makefile so no buildserver
 	emake DESTDIR="${D}" distro-pack-install -o build -o check
 
 	# bug 593514