[packages/wxWidgets/DEVEL] - up to 3.0.0; enable printing

arekm arekm at pld-linux.org
Tue Jan 14 20:35:52 CET 2014 

commit 6c24c3f874b1566ed00350697c193860995c6681
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Tue Jan 14 20:35:48 2014 +0100

    - up to 3.0.0; enable printing

 wxWidgets-build.patch      | 29 ------------------------
 wxWidgets-x11unicode.patch | 11 ---------
 wxWidgets.spec             | 56 +++++++++++++++++++++++-----------------------
 3 files changed, 28 insertions(+), 68 deletions(-)
---
diff --git a/wxWidgets.spec b/wxWidgets.spec
index 62b9584..c821e6c 100644
--- a/wxWidgets.spec
+++ b/wxWidgets.spec
@@ -10,18 +10,16 @@
 Summary:	wxWidgets library
 Summary(pl.UTF-8):	Biblioteka wxWidgets
 Name:		wxWidgets
-Version:	2.9.4
+Version:	3.0.0
 Release:	1
 License:	wxWindows Library Licence 3.1 (LGPL v2+ with exception)
 Group:		X11/Libraries
-Source0:	http://ftp.wxwidgets.org/pub/%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5:	f1348f740a569ce2945512d5b0e70e87
+Source0:	http://dl.sourceforge.net/project/wxwindows/%{version}/%{name}-%{version}.7z
+# Source0-md5:	294362f2a7407547b6819748896b1632
 Patch0:		%{name}-samples.patch
 Patch1:		%{name}-ogl.patch
 Patch2:		%{name}-ac.patch
-Patch3:		%{name}-x11unicode.patch
-Patch4:		%{name}-link.patch
-Patch5:		%{name}-build.patch
+Patch3:		%{name}-link.patch
 URL:		http://www.wxWidgets.org/
 BuildRequires:	OpenGL-GLU-devel
 #BuildRequires:	SDL-devel
@@ -41,6 +39,7 @@ BuildRequires:	libpng-devel
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtiff-devel
 BuildRequires:	libtool
+BuildRequires:	p7zip-standalone
 BuildRequires:	pkgconfig
 %{?with_x11:BuildRequires:	xorg-lib-libXext-devel}
 # these are not supported by wxWidgets
@@ -453,14 +452,13 @@ Pliki programistyczne biblioteki GL dla opartej na wxUniversal wxX11 z
 obsługą UNICODE.
 
 %prep
-%setup -q
+%setup -q -c
 %patch0 -p1
-# is this still needed?
-#%patch1 -p1
+%patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
-%patch5 -p1
+
+%undos src/stc/gen_iface.py
 
 %build
 # if bakefiles rebuild is needed:
@@ -496,6 +494,8 @@ for unicode in %{?with_ansi:'--disable-unicode %{?with_odbc:--with-odbc}'} \
 		${gui} \
 		--disable-universal \
 		${unicode} \
+		--enable-printarch \
+		--with-gtkprint \
 		%{!?with_gnomeprint:--without-gnomeprint}
 	%{__make}
 	cd ..
@@ -612,7 +612,7 @@ rm -rf $RPM_BUILD_ROOT
 %postun -n wxX11-unicode -p /sbin/ldconfig
 
 %define _libf %{?with_debug:d}
-%define _configf %{?with_debug:-debug}-2.9
+%define _configf %{?with_debug:-debug}-3.0
 
 %files -f wxstd.lang
 %defattr(644,root,root,755)
@@ -641,8 +641,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libwx_base%{_libf}-*.so.*.*
 %attr(755,root,root) %{_libdir}/libwx_base%{_libf}_*.so.*.*
 #%attr(755,root,root) %{_libdir}/wx/%{version}/sound_sdl-*.so
