gentoo auto-resync : 15:11:2024 - 03:02:36

4 files changed, 124 insertions, 1 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 42115ddc9be3..de40b8eac917 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 2a1080f5d9b1..1b074e2f60dc 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -1,6 +1,7 @@
 AUX libreoffice-24.2-qtdetect.patch 989 BLAKE2B 01e1c1493293363206cd43ded09b69becd02b0b93c2fcb5fd4387a54424b9fa552ebfa128290a1b0551e6b6fe5de8f57025a2ebf5c75da2ea01bd66f5910f9d6 SHA512 dc00b2afe98f7bf30637c4102e336d6781f76cd7eb6c339c0b369ec2aa50544bc266fd42540fea037c1fcd07ae7e6d1b6503be620db9127084ffe6528f8db4b1
 AUX libreoffice-24.2-unused-qt6network.patch 3348 BLAKE2B 9ec1c83e9405128fcf493e6382e822cb577548e68ec46d0971825dec08cefe7ab18fdaf5d028ce747aaec5cdb57f3d2267b96cff997d90990435cda3ae98d47f SHA512 2eb04c76377526c67e28d20bfcdc682a52c7afa754a2e5a0f6df146917050dd9565bd4ae767347db58bb95afa5436baceea33b3e9b1e6c5b96517eb4cf22e1cb
 AUX libreoffice-24.2.3.2-fix-bashism.patch 2016 BLAKE2B 4bf97ed1f62232c777715f9f93f65eed50275bd8a00b53ac551024bcccf1faa497ac5e45e56274e86d74f82a1c4094a2c85388503131181af9b2a3e11ba6a75c SHA512 f7f1c46d854d2fbeffa0a65c58447f8a662d85b98b2ec2b8f0734ae382ec8c40ef93f1eb7271e5fd160e6204e176cba9de02fd755a0041c5fa930784dc198960
+AUX libreoffice-24.2.7.2-no-std-basic_string-int.patch 5372 BLAKE2B 2ec346b903738cd27ff1207d71b57ffcc48891d80dd7c6ef8f38d35516619569b59849ef4065aeb9a976af9929e47366ffa90d1fa50abc195f6c16785790c7b6 SHA512 d0533ec22550cb69a4536edaed71243c294babbc032f4f3ba616aa7d600f372d103559cb50e90429a584c6375a771d15a5485d4f170ce869e4bd0c8621341321
 AUX libreoffice-24.8-unused-qt5network.patch 3095 BLAKE2B 32c696893de2543c27bd390bcf05506855cad57dd3c568c544f6514ab1e46887625d83ce2f311c436b175332db174b2bcb090837fdc361e4bd4e1f9377f4895f SHA512 47148c0ef291e84bff564ddb0f462d7b88bb07f6a79dbed4cbe4fdaf7168b38a814f9efa2b37604665894c130526054a767975b81b97daf1e2744559dd31f9c5
 AUX libreoffice-24.8-unused-qt6network.patch 3227 BLAKE2B f2fca932af55e949854e3624c281b81b124612edf4fc1d9949e2f494ddd51650eb8aaec78ee07c6895c351ab34e5ad214fffde6b63e03e343d93d69e06ab13cb SHA512 d187359add55a7c6336f9afaccbf2fc51120a45d1bbc29e1bdeac060b46c41c2ebd028efe95f080abf0aabfdae8a7165a35cec94ab18d373444ff2bed0af63d8
 AUX libreoffice-5.3.4.2-kioclient5.patch 605 BLAKE2B 30961066c080c4d06ca978b7c0ad4b57a3739d6d34a2941f2ea57d3a5c4ab65e3f3c2376243aa88c9c05b1038cf9bfb7605a370d11513bb4553de2d268010519 SHA512 2aa6d1fc96749b79b3291f6e27630c6cf59d2c743f0dd8603867ba8aec2c17f87b70e1dd031365013f7e9ea53c160e9cb3f48af592a587dc05f3ae4cc1b35df6
