packages: wxWidgets/wxWidgets.spec, wxWidgets/gsocket.patch (NEW) - added g...

[sls]

Author: sls                          Date: Thu Oct 29 09:27:03 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added gsocket.patch

---- Files affected:
packages/wxWidgets:
   wxWidgets.spec (1.82 -> 1.83) , gsocket.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/wxWidgets/wxWidgets.spec
diff -u packages/wxWidgets/wxWidgets.spec:1.82 packages/wxWidgets/wxWidgets.spec:1.83
--- packages/wxWidgets/wxWidgets.spec:1.82	Thu Oct 29 10:00:05 2009
+++ packages/wxWidgets/wxWidgets.spec	Thu Oct 29 10:26:58 2009
@@ -22,6 +22,7 @@
 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
@@ -472,6 +473,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 # if bakefiles rebuild is needed:
@@ -822,6 +824,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.83  2009/10/29 09:26:58  sls
+- added gsocket.patch
+
 Revision 1.82  2009/10/29 09:00:05  sls
 - reverted (2.9.0 goes to DEVEL)
 

================================================================
Index: packages/wxWidgets/gsocket.patch
diff -u /dev/null packages/wxWidgets/gsocket.patch:1.1
--- /dev/null	Thu Oct 29 10:27:03 2009
+++ packages/wxWidgets/gsocket.patch	Thu Oct 29 10:26:58 2009
@@ -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" 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wxWidgets/wxWidgets.spec?r1=1.82&r2=1.83&f=u