[packages/crossmingw32-wxWidgets] - updated to 3.2.4

qboosh qboosh at pld-linux.org
Thu Nov 23 20:36:14 CET 2023 

commit 52286129caae0f2bec6036e3f3887d5efb798a6a
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Nov 23 20:19:58 2023 +0100

    - updated to 3.2.4

 crossmingw32-wxWidgets.spec | 87 +++++++++++++++++++++++----------------------
 wxWidgets-gifdelay.patch    |  2 +-
 wxWidgets-samples.patch     |  9 +++--
 3 files changed, 49 insertions(+), 49 deletions(-)
---
diff --git a/crossmingw32-wxWidgets.spec b/crossmingw32-wxWidgets.spec
index a81198a..4afd25d 100644
--- a/crossmingw32-wxWidgets.spec
+++ b/crossmingw32-wxWidgets.spec
@@ -2,19 +2,20 @@
 Summary:	wxWidgets library - MinGW32 cross version
 Summary(pl.UTF-8):	Biblioteka wxWidgets - wersja skrośna dla MinGW32
 Name:		crossmingw32-%{realname}
-Version:	3.0.4
+Version:	3.2.4
 Release:	1
 License:	wxWidgets Library Licence 3.1 (LGPL v2+ with exception)
 Group:		Development/Libraries
-Source0:	http://downloads.sourceforge.net/wxwindows/%{realname}-%{version}.tar.bz2
-# Source0-md5:	b0035731777acc5597cea8982da10317
+#Source0Download: https://github.com/wxWidgets/wxWidgets/releases
+Source0:	https://github.com/wxWidgets/wxWidgets/releases/download/v%{version}/%{realname}-%{version}.tar.bz2
+# Source0-md5:	8eada508f5bdf390eeec5b0e0af38f71
 Patch0:		%{realname}-samples.patch
 Patch1:		%{realname}-ac.patch
 Patch2:		%{realname}-gifdelay.patch
-URL:		http://www.wxWidgets.org/
+URL:		https://www.wxWidgets.org/
 BuildRequires:	autoconf >= 2.58
 BuildRequires:	automake
-#BuildRequires:	bakefile >= 0.2.9
+#BuildRequires:	bakefile >= 0.2.12
 BuildRequires:	crossmingw32-expat
 BuildRequires:	crossmingw32-gcc-c++
 BuildRequires:	crossmingw32-libjpeg
@@ -28,9 +29,10 @@ Requires:	crossmingw32-libjpeg
 Requires:	crossmingw32-libpng
 Requires:	crossmingw32-libtiff
 Requires:	crossmingw32-w32api
-Obsoletes:	crossmingw32-wxMSW
+Obsoletes:	crossmingw32-wxMSW < 2.5
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_enable_debug_packages	0
 %define		no_install_post_strip	1
 
 %define		target			i386-mingw32
@@ -100,7 +102,6 @@ cp -f /usr/share/automake/config.sub .
 	--enable-controls \
 	--enable-plugins \
 	--enable-std-iostreams \
-	--enable-tabdialog \
 	--enable-vendor=pld \
 	--with-msw \
 	--with-opengl