@@ -42,7 +43,7 @@ DIST skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz 10868024 BLAKE2B
 DIST zxcvbn-c-2.5.tar.gz 1404434 BLAKE2B f0f22fc8643f785e8f9ed42033d6654c2e67aa4e258bbc4fecf533efcf8b86b6d7e67f9042326247c311c42a4e2b24b844e0bae65cdb2e46ea043a2974ffd857 SHA512 d7199b3cc36cd0e401bd8f857132425908307aefcdb1bb635ee81c34cf71ccbcdf0fe36a336a55da1281692b508881b54773afa41379a448863095f4abd5c0e8
 EBUILD libreoffice-24.2.4.2-r1.ebuild 20416 BLAKE2B 6c431ea8cd6d299764a68b584d83f36a2470d2905ec45acfb63a3a39bd70be15ab7110d1e54d1397a028efee5a5832d83c3ff279d2f18c3ec6a77469ac3b0589 SHA512 f264cf1d5da29ab6118fe767b816f0a7d5d6500f4670359bb485b1e3396ca69daa215c4709d0f708e6efe1a85dc6324ba2c61a03d35d1f09095553e3c74d8ded
 EBUILD libreoffice-24.2.6.2.ebuild 20719 BLAKE2B 7af8205a122c67abf195e536e499402f68e2024bd3f97bd83885bda29b28d3b224f62d93777ca235ee4ff14cfe5888cff35963cefb4abf34aba09bae17cef301 SHA512 1b9f46208297dde97bcd4fd63a33df8bffa6e15d65956e3024e7c79292575e7833f85b71e6f5d35f5a71a4be039124b318103b2fb2a0babf5a8e0b2585d31db1
-EBUILD libreoffice-24.2.7.2.ebuild 20722 BLAKE2B feaf985354fea8411918d654908d392c89a7fb6aa936583cc038ebc617b3cfb7edcbccbed300ac21ba8a818e43bfb25304b3c1832f3b37bd5362d66d762d756b SHA512 3846fa838a6f0a00e603af9715c96a346828bf1f8e5d0dcc0e229977393085f6d84562ab1eeedb8b063de72a5f558a974b5c648ceb245009052ba0aa51089911
+EBUILD libreoffice-24.2.7.2.ebuild 20802 BLAKE2B 0747b3420c564a77a11d8feca49b8a1f06f845e9ad59f8a28ed8b6a0f7e1312dcaffffecef7186282afdfe6f0f4842fc6a86724629da92decd3b5f460a290381 SHA512 ab3d714ed490b36c5a0c7d24f878c5b7b615a22d42c86343b441517b412f9c66b972d177149ef376a902c429e5cab7c12ef7a4f299cb71907b8dbf51c63273e0
 EBUILD libreoffice-24.2.9999.ebuild 20330 BLAKE2B 42521f7963506688ba8745758f3b0382f6a87f841305b979311f37a57349bb08dad8916d7fae1d5626fa7144cca081989900d311a610352229d10bb7e9f42ea0 SHA512 8cf7e4107a241246b4fa78c30bbd3267795ff38c85599e19d6951482df296de169e382a6b6f8150f572d75528bc612821569c6cb4a76a2c01912e9263ab0b27d
 EBUILD libreoffice-9999.ebuild 19483 BLAKE2B 8ef4ff672cd190f78d9084f8a894f14582347ad1ec37e2eab74119a5b37a4807438a153a8af391657db8d5e6977cb3233999e95912b8162851707ade963e7645 SHA512 6a27e69c7f3814d2292e156dab08e5ebd148a48b9dd25a14f091506603fb651c6f3aa5a4d85a210bb628e2033963bde661f639b944d874910a4177f3c83bcd15
 MISC metadata.xml 1233 BLAKE2B f93989caf1340cda4c3327a3d3d033d224050848b32b9d80e0b093b024bf124d238f1aae9852d1a6173e8aee79314517dd12e589079e58378e5f63626a80957c SHA512 3af0cefdceeba7a45658a2151b0534f44b9dfe6d3af8374f3061cb098f607a36a2fe134e3c0280ce6d807b523f68e708b51e6f1b4178292a528405e18f12d686
