- added format patch to allow build with -Werror=format-security

[packages/wxWidgets.git] / wxWidgets.spec

diff --git a/wxWidgets.spec b/wxWidgets.spec
index ca9cacecae1ea6f3304de461f17b5e2fd9488954..aa844f304584816f2ec77ec39f50214a2970adb0 100644 (file)
--- a/wxWidgets.spec
+++ b/wxWidgets.spec
@@ -10,24 +10,29 @@
 Summary:       wxWidgets library
 Summary(pl.UTF-8):     Biblioteka wxWidgets
 Name:          wxWidgets
-Version:       2.8.11
-Release:       3
+Version:       2.8.12
+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
-# Source0-md5: 303a2d5aeb6c79460c8088193d799147
+# Source0-md5: 4103e37e277abeb8aee607b990c215c4
 Patch0:                %{name}-samples.patch
 Patch1:                %{name}-ogl.patch
 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
+Patch7:                %{name}-format.patch
 URL:           http://www.wxWidgets.org/
 BuildRequires: OpenGL-GLU-devel
 #BuildRequires:        SDL-devel
 BuildRequires: autoconf >= 2.59-9
 BuildRequires: automake
-#BuildRequires:        bakefile >= 0.2.1
-BuildRequires: cppunit-devel
+# for m4 files
+BuildRequires: bakefile >= 0.2.9
+BuildRequires: cairo-devel
+BuildRequires: cppunit-devel >= 1.8.0
 BuildRequires: expat-devel
 BuildRequires: gettext-devel
 BuildRequires: gtk+2-devel >= 2.0.0
@@ -470,6 +475,11 @@ obsługą UNICODE.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+
+%{__rm} build/aclocal/bakefile*.m4
 
 %build
 # if bakefiles rebuild is needed:
@@ -488,13 +498,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}'} \
@@ -505,6 +515,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}