From c5092364e955b0adfcbea897036270094e6ef4d37a91744c867b381fbb40aafb Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 16 Dec 2023 16:58:40 +0000 Subject: [PATCH] - Update to release 3.2.4 OBS-URL: https://build.opensuse.org/package/show/X11:wxWidgets/wxWidgets-3_2?expand=0&rev=109 --- soversion.diff | 43 +++++++++++++++++++++++------------------ wxWidgets-3.2.3.tar.bz2 | 3 --- wxWidgets-3.2.4.tar.bz2 | 3 +++ wxWidgets-3_2.changes | 11 +++++++++++ wxWidgets-3_2.spec | 36 ++++++++++++++++++---------------- 5 files changed, 57 insertions(+), 39 deletions(-) delete mode 100644 wxWidgets-3.2.3.tar.bz2 create mode 100644 wxWidgets-3.2.4.tar.bz2 diff --git a/soversion.diff b/soversion.diff index ac2a3af..5537ef5 100644 --- a/soversion.diff +++ b/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 +--- + Makefile.in | 5 +++-- + build/aclocal/bakefile.m4 | 3 +-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +Index: wxWidgets-3.2.4/Makefile.in =================================================================== ---- 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 - ;; - - *-*-solaris2* ) -Index: wxWidgets-3.2.1/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* ) diff --git a/wxWidgets-3.2.3.tar.bz2 b/wxWidgets-3.2.3.tar.bz2 deleted file mode 100644 index 6016d47..0000000 --- a/wxWidgets-3.2.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c170ab67c7e167387162276aea84e055ee58424486404bba692c401730d1a67a -size 27537724 diff --git a/wxWidgets-3.2.4.tar.bz2 b/wxWidgets-3.2.4.tar.bz2 new file mode 100644 index 0000000..7bb18d4 --- /dev/null +++ b/wxWidgets-3.2.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0640e1ab716db5af2ecb7389dbef6138d7679261fbff730d23845ba838ca133e +size 27505949 diff --git a/wxWidgets-3_2.changes b/wxWidgets-3_2.changes index 4e3fede..f47ebf1 100644 --- a/wxWidgets-3_2.changes +++ b/wxWidgets-3_2.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sat Nov 11 17:38:28 UTC 2023 - Jan Engelhardt + +- 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 diff --git a/wxWidgets-3_2.spec b/wxWidgets-3_2.spec index d752551..babf0c8 100644 --- a/wxWidgets-3_2.spec +++ b/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,13 +28,13 @@ 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 @@ -44,7 +44,7 @@ Name: wxGTK3-3_2 %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 +56,19 @@ 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.3 -Release: 0 %define wx_minor 3.2 +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++ @@ -124,6 +121,11 @@ BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(sdl2) BuildRequires: pkgconfig(xtst) %endif +%define psonum 10_0_0 +%define sonum 10.0.0 +# 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 @@ -439,7 +441,7 @@ find docs/doxygen/out/html/ -iname \*.dot -print -delete export VENDORTAG='-$variant' # only needed for non-MSW %make_install -%if !%base_packages +%if !0%{?base_packages:1} # Drop libraries already supplied by another packages rm -fv "%buildroot/%_libdir"/libwx_baseu*.so* \ "%buildroot/%_libdir/wx/%wx_minor"/sound_sdlu-*.so @@ -512,7 +514,7 @@ export WX_TEST_WEBREQUEST_URL=0 %else -%if %base_packages +%if 0%{?base_packages:1} %files -n libwx_base-%variant-devel %_libdir/libwx_baseu*.so @@ -570,7 +572,7 @@ export WX_TEST_WEBREQUEST_URL=0 %files -n libwx_%{toolkit}u_xrc-%variant%psonum %_libdir/libwx_%{toolkit}u_xrc-%variant.so.%{sonum}* -%if %base_packages +%if 0%{?base_packages:1} %if "%flavor" != "GTK3-nostl" %files -n %{base_name}-plugin-sound_sdlu-3_2 %dir %_libdir/wx @@ -589,7 +591,7 @@ export WX_TEST_WEBREQUEST_URL=0 %_datadir/bakefile %_includedir/wx-%wx_minor %_libdir/*.so -%if %base_packages +%if 0%{?ase_packages:1} %exclude %_libdir/libwx_baseu* %endif %dir %_libdir/wx