diff --git a/add-pie-compile-option.patch b/add-pie-compile-option.patch index 9f7bfc22e55bdce66bfe8286bf2a4db75c294a0a..7c9cdd396ce6be1cf12ce9ba287c3a1a9c382c64 100644 --- a/add-pie-compile-option.patch +++ b/add-pie-compile-option.patch @@ -1,12 +1,11 @@ -diff -Nur a/utils/wxrc/Makefile.in b/utils/wxrc/Makefile.in ---- a/utils/wxrc/Makefile.in 2023-09-07 15:51:55.352827569 +0800 -+++ b/utils/wxrc/Makefile.in 2023-09-07 16:05:11.820373156 +0800 -@@ -114,7 +114,7 @@ +--- a/utils/wxrc/Makefile.in 2025-10-31 16:03:31.870092978 +0800 ++++ b/utils/wxrc/Makefile.in 2025-10-31 16:02:52.427092978 +0800 +@@ -113,7 +113,7 @@ rm -f config.cache config.log config.status bk-deps bk-make-pch Makefile @COND_USE_XML_1@wxrc$(EXEEXT): $(WXRC_OBJECTS) --@COND_USE_XML_1@ $(CXX) -o $@ $(WXRC_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS) $(WX_LDFLAGS) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) -+@COND_USE_XML_1@ $(CXX) -fPIE -o $@ $(WXRC_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS) $(WX_LDFLAGS) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) +-@COND_USE_XML_1@ $(CXX) -o $@ $(WXRC_OBJECTS) -L$(LIBDIRNAME) $(DYLIB_RPATH_FLAG) $(LDFLAGS) $(WX_LDFLAGS) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) ++@COND_USE_XML_1@ $(CXX) -fPIE -o $@ $(WXRC_OBJECTS) -L$(LIBDIRNAME) $(DYLIB_RPATH_FLAG) $(LDFLAGS) $(WX_LDFLAGS) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) @COND_USE_XML_1@install_wxrc: $(__wxrc___depname) @COND_USE_XML_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) diff --git a/wx-config b/wx-config index 56122f5e5d2410a2b722a19ebd2e56c59a28ee65..26a4055cbe7cffb67e9e52c6b1a167ea31b53d1d 100644 --- a/wx-config +++ b/wx-config @@ -5,7 +5,7 @@ # Usage: wx-config [--arch ] # -version=3.2 +version=3.3 if [ $# -ge 2 ]; then if [ $1 = "--arch" ]; then diff --git a/wxGTK3.spec b/wxGTK3.spec index 9a4b17558360f107d105c7a60ee657ce3b29e725..0c2b473d2ea90b7dc315b8417392d1db82fc3160 100644 --- a/wxGTK3.spec +++ b/wxGTK3.spec @@ -1,5 +1,5 @@ Name: wxGTK3 -Version: 3.2.8 +Version: 3.3.1 Release: 1 Summary: C++ Library for Cross-Platform Development @@ -133,7 +133,7 @@ This package provides documentation for the wxGTK3-docs library. %prep %autosetup -n wxWidgets-%{version} -p1 -sed -i -e 's|aclocal)|aclocal/wxwin32.m4)|;s|wxstd.mo|wxstd3.mo|;s|wxmsw.mo|wxmsw3.mo|' Makefile.in +sed -i -e 's|aclocal)|aclocal/wxwin33.m4)|;s|wxstd.mo|wxstd3.mo|;s|wxmsw.mo|wxmsw3.mo|' Makefile.in sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure sed -i -e 's|/lib|/%{_lib}|' src/unix/stdpaths.cpp sed -i -e 's|$CPPUNIT_CONFIG --version|$CPPUNIT_CONFIG --modversion|' configure @@ -181,18 +181,18 @@ cd - rm %{buildroot}%{_bindir}/wx-config install -pD -m 755 %{S:1} %{buildroot}%{_libexecdir}/wxGTK3/wx-config sed -i -e 's|=/usr|=%{_prefix}|' %{buildroot}%{_libexecdir}/%{name}/wx-config -ln -s ../..%{_libexecdir}/wxGTK3/wx-config %{buildroot}%{_bindir}/wx-config-3.2 +ln -s ../..%{_libexecdir}/wxGTK3/wx-config %{buildroot}%{_bindir}/wx-config-3.3 touch %{buildroot}%{_bindir}/wx-config mv %{buildroot}%{_bindir}/wxrc* %{buildroot}%{_libexecdir}/wxGTK3 -ln -s ../..%{_libexecdir}/wxGTK3/wxrc-3.2 %{buildroot}%{_bindir}/wxrc-3.2 +ln -s ../..%{_libexecdir}/wxGTK3/wxrc-3.3 %{buildroot}%{_bindir}/wxrc-3.3 touch %{buildroot}%{_bindir}/wxrc -install -d %{buildroot}%{_datadir}/bakefile/presets/wx32 -mv %{buildroot}%{_datadir}/bakefile/presets/*.* %{buildroot}%{_datadir}/bakefile/presets/wx32 +install -d %{buildroot}%{_datadir}/bakefile/presets/wx33 +mv %{buildroot}%{_datadir}/bakefile/presets/*.* %{buildroot}%{_datadir}/bakefile/presets/wx33 -%find_lang wxstd-3.2 +%find_lang wxstd-3.3 %check cd bld_gtk2/tests @@ -219,31 +219,31 @@ fi %files %{_libdir}/libwx_gtk3u_*.so.* %dir %{_libdir}/wx -%{_libdir}/wx/3.2 +%{_libdir}/wx/3.3.1 %files -n compat-wxGTK3-gtk2 %{_libdir}/libwx_gtk2u_*.so.* %files -n wxBase3-devel %ghost %{_bindir}/{wx-config,wxrc} -%{_bindir}/{wxrc-3.2,wx-config-3.2} -%{_includedir}/wx-3.2 +%{_bindir}/{wxrc-3.3,wx-config-3.3} +%{_includedir}/wx-3.3 %{_libdir}/libwx_baseu*.so %dir %{_libdir}/wx %dir %{_libdir}/wx/config %dir %{_libdir}/wx/include -%{_datadir}/{aclocal/wxwin32.m4,bakefile/presets/wx32} +%{_datadir}/{aclocal/wxwin33.m4,bakefile/presets/wx33} %{_libexecdir}/wxGTK3 %files devel %{_libdir}/libwx_gtk3u_*.so -%{_libdir}/wx/{config/gtk3-unicode-3.2,include/gtk3-unicode-3.2} +%{_libdir}/wx/{config/gtk3-unicode-3.3,include/gtk3-unicode-3.3} %files -n compat-wxGTK3-gtk2-devel %{_libdir}/libwx_gtk2u_*.so -%{_libdir}/wx/{config/gtk2-unicode-3.2,include/gtk2-unicode-3.2} +%{_libdir}/wx/{config/gtk2-unicode-3.3,include/gtk2-unicode-3.3} -%files i18n -f wxstd-3.2.lang +%files i18n -f wxstd-3.3.lang %files -n wxBase3 %{_libdir}/libwx_baseu*.so.* @@ -253,6 +253,15 @@ fi %doc html %changelog +* Fri Oct 31 2025 yaoxin <1024769339@qq.com> - 3.3.1-1 +- Update to 3.3.1: + * Fix crash when sorting wxDataViewCtrl with single leaf node (#25625). + * Fix losing wxListCtrl contents after AppendColumn() (#25519). + * Fix buffer overrun when getting preferred languages list (#25612). + * Fix crash when using per-window menu in MDI applications (#25522). + * Fix border look for wxDVC, wxListBox, wxTextCtrl (Will Cosgrove, #25570). + * Fix crash on startup when using Farsi as system language (#25561). + * Fri Apr 25 2025 Funda Wang - 3.2.8-1 - update to 3.2.8 diff --git a/wxWidgets-3.2.8.tar.bz2 b/wxWidgets-3.3.1.tar.bz2 similarity index 32% rename from wxWidgets-3.2.8.tar.bz2 rename to wxWidgets-3.3.1.tar.bz2 index fd499f17699d7cca61a63de9e453e6144bdc21eb..39686f582259c881265e7a91b79d79e2a1438107 100644 --- a/wxWidgets-3.2.8.tar.bz2 +++ b/wxWidgets-3.3.1.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c74784904109d7229e6894c85cfa068f1106a4a07c144afd78af41f373ee0fe6 -size 27675086 +oid sha256:f936c8d694f9c49a367a376f99c751467150a4ed7cbf8f4723ef19b2d2d9998d +size 31703187