gentoo auto-resync : 09:03:2024 - 01:07:53

3 files changed, 91 insertions, 1 deletions

diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 0903410d03a8..3f347eb196b5 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -5,6 +5,7 @@ AUX wxGTK-3.2.1-configure-tests.patch 478 BLAKE2B 1fdbb7d04c4100b39234c15181e3ea
 AUX wxGTK-3.2.1-gtk3-translation-domain.patch 425 BLAKE2B c517b85a352e010e8002de6e2e282728e1f9ee47d22380072d15e35723e65d0a417c06b23f0c50e8d91036611ee0bfe54ba124c4294ec248de3a5cb64b35a448 SHA512 0e5b01958c848b81008a2296405e4de33da46445553d555deeed215928d90583a4da61de4bdceb1fb3745cce53118b7bc29be73f511f0bdb9c3c6b193f2f6c24
 AUX wxGTK-3.2.1-prefer-lib64-in-tests.patch 1016 BLAKE2B b2d7cac45af6a0e5e118c8688db5e5a60e144dc5e82f4653f4dfea53fa969c3af0ca2c4ce1d6d430bc8e6aef45c4d946e8cf65cf6c53222981fcdde005d05e09 SHA512 a5c7c81af28d637a31c93d2296e1c1b5456038c0703c3d32f136188435ab3e7f4766805dcb73dac0d976eac7cb6e4c86923cca023543b29b735d5ea87ccb2b1b
 AUX wxGTK-3.2.1-wayland-control.patch 6150 BLAKE2B 4aef8ab0fb4e2352afba139cc539f77b1c0825ee7c4a33c0f2fc41bcbadd943a90c55dced954f362f73995d2232d54b1815725a0c5d03325c64d0a00d92191aa SHA512 995eeb0409293247756eddde8bf8fcee87ded284bb0f9faac27ae511483e0131e4802bdb9d93063097273e83b55b08328dd0380639fcb265352991cf3d34fc1d
+AUX wxGTK-3.2.2.1-backport-pr24197.patch 3030 BLAKE2B b005f114f03f4791fc3a94ab0ffd807dfa20fc7ccb36af58336010b3c3d5de262f53615cd99369e7d013c741f4b070417568e1671144287c2e8ed3c6f9a68880 SHA512 d358517a34a5040ee51055e4d67807e24e344f5ad0a8809939fd1cc708a7a409e564cb88fbffd95c6b8ef901fb00ed65423e745038675948d8c93052f222acaa
 AUX wxGTK-3.2.2.1-dont-break-flags.patch 1373 BLAKE2B 2ae7524b2f80cc562dc6a62a823e1e0d904213de4c11346995d7014490843ad6f7111c5b39b5d147a39beaf07b627b8f13378bfdc1ea129a24230054ccf8aad4 SHA512 3cb557dc51b7694a9e935b14d4c4ab430a75c3de091f697d3291e04b78cd0b3b6a8c7fc3c4afc32a2692d32f43cf4bb52655a4230ac1b38cd101f903f136f2e4
 AUX wxGTK-configure-tests.patch 560 BLAKE2B 86a735c58abc8690cd943ff58a39140a636c56dcde08f47d27dbdcf99790216ebe0f4524f2f7cd67e35748c32adaee377c4e8a4b606975115c666cbc453b5173 SHA512 f02b708e5de66a4a7dce9f1adef1ebd1461ef68acee502b54d514a0ce4e5fe998eaad9a9ec7b1bec9aa4d8803a4042111ea4cddafe8e2f68d3d122faf90465df
 AUX wxGTK-ignore-c++-abi.patch 1657 BLAKE2B 5d865c83174f2540b798a2930f8d5ae8336f031214691fe7d5cd8c283faf9511fff260735d9dcd293e6377be0e96a6521e84ceae4560f2fef8fc7e7ed5642cd6 SHA512 649551eeacc9915f249ece1c3ed79959f0f0129e54373bfbe84ea5fbf2b8e0ba7778d6a22ac6f165e5d4e85a3ea4320274296b1b2a8e623acb11300fe44478f8
