- up to 2.8.11

Changed files:
    gsocket.patch -> 1.2
    wxWidgets.spec -> 1.88

diff --git a/gsocket.patch b/gsocket.patch
deleted file mode 100644 (file)
index b5fd77b..0000000
--- a/gsocket.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-fix build with glib >= 2.21 (stolen from Fedora)
---- 2.8/src/gtk/gsockgtk.cpp (revision 60599)
-+++ 2.8/src/gtk/gsockgtk.cpp (working copy)
-@@ -15,8 +15,13 @@
- #include <stdlib.h>
- #include <stdio.h>
- 
-+// newer versions of glib define its own GSocket but we unfortunately use this
-+// name in our own (semi-)public header and so can't change it -- rename glib
-+// one instead
-+#define GSocket GlibGSocket
- #include <gdk/gdk.h>
- #include <glib.h>
-+#undef GSocket
- 
- #include "wx/gsocket.h"
- #include "wx/unix/gsockunx.h" 

diff --git a/wxWidgets.spec b/wxWidgets.spec
index 2a55b79d1c8b7878941439c613344a64ab1735fa..59cf07f9feafec504f5ae0708f5041c28c51a2c5 100644 (file)
--- a/wxWidgets.spec
+++ b/wxWidgets.spec
@@ -10,18 +10,17 @@
 Summary:       wxWidgets library
 Summary(pl.UTF-8):     Biblioteka wxWidgets
 Name:          wxWidgets
-Version:       2.8.10
-Release:       4
+Version:       2.8.11
+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: 0461c2085ac1ad7e648aa84c4ba51dd1
+# Source0-md5: 303a2d5aeb6c79460c8088193d799147
 Patch0:                %{name}-samples.patch
 Patch1:                %{name}-ogl.patch
 Patch2:                %{name}-ac.patch
 Patch3:                %{name}-x11unicode.patch
 Patch4:                %{name}-gcc4.patch
-Patch5:                gsocket.patch
 URL:           http://www.wxWidgets.org/
 BuildRequires: OpenGL-GLU-devel
 #BuildRequires:        SDL-devel
@@ -471,7 +470,6 @@ obsługą UNICODE.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 %build
 # if bakefiles rebuild is needed: