gentoo auto-resync : 29:03:2024 - 01:13:38

3 files changed, 60 insertions, 3 deletions

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 324ea53f8472..599ac51b34cc 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -7,6 +7,7 @@ AUX libreoffice-7.5.8.2-icu-74-compatibility.patch 5299 BLAKE2B b1c12af133c48ef3
 AUX libreoffice-7.5.9.2-libxml2-2.12.patch 12445 BLAKE2B 3675c092e6a6d5f357a623fd0381faf53d20f66a555895450f0b437b0ca709a9bb2453a351abcf2e5caaad17dcaa8a9bebf2ede559ad6311c5f382088f44e460 SHA512 ffe0c6a3c696bf7549dcd4b6907d35b271361a53aa730502569b5073ecef15747f40886a554da0b369f549ab2fccb897dba7c1c04332f9271ba98d9ac11dc6ea
 AUX libreoffice-7.6-unused-qt5network.patch 3218 BLAKE2B 1445716fcfb556d7ef997bf1f5bf8dbb75032e9556d878fd999c6d260b2bff9e445cfec5f2a7537fe5118f31a1574cc21badb62b4a70b2452f694f03e75d2fd7 SHA512 e9861f2acfda59d09fc2f5431e4697a9bbd0927c5a765e35e7418b60ed0aeeafcaac3873fd0222b57facf71f4375a095a75e57574cd36e02f8ade0f264993647
 AUX libreoffice-7.6.5.2-gcc14.patch 1134 BLAKE2B a58f62b255455a827625eeecb43816aae1e66b98c9d93b926f2b000be72787e68a5f7c2e3a9a5301b7c82978275dfe53ec9474fc0bdd6d10801cf473009a0573 SHA512 2f4d00cec8ddf2362b787420f5f6e71f060fd4800291b907918255615cfa0996d7cc199898e69665ec0d6041776025043c796402a02be1192b087632cad9bea3
+AUX libreoffice-7.6.6.3-autoconf-2.72.patch 2967 BLAKE2B 9baf9a3f904abe5bc0f8bd6a6c322412daae3a6c4fb858185eee2c6af715286c9d71c80be93eb955d9e6d8c1ffb12cb194e614549e345976116e2e39727ba2e2 SHA512 8b77f14d396ceaa45b3b3a9ec452e3e6e5a1e277d75d86b9de565ab6fb0de69e8b8b0f185179c23a259300ab52db67e4aee22b6e9ca88ee38dbed75c90b0af9a
 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
@@ -46,7 +47,7 @@ EBUILD libreoffice-24.2.2.2.ebuild 20418 BLAKE2B a4565590a86e64cfa92b6ad0f476aeb
 EBUILD libreoffice-24.2.9999.ebuild 20337 BLAKE2B 127d3de6087ca61860bad4a2987bd693df8b3116d11abeaba6cdea51cd0ccf12fc557db50e2b2720eb83f21d724384bbf01f2036a9803f2932efe3ef76d2c9f4 SHA512 2c37f139a05d5df7bc45d53082cc7e3dd1cc5cb71197682349fb4b809b35f0ddc9cf8ee7bd113be3233cae950960cd907154ab7f2c637fb8b5f5d2e4634e6a54
 EBUILD libreoffice-7.6.4.1.ebuild 19678 BLAKE2B 9437af453ccbf75140b39cb37ff2705630a2499295681fa129945ca6ed96b030a832ac997990e80ee3cfb7d7203f5e3a1e4375677e456e1ff11c6a4dce3a3178 SHA512 c8d41e5bbbc9cbf9f2cd1f3d4dd74aca9074287410c4a2e26e789ed939a691385c6d9c3f62c5144ad2f8af15a9be26206f2470e5908ab10f507b423c459873b0
 EBUILD libreoffice-7.6.5.2.ebuild 19659 BLAKE2B 81a6b4e532ee828a93e7a586f7ca7765cc3a05500c563e9ead4f739de44f5c3ada7d9025862df5cf2d7d177e59ee091bd7554141df3c5f5a86616e367ddd901c SHA512 ce8574db7ad42413e68775dfe7cbf2ea3d5b3e8a5d27de9a84b9e1c4381a3bcd0c395f64ade36a44b5e6c463670f6c9959073b5634f543fb97c2a7c60c164974
-EBUILD libreoffice-7.6.6.3.ebuild 19674 BLAKE2B a623f785caa8ccfc03e0b1a06bb1afd54d3d8497227ebd0ca760ba124fe9baeaa327dc4c159e1250e8659971e3bfc919828434262b1180dd4904539b363ed4ab SHA512 5b73041c1be293b83980905cbedc4810e15621f5a2a98fb0faa44dfa8fb3167089d87c05f2b9b73c653a150585916580823ac68e4973a481faecbe58e9504cca
+EBUILD libreoffice-7.6.6.3.ebuild 19739 BLAKE2B d880c1fe8860f8fc1c07b79d1e57943ba6c11d986bb2f4c9fafc5ca6f38b49da9f35a6be88b73140af1e523e33db828b135c6b5cc50d9ab964509afac206a7d4 SHA512 3eef58354e82eb888de6ff0e9e5656e3e8704319c4718253f96093ce0f57f430e34cdec64ede22438e7cdc3a0977ce471ec754f51a34ecd0fa36f406ec2b570f
 EBUILD libreoffice-7.6.9999.ebuild 19670 BLAKE2B 3485289367b03f709aef887ae08a377f2ee1b33b6aac2cb9545d8a7a0d27fa1a98dfcf7bbe197cb168da2c454f1dd1a6671fe1c0567f2b9f473f53eae05509da SHA512 eedbaffa3957a00a93a517fd7a397d8050de64c45de846705d4277df8d49f1109c63572a163d8333ce02ea3e85a22f6cdaf116d5b57b7840d846a32015805695
 EBUILD libreoffice-9999.ebuild 20337 BLAKE2B 127d3de6087ca61860bad4a2987bd693df8b3116d11abeaba6cdea51cd0ccf12fc557db50e2b2720eb83f21d724384bbf01f2036a9803f2932efe3ef76d2c9f4 SHA512 2c37f139a05d5df7bc45d53082cc7e3dd1cc5cb71197682349fb4b809b35f0ddc9cf8ee7bd113be3233cae950960cd907154ab7f2c637fb8b5f5d2e4634e6a54
 MISC metadata.xml 1233 BLAKE2B f93989caf1340cda4c3327a3d3d033d224050848b32b9d80e0b093b024bf124d238f1aae9852d1a6173e8aee79314517dd12e589079e58378e5f63626a80957c SHA512 3af0cefdceeba7a45658a2151b0534f44b9dfe6d3af8374f3061cb098f607a36a2fe134e3c0280ce6d807b523f68e708b51e6f1b4178292a528405e18f12d686
