Accepting request 1135375 from X11:wxWidgets

- Update to release 3.2.4

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

autoconf-2_72.diff

@@ -0,0 +1,21 @@
+From: Jan Engelhardt <jengelh@inai.de>
+Date: 2023-12-26 15:16:01.213214373 +0100
+
+wxWidgets stupidly uses $EGREP near the end of configure.in without ever setting it.
+
+---
+ configure.in |    1 +
+ 1 file changed, 1 insertion(+)
+
+Index: wxWidgets-3.2.4/configure.in
+===================================================================
+--- wxWidgets-3.2.4.orig/configure.in
++++ wxWidgets-3.2.4/configure.in
+@@ -8712,6 +8712,7 @@ dnl MAKE_SET will be replaced with "MAKE
+ dnl itself (this macro is required if SUBDIRS variable is used in Makefile.am
+ dnl - and we do use it)
+ AC_PROG_MAKE_SET
++AC_PROG_EGREP
+ 
+ 
+ AC_CONFIG_HEADERS([lib/wx/include/${TOOLCHAIN_FULLNAME}/wx/setup.h:setup.h.in])

soversion.diff

@@ -12,24 +12,15 @@ to do it. As we have a vendor suffix, no filename conflicts can occur.
 One needs to look at the diff between versions. If in doubt, just
 always bump, specifically(!) the SO major.
 
-Index: wxWidgets-3.2.1/build/aclocal/bakefile.m4
-===================================================================
---- wxWidgets-3.2.1.orig/build/aclocal/bakefile.m4
-+++ wxWidgets-3.2.1/build/aclocal/bakefile.m4
-@@ -408,8 +408,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_VERSIONS],
-             SONAME_FLAG="-Wl,-soname,"
-         fi
-         USE_SOVERSION=1
--        USE_SOVERLINUX=1
--        USE_SOTWOSYMLINKS=1
-+        USE_SOVERSOLARIS=1
-       ;;
+---
+ Makefile.in               |    5 +++--
+ build/aclocal/bakefile.m4 |    3 +--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
 
-       *-*-solaris2* )
-Index: wxWidgets-3.2.1/Makefile.in
+Index: wxWidgets-3.2.4/Makefile.in
 ===================================================================
---- wxWidgets-3.2.1.orig/Makefile.in
-+++ wxWidgets-3.2.1/Makefile.in
+--- wxWidgets-3.2.4.orig/Makefile.in
++++ wxWidgets-3.2.4/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 \
@@ -48,11 +39,25 @@ Index: wxWidgets-3.2.1/Makefile.in
  COND_wxUSE_REGEX_builtin___wxregex___depname = \
  	$(LIBDIRNAME)/$(LIBPREFIX)wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
 @@ -13981,7 +13982,7 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE
- @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.2.1.$(SO_SUFFIX)
+ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.2.2.$(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).9.0.0
++@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).10.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.4/build/aclocal/bakefile.m4
+===================================================================
+--- wxWidgets-3.2.4.orig/build/aclocal/bakefile.m4
++++ wxWidgets-3.2.4/build/aclocal/bakefile.m4
+@@ -408,8 +408,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_VERSIONS],
+             SONAME_FLAG="-Wl,-soname,"
+         fi
+         USE_SOVERSION=1
+-        USE_SOVERLINUX=1
+-        USE_SOTWOSYMLINKS=1
++        USE_SOVERSOLARIS=1
+       ;;
+ 
+       *-*-solaris2* )

wxWidgets-3_2.changes

