Accepting request 1195015 from X11:wxWidgets

- Add textfiletest-fix-file-exists.diff to fix a wrong skip
  condition in the test (fixes the build on s390x)

OBS-URL: https://build.opensuse.org/request/show/1195015
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wxWidgets-3_2?expand=0&rev=28

_scmsync.obsinfo

@@ -0,0 +1,4 @@
+mtime: 1724222971
+commit: 96fa1f90786bdfcd1066e09e103da11d7b6e96d1ed56f0d708e3690fd5c7b733
+url: https://src.opensuse.org/jengelh/wxWidgets-3_2
+revision: master

build.specials.obscpio

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:48d51243ad79928cd8ddbb40834759ce5acb6a5238dd6e89546f9f8609e8c3d3
+size 256

doxygen111.patch

@@ -1,48 +0,0 @@
-From 2d79dfc7a2a8dd42021ff0ea3dcc8ed05f7c23ef Mon Sep 17 00:00:00 2001
-From: Scott Talbert <swt@techie.net>
-Date: Mon, 16 Sep 2024 22:38:13 -0400
-Subject: [PATCH] Fix docs generation for datetime with doxygen 1.11.0
-References: https://github.com/wxWidgets/wxWidgets/pull/24814
-
-It seems that as of the below commit, doxygen changed its handling of
-parsing backticks in comments such that it now fails to properly
-generate documentation for the entire datetime.h file.  Fix this by
-closing the open backtick.
-
-Also update the actual, non-documentation, header to match for
-consistency, even if non-matching backticks are not a problem there.
-
-See: https://github.com/doxygen/doxygen/commit/f18767307be20ca8d2ca81f74cc1f3446205282b
-
-Closes #24814.
----
- include/wx/datetime.h   | 2 +-
- interface/wx/datetime.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/include/wx/datetime.h b/include/wx/datetime.h
-index 445c3dbb3929..55292f008408 100644
---- a/include/wx/datetime.h
-+++ b/include/wx/datetime.h
-@@ -149,7 +149,7 @@ class WXDLLIMPEXP_BASE wxDateTime
-         Local,
- 
-         // zones from GMT (= Greenwich Mean Time): they're guaranteed to be
--        // consequent numbers, so writing something like `GMT0 + offset' is
-+        // consequent numbers, so writing something like `GMT0 + offset` is
-         // safe if abs(offset) <= 12
- 
-         // underscore stands for minus
-diff --git a/interface/wx/datetime.h b/interface/wx/datetime.h
-index ea3df2323338..1a0222435565 100644
---- a/interface/wx/datetime.h
-+++ b/interface/wx/datetime.h
-@@ -96,7 +96,7 @@ class wxDateTime
- 
-         ///@{
-         /// zones from GMT (= Greenwich Mean Time): they're guaranteed to be
--        /// consequent numbers, so writing something like `GMT0 + offset' is
-+        /// consequent numbers, so writing something like `GMT0 + offset` is
-         /// safe if abs(offset) <= 12
- 
-         // underscore stands for minus

soversion.diff

@@ -1,31 +1,26 @@
 From: Jan Engelhardt <jengelh@inai.de>
 Date: 2014-11-07 10:41:58.650412802 +0100
 
-https://github.com/wxWidgets/wxWidgets/releases/tag/v3.2.6 claims
-it's ABI compatible with 3.2.5, but then you see virtual function
-changes...
+Because it is so easy to change the ABI with just one configure option,
+explicitly mark our build with a vendor tag.
+(We do the same in windows:mingw: where this issue is even more pressing.)
 
--    virtual void        SetupMouseEvent(wxMouseEvent &wxevent, NSEvent * nsEvent);
-+
-+    using MouseEvents = std::vector<wxMouseEvent>;
-+    virtual MouseEvents TranslateMouseEvent(NSEvent * nsEvent);
+In addition, because wxWidgets changes the ABI midway (for example,
+did so between 3.0.1 and 3.0.2) without changing the SONAME, we have
+to do it. As we have a vendor suffix, no filename conflicts can occur.
 