@@ -23,5 +24,5 @@ EBUILD wxGTK-3.0.5.1-r1.ebuild 5652 BLAKE2B af627de9327d718ac25c163fee1acc37cde2
 EBUILD wxGTK-3.2.1.ebuild 6965 BLAKE2B 52793532cc872150da8bcbac2d6900ae65c943da7dff9bf6c276cf21cd2039c8ab99bf49ed99a4564aac53519714d9a22f3a600aed073acbf69004e86303854b SHA512 c6311eafbdb8ba4f2b3f69769f5c429f22f2cf2564f7136f14a7e05540d119a2aff912049307d867f10ce9220a3fd510b3e7517387f86557fd643e1e4a405737
 EBUILD wxGTK-3.2.2.1-r1.ebuild 7109 BLAKE2B 3eadc50972ffdc275e4b30c2047ad37da235cb147dedd2de1e045c6756af8d929a93b163a5d329de97f194ec580459c594842127c043033956fef8b03dfba495 SHA512 8b17bad69480352985a78b2fd57b4731ef4ab38f25303b12eca54814e82ed72841db97872bc04909d0a5b27694ac85c2fd6df0cb984d4c5920aa65ec9b6a8e76
 EBUILD wxGTK-3.2.2.1-r2.ebuild 7107 BLAKE2B 1ba471cc7f3b3fdb3be9c6e2f0d3f88033dc020e665fb0b1a3f0933d084647ccc12553c699829d201dc8b1747ed906dbaf3ef66d7be81510407d4736e5dd5f54 SHA512 d30f9948af59c19012d276431b660e6e8bf9f673165a582c579cab721070171f86559573afd5ae9f5b1764eba89a282bfe12712b5a0f261daf2be5e113c1867b
-EBUILD wxGTK-3.2.2.1-r3.ebuild 7729 BLAKE2B 5fc0a67741174aa4c92791051f70bc2fcb7a3e33999d9faa5bc64a2268198ab36a7c5b7c6d9e91d6f65d26aba0a39c30018276fb9fbbb1055d6499b495cedac2 SHA512 e9672697e0583d1ab5bc8a0890a213e11b35e41ac3d7fd213f053350756d2008226fc1f3dc1b57ee6593c9d0a7678bee8dd5a16c5ca13ffc8139a859ddf24167
+EBUILD wxGTK-3.2.2.1-r3.ebuild 7781 BLAKE2B 005edc4eb0a7bfaa00a9a679240c9239bf6f8953cb51c238af51b7f5b4127aa966b7c2559f5f12c1d03cd07d048c27d8585b970126c8884d11f0dd82e33d4e51 SHA512 e87b6e4ea674958c2b640ea25e314486a1e82874db8cd5d4048ab122119ee7fe33df6134d5d371006df0d7dbafd4c1270d0cf2e2885e89981aa0926cba1569f6
 MISC metadata.xml 756 BLAKE2B 336ffb3375ee9092de02d0808d0a44f7f5bcbc6e4a845c12b6466af0b91f3397c2b335e5433917361a060db43d6cb836cde0f87be2059214f314fa6726199e2d SHA512 190b72992c64b43b46e28ca2f730e1897a5f740ba211b859c816b4892256284feb579fbce06cb1939b774ae989dc68754f5a57f6375cfca50d7770d0c2ed47ed