@@ -1,3 +1,31 @@
+-------------------------------------------------------------------
+Tue Dec 26 14:28:08 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
+
+- Add autoconf-2_72.diff
+
+-------------------------------------------------------------------
+Sat Nov 11 17:38:28 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 3.2.4
+  * Allow creating wxArrays from std::initializer_list
+  * Fix regression in wxTranslations::AddCatalog() return value
+  * Fix possible crash when dragging pages in wxAuiNotebook
+  * Don't crash in console apps linked with GUI libraries
+  * Fix possible crash and too high CPU use when using EGL
+  * Fix losing clipboard contents when clearing a different selection
+
+-------------------------------------------------------------------
+Fri Nov  3 09:54:45 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 3.2.3
+  * Add move ctor and assignment operator to wxString
+  * Enable large file support in Unix CMake builds
+  * Make wxSocket::Peek() work with UDP too
+  * Fix infinite loop in wxFTP::GetFilesList()
+  * Add wxUILocale::GetMonthName() and GetWeekDayName()
+  * Add EVT_FULLSCREEN event macro
+  * Fix crash when deleting selected item in wxGenericListCtrl
+
 -------------------------------------------------------------------
 Wed May 24 09:29:25 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
 

wxWidgets-3_2.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package wxWidgets-3_2
+# spec file
 #
 # Copyright (c) 2023 SUSE LLC
 #
@@ -19,7 +19,7 @@
 %global flavor @BUILD_FLAVOR@%nil
 %if "%flavor" == ""
 # default flavor is GTK2
-Name:           wxWidgets-3_2
+%define this_spec wxWidgets-3_2
 %define variant suse
 %define gtk_version 2
 %define toolkit gtk%gtk_version
@@ -28,23 +28,22 @@ Name:           wxWidgets-3_2
 %endif
 
 %if "%{flavor}" == "doc"
-Name:           wxWidgets-3_2-doc
+%define this_spec wxWidgets-3_2-doc
 %define variant %{nil}
 %define toolkit %{nil}
 %endif
 
 %if "%flavor" == "GTK3"
-Name:           wxGTK3-3_2
+%define this_spec wxGTK3-3_2
 %define variant suse
 %define gtk_version 3
 %define toolkit gtk%gtk_version
-# build non-UI toolkit related packages
 %define base_packages 1
 %bcond_without webview
 %endif
 
 %if "%flavor" == "GTK3-nostl"
-Name:           wxWidgets-3_2-nostl
+%define this_spec wxWidgets-3_2-nostl
 %define variant suse-nostl
 %define gtk_version 3
 %define toolkit gtk%gtk_version
@@ -56,22 +55,21 @@ wxString and instead rely on the wxChar pointer API.
 %endif
 
 %if "%flavor" == "Qt"
-Name:           wxQt-3_2
+%define this_spec wxQt-3_2
 %define variant suse
 %define toolkit qt
 %define base_packages 0
 %bcond_with webview
 %endif
 
+# At most one Name: line to not confuse quilt(1)
 %define base_name wxWidgets-3_2
-# Use default debug level, enabling exceptions
-# Other valid values: yes/no/max
-%define wx_debug %nil
-%define psonum 9_0_0
-%define sonum 9.0.0
-Version:        3.2.2.1
-Release:        0
 %define wx_minor 3.2
+%define psonum 10_0_0
+%define sonum 10.0.0
+Name:           %this_spec
+Version:        3.2.4
+Release:        0
 Summary:        C++ Library for Cross-Platform Development
 License:        LGPL-2.1-or-later WITH WxWindows-exception-3.1
 Group:          Development/Libraries/C and C++
@@ -83,6 +81,7 @@ Source5:        wxWidgets-3_2-rpmlintrc
 # identify and backport wxPython fixes to wxWidgets.
 Source6:        wxpython-mkdiff.sh
 Patch1:         soversion.diff
+Patch2:         autoconf-2_72.diff
 %if "%{flavor}" == "doc"
 BuildRequires:  doxygen
 BuildRequires:  fdupes
@@ -124,6 +123,9 @@ BuildRequires:  pkgconfig(liblzma)
 BuildRequires:  pkgconfig(sdl2)
 BuildRequires:  pkgconfig(xtst)
 %endif
+# Use default debug level, enabling exceptions
+# Other valid values: yes/no/max
+%define wx_debug %nil
 
 %description
 wxWidgets is a C++ library abstraction layer for a number of GUI