-So their promise means nothing.
-
-It is also possible for distributions to accidentally cause ABI
-changes with the flick of a configure option (e.g. enable-stl), since
-that can change the set of class bases, members or member function
-signatures.
+One needs to look at the diff between versions. If in doubt, just
+always bump, specifically(!) the SO major.
 
 ---
  Makefile.in               |    5 +++--
  build/aclocal/bakefile.m4 |    3 +--
  2 files changed, 4 insertions(+), 4 deletions(-)
 
-Index: wxWidgets-3.2.6/Makefile.in
+Index: wxWidgets-3.2.5/Makefile.in
 ===================================================================
---- wxWidgets-3.2.6.orig/Makefile.in
-+++ wxWidgets-3.2.6/Makefile.in
+--- wxWidgets-3.2.5.orig/Makefile.in
++++ wxWidgets-3.2.5/Makefile.in
 @@ -2225,6 +2225,7 @@ LOCALE_LINGUAS = ca cs da de el es fi fr
  @COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@WXCOMPILER = _gcc
  @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@WXCOMPILER \
@@ -44,18 +39,18 @@ Index: wxWidgets-3.2.6/Makefile.in
  COND_wxUSE_REGEX_builtin___wxregex___depname = \
  	$(LIBDIRNAME)/$(LIBPREFIX)wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
 @@ -13982,7 +13983,7 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE
- @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.3.0.$(SO_SUFFIX)
+ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.2.3.$(SO_SUFFIX)
  @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -0.$(SO_SUFFIX)
  @COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX)
 -@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).0
-+@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).12.0.0
++@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).11.0.0
  @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
  @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
  @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
-Index: wxWidgets-3.2.6/build/aclocal/bakefile.m4
+Index: wxWidgets-3.2.5/build/aclocal/bakefile.m4
 ===================================================================
---- wxWidgets-3.2.6.orig/build/aclocal/bakefile.m4
-+++ wxWidgets-3.2.6/build/aclocal/bakefile.m4
+--- wxWidgets-3.2.5.orig/build/aclocal/bakefile.m4
++++ wxWidgets-3.2.5/build/aclocal/bakefile.m4
 @@ -408,8 +408,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_VERSIONS],
              SONAME_FLAG="-Wl,-soname,"
          fi

wxWidgets-3.2.5.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0ad86a3ad3e2e519b6a705248fc9226e3a09bbf069c6c692a02acf7c2d1c6b51
+size 27539152

wxWidgets-3_2.changes

@@ -1,31 +1,3 @@
--------------------------------------------------------------------
-Mon Oct  7 14:14:45 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
-
-- Use webkit2gtk-4.1 pkgconfig file instead of 4.0
-
--------------------------------------------------------------------
-Tue Oct  1 09:33:13 UTC 2024 - Markéta Machová <mmachova@suse.com>
-
-- Add upstream doxygen111.patch to fix the docs with new doxygen
-
--------------------------------------------------------------------
-Mon Sep  9 16:24:15 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
-
-- Update to release 3.2.6
-  * Add wxTranslations::AddAvailableCatalog() overload with msgid
-    language
-  * Dark mode appearance fixes for wxActivityIndicator,
-    wxHyperlinkCtrl, etc.
-  * Improve wxWizard appearance in high DPI
-  * Fix wxPropertyGrid row height in high DPI
-  * Fix possible crash during drag-and-drop
-  * Fix wxListBox minimum size regression introduced in 3.2.5
-  * Fix wxBitmapComboBox bitmaps scaling in high DPI
-  * Allow positioning wxDialog at specified position, at least
-    under X11
-  * Fix incorrect handling of ligatures in wxStyledTextCtrl
-  * Fix using wrong keyboard layout in key events
-
 -------------------------------------------------------------------
 Tue Aug 20 19:05:50 UTC 2024 - Christian Boltz <suse-beta@cboltz.de>
 

wxWidgets-3_2.spec

@@ -65,10 +65,10 @@ wxString and instead rely on the wxChar pointer API.
 # At most one Name: line to not confuse quilt(1)
 %define base_name wxWidgets-3_2
 %define wx_minor 3.2
-%define psonum 12_0_0
-%define sonum 12.0.0
+%define psonum 11_0_0
+%define sonum 11.0.0
 Name:           %this_spec
