packages: crossmingw32-wxWidgets/crossmingw32-wxWidgets.spec, crossmingw32-...

[qboosh]

Author: qboosh                       Date: Wed Oct 20 05:31:04 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 2.8.11
- added msw patch

---- Files affected:
packages/crossmingw32-wxWidgets:
   crossmingw32-wxWidgets.spec (1.13 -> 1.14) , wxWidgets-msw.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/crossmingw32-wxWidgets/crossmingw32-wxWidgets.spec
diff -u packages/crossmingw32-wxWidgets/crossmingw32-wxWidgets.spec:1.13 packages/crossmingw32-wxWidgets/crossmingw32-wxWidgets.spec:1.14
--- packages/crossmingw32-wxWidgets/crossmingw32-wxWidgets.spec:1.13	Mon Jan 14 20:28:19 2008
+++ packages/crossmingw32-wxWidgets/crossmingw32-wxWidgets.spec	Wed Oct 20 07:30:58 2010
@@ -1,28 +1,30 @@
 # $Revision$, $Date$
 %define		realname	wxWidgets
-Summary:	wxWidgets library - Mingw32 cross version
-Summary(pl.UTF-8):	Biblioteka wxWidgets - wersja skrośna dla Mingw32
+Summary:	wxWidgets library - MinGW32 cross version
+Summary(pl.UTF-8):	Biblioteka wxWidgets - wersja skrośna dla MinGW32
 Name:		crossmingw32-%{realname}
-Version:	2.8.7
+Version:	2.8.11
 Release:	1
 License:	wxWidgets Licence (LGPL v2+ with exception)
 Group:		Development/Libraries
 Source0:	http://ftp.wxwidgets.org/pub/%{version}/%{realname}-%{version}.tar.bz2
-# Source0-md5:	e3455083afdf6404a569a8bf0701cf13
+# Source0-md5:	303a2d5aeb6c79460c8088193d799147
 Patch0:		%{realname}-samples.patch
 Patch1:		%{realname}-ac.patch
-Patch2:		%{realname}-gif0delay.patch
+Patch2:		%{realname}-msw.patch
 URL:		http://www.wxWidgets.org/
 BuildRequires:	autoconf >= 2.58
 BuildRequires:	automake
-#BuildRequires:	bakefile >= 0.1.9
+#BuildRequires:	bakefile >= 0.2.1
 BuildRequires:	crossmingw32-gcc-c++
 BuildRequires:	crossmingw32-libjpeg
 BuildRequires:	crossmingw32-libpng
+BuildRequires:	crossmingw32-libtiff
 BuildRequires:	crossmingw32-runtime
 BuildRequires:	libtool
 Requires:	crossmingw32-libjpeg
 Requires:	crossmingw32-libpng
+Requires:	crossmingw32-libtiff
 Requires:	crossmingw32-runtime
 Obsoletes:	crossmingw32-wxMSW
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -45,6 +47,8 @@
 # arch-specific flags (like alpha's -mieee) are not valid for i386 gcc
 %define		optflags	-O2
 %endif
+# -z options are invalid for mingw linker
+%define		filterout_ld	-Wl,-z,.*
 
 %description
 wxWidgets is a free C++ library for cross-platform GUI development.
@@ -61,6 +65,9 @@
 Summary:	%{realname} - DLL library for Windows
 Summary(pl.UTF-8):	%{realname} - biblioteka DLL dla Windows
 Group:		Applications/Emulators
+Requires:	crossmingw32-libjpeg-dll
+Requires:	crossmingw32-libpng-dll
+Requires:	crossmingw32-libtiff-dll
 
 %description dll
 %{realname} - DLL libraries for Windows.
@@ -79,26 +86,29 @@
 %{__aclocal} -I build/aclocal
 %{__autoconf}
 
+# use hack to get GCC=yes (needed not to disable OLE support)
+# because AC_PROG_CC has been replaced by AC_BAKEFILE_PROG_CC, which doesn't set appropriate vars
 %configure \
+	ac_cv_c_compiler_gnu=yes \
+	--host=%{target} \
+	--target=%{target} \
 	--with-msw \
 	--with-opengl \
 	--disable-precomp-headers \
+	--enable-controls \
 	--enable-official-build \
 	--enable-std-iostreams \
-	--enable-controls \
-	--enable-tabdialog \
-	--host=%{target} \
-	--target=%{target}
+	--enable-tabdialog
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{_dlldir},%{_sysbindir}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT%{_dlldir}
 mv -f $RPM_BUILD_ROOT%{_libdir}/*.dll $RPM_BUILD_ROOT%{_dlldir}
 
 %if 0%{!?debug:1}
@@ -106,7 +116,7 @@
 %{target}-strip -g -R.comment -R.note $RPM_BUILD_ROOT%{_libdir}/*.a
 %endif
 
-ln -s %{_libdir}/wx/config/i386-mingw32-msw-ansi-release-2.8 $RPM_BUILD_ROOT%{_sysbindir}
+ln -sf %{_libdir}/wx/config/i386-mingw32-msw-ansi-release-2.8 $RPM_BUILD_ROOT%{_sysbindir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -131,6 +141,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2010/10/20 05:30:58  qboosh
+- updated to 2.8.11
+- added msw patch
+
 Revision 1.13  2008/01/14 19:28:19  qboosh
 - force %{_lib}-independent libdir
 

================================================================
Index: packages/crossmingw32-wxWidgets/wxWidgets-msw.patch
diff -u /dev/null packages/crossmingw32-wxWidgets/wxWidgets-msw.patch:1.1
--- /dev/null	Wed Oct 20 07:31:04 2010
+++ packages/crossmingw32-wxWidgets/wxWidgets-msw.patch	Wed Oct 20 07:30:58 2010
@@ -0,0 +1,13 @@
+--- wxWidgets-2.8.11/configure.in.orig	2010-10-19 09:12:38.779736853 +0200
++++ wxWidgets-2.8.11/configure.in	2010-10-19 09:13:00.015736853 +0200
+@@ -8399,9 +8399,7 @@
+ 
+ if test "$USE_WIN32" = 1; then
+     AC_CONFIG_COMMANDS(
+-        [
+-            rcdefs.h
+-        ],
++        [lib/wx/include/${TOOLCHAIN_FULLNAME}/wx/msw/rcdefs.h],
+         [
+             mkdir -p $outdir &&
+             $CPP $infile | sed 's/^# *[1-9].*//;s/^ *//;/./,/^$/!d' > $outdir/rcdefs.h
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/crossmingw32-wxWidgets/crossmingw32-wxWidgets.spec?r1=1.13&r2=1.14&f=u