@@ -114,14 +115,14 @@ install -d $RPM_BUILD_ROOT{%{_dlldir},%{_sysbindir}}
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-mv -f $RPM_BUILD_ROOT%{_libdir}/*.dll $RPM_BUILD_ROOT%{_dlldir}
+%{__mv} $RPM_BUILD_ROOT%{_bindir}/*.dll $RPM_BUILD_ROOT%{_dlldir}
 
 %if 0%{!?debug:1}
 %{target}-strip --strip-unneeded -R.comment -R.note $RPM_BUILD_ROOT%{_dlldir}/*.dll
 %{target}-strip -g -R.comment -R.note $RPM_BUILD_ROOT%{_libdir}/*.a
 %endif
 
-ln -sf %{_libdir}/wx/config/i386-mingw32-msw-unicode-3.0 $RPM_BUILD_ROOT%{_sysbindir}/i386-mingw32-wx-msw-unicode-config
+ln -sf %{_libdir}/wx/config/i386-mingw32-msw-unicode-3.2 $RPM_BUILD_ROOT%{_sysbindir}/i386-mingw32-wx-msw-unicode-config
 
 # use from native wxWidgets if needed
 %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/{aclocal,bakefile,locale}
@@ -132,43 +133,43 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sysbindir}/i386-mingw32-wx-msw-unicode-config
-%{_libdir}/libwx_baseu-3.0-i386-mingw32.dll.a
-%{_libdir}/libwx_baseu_net-3.0-i386-mingw32.dll.a
-%{_libdir}/libwx_baseu_xml-3.0-i386-mingw32.dll.a
-%{_libdir}/libwx_mswu_adv-3.0-i386-mingw32.dll.a
-%{_libdir}/libwx_mswu_aui-3.0-i386-mingw32.dll.a
-%{_libdir}/libwx_mswu_core-3.0-i386-mingw32.dll.a
-%{_libdir}/libwx_mswu_gl-3.0-i386-mingw32.dll.a
-%{_libdir}/libwx_mswu_html-3.0-i386-mingw32.dll.a
-%{_libdir}/libwx_mswu_media-3.0-i386-mingw32.dll.a
-%{_libdir}/libwx_mswu_propgrid-3.0-i386-mingw32.dll.a
-%{_libdir}/libwx_mswu_qa-3.0-i386-mingw32.dll.a
-%{_libdir}/libwx_mswu_ribbon-3.0-i386-mingw32.dll.a
-%{_libdir}/libwx_mswu_richtext-3.0-i386-mingw32.dll.a
-%{_libdir}/libwx_mswu_stc-3.0-i386-mingw32.dll.a
-%{_libdir}/libwx_mswu_webview-3.0-i386-mingw32.dll.a
-%{_libdir}/libwx_mswu_xrc-3.0-i386-mingw32.dll.a
+%{_libdir}/libwx_baseu-3.2-i386-mingw32.dll.a
+%{_libdir}/libwx_baseu_net-3.2-i386-mingw32.dll.a
+%{_libdir}/libwx_baseu_xml-3.2-i386-mingw32.dll.a
+%{_libdir}/libwx_mswu_adv-3.2-i386-mingw32.dll.a
+%{_libdir}/libwx_mswu_aui-3.2-i386-mingw32.dll.a
+%{_libdir}/libwx_mswu_core-3.2-i386-mingw32.dll.a
+%{_libdir}/libwx_mswu_gl-3.2-i386-mingw32.dll.a
+%{_libdir}/libwx_mswu_html-3.2-i386-mingw32.dll.a
+%{_libdir}/libwx_mswu_media-3.2-i386-mingw32.dll.a
+%{_libdir}/libwx_mswu_propgrid-3.2-i386-mingw32.dll.a
+%{_libdir}/libwx_mswu_qa-3.2-i386-mingw32.dll.a
+%{_libdir}/libwx_mswu_ribbon-3.2-i386-mingw32.dll.a
+%{_libdir}/libwx_mswu_richtext-3.2-i386-mingw32.dll.a
+%{_libdir}/libwx_mswu_stc-3.2-i386-mingw32.dll.a
+%{_libdir}/libwx_mswu_webview-3.2-i386-mingw32.dll.a
+%{_libdir}/libwx_mswu_xrc-3.2-i386-mingw32.dll.a
 %dir %{_libdir}/wx
 %dir %{_libdir}/wx/config
-%attr(755,root,root) %{_libdir}/wx/config/i386-mingw32-msw-unicode-3.0
+%attr(755,root,root) %{_libdir}/wx/config/i386-mingw32-msw-unicode-3.2
 %{_libdir}/wx/include
-%{_includedir}/wx-3.0
+%{_includedir}/wx-3.2
 
 %files dll
 %defattr(644,root,root,755)
-%{_dlldir}/wxbase30u_gcc_pld.dll
-%{_dlldir}/wxbase30u_net_gcc_pld.dll
-%{_dlldir}/wxbase30u_xml_gcc_pld.dll
-%{_dlldir}/wxmsw30u_adv_gcc_pld.dll
-%{_dlldir}/wxmsw30u_aui_gcc_pld.dll
-%{_dlldir}/wxmsw30u_core_gcc_pld.dll
-%{_dlldir}/wxmsw30u_gl_gcc_pld.dll
-%{_dlldir}/wxmsw30u_html_gcc_pld.dll
-%{_dlldir}/wxmsw30u_media_gcc_pld.dll
-%{_dlldir}/wxmsw30u_propgrid_gcc_pld.dll
-%{_dlldir}/wxmsw30u_qa_gcc_pld.dll
-%{_dlldir}/wxmsw30u_ribbon_gcc_pld.dll
-%{_dlldir}/wxmsw30u_richtext_gcc_pld.dll
-%{_dlldir}/wxmsw30u_stc_gcc_pld.dll
-%{_dlldir}/wxmsw30u_webview_gcc_pld.dll
-%{_dlldir}/wxmsw30u_xrc_gcc_pld.dll
+%{_dlldir}/wxbase32u_gcc_pld.dll
+%{_dlldir}/wxbase32u_net_gcc_pld.dll
+%{_dlldir}/wxbase32u_xml_gcc_pld.dll
+%{_dlldir}/wxmsw32u_adv_gcc_pld.dll
+%{_dlldir}/wxmsw32u_aui_gcc_pld.dll
+%{_dlldir}/wxmsw32u_core_gcc_pld.dll
+%{_dlldir}/wxmsw32u_gl_gcc_pld.dll
+%{_dlldir}/wxmsw32u_html_gcc_pld.dll
+%{_dlldir}/wxmsw32u_media_gcc_pld.dll
+%{_dlldir}/wxmsw32u_propgrid_gcc_pld.dll
+%{_dlldir}/wxmsw32u_qa_gcc_pld.dll
+%{_dlldir}/wxmsw32u_ribbon_gcc_pld.dll
+%{_dlldir}/wxmsw32u_richtext_gcc_pld.dll
+%{_dlldir}/wxmsw32u_stc_gcc_pld.dll
+%{_dlldir}/wxmsw32u_webview_gcc_pld.dll
+%{_dlldir}/wxmsw32u_xrc_gcc_pld.dll
diff --git a/wxWidgets-gifdelay.patch b/wxWidgets-gifdelay.patch
index eae0c43..daa846b 100644
--- a/wxWidgets-gifdelay.patch
+++ b/wxWidgets-gifdelay.patch
@@ -21,4 +21,4 @@
 +        delay = 10;
      timer->Start(delay, true);
  }
- 
+ #endif
diff --git a/wxWidgets-samples.patch b/wxWidgets-samples.patch
index a3900d4..7fedadb 100644
--- a/wxWidgets-samples.patch
+++ b/wxWidgets-samples.patch
@@ -1,11 +1,10 @@
---- wxWidgets-2.5.4/configure.in~	2005-02-28 15:03:24.811627176 +0100
-+++ wxWidgets-2.5.4/configure.in	2005-02-28 15:08:28.636438784 +0100
-@@ -5069,7 +5069,7 @@
-         fi
+--- wxWidgets-3.2.4/configure.in.orig	2023-11-18 20:56:18.286637239 +0100
++++ wxWidgets-3.2.4/configure.in	2023-11-18 20:58:09.269369327 +0100
+@@ -6393,7 +6393,6 @@ if test "$wxUSE_DATETIME" = "yes"; then
+         AC_DEFINE(HAVE_NL_TIME_FIRST_WEEKDAY)
      fi
  
 -    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS typetest"
-+    #SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS typetest"
  fi
  
  dnl ------------------------------------------------------------------------
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/crossmingw32-wxWidgets.git/commitdiff/52286129caae0f2bec6036e3f3887d5efb798a6a

More information about the pld-cvs-commit mailing list