commit b0d695661f49d4c6af6af587b5e6ab9821fb599c
Merge: 6cf7aed 6c24c3f
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Tue Jan 14 20:43:45 2014 +0100
- merge DEVEL
wxWidgets-ac.patch | 38 +++++++++++++++++++-------------------
wxWidgets-link.patch | 14 ++++++++++++++
wxWidgets-x11unicode.patch | 11 -----------
wxWidgets.spec | 31 ++++++++++++++++---------------
4 files changed, 49 insertions(+), 45 deletions(-)
---
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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/wxWidgets.git/commitdiff/b0d695661f49d4c6af6af587b5e6ab9821fb599c
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
