commit c5dbb1f596ae1cd8c178d40359e4bb48b0065403
Author: Jakub Bogusz <[email protected]>
Date: Sun Sep 30 07:47:06 2012 +0200
- enabled graphics_ctx in wxGTK2 (not supported in wxX11)
- added cairo patch to fix library linking
- release 4
wxWidgets-cairo.patch | 11 +++++++++++
wxWidgets.spec | 16 ++++++++++------
2 files changed, 21 insertions(+), 6 deletions(-)
---
diff --git a/wxWidgets.spec b/wxWidgets.spec
index 6b75cc8..2afed7a 100644
--- a/wxWidgets.spec
+++ b/wxWidgets.spec
@@ -11,7 +11,7 @@ Summary: wxWidgets library
Summary(pl.UTF-8): Biblioteka wxWidgets
Name: wxWidgets
Version: 2.8.12
-Release: 3
+Release: 4
License: wxWindows Library Licence 3.1 (LGPL v2+ with exception)
Group: X11/Libraries
Source0:
http://ftp.wxwidgets.org/pub/%{version}/%{name}-%{version}.tar.bz2
@@ -22,6 +22,7 @@ Patch2: %{name}-ac.patch
Patch3: %{name}-x11unicode.patch
Patch4: %{name}-gcc4.patch
Patch5: wxGTK-2.8.10.1-odbc-defines.patch
+Patch6: %{name}-cairo.patch
URL: http://www.wxWidgets.org/
BuildRequires: OpenGL-GLU-devel
#BuildRequires: SDL-devel
@@ -29,6 +30,7 @@ BuildRequires: autoconf >= 2.59-9
BuildRequires: automake
# for m4 files
BuildRequires: bakefile >= 0.2.9
+BuildRequires: cairo-devel
BuildRequires: cppunit-devel >= 1.8.0
BuildRequires: expat-devel
BuildRequires: gettext-devel
@@ -473,8 +475,9 @@ obsługą UNICODE.
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
-rm -f build/aclocal/bakefile*.m4
+%{__rm} build/aclocal/bakefile*.m4
%build
# if bakefiles rebuild is needed:
@@ -493,13 +496,13 @@ LDFLAGS=" "; export LDFLAGS
args="%{?with_debug:--enable-debug}%{!?with_debug:--disable-debug} \
ac_cv_lib_iodbc_SQLAllocEnv=no \
ac_cv_lib_unixodbc_SQLAllocEnv=no \
+ --enable-calendar \
+ --enable-controls \
--enable-plugins \
--enable-std_iostreams \
+ --enable-tabdialog \
--without-sdl \
- --with-opengl \
- --enable-calendar \
- --enable-controls \
- --enable-tabdialog"
+ --with-opengl"
gui='--with-gtk'
for unicode in %{?with_ansi:'--disable-unicode %{?with_odbc:--with-odbc}'} \
@@ -510,6 +513,7 @@ for unicode in %{?with_ansi:'--disable-unicode
%{?with_odbc:--with-odbc}'} \
../%configure \
${args} \
${gui} \
+ --enable-graphics_ctx \
--disable-universal \
${unicode} \
%{!?with_gnomeprint:--without-gnomeprint}
diff --git a/wxWidgets-cairo.patch b/wxWidgets-cairo.patch
new file mode 100644
index 0000000..a1fcf8f
--- /dev/null
+++ b/wxWidgets-cairo.patch
@@ -0,0 +1,11 @@
+--- wxWidgets-2.8.12/configure.in.orig 2012-09-29 20:11:38.406055673 +0200
++++ wxWidgets-2.8.12/configure.in 2012-09-29 21:53:33.069261558 +0200
+@@ -8010,7 +8010,7 @@
+ EXTRALIBS_MEDIA="$GST_LIBS"
+ EXTRALIBS_ODBC="$ODBC_LINK"
+ if test "$wxUSE_GUI" = "yes"; then
+- EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK
$WEBKIT_LINK $EXTRALIBS_HILDON $EXTRALIBS_GNOMEVFS $EXTRALIBS_GNOMEPRINT`
++ EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $CAIRO_LIBS $PNG_LINK $JPEG_LINK
$TIFF_LINK $WEBKIT_LINK $EXTRALIBS_HILDON $EXTRALIBS_GNOMEVFS
$EXTRALIBS_GNOMEPRINT`
+ fi
+ if test "$wxUSE_OPENGL" = "yes"; then
+ EXTRALIBS_OPENGL="$LDFLAGS_GL $OPENGL_LIBS"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/wxWidgets.git/commitdiff/c5dbb1f596ae1cd8c178d40359e4bb48b0065403
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
