From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Tue, 14 Jan 2014 19:43:45 +0000 (+0100)
Subject: - merge DEVEL
X-Git-Tag: auto/th/wxWidgets-3.0.0-1~4
X-Git-Url: https://git.pld-linux.org/?p=packages%2FwxWidgets.git;a=commitdiff_plain;h=b0d695661f49d4c6af6af587b5e6ab9821fb599c

- merge DEVEL
---

b0d695661f49d4c6af6af587b5e6ab9821fb599c
diff --cc wxWidgets.spec
index 98f8a6f,c821e6c..29c1ba8
--- a/wxWidgets.spec
+++ b/wxWidgets.spec
@@@ -44,11 -39,9 +39,12 @@@ BuildRequires:	libpng-deve
  BuildRequires:	libstdc++-devel
  BuildRequires:	libtiff-devel
  BuildRequires:	libtool
 +%{?with_x11:BuildRequires:	pangox-compat-devel}
+ BuildRequires:	p7zip-standalone
  BuildRequires:	pkgconfig
 +%{?with_odbc:BuildRequires:	unixODBC-devel}
  %{?with_x11:BuildRequires:	xorg-lib-libXext-devel}
 +%{?with_x11:BuildRequires:	xorg-lib-libXt-devel}
  # these are not supported by wxWidgets
  Obsoletes:	LDAPExplorerTool <= 0.6-1
  Obsoletes:	abridge <= 0.4.0-1
@@@ -470,20 -452,14 +468,21 @@@ Pliki programistyczne biblioteki GL dl
  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
 +%patch6 -p1
 +%patch7 -p1
 +%patch8 -p1
 +
 +%{__rm} build/aclocal/bakefile*.m4
  
+ %undos src/stc/gen_iface.py
+ 
  %build
  # if bakefiles rebuild is needed:
  #%if "%(rpm -q bakefile --qf '%%{VERSION}')" != "0.2.1"
@@@ -518,12 -492,12 +517,14 @@@ for unicode in %{?with_ansi:'--disable-
  	../%configure \
  		${args} \
  		${gui} \
 +		--enable-graphics_ctx \
  		--disable-universal \
  		${unicode} \
+ 		--enable-printarch \
+ 		--with-gtkprint \
  		%{!?with_gnomeprint:--without-gnomeprint}
  	%{__make}
 +	%{__make} -C contrib/src
  	cd ..
  done