diff --git a/app-office/libreoffice/files/libreoffice-7.6.6.3-autoconf-2.72.patch b/app-office/libreoffice/files/libreoffice-7.6.6.3-autoconf-2.72.patch
new file mode 100644
index 000000000000..749231a595e5
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-7.6.6.3-autoconf-2.72.patch
@@ -0,0 +1,53 @@
+From 78629e74e1e046a9ae4945088e2f7afde6db88d6 Mon Sep 17 00:00:00 2001
+From: Fridrich Strba <fridrich_strba@opensuse.org>
+Date: Tue, 12 Mar 2024 11:34:52 +0100
+Subject: Fix build with autoconf 2.72
+
+This commit http://git.savannah.gnu.org/gitweb/
+?p=autoconf.git;a=commitdiff;
+h=cf09f48841b66fe76f606dd6018bb3a93242a7c9
+changed the internal cache variable name and its content
+
+The effects show later in message like
+/tmp/ccyB6wS6.ltrans9.ltrans.o: in function `comphelper::DocPasswordHelper::decryptGpgSession(com::sun::star::uno::Sequence<com::sun::star::uno::Sequence<com::sun::star::beans::NamedValue> > const&)':
+/home/abuild/rpmbuild/BUILD/libreoffice-24.2.1.2/comphelper/source/misc/docpasswordhelper.cxx:705:(.text+0x4fb7): undefined reference to `GpgME::Data::seek(long, int)'
+/usr/bin/ld.bfd: /home/abuild/rpmbuild/BUILD/libreoffice-24.2.1.2/comphelper/source/misc/docpasswordhelper.cxx:716:(.text+0x5402): undefined reference to `GpgME::Data::seek(long, int)'
+/usr/bin/ld.bfd: /tmp/ccyB6wS6.ltrans13.ltrans.o: in function `comphelper::OStorageHelper::CreateGpgPackageEncryptionData()':
+/home/abuild/rpmbuild/BUILD/libreoffice-24.2.1.2/comphelper/source/misc/storagehelper.cxx:507:(.text+0x64e3): undefined reference to `GpgME::Data::seek(long, int)'
+/usr/bin/ld.bfd: /home/abuild/rpmbuild/BUILD/libreoffice-24.2.1.2/comphelper/source/misc/storagehelper.cxx:520:(.text+0x6583): undefined reference to `GpgME::Data::seek(long, int)'
+collect2: error: ld returned 1 exit status
+
+Where the type 'off_t' at the time of inclusion of the header and
+at the time of compilation of the library differ.
+
+Change-Id: Ie0486dbc869e84f5fb2688473334cfe464abd570
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164704
+Tested-by: Jenkins
+Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164715
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164764
+Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
+Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
+Tested-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
+---
+ configure.ac | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8101a2b2e1dd..758e160400ba 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -7197,7 +7197,9 @@ if test "$_os" != "WINNT"; then
+ 
+     dnl Check for large file support
+     AC_SYS_LARGEFILE
+-    if test -n "$ac_cv_sys_file_offset_bits" -a "$ac_cv_sys_file_offset_bits" != "no"; then
++    if test -n "$ac_cv_sys_largefile_opts"  -a "$ac_cv_sys_largefile_opts" != "none needed" -a "$ac_cv_sys_largefile_opts" != "support not detected"; then
++        LFS_CFLAGS="$ac_cv_sys_largefile_opts"
++    elif test -n "$ac_cv_sys_file_offset_bits" -a "$ac_cv_sys_file_offset_bits" != "no"; then
+         LFS_CFLAGS="-D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
+     fi
+     if test -n "$ac_cv_sys_large_files" -a "$ac_cv_sys_large_files" != "no"; then
+-- 
+cgit v1.2.3
+
diff --git a/app-office/libreoffice/libreoffice-7.6.6.3.ebuild b/app-office/libreoffice/libreoffice-7.6.6.3.ebuild
index c46991a279eb..847e7e9ebb21 100644
--- a/app-office/libreoffice/libreoffice-7.6.6.3.ebuild
+++ b/app-office/libreoffice/libreoffice-7.6.6.3.ebuild
@@ -102,8 +102,8 @@ RESTRICT="!test? ( test )"
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
 
-# [[ ${MY_PV} == *9999* ]] || \
-# KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	app-arch/unzip
@@ -296,6 +296,9 @@ PATCHES=(
 	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
 	"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
 
+	# 24.2 branch
+	"${FILESDIR}/${P}-autoconf-2.72.patch" # bug 925162
+
 	# TODO: upstream
 	"${FILESDIR}/${PN}-7.6-unused-qt5network.patch"