forward s390 patch to upstream

OBS-URL: https://build.opensuse.org/package/show/X11:wxWidgets/wxWidgets-3_2?expand=0&rev=118

wxWidgets-3_2-fix-building-fault-S390.patch

@@ -1,7 +1,37 @@
-diff -Nura wxWidgets-3.2.4/tests/file/filetest.cpp wxWidgets-3.2.4_new/tests/file/filetest.cpp
+From 891bfff867b7dc92ed6330ea46ee2dcfa5424ee0 Mon Sep 17 00:00:00 2001
---- wxWidgets-3.2.4/tests/file/filetest.cpp	2023-11-09 06:53:55.000000000 +0800
+From: Cliff Zhao <qzhao@suse.com>
-+++ wxWidgets-3.2.4_new/tests/file/filetest.cpp	2024-01-03 16:59:53.793721314 +0800
+Date: Thu, 4 Jan 2024 08:01:00 +0100
-@@ -153,6 +153,7 @@
+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() );
  
@@ -9,7 +39,7 @@ diff -Nura wxWidgets-3.2.4/tests/file/filetest.cpp wxWidgets-3.2.4_new/tests/fil
      // 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 @@
+@@ -163,6 +164,7 @@ TEST_CASE("wxFile::Special", "[file][linux][special-file]")
      CHECK( fileSys.ReadAll(&s) );
      CHECK( !s.empty() );
      CHECK( s.length() < pageSize );
@@ -17,10 +47,11 @@ diff -Nura wxWidgets-3.2.4/tests/file/filetest.cpp wxWidgets-3.2.4_new/tests/fil
  }
  
  #endif // __LINUX__
-diff -Nura wxWidgets-3.2.4/tests/filename/filenametest.cpp wxWidgets-3.2.4_new/tests/filename/filenametest.cpp
+diff --git a/tests/filename/filenametest.cpp b/tests/filename/filenametest.cpp
---- wxWidgets-3.2.4/tests/filename/filenametest.cpp	2023-11-09 06:53:55.000000000 +0800
+index 84356b39f7..ce2ec2af27 100644
-+++ wxWidgets-3.2.4_new/tests/filename/filenametest.cpp	2024-01-03 17:00:36.881285813 +0800
+--- a/tests/filename/filenametest.cpp
-@@ -1040,9 +1040,11 @@
++++ 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 );
  
@@ -32,22 +63,26 @@ diff -Nura wxWidgets-3.2.4/tests/filename/filenametest.cpp wxWidgets-3.2.4_new/t
  }
  
  #endif // __LINUX__
-diff -Nura wxWidgets-3.2.4/tests/textfile/textfiletest.cpp wxWidgets-3.2.4_new/tests/textfile/textfiletest.cpp
+diff --git a/tests/textfile/textfiletest.cpp b/tests/textfile/textfiletest.cpp
---- wxWidgets-3.2.4/tests/textfile/textfiletest.cpp	2024-01-03 16:57:28.265814711 +0800
+index f744ffc327..73467be8f8 100644
-+++ wxWidgets-3.2.4_new/tests/textfile/textfiletest.cpp	2024-01-03 17:01:18.854835722 +0800
+--- a/tests/textfile/textfiletest.cpp
-@@ -348,6 +348,7 @@
++++ 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")
      {
-         if ( wxFile::Exists("/sys/power/state") ) {
+         wxTextFile f;
-@@ -358,6 +359,7 @@
+@@ -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
+

wxWidgets-3_2.spec

@@ -80,11 +80,8 @@ 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
-# PATCH-FIX-OPENSUSE soversion.diff jengelh@inai.de -- Use the package version, not some incremental integer.
 Patch0:         soversion.diff
-# PATCH-FIX-OPENSUSE autoconf-2_72.diff jengelh@inai.de -- Add autoconf-2_72.diff.
 Patch1:         autoconf-2_72.diff
-# PATCH-FIX-OPENSUSE wxWidgets-3_2-fix-building-fault-S390.patch bsc#1217026 qzhao@suse.com -- Fix wxWidgets-3_2 building check fault on S390 platform.
 Patch2:         wxWidgets-3_2-fix-building-fault-S390.patch
 %if "%{flavor}" == "doc"
 BuildRequires:  doxygen