-%attr(755,root,root) %ghost %{_libdir}/libwx_base%{_libf}-*.so.4
-%attr(755,root,root) %ghost %{_libdir}/libwx_base%{_libf}_*.so.4
+%attr(755,root,root) %ghost %{_libdir}/libwx_base%{_libf}-*.so.0
+%attr(755,root,root) %ghost %{_libdir}/libwx_base%{_libf}_*.so.0
 
 %files -n wxBase-devel
 %defattr(644,root,root,755)
@@ -655,8 +655,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libwx_baseu%{_libf}-*.so.*.*
 %attr(755,root,root) %{_libdir}/libwx_baseu%{_libf}_*.so.*.*
 #%attr(755,root,root) %{_libdir}/wx/%{version}/sound_sdlu-*.so
-%attr(755,root,root) %ghost %{_libdir}/libwx_baseu%{_libf}-*.so.4
-%attr(755,root,root) %ghost %{_libdir}/libwx_baseu%{_libf}_*.so.4
+%attr(755,root,root) %ghost %{_libdir}/libwx_baseu%{_libf}-*.so.0
+%attr(755,root,root) %ghost %{_libdir}/libwx_baseu%{_libf}_*.so.0
 
 %files -n wxBase-unicode-devel
 %defattr(644,root,root,755)
@@ -668,8 +668,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libwx_gtk2%{_libf}_*.so.*.*
 %exclude %{_libdir}/libwx_gtk2%{_libf}_gl-*.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libwx_gtk2%{_libf}_*.so.4
-%exclude %{_libdir}/libwx_gtk2%{_libf}_gl-*.so.4
+%attr(755,root,root) %ghost %{_libdir}/libwx_gtk2%{_libf}_*.so.0
+%exclude %{_libdir}/libwx_gtk2%{_libf}_gl-*.so.0
 
 %files -n wxGTK2-devel
 %defattr(644,root,root,755)
@@ -682,7 +682,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -n wxGTK2-gl
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libwx_gtk2%{_libf}_gl-*.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libwx_gtk2%{_libf}_gl-*.so.4
+%attr(755,root,root) %ghost %{_libdir}/libwx_gtk2%{_libf}_gl-*.so.0
 
 %files -n wxGTK2-gl-devel
 %defattr(644,root,root,755)
@@ -693,8 +693,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libwx_gtk2u%{_libf}_*-*.so.*.*
 %exclude %{_libdir}/libwx_gtk2u%{_libf}_gl-*.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libwx_gtk2u%{_libf}_*-*.so.4
-%exclude %{_libdir}/libwx_gtk2u%{_libf}_gl-*.so.4
+%attr(755,root,root) %ghost %{_libdir}/libwx_gtk2u%{_libf}_*-*.so.0
+%exclude %{_libdir}/libwx_gtk2u%{_libf}_gl-*.so.0
 
 %files -n wxGTK2-unicode-devel
 %defattr(644,root,root,755)
@@ -707,7 +707,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -n wxGTK2-unicode-gl
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libwx_gtk2u%{_libf}_gl-*.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libwx_gtk2u%{_libf}_gl-*.so.4
+%attr(755,root,root) %ghost %{_libdir}/libwx_gtk2u%{_libf}_gl-*.so.0
 
 %files -n wxGTK2-unicode-gl-devel
 %defattr(644,root,root,755)
@@ -727,8 +727,8 @@ rm -rf $RPM_BUILD_ROOT
 %doc docs/wxX11-readme.txt
 %attr(755,root,root) %{_libdir}/libwx_x11univ%{_libf}_*-*.so.*.*
 %exclude %{_libdir}/libwx_x11univ%{_libf}_gl-*.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libwx_x11univ%{_libf}_*-*.so.4
-%exclude %{_libdir}/libwx_x11univ%{_libf}_gl-*.so.4
+%attr(755,root,root) %ghost %{_libdir}/libwx_x11univ%{_libf}_*-*.so.0
+%exclude %{_libdir}/libwx_x11univ%{_libf}_gl-*.so.0
 
 %files -n wxX11-devel
 %defattr(644,root,root,755)