diff --git a/app-office/libreoffice/files/libreoffice-24.2.7.2-no-std-basic_string-int.patch b/app-office/libreoffice/files/libreoffice-24.2.7.2-no-std-basic_string-int.patch
new file mode 100644
index 000000000000..d95adb050df2
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-24.2.7.2-no-std-basic_string-int.patch
@@ -0,0 +1,119 @@
+https://git.libreoffice.org/core/commit/d91ab7de467abea6c01c9dd8473f81ac1f29513c
+From d91ab7de467abea6c01c9dd8473f81ac1f29513c Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <stephan.bergmann@allotropia.de>
+Date: Tue, 6 Feb 2024 13:27:59 +0100
+Subject: [PATCH] external/zxcvbn-c: There is no std::basic_string<int>
+
+...and at least LLVM 19 trunk libc++ complains about it now since
+<c3668779c13596e223c26fbd49670d18cd638c40> "[libc++] Remove deprecated
+char_traits base template (#72694)" with
+
+> In file included from dict-generate.cpp:25:
+> In file included from ~/llvm/inst/bin/../include/c++/v1/iostream:43:
+> In file included from ~/llvm/inst/bin/../include/c++/v1/ios:223:
+> In file included from ~/llvm/inst/bin/../include/c++/v1/__locale:24:
+> ~/llvm/inst/bin/../include/c++/v1/string:746:43: error: implicit instantiation of undefined template 'std::char_traits<int>'
+>   746 |   static_assert((is_same<_CharT, typename traits_type::char_type>::value),
+>       |                                           ^
+> dict-generate.cpp:861:18: note: in instantiation of template class 'std::basic_string<int>' requested here
+>   861 |     StringOfInts Chld;
+>       |                  ^
+> ~/llvm/inst/bin/../include/c++/v1/__fwd/string.h:23:29: note: template is declared here
+>    23 | struct _LIBCPP_TEMPLATE_VIS char_traits;
+>       |                             ^
+
+etc., so use a std::vector<int> instead
+
+Change-Id: I51e8296edf7b16925ff01679e671525256055552
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163048
+Tested-by: Jenkins
+Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
+--- /dev/null
++++ b/external/zxcvbn-c/0001-There-is-no-std-basic_string-int.patch.1
+@@ -0,0 +1,72 @@
++From 92c6ea875231876ca264187326ce2d615d5ad543 Mon Sep 17 00:00:00 2001
++From: Stephan Bergmann <stephan.bergmann@allotropia.de>
++Date: Tue, 6 Feb 2024 13:14:08 +0100
++Subject: There is no std::basic_string<int>
++
++...and at least LLVM 19 trunk libc++ complains about it now since
++<c3668779c13596e223c26fbd49670d18cd638c40> "[libc++] Remove deprecated
++char_traits base template (#72694)" with
++
++> In file included from dict-generate.cpp:25:
++> In file included from ~/llvm/inst/bin/../include/c++/v1/iostream:43:
++> In file included from ~/llvm/inst/bin/../include/c++/v1/ios:223:
++> In file included from ~/llvm/inst/bin/../include/c++/v1/__locale:24:
++> ~/llvm/inst/bin/../include/c++/v1/string:746:43: error: implicit instantiation of undefined template 'std::char_traits<int>'
++>   746 |   static_assert((is_same<_CharT, typename traits_type::char_type>::value),
++>       |                                           ^
++> dict-generate.cpp:861:18: note: in instantiation of template class 'std::basic_string<int>' requested here
++>   861 |     StringOfInts Chld;
++>       |                  ^
++> ~/llvm/inst/bin/../include/c++/v1/__fwd/string.h:23:29: note: template is declared here
++>    23 | struct _LIBCPP_TEMPLATE_VIS char_traits;
++>       |                             ^
++
++etc., so use a std::vector<int> instead
++---
++ dict-generate.cpp | 12 ++++++------
++ 1 file changed, 6 insertions(+), 6 deletions(-)
++
++diff --git a/dict-generate.cpp b/dict-generate.cpp
++index eebcca9..fcfaaea 100644
++--- a/dict-generate.cpp
+++++ b/dict-generate.cpp
++@@ -22,6 +22,7 @@
++  *
++  **********************************************************************************/
++ 
+++#include <algorithm>
++ #include <iostream>
++ #include <string>
++ #include <fstream>
++@@ -387,7 +388,7 @@ typedef map<string, Entry> EntryMap_t;
++ typedef list<string> StringList_t;
++ typedef list<NodeSPtr> NodeList_t;
++ typedef set<StringInt> StringIntSet_t;
++-typedef basic_string<int> StringOfInts;
+++typedef vector<int> StringOfInts;
++ typedef vector<unsigned int> UintVect;
++ typedef vector<uint64_t> Uint64Vect;
++ typedef vector<StringInt *> StrIntPtrVect_t;
++@@ -864,15 +865,14 @@ void CreateArrays(NodeSPtr Root, StringIntSet_t & StrSet, StringOfInts & ChildAd
++     for(Itc = Root->ChildBegin(); Itc != Root->ChildEnd(); ++Itc)
++     {
++         int i = Itc->second->GetAddr();
++-        Chld += i;
+++        Chld.push_back(i);
++     }
++     // Find where in pointer array the child pointer string is
++-    StringOfInts::size_type x = ChildAddrs.find(Chld);
++-    if (x == StringOfInts::npos)
+++    StringOfInts::size_type x = search(ChildAddrs.begin(), ChildAddrs.end(), Chld.begin(), Chld.end()) - ChildAddrs.begin();
+++    if (x == ChildAddrs.size())
++     {
++         // Not found, add it
++-        x = ChildAddrs.length();
++-        ChildAddrs += Chld;
+++        ChildAddrs.insert(ChildAddrs.end(), Chld.begin(), Chld.end());
++     }
++     // Val will contain the final node data
++     uint64_t Val = Its->i;
++-- 
++2.43.0
++
+--- a/external/zxcvbn-c/UnpackedTarball_zxcvbn-c.mk
++++ b/external/zxcvbn-c/UnpackedTarball_zxcvbn-c.mk
+@@ -11,8 +11,11 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,zxcvbn-c))
+ 
+ $(eval $(call gb_UnpackedTarball_set_tarball,zxcvbn-c,$(ZXCVBN_C_TARBALL)))
+ 
++# * external/zxcvbn-c/0001-There-is-no-std-basic_string-int.patch.1 sent upstream as
++#   <https://github.com/tsyrogit/zxcvbn-c/pull/31> "There is no std::basic_string<int>":
+ $(eval $(call gb_UnpackedTarball_add_patches,zxcvbn-c,\
+ 	external/zxcvbn-c/zxcvbn-c-2.5-do-not-use-stdafx.patch \
++	external/zxcvbn-c/0001-There-is-no-std-basic_string-int.patch.1 \
+ ))
+ 
+ # vim: set noet sw=4 ts=4:
diff --git a/app-office/libreoffice/libreoffice-24.2.7.2.ebuild b/app-office/libreoffice/libreoffice-24.2.7.2.ebuild
index e0088e87838d..22d3a6835554 100644
--- a/app-office/libreoffice/libreoffice-24.2.7.2.ebuild
+++ b/app-office/libreoffice/libreoffice-24.2.7.2.ebuild
@@ -320,6 +320,9 @@ PATCHES=(
 	"${FILESDIR}/${PN}-7.6-unused-qt5network.patch"
 	"${FILESDIR}/${PN}-24.2-unused-qt6network.patch"
 
+	# 24.8 branch
+	"${FILESDIR}/${P}-no-std-basic_string-int.patch" # bug #923950
+
 	# git master
 	# bug #917618, thx to Debian:
 	"${WORKDIR}/${PN}-24.2.3.2-icu-74/${PN}-24.2.3.2-icu-74.2-reviewed-breakIterator-customizations.patch"