diff --git a/x11-libs/wxGTK/files/wxGTK-3.2.2.1-backport-pr24197.patch b/x11-libs/wxGTK/files/wxGTK-3.2.2.1-backport-pr24197.patch
new file mode 100644
index 000000000000..2adf03aef45b
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-3.2.2.1-backport-pr24197.patch
@@ -0,0 +1,88 @@
+https://bugs.gentoo.org/916884
+https://github.com/wxWidgets/wxWidgets/pull/24197
+
+From 891bfff867b7dc92ed6330ea46ee2dcfa5424ee0 Mon Sep 17 00:00:00 2001
+From: Cliff Zhao <qzhao@suse.com>
+Date: Thu, 4 Jan 2024 08:01:00 +0100
+Subject: [PATCH] Fix testsuite failures on s390x
+
+``/sys/power/state`` does not exist on s390x platforms and certain
+types of containers, so check that the file exist before running the
+test case.
+
+Output from ``make check`` was:
+
+	./textfile/textfiletest.cpp:351
+	...............................................................................
+
+	./textfile/textfiletest.cpp:354: FAILED:
+	  CHECK( f.Open("/sys/power/state") )
+	with expansion:
+	  false
+
+	./textfile/textfiletest.cpp:355: FAILED:
+	  REQUIRE( f.GetLineCount() == 1 )
+	with expansion:
+	  0 == 1
+---
+ tests/file/filetest.cpp         | 2 ++
+ tests/filename/filenametest.cpp | 2 ++
+ tests/textfile/textfiletest.cpp | 2 ++
+ 3 files changed, 6 insertions(+)
+
+diff --git a/tests/file/filetest.cpp b/tests/file/filetest.cpp
+index 8902eb4d6684..fc3c90569480 100644
+--- a/tests/file/filetest.cpp
++++ b/tests/file/filetest.cpp
+@@ -153,6 +153,7 @@ TEST_CASE("wxFile::Special", "[file][linux][special-file]")
+     CHECK( fileProc.ReadAll(&s) );
+     CHECK( !s.empty() );
+ 
++    if ( wxFile::Exists("/sys/power/state") ) {
+     // All files in /sys have the size of one kernel page, even if they don't
+     // have that much data in them.
+     const long pageSize = sysconf(_SC_PAGESIZE);
+@@ -163,6 +164,7 @@ TEST_CASE("wxFile::Special", "[file][linux][special-file]")
+     CHECK( fileSys.ReadAll(&s) );
+     CHECK( !s.empty() );
+     CHECK( s.length() < pageSize );
++    }
+ }
+ 
+ #endif // __LINUX__
+diff --git a/tests/filename/filenametest.cpp b/tests/filename/filenametest.cpp
+index 84356b39f719..ce2ec2af2760 100644
+--- a/tests/filename/filenametest.cpp
++++ b/tests/filename/filenametest.cpp
+@@ -1040,9 +1040,11 @@ TEST_CASE("wxFileName::GetSizeSpecial", "[filename][linux][special-file]")
+     INFO( "size of /proc/kcore=" << size );
+     CHECK( size > 0 );
+ 
++    if ( wxFile::Exists("/sys/power/state") ) {
+     // All files in /sys are one page in size, irrespectively of the size of
+     // their actual contents.
+     CHECK( wxFileName::GetSize("/sys/power/state") == sysconf(_SC_PAGESIZE) );
++    }
+ }
+ 
+ #endif // __LINUX__
+diff --git a/tests/textfile/textfiletest.cpp b/tests/textfile/textfiletest.cpp
+index f744ffc3271b..73467be8f85f 100644
+--- a/tests/textfile/textfiletest.cpp
++++ b/tests/textfile/textfiletest.cpp
+@@ -348,6 +348,7 @@ TEST_CASE("wxTextFile::Special", "[textfile][linux][special-file]")
+         CHECK( f.GetLineCount() > 1 );
+     }
+ 
++    if ( wxFile::Exists("/sys/power/state") ) {
+     SECTION("/sys")
+     {
+         wxTextFile f;
+@@ -356,6 +357,7 @@ TEST_CASE("wxTextFile::Special", "[textfile][linux][special-file]")
+         INFO( "/sys/power/state contains \"" << f[0] << "\"" );
+         CHECK( (f[0].find("mem") != wxString::npos || f[0].find("disk") != wxString::npos) );
+     }
++    }
+ }
+ 
+ #endif // __LINUX__
diff --git a/x11-libs/wxGTK/wxGTK-3.2.2.1-r3.ebuild b/x11-libs/wxGTK/wxGTK-3.2.2.1-r3.ebuild
index b6f07556613f..90d412ce19a8 100644
--- a/x11-libs/wxGTK/wxGTK-3.2.2.1-r3.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.2.2.1-r3.ebuild
@@ -84,6 +84,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-3.2.1-wayland-control.patch"
 	"${FILESDIR}/${PN}-3.2.1-prefer-lib64-in-tests.patch"
 	"${FILESDIR}/${PN}-3.2.2.1-dont-break-flags.patch"
+	"${FILESDIR}/${PN}-3.2.2.1-backport-pr24197.patch"
 )
 
 src_prepare() {