@@ -741,7 +741,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -n wxX11-gl
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libwx_x11univ%{_libf}_gl-*.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libwx_x11univ%{_libf}_gl-*.so.4
+%attr(755,root,root) %ghost %{_libdir}/libwx_x11univ%{_libf}_gl-*.so.0
 
 %files -n wxX11-gl-devel
 %defattr(644,root,root,755)
@@ -752,8 +752,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libwx_x11univu%{_libf}_*-*.so.*.*
 %exclude %{_libdir}/libwx_x11univu%{_libf}_gl-*.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libwx_x11univu%{_libf}_*-*.so.4
-%exclude %{_libdir}/libwx_x11univu%{_libf}_gl-*.so.4
+%attr(755,root,root) %ghost %{_libdir}/libwx_x11univu%{_libf}_*-*.so.0
+%exclude %{_libdir}/libwx_x11univu%{_libf}_gl-*.so.0
 
 %files -n wxX11-unicode-devel
 %defattr(644,root,root,755)
@@ -766,7 +766,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -n wxX11-unicode-gl
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libwx_x11univu%{_libf}_gl-*.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libwx_x11univu%{_libf}_gl-*.so.4
+%attr(755,root,root) %ghost %{_libdir}/libwx_x11univu%{_libf}_gl-*.so.0
 
 %files -n wxX11-unicode-gl-devel
 %defattr(644,root,root,755)
diff --git a/wxWidgets-build.patch b/wxWidgets-build.patch
deleted file mode 100644
index bfc6a24..0000000
--- a/wxWidgets-build.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-commit c8723b866e31b8a506a87b4bff5c2d6ed092dd80
-Author: Vadim Zeitlin <vadim at wxwidgets.org>
-Date:   Fri Feb 15 12:40:17 2013 +0000
-
-    sAlways iInclude wx/encinfo.h from src/unix/fontutil.cpp.
-    
-    We use wxNativeEncodingInfo in this file, so we always need this header, not
-    just when not using PCH.
-    
-    git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73519 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
-
-diff --git a/src/unix/fontutil.cpp b/src/unix/fontutil.cpp
-index 23fc29e..07ee323 100644
---- a/src/unix/fontutil.cpp
-+++ b/src/unix/fontutil.cpp
-@@ -29,12 +29,12 @@
- #ifndef WX_PRECOMP
-     #include "wx/app.h"
-     #include "wx/font.h" // wxFont enums
--    #include "wx/encinfo.h"
-     #include "wx/hash.h"
-     #include "wx/utils.h"       // for wxGetDisplay()
-     #include "wx/module.h"
- #endif // PCH
- 
-+#include "wx/encinfo.h"
- #include "wx/fontmap.h"
- #include "wx/tokenzr.h"
- #include "wx/fontenum.h"
diff --git a/wxWidgets-x11unicode.patch b/wxWidgets-x11unicode.patch
deleted file mode 100644
index 54c5017..0000000
--- a/wxWidgets-x11unicode.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -uNr wxWidgets-2.7.2.orig/src/unix/fontutil.cpp wxWidgets-2.7.2/src/unix/fontutil.cpp
---- wxWidgets-2.7.2.orig/src/unix/fontutil.cpp	2006-11-07 15:18:20.000000000 +0100
-+++ wxWidgets-2.7.2/src/unix/fontutil.cpp	2006-11-10 14:55:57.000000000 +0100
-@@ -51,6 +51,7 @@
- #else
-     #include "wx/x11/private.h"
-     #include "wx/gtk/private/string.h"
-+    #include "wx/app.h"
- 
-     #define wxPANGO_CONV(s) (wxConvUTF8.cWX2MB((s)))
- #endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/wxWidgets.git/commitdiff/6c24c3f874b1566ed00350697c193860995c6681

More information about the pld-cvs-commit mailing list