- added gsocket.patch

Changed files:
    gsocket.patch -> 1.1
    wxWidgets.spec -> 1.83

diff --git a/gsocket.patch b/gsocket.patch
new file mode 100644 (file)
index 0000000..b5fd77b
--- /dev/null
+++ b/gsocket.patch
@@ -0,0 +1,17 @@
+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 22bbde161fc269c4fd48057e4a0547ac49170948..5ef6943d27c721ba1dd0a52caa53dd5998a14c06 100644 (file)
--- a/wxWidgets.spec
+++ b/wxWidgets.spec
@@ -21,6 +21,7 @@ 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,6 +472,7 @@ obsługą UNICODE.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 # if bakefiles rebuild is needed: