gentoo auto-resync : 13:01:2023 - 23:50:08

3 files changed, 39 insertions, 1 deletions

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index fc0098ea46f5..dfa23e607362 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.3.5.2-gpgme-1.18.0.patch 2290 BLAKE2B ff65e3bb94e000c9963300580378213e7768748012f5ece1f761eb95ee9cda1dd5582c47abd7a2ca10c0266ab26ce4cc1aa4a683d8791c6940ca9d8758cac446 SHA512 b631300030d0fa9434ca97bf79ebfb8d497568f02aff58b9438840f1166b7d6d9c0d3ce7a4ad67dedfe5ee7588adb4027ef17dd6054a6c29f28278615ae0c019
 AUX libreoffice-7.3.7.2-boost-1.81-locale.patch 1687 BLAKE2B 2d95ddf84c7a2b1eb69da311ac0bc7bdac67ec48173d20a375563455411501b783805f6f8d7e71dc8b3e9b8dc166e5bde96260e26ca57c0333a9c4c5f9a09661 SHA512 4fc2f01f890809f4e118744d7d6dc484f124b980b7699753acf6597c390e4457aac2a32bb720d4ac3afcbb9776b472c27b9c13ebd9aadec2c354a9ee0108e854
 AUX libreoffice-7.3.7.2-zxing-cpp-1.4.0.patch 2221 BLAKE2B c0b719247e58ae9270c420d3f3d4c34ac71ab67cfdcf2e766c6b7420c4919e486fb123c816a0651ad71c71662c155159fb4855934402f0959a3e5394ef818376 SHA512 26bf310f333e862eb91241e0f7b30fea031f29a4a1dfb74b5bfc0a2a9799f80c8a4d550fdcb22d674b4c5bb87618968892d7aa30ed2f0d30ce837c11707bac43
+AUX libreoffice-7.4.4.2-zxing-cpp-1.4.0-c++17.patch 1344 BLAKE2B 463964af9f5480e8038d1d860ac3184da611a2fde3c5a4ba9bacb61d8d676d336aedae65471054d0d01e0524fd7021bc513e8e1a44126e310817dbcda419a626 SHA512 77baae50517f3cefe9edcedfb9438e3b988a1430dc85ac18d0d7e4a15296ff7500b2b0d9db4a2c1d7e383afc2711afe862044c33ad05fa3764a72de0b10e1835
 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
@@ -39,7 +40,7 @@ DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 BLAKE2B
 DIST skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz 11826600 BLAKE2B 2985ba0318fd72ac216fda33c6961eaa8ee649d2a850eb736accbd91fbc9cee7dc4e5752b2696a35204770a188412e2ecd0cc128cec324c682f9bc35e68358b3 SHA512 fbf5cfef66991565dbad928091a4e795a5b5b79a1e062a98ab9135b9972827de703c449507957294e7471c422c2e2ed239d6df61ffb9b9581a9ca3d848687a76
 EBUILD libreoffice-7.3.7.2.ebuild 19417 BLAKE2B 186ac78ef4f9fc953f1301928921f06999205959290ffefd9c25110289cf99c48bdb45637466bee7f0f3a242aba1f0df7cfb3a26f68695ae00b4b79c703caabd SHA512 d520cbbb1a1a75d4350bd296421c7f2164e8be51d8fbebecc4f6e6b9aa1a2a7ccb75162facf8a83ed9e8ea62e5d0ea1231becf1e8a22943381839d8b13b328c9
 EBUILD libreoffice-7.4.3.2.ebuild 19374 BLAKE2B 789589be31dc83469925ca376b7127030e27a126c169cb2945fd94d73c6e8870f617d6de32d0a26903534e2cce43852121783242590ee79034044b39a000470b SHA512 833e75cad1f9b288a6a0c883233ca0ddd1510826a8d4284195e307b891712e4b7475536230b0ce6212e5b95eb152964083f1f6a7ecfd367a9784ccf7b28bc14e
-EBUILD libreoffice-7.4.4.2.ebuild 19374 BLAKE2B 4e28f373ddb07f9745ea9a7565fcd0290768a9dc8562529231b14b4f4b84671d2f35dd1d6103a24766bdc818b71d78ced51a0a40abf3ef98d0e8eb3f82a33034 SHA512 f1aa09e55c4277a7cb2a78bd88cc450f715af5fdcd3e3e2054db8934aaf872e12e28bd3df05ee41de28facf6e8f29a70881efbf9db6ba715e94d6b43c4afda60
+EBUILD libreoffice-7.4.4.2.ebuild 19431 BLAKE2B 12f566dc1b4bbebc8b545323c5dca259a390827f01256ec011e86b3e94932b8a8942a833ab546e8d6cb46e15a2c2a20e652c65d565b94d5df0437cb7e3ba951c SHA512 001a872c923b9379fce9178953de4bb1a2f3e3f5a51ce3be817745def0e1d9fc107872560d2c75c212ebbf214b874d0e8c86a55b20774bcb40889fe650603db4
 EBUILD libreoffice-7.4.9999.ebuild 19376 BLAKE2B 73487b2fe09248f84c7f6f729d52bdf376c5291cda91cbd4baf800df1940012e171baba08e5b26248e296f753a880d4af73ce8d30abca30bbd6941e2d4d9d46e SHA512 4dde440963552663910a8d4e673230bc2c4111a7097d4e61d60e44e4c01edb80dc7999cf872bf28a284773d1d29761e04128e063eadce9efe98a23ba0f9f2fff
 EBUILD libreoffice-9999.ebuild 19257 BLAKE2B b70f1e507d044322492b21e2ccda20d231e77826e8ed4f99857ba820cd3c84097d2523a87a3da931bd4723d92d4774d08ab369830dceafb5265cc1c5ef5223f0 SHA512 66d784ed3bff6e8b2c0e0992689a79b4345bfaafde4d68effdb21db9215b780a505ee9462a513b3a9082537188e7801dd491229e26f83cc50447dd21b69d391f
 MISC metadata.xml 1233 BLAKE2B f93989caf1340cda4c3327a3d3d033d224050848b32b9d80e0b093b024bf124d238f1aae9852d1a6173e8aee79314517dd12e589079e58378e5f63626a80957c SHA512 3af0cefdceeba7a45658a2151b0534f44b9dfe6d3af8374f3061cb098f607a36a2fe134e3c0280ce6d807b523f68e708b51e6f1b4178292a528405e18f12d686
diff --git a/app-office/libreoffice/files/libreoffice-7.4.4.2-zxing-cpp-1.4.0-c++17.patch b/app-office/libreoffice/files/libreoffice-7.4.4.2-zxing-cpp-1.4.0-c++17.patch
new file mode 100644
index 000000000000..0c47a14fe308
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-7.4.4.2-zxing-cpp-1.4.0-c++17.patch
@@ -0,0 +1,36 @@
+https://gerrit.libreoffice.org/c/core/+/145479
+
+From a7a6b436f1a83321ccba5b6b44a275205aa729e0 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 13 Jan 2023 15:09:59 +0000
+Subject: [PATCH] configure.ac: Fix build with --with-system-zxing and < Clang
+ 16
+
+Clang 15 and older default to -std=c++14, not -std=c++17 (unlike Clang 16 onwards).
+
+This doesn't show up with GCC because GCC 11 onwards defaults to -std=c++17.
+
+The new version of libzxing requires C++ 17, per its release notes. Adapt
+the configure check accordingly to pass -std=c++17 when checking for its
+headers and save accordingly if successful.
+
+(Do this via ${CXXFLAGS_CXX11} which has the appropriate switch
+for our compiler, despite its name.)
+
+Bug: https://bugs.gentoo.org/890324
+Change-Id: Iaaa8fdc05eea0e26416b605bfda8f2d831f8729c
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -11187,7 +11187,7 @@ else
+                 continue
+             fi
+             dnl TODO: White space in $i would cause problems:
+-            CXXFLAGS="$save_CXXFLAGS -I$i/ZXing"
++            CXXFLAGS="$save_CXXFLAGS ${CXXFLAGS_CXX11} -I$i/ZXing"
+             AC_CHECK_HEADER(MultiFormatWriter.h, [ZXING_CFLAGS=-I$i/ZXing; break],
+                 [unset ac_cv_header_MultiFormatWriter_h], [#include <stdexcept>])
+         done
+-- 
+2.39.0
+
diff --git a/app-office/libreoffice/libreoffice-7.4.4.2.ebuild b/app-office/libreoffice/libreoffice-7.4.4.2.ebuild
index 1c1165c55a5f..7ce3b1b6b9f2 100644
--- a/app-office/libreoffice/libreoffice-7.4.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.4.4.2.ebuild
@@ -297,6 +297,7 @@ PATCHES=(
 	# 7.5 branch
 	"${FILESDIR}/${PN}-7.3.7.2-boost-1.81-locale.patch"
 	"${FILESDIR}/${PN}-7.3.7.2-zxing-cpp-1.4.0.patch"
+	"${FILESDIR}/${PN}-7.4.4.2-zxing-cpp-1.4.0-c++17.patch"
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"