Update to 3.2.2.1

2023-09-06 09:34:18 +08:00 · 2023-09-06 09:34:18 +08:00 · f9da3ffd35
commit f9da3ffd35
parent 8fa83c359c
6 changed files with 56 additions and 55 deletions
--- a/add-pie-compile-option.patch
+++ b/add-pie-compile-option.patch
@ -1,13 +1,12 @@
-diff --git a/utils/wxrc/Makefile.in b/utils/wxrc/Makefile.in
-index 44b7d02..dd9d4b8 100644
--- a/utils/wxrc/Makefile.in
-+++ b/utils/wxrc/Makefile.in
-@@ -115,7 +115,7 @@ distclean: clean
- 	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+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 @@
+ 	rm -f config.cache config.log config.status bk-deps bk-make-pch Makefile
 
- @COND_USE_XRC_1@wxrc$(EXEEXT): $(WXRC_OBJECTS)
-@COND_USE_XRC_1@	$(CXX) -o $@ $(WXRC_OBJECTS)    -L$(LIBDIRNAME)  $(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_XRC_1@	$(CXX) -fPIE -o $@ $(WXRC_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS) -pie $(__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_XRC_1@	
- @COND_USE_XRC_1@	$(__wxrc___mac_setfilecmd)
+ @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@install_wxrc: $(__wxrc___depname)
+ @COND_USE_XML_1@	$(INSTALL_DIR) $(DESTDIR)$(bindir)
--- a/4
+++ b/4
@ -5,7 +5,7 @@
 # Usage: wx-config [--arch <arch>] <regular wx-config options>
 #

-version=3.0
+version=3.2

 if [ $# -ge 2 ]; then
    if [ $1 = "--arch" ]; then
@ -46,6 +46,6 @@ fi
 if [ -x $wxconfig ]; then
    exec $wxconfig $@
 else
-    echo "wxWidgets3-devel isn't installed for architecture '$arch'"
+    echo "wxGTK-devel isn't installed for architecture '$arch'"
    exit 9
 fi
--- a/wxGTK3-3.0.3-abicheck.patch
+++ b/wxGTK3-3.0.3-abicheck.patch
@ -1,14 +0,0 @@
--- wxWidgets-3.0.2/src/common/appbase.cpp.abicheck	2015-05-28 12:36:40.697163073 +0900
-+++ wxWidgets-3.0.2/src/common/appbase.cpp	2015-05-28 12:38:30.597154298 +0900
-@@ -762,10 +762,7 @@
-         msg.Printf(wxT("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."),
-                    lib.c_str(), progName.c_str(), prog.c_str());
- 
-        wxLogFatalError(msg.c_str());
-
-        // normally wxLogFatalError doesn't return
-        return false;
-+        wxLogWarning(msg.c_str());
-     }
- 
-     return true;
--- a/wxGTK3-3.1.6-abicheck.patch
+++ b/wxGTK3-3.1.6-abicheck.patch
@ -0,0 +1,16 @@
+diff -up wxWidgets-3.1.6/src/common/appbase.cpp.abicheck wxWidgets-3.1.6/src/common/appbase.cpp
+--- wxWidgets-3.1.6/src/common/appbase.cpp.abicheck	2022-04-04 09:41:33.000000000 -0400
+++ wxWidgets-3.1.6/src/common/appbase.cpp	2022-04-04 19:14:33.883814729 -0400
+@@ -843,11 +843,8 @@ bool wxAppConsoleBase::CheckBuildOptions
+         wxString prog = wxString::FromAscii(optionsSignature);
+         wxString progName = wxString::FromAscii(componentName);
+ 
+-        wxLogFatalError(wxT("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."),
+        wxLogWarning(wxT("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."),
+                         lib, progName, prog);
+-
+-        // normally wxLogFatalError doesn't return
+-        return false;
+     }
+ 
+     return true;
--- a/wxGTK3.spec
+++ b/wxGTK3.spec
@ -1,13 +1,13 @@
 Name:           wxGTK3
-Version:        3.0.4
-Release:        9
+Version:        3.2.2.1
+Release:        1
 Summary:        C++ Library for Cross-Platform Development

 License:        GPL-2.0-or-later or LGPL-2.1-only
 URL:            https://www.wxwidgets.org/
 Source0:        https://github.com/wxWidgets/wxWidgets/releases/download/v%{version}/wxWidgets-%{version}.tar.bz2
 Source1:        wx-config
-Patch0001:      wxGTK3-3.0.3-abicheck.patch
+Patch0001:      wxGTK3-3.1.6-abicheck.patch
 Patch0002:      add-pie-compile-option.patch

 BuildRequires:  gtk2-devel gtk3-devel webkit2gtk3-devel zlib-devel libpng-devel libjpeg-devel
@ -104,7 +104,7 @@ This package provides documentation for the wxGTK3-docs library.
 %prep
 %autosetup -n wxWidgets-%{version} -p1

-sed -i -e 's|aclocal)|aclocal/wxwin3.m4)|;s|wxstd.mo|wxstd3.mo|;s|wxmsw.mo|wxmsw3.mo|' Makefile.in
+sed -i -e 's|aclocal)|aclocal/wxwin32.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
@ -119,16 +119,16 @@ export CPPUNIT_CONFIG="/usr/bin/pkg-config cppunit"

 install -d bld_gtk2
 cd bld_gtk2
-%configure --with-gtk=2 --with-opengl --with-sdl --with-gnomeprint --with-libmspack --enable-intl \
-  --enable-no_deps --disable-rpath --enable-ipv6
+%configure --with-gtk=2 --with-opengl --with-sdl --with-libmspack --enable-intl \
+  --disable-rpath --disable-glcanvasegl --enable-ipv6

 %make_build
 cd -

 install -d bld_gtk3
 cd bld_gtk3
-%configure --with-gtk=3 --with-opengl --with-sdl --with-gnomeprint --with-libmspack --enable-intl \
-  --enable-no_deps --disable-rpath --enable-ipv6
+%configure --with-gtk=3 --with-opengl --with-sdl --with-libmspack --enable-intl \
+  --disable-rpath --disable-glcanvasegl --enable-ipv6

 %make_build
 cd -
@ -142,29 +142,28 @@ cd -

 %install
 cd bld_gtk2
-%makeinstall
+%make_install
 cd -

 cd bld_gtk3
-%makeinstall
+%make_install
 cd -

 rm %{buildroot}%{_bindir}/wx-config
 install -pD -m 755 %{SOURCE1} %{buildroot}%{_libexecdir}/wxGTK3/wx-config
-ln -s ../..%{_libexecdir}/wxGTK3/wx-config %{buildroot}%{_bindir}/wx-config-3.0
+sed -i -e 's|=/usr|=%{_prefix}|' %{buildroot}%{_libexecdir}/%{name}/wx-config
+ln -s ../..%{_libexecdir}/wxGTK3/wx-config %{buildroot}%{_bindir}/wx-config-3.2
 touch %{buildroot}%{_bindir}/wx-config

 mv %{buildroot}%{_bindir}/wxrc* %{buildroot}%{_libexecdir}/wxGTK3
-ln -s ../..%{_libexecdir}/wxGTK3/wxrc-3.0 %{buildroot}%{_bindir}/wxrc-3.0
+ln -s ../..%{_libexecdir}/wxGTK3/wxrc-3.2 %{buildroot}%{_bindir}/wxrc-3.2
 touch %{buildroot}%{_bindir}/wxrc


-install -d %{buildroot}%{_datadir}/bakefile/presets/wx3
-mv %{buildroot}%{_datadir}/bakefile/presets/*.* %{buildroot}%{_datadir}/bakefile/presets/wx3
+install -d %{buildroot}%{_datadir}/bakefile/presets/wx32
+mv %{buildroot}%{_datadir}/bakefile/presets/*.* %{buildroot}%{_datadir}/bakefile/presets/wx32

-%find_lang wxstd3
-%find_lang wxmsw3
-cat wxmsw3.lang >> wxstd3.lang
+%find_lang wxstd-3.2

 %check
 cd bld_gtk2/tests
@ -178,9 +177,9 @@ cd -
 %post -n wxBase3-devel
 if [ -f %{_bindir}/wx-config ] && [ ! -h %{_bindir}/wx-config ] ; then rm %{_bindir}/wx-config; fi;

-%{_sbindir}/update-alternatives --install %{_bindir}/wx-config wx-config %{_libexecdir}/%{name}/wx-config 3
+%{_sbindir}/update-alternatives --install %{_bindir}/wx-config wx-config %{_libexecdir}/%{name}/wx-config 25

-%{_sbindir}/update-alternatives --install %{_bindir}/wxrc wxrc %{_libexecdir}/%{name}/wxrc 3
+%{_sbindir}/update-alternatives --install %{_bindir}/wxrc wxrc %{_libexecdir}/%{name}/wxrc 25

 %postun -n wxBase3-devel
 if [ $1 -eq 0 ] ; then
@ -191,33 +190,31 @@ fi
 %files
 %{_libdir}/libwx_gtk3u_*.so.*
 %dir %{_libdir}/wx
-%{_libdir}/wx/3.0
+%{_libdir}/wx/3.2

 %files -n compat-wxGTK3-gtk2
 %{_libdir}/libwx_gtk2u_*.so.*

 %files -n wxBase3-devel
 %ghost %{_bindir}/{wx-config,wxrc}
-%{_bindir}/{wxrc-3.0,wx-config-3.0}
-%{_includedir}/wx-3.0
+%{_bindir}/{wxrc-3.2,wx-config-3.2}
+%{_includedir}/wx-3.2
 %{_libdir}/libwx_baseu*.so
 %dir %{_libdir}/wx
 %dir %{_libdir}/wx/config
 %dir %{_libdir}/wx/include
-%{_datadir}/{aclocal/wxwin3.m4,bakefile/presets/wx3}
-%exclude %{_datadir}/bakefile/presets/wx3/*.pyc
-%exclude %{_datadir}/bakefile/presets/wx3/*.pyo
+%{_datadir}/{aclocal/wxwin32.m4,bakefile/presets/wx32}
 %{_libexecdir}/wxGTK3

 %files devel
 %{_libdir}/libwx_gtk3u_*.so
-%{_libdir}/wx/{config/gtk3-unicode-3.0,include/gtk3-unicode-3.0}
+%{_libdir}/wx/{config/gtk3-unicode-3.2,include/gtk3-unicode-3.2}

 %files -n compat-wxGTK3-gtk2-devel
 %{_libdir}/libwx_gtk2u_*.so
-%{_libdir}/wx/{config/gtk2-unicode-3.0,include/gtk2-unicode-3.0}
+%{_libdir}/wx/{config/gtk2-unicode-3.2,include/gtk2-unicode-3.2}

-%files i18n -f wxstd3.lang
+%files i18n -f wxstd-3.2.lang

 %files -n wxBase3
 %{_libdir}/libwx_baseu*.so.*
@ -228,6 +225,9 @@ fi


 %changelog
+* Wed Sep 06 2023 wulei <wu_lei@hoperun.com> - 3.2.2.1-1
+- Update to 3.2.2.1
+
 * Wed Jun 07 2023 xu_ping <707078654@qq.com> - 3.0.4-9
 - Add pie compile option

--- a/wxWidgets-3.2.2.1.tar.bz2
+++ b/wxWidgets-3.2.2.1.tar.bz2