diff --git a/wxWidgets-3_2-fix-building-fault-S390.patch b/wxWidgets-3_2-fix-building-fault-S390.patch new file mode 100644 index 0000000..4c82ad6 --- /dev/null +++ b/wxWidgets-3_2-fix-building-fault-S390.patch @@ -0,0 +1,88 @@ +From 891bfff867b7dc92ed6330ea46ee2dcfa5424ee0 Mon Sep 17 00:00:00 2001 +From: Cliff Zhao +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 8902eb4d66..fc3c905694 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 84356b39f7..ce2ec2af27 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 f744ffc327..73467be8f8 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__ +-- +2.43.0 + diff --git a/wxWidgets-3_2.changes b/wxWidgets-3_2.changes index 6ce475c..4aed1c7 100644 --- a/wxWidgets-3_2.changes +++ b/wxWidgets-3_2.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Dec 28 08:21:30 UTC 2023 - Cliff Zhao + +- Add wxWidgets-3_2-fix-building-fault-S390.patch: + Fix wxWidgets-3_2 building check fault on S390 platform: + /sys/power/state doesn't exist in SLE S390 platform and certain + types of containers, so check the file exist before run the + test case. + (bsc#1217026) + ------------------------------------------------------------------- Tue Dec 26 14:28:08 UTC 2023 - Jan Engelhardt @@ -177,7 +187,20 @@ Wed Apr 13 16:45:53 UTC 2022 - Ferdinand Thiessen * Fix getting wxPrintData from the print dialog. * Fix wxMediaCtrl support when using Wayland * Generate wxKeyEvents for GDK_KEY_LaunchX keys -- Drop upstream fixed wxWidgets-3.1.5-fix-wxIcon-wxDVC-columns.patch +- Remove wxWidgets-3.1.5-fix-wxIcon-wxDVC-columns.patch: + This update already include the patch. +- Remove wxWidgets-3_2-Create-our-own-socket-file-for-socket-file-test.patch: + This update already include the patch. + (bsc#1217026) + +------------------------------------------------------------------- +Tue Apr 12 12:45:12 UTC 2022 - Cliff Zhao + +- Add wxWidgets-3_2-Create-our-own-socket-file-for-socket-file-test.patch: + Backporting f172f53a from upstream to fix building check fault: + Create our own socket file for socket file test, /dev/log doesn't + exist in certain types of containers. + (bsc#1217026) ------------------------------------------------------------------- Fri Feb 11 14:53:40 UTC 2022 - Bjørn Lie diff --git a/wxWidgets-3_2.spec b/wxWidgets-3_2.spec index 806a66c..976876e 100644 --- a/wxWidgets-3_2.spec +++ b/wxWidgets-3_2.spec @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -80,8 +80,9 @@ Source5: wxWidgets-3_2-rpmlintrc # This script is not used during build, but it makes possible to # identify and backport wxPython fixes to wxWidgets. Source6: wxpython-mkdiff.sh -Patch1: soversion.diff -Patch2: autoconf-2_72.diff +Patch0: soversion.diff +Patch1: autoconf-2_72.diff +Patch2: wxWidgets-3_2-fix-building-fault-S390.patch %if "%{flavor}" == "doc" BuildRequires: doxygen BuildRequires: fdupes