rpms/wxGTK/devel wxGTK-2.8.10-gsocket.patch, NONE, 1.1 wxGTK.spec, 1.45, 1.46

[Dan Horák]

Author: sharkcz

Update of /cvs/pkgs/rpms/wxGTK/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32286

Modified Files:
	wxGTK.spec 
Added Files:
	wxGTK-2.8.10-gsocket.patch 
Log Message:
* Thu Jun 11 2009 Dan Horák <dan[at]danny.cz> - 2.8.10-2
- fix build with glib >= 2.21


wxGTK-2.8.10-gsocket.patch:

--- NEW FILE wxGTK-2.8.10-gsocket.patch ---
Index: 2.8/src/gtk/gsockgtk.cpp
===================================================================
--- 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"



Index: wxGTK.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wxGTK/devel/wxGTK.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- wxGTK.spec	21 Mar 2009 17:53:08 -0000	1.45
+++ wxGTK.spec	11 Jun 2009 11:53:13 -0000	1.46
@@ -4,7 +4,7 @@
 
 Name:           wxGTK
 Version:        2.8.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GTK2 port of the wxWidgets GUI library
 # The wxWindows licence is the LGPL with a specific exemption allowing
 # distribution of derived binaries under any terms. (This will eventually
@@ -14,6 +14,9 @@ Group:          System Environment/Libra
 URL:            http://www.wxwidgets.org/
 Source0:        http://dl.sf.net/wxwindows/%{name}-%{version}.tar.bz2
 
+# http://trac.wxwidgets.org/ticket/10883
+Patch0:         %{name}-2.8.10-gsocket.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel, zlib-devel >= 1.1.4
@@ -94,6 +97,7 @@ libraries or the X Window System.
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1 -b .gsocket
 
 sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
 
@@ -245,6 +249,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jun 11 2009 Dan Horák <dan[at]danny.cz> - 2.8.10-2
+- fix build with glib >= 2.21
+
 * Sat Mar 21 2009 Dan Horák <dan[at]danny.cz> - 2.8.10-1
 - update to 2.8.10
 - fix default plugin path for 64 bit arches