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

soversion.diff

@@ -1,32 +1,27 @@
 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
+Because it is so easy to change the ABI with just one configure option,
-it's ABI compatible with 3.2.5, but then you see virtual function
+explicitly mark our build with a vendor tag.
-changes...
+(We do the same in windows:mingw: where this issue is even more pressing.)
 
--    virtual void        SetupMouseEvent(wxMouseEvent &wxevent, 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
-+    using MouseEvents = std::vector<wxMouseEvent>;
+to do it. As we have a vendor suffix, no filename conflicts can occur.
-+    virtual MouseEvents TranslateMouseEvent(NSEvent * nsEvent);
 
-So their promise means nothing.
+One needs to look at the diff between versions. If in doubt, just
-
+always bump, specifically(!) the SO major.
-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.
 
 ---
  Makefile.in               |    5 +++--
  build/aclocal/bakefile.m4 |    3 +--
  2 files changed, 4 insertions(+), 4 deletions(-)
 
-Index: wxWidgets-3.2.8/Makefile.in
+Index: wxWidgets-3.2.5/Makefile.in
 ===================================================================
---- wxWidgets-3.2.8.orig/Makefile.in
+--- wxWidgets-3.2.5.orig/Makefile.in
-+++ wxWidgets-3.2.8/Makefile.in
++++ wxWidgets-3.2.5/Makefile.in
-@@ -2226,6 +2226,7 @@ LOCALE_LINGUAS = af an ar ca ca@valencia
+@@ -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 \
  @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@	= _gcc$(COMPILER_VERSION)
@@ -34,7 +29,7 @@ Index: wxWidgets-3.2.8/Makefile.in
  @COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@VENDORTAG = _$(VENDOR)
  @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG = 
  @COND_BUILD_debug@WXDEBUGFLAG = d
-@@ -2237,7 +2238,7 @@ LOCALE_LINGUAS = af an ar ca ca@valencia
+@@ -2236,7 +2237,7 @@ LOCALE_LINGUAS = ca cs da de el es fi fr
  @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
  @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
  @COND_PLATFORM_WIN32_1@	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
@@ -43,19 +38,19 @@ Index: wxWidgets-3.2.8/Makefile.in
  @COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = 
  COND_wxUSE_REGEX_builtin___wxregex___depname = \
  	$(LIBDIRNAME)/$(LIBPREFIX)wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@@ -13984,7 +13985,7 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE
+@@ -13982,7 +13983,7 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE
- @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.4.1.$(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).16.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.8/build/aclocal/bakefile.m4
+Index: wxWidgets-3.2.5/build/aclocal/bakefile.m4
 ===================================================================
---- wxWidgets-3.2.8.orig/build/aclocal/bakefile.m4
+--- wxWidgets-3.2.5.orig/build/aclocal/bakefile.m4
-+++ wxWidgets-3.2.8/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,80 +1,3 @@
--------------------------------------------------------------------
-Thu May 29 17:11:39 UTC 2025 - Antonio Larrosa <alarrosa@suse.com>
-
-- Do not build the Qt flavor in SLE16 where Qt5 will not be
-  available.
-
--------------------------------------------------------------------
-Mon Apr 28 09:39:40 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
-
-- Update to release 3.2.8
-  * Fix crash in wxPropertyGrid with wxGTK3 after recent change.
-  * Fix key codes in WXK_NUMPADx events in wxGTK.
-  * Add wxVector(std::initializer_list<U> list) constructor.
-  * Add mouse scrolling support to generic wxSpinCtrl.
-  * Compute wxStaticText best size ourselves if GTK does it wrongly.
-
--------------------------------------------------------------------
-Thu Mar 20 12:11:36 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
-
-- Update to release 3.2.7
-  * Fix crash in wxWebRequestCURL when connection was refused
-  * Fix buffer read overflow when compiling RE ending with
-    backslash
-  * Fix crash in wxWebRequest::Close() with recent libcurl
-  * Improve wxPropGrid checkboxes in high DPI
-  * Many fixes to key event generation (#25053, #25199, #25200)
-  * Fix copy-pasting text under more Wayland compositors (Weston,
-    kwin)
-  * Don't consume Ctrl-C when using SDL-based wxSound
-  * Avoid repaint problems when using wxWindow::Update() with
-    Wayland
-  * Fix crash when connection is refused in wxWebRequestCURL
-   (gh#wxWidgets/wxWidgets#24885, CVE-2024-58249, bsc#1239902)
-- Delete doxygen111.patch (merged)
-
--------------------------------------------------------------------
-Sun Mar  9 22:04:26 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
-
-- Build with --enable-secretstore [boo#1239137].
-
--------------------------------------------------------------------
-Sat Mar  1 09:12:56 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
-
-- Build with --enable-glcanvasegl [boo#1235150]. This turns off GLX
-  and enables EGL instead. Sibling toolkits need to do this at the
-  same time for this to work, e.g. hugin needs both wx and GLEW to
-  be built for EGL.
-- Bump SO version since the base for wxGLCanvas changed. [boo#1239101]
-
--------------------------------------------------------------------
-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

@@ -1,7 +1,7 @@
 #
 # spec file for package wxWidgets-3_2
 #
-# Copyright (c) 2025 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
@@ -27,10 +27,10 @@
 %bcond_with webview
 %endif
 
-%if "%flavor" == "doc"
+%if "%{flavor}" == "doc"
 %define this_spec wxWidgets-3_2-doc
-%define variant %nil
+%define variant %{nil}
-%define toolkit %nil
+%define toolkit %{nil}
 %endif
 
 %if "%flavor" == "GTK3"
@@ -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 16_0_0
+%define psonum 11_0_0
-%define sonum 16.0.0
+%define sonum 11.0.0
 Name:           %this_spec
-Version:        3.2.8
+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,7 @@ Source6:        wxpython-mkdiff.sh
 Patch0:         soversion.diff
 Patch1:         autoconf-2_72.diff
 Patch2:         textfiletest-fix-file-exists.diff
-%if "%flavor" == "doc"
+%if "%{flavor}" == "doc"
 BuildRequires:  doxygen
 BuildRequires:  fdupes
 BuildRequires:  graphviz
@@ -101,7 +101,6 @@ BuildRequires:  pkgconfig(gstreamer-plugins-base-1.0)
 BuildRequires:  pkgconfig(libcurl)
 BuildRequires:  pkgconfig(libmspack)
 BuildRequires:  pkgconfig(libnotify)
-BuildRequires:  pkgconfig(libsecret-1)
 BuildRequires:  pkgconfig(sm)
 %if "%toolkit" == "gtk2"
 BuildRequires:  pkgconfig(gtk+-2.0)
@@ -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"
@@ -119,9 +118,6 @@ BuildRequires:  pkgconfig(Qt5OpenGL) >= 5.2.1
 BuildRequires:  pkgconfig(Qt5Test) >= 5.2.1
 BuildRequires:  pkgconfig(Qt5Widgets) >= 5.2.1
 BuildRequires:  pkgconfig(cairo)
-%if 0%{?suse_version} >= 1600
-ExclusiveArch:  donotbuild
-%endif
 %endif
 BuildRequires:  pkgconfig(glu)
 BuildRequires:  pkgconfig(liblzma)
@@ -393,7 +389,7 @@ This package contains the API documentation in HTML format.
 cp %{S:2} .
 
 %build
-%if "%flavor" == "doc"
+%if "%{flavor}" == "doc"
 pushd  docs/doxygen
 echo "DOT_IMAGE_FORMAT = svg" >> Doxyfile
 WX_SKIP_DOXYGEN_VERSION_CHECK=1 ./regen.sh xml
@@ -401,8 +397,6 @@ WX_SKIP_DOXYGEN_VERSION_CHECK=1 ./regen.sh html
 
 %else
 autoconf -f -i
-rm -Rf src/tiff
-
 # NOTE: gnome-vfs is deprecated. Disabled by default upstream.
 #
 # With 2.9.1:
@@ -423,11 +417,10 @@ rm -Rf src/tiff
 	--enable-ipv6 \
 	--enable-mediactrl \
 	--enable-optimise \
-	%{wx_debug:--enable-debug=%wx_debug} \
+	%{wx_debug:--enable-debug=%{wx_debug}} \
-	--enable-repro-build \
+        --enable-repro-build \
-	--enable-glcanvasegl \
+        --disable-glcanvasegl \
-	--enable-webrequest \
+        --enable-webrequest \
-	--enable-secretstore \
 %if "%flavor" == "GTK3-nostl"
 	--disable-stl \
 	--disable-plugins
@@ -440,7 +433,7 @@ rm -Rf src/tiff
 %endif
 
 %install
-%if "%flavor" == "doc"
+%if "%{flavor}" == "doc"
 find docs/doxygen/out/xml/ -iname \*.png -print -delete
 find docs/doxygen/out/html/ -iname \*.dot -print -delete
 %fdupes -s docs/doxygen/out/html/
@@ -461,7 +454,7 @@ ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildr
 %endif
 
 %check
-%if "%flavor" != "doc"
+%if "%{flavor}" != "doc"
 %make_build -C tests all
 pushd tests
 # Disable webrequest tests requiring network access
@@ -474,24 +467,40 @@ export WX_TEST_WEBREQUEST_URL=0
 # ./test_gui -l || true
 %endif
 
-%ldconfig_scriptlets -n libwx_baseu-%variant%psonum
+%post   -n libwx_baseu-%variant%psonum -p /sbin/ldconfig
-%ldconfig_scriptlets -n libwx_baseu_net-%variant%psonum
+%postun -n libwx_baseu-%variant%psonum -p /sbin/ldconfig
-%ldconfig_scriptlets -n libwx_baseu_xml-%variant%psonum
+%post   -n libwx_baseu_net-%variant%psonum -p /sbin/ldconfig
-%ldconfig_scriptlets -n libwx_%{toolkit}u_adv-%variant%psonum
+%postun -n libwx_baseu_net-%variant%psonum -p /sbin/ldconfig
-%ldconfig_scriptlets -n libwx_%{toolkit}u_aui-%variant%psonum
+%post   -n libwx_baseu_xml-%variant%psonum -p /sbin/ldconfig
-%ldconfig_scriptlets -n libwx_%{toolkit}u_core-%variant%psonum
+%postun -n libwx_baseu_xml-%variant%psonum -p /sbin/ldconfig
-%ldconfig_scriptlets -n libwx_%{toolkit}u_gl-%variant%psonum
+%post   -n libwx_%{toolkit}u_adv-%variant%psonum -p /sbin/ldconfig
-%ldconfig_scriptlets -n libwx_%{toolkit}u_html-%variant%psonum
+%postun -n libwx_%{toolkit}u_adv-%variant%psonum -p /sbin/ldconfig
-%ldconfig_scriptlets -n libwx_%{toolkit}u_media-%variant%psonum
+%post   -n libwx_%{toolkit}u_aui-%variant%psonum -p /sbin/ldconfig
-%ldconfig_scriptlets -n libwx_%{toolkit}u_propgrid-%variant%psonum
+%postun -n libwx_%{toolkit}u_aui-%variant%psonum -p /sbin/ldconfig
-%ldconfig_scriptlets -n libwx_%{toolkit}u_qa-%variant%psonum
+%post   -n libwx_%{toolkit}u_core-%variant%psonum -p /sbin/ldconfig
-%ldconfig_scriptlets -n libwx_%{toolkit}u_ribbon-%variant%psonum
+%postun -n libwx_%{toolkit}u_core-%variant%psonum -p /sbin/ldconfig
-%ldconfig_scriptlets -n libwx_%{toolkit}u_richtext-%variant%psonum
+%post   -n libwx_%{toolkit}u_gl-%variant%psonum -p /sbin/ldconfig
-%ldconfig_scriptlets -n libwx_%{toolkit}u_stc-%variant%psonum
+%postun -n libwx_%{toolkit}u_gl-%variant%psonum -p /sbin/ldconfig
-%ldconfig_scriptlets -n libwx_%{toolkit}u_webview-%variant%psonum
+%post   -n libwx_%{toolkit}u_html-%variant%psonum -p /sbin/ldconfig
-%ldconfig_scriptlets -n libwx_%{toolkit}u_xrc-%variant%psonum
+%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"
+%if "%{flavor}" == "doc"
 %files xml
 %doc docs/doxygen/out/xml/*.{xml,xslt}