-Version:        3.2.6
+Version:        3.2.5
 Release:        0
 Summary:        C++ Library for Cross-Platform Development
 License:        LGPL-2.1-or-later WITH WxWindows-exception-3.1
@@ -83,7 +83,6 @@ Source6:        wxpython-mkdiff.sh
 Patch0:         soversion.diff
 Patch1:         autoconf-2_72.diff
 Patch2:         textfiletest-fix-file-exists.diff
-Patch3:         doxygen111.patch
 %if "%{flavor}" == "doc"
 BuildRequires:  doxygen
 BuildRequires:  fdupes
@@ -109,7 +108,7 @@ BuildRequires:  pkgconfig(gtk+-2.0)
 %if "%toolkit" == "gtk3"
 BuildRequires:  pkgconfig(gtk+-3.0)
 %if %{with webview}
-BuildRequires:  pkgconfig(webkit2gtk-4.1)
+BuildRequires:  pkgconfig(webkit2gtk-4.0)
 %endif
 %endif
 %if "%toolkit" == "qt"
@@ -468,22 +467,38 @@ export WX_TEST_WEBREQUEST_URL=0
 # ./test_gui -l || true
 %endif
 
-%ldconfig_scriptlets -n libwx_baseu-%variant%psonum
-%ldconfig_scriptlets -n libwx_baseu_net-%variant%psonum
-%ldconfig_scriptlets -n libwx_baseu_xml-%variant%psonum
-%ldconfig_scriptlets -n libwx_%{toolkit}u_adv-%variant%psonum
-%ldconfig_scriptlets -n libwx_%{toolkit}u_aui-%variant%psonum
-%ldconfig_scriptlets -n libwx_%{toolkit}u_core-%variant%psonum
-%ldconfig_scriptlets -n libwx_%{toolkit}u_gl-%variant%psonum
-%ldconfig_scriptlets -n libwx_%{toolkit}u_html-%variant%psonum
-%ldconfig_scriptlets -n libwx_%{toolkit}u_media-%variant%psonum
-%ldconfig_scriptlets -n libwx_%{toolkit}u_propgrid-%variant%psonum
-%ldconfig_scriptlets -n libwx_%{toolkit}u_qa-%variant%psonum
-%ldconfig_scriptlets -n libwx_%{toolkit}u_ribbon-%variant%psonum
-%ldconfig_scriptlets -n libwx_%{toolkit}u_richtext-%variant%psonum
-%ldconfig_scriptlets -n libwx_%{toolkit}u_stc-%variant%psonum
-%ldconfig_scriptlets -n libwx_%{toolkit}u_webview-%variant%psonum
-%ldconfig_scriptlets -n libwx_%{toolkit}u_xrc-%variant%psonum
+%post   -n libwx_baseu-%variant%psonum -p /sbin/ldconfig
+%postun -n libwx_baseu-%variant%psonum -p /sbin/ldconfig
+%post   -n libwx_baseu_net-%variant%psonum -p /sbin/ldconfig
+%postun -n libwx_baseu_net-%variant%psonum -p /sbin/ldconfig
+%post   -n libwx_baseu_xml-%variant%psonum -p /sbin/ldconfig
+%postun -n libwx_baseu_xml-%variant%psonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_adv-%variant%psonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_adv-%variant%psonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_aui-%variant%psonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_aui-%variant%psonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_core-%variant%psonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_core-%variant%psonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_gl-%variant%psonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_gl-%variant%psonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_html-%variant%psonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_html-%variant%psonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_media-%variant%psonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_media-%variant%psonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_propgrid-%variant%psonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_propgrid-%variant%psonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_qa-%variant%psonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_qa-%variant%psonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_ribbon-%variant%psonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_ribbon-%variant%psonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_richtext-%variant%psonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_richtext-%variant%psonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_stc-%variant%psonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_stc-%variant%psonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_webview-%variant%psonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_webview-%variant%psonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_xrc-%variant%psonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_xrc-%variant%psonum -p /sbin/ldconfig
 
 %if "%{flavor}" == "doc"
 %files xml