diff --git a/soversion.diff b/soversion.diff index 433107c..1c27ab9 100644 --- a/soversion.diff +++ b/soversion.diff @@ -1,26 +1,31 @@ From: Jan Engelhardt Date: 2014-11-07 10:41:58.650412802 +0100 -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.) +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... -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. +- virtual void SetupMouseEvent(wxMouseEvent &wxevent, NSEvent * nsEvent); ++ ++ using MouseEvents = std::vector; ++ virtual MouseEvents TranslateMouseEvent(NSEvent * nsEvent); -One needs to look at the diff between versions. If in doubt, just -always bump, specifically(!) the SO major. +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. --- Makefile.in | 5 +++-- build/aclocal/bakefile.m4 | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) -Index: wxWidgets-3.2.5/Makefile.in +Index: wxWidgets-3.2.6/Makefile.in =================================================================== ---- wxWidgets-3.2.5.orig/Makefile.in -+++ wxWidgets-3.2.5/Makefile.in +--- wxWidgets-3.2.6.orig/Makefile.in ++++ wxWidgets-3.2.6/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 \ @@ -39,18 +44,18 @@ Index: wxWidgets-3.2.5/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.2.3.$(SO_SUFFIX) + @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.3.0.$(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).11.0.0 ++@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).12.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.5/build/aclocal/bakefile.m4 +Index: 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 +--- wxWidgets-3.2.6.orig/build/aclocal/bakefile.m4 ++++ wxWidgets-3.2.6/build/aclocal/bakefile.m4 @@ -408,8 +408,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_VERSIONS], SONAME_FLAG="-Wl,-soname," fi diff --git a/wxWidgets-3.2.5.tar.bz2 b/wxWidgets-3.2.5.tar.bz2 deleted file mode 100644 index 65005bf..0000000 --- a/wxWidgets-3.2.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0ad86a3ad3e2e519b6a705248fc9226e3a09bbf069c6c692a02acf7c2d1c6b51 -size 27539152 diff --git a/wxWidgets-3.2.6.tar.bz2 b/wxWidgets-3.2.6.tar.bz2 new file mode 100644 index 0000000..5eb5db1 --- /dev/null +++ b/wxWidgets-3.2.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:939e5b77ddc5b6092d1d7d29491fe67010a2433cf9b9c0d841ee4d04acb9dce7 +size 27528560 diff --git a/wxWidgets-3_2.changes b/wxWidgets-3_2.changes index dc5f150..d0f1aac 100644 --- a/wxWidgets-3_2.changes +++ b/wxWidgets-3_2.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Mon Sep 9 16:24:15 UTC 2024 - Jan Engelhardt + +- 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 diff --git a/wxWidgets-3_2.spec b/wxWidgets-3_2.spec index e6e24ef..c52ecc7 100644 --- a/wxWidgets-3_2.spec +++ b/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 11_0_0 -%define sonum 11.0.0 +%define psonum 12_0_0 +%define sonum 12.0.0 Name: %this_spec -Version: 3.2.5 +Version: 3.2.6 Release: 0 Summary: C++ Library for Cross-Platform Development License: LGPL-2.1-or-later WITH WxWindows-exception-3.1 @@ -467,38 +467,22 @@ export WX_TEST_WEBREQUEST_URL=0 # ./test_gui -l || true %endif -%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 +%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 %if "%{flavor}" == "doc" %files xml