rpms/compat-wxGTK26/devel wxGTK-2.6.4-gsocket-conflict.patch, NONE, 1.1 compat-wxGTK26.spec, 1.26, 1.27
Michael Schwendt
mschwendt at fedoraproject.org
Thu Jun 11 11:35:53 UTC 2009
Author: mschwendt
Update of /cvs/extras/rpms/compat-wxGTK26/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7863
Modified Files:
compat-wxGTK26.spec
Added Files:
wxGTK-2.6.4-gsocket-conflict.patch
Log Message:
* Thu Jun 11 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.6.4-9
- glib2 2.21.1's gio in Rawhide F-12 introduces a GSocket that
conflicts with wxGTK's GSocket class (gsocket.h): reduce the glib/gdk
headers that are included during build to avoid conflicting redefinitions
wxGTK-2.6.4-gsocket-conflict.patch:
--- NEW FILE wxGTK-2.6.4-gsocket-conflict.patch ---
diff -Nur wxGTK-2.6.4-orig/src/gtk/gsockgtk.cpp wxGTK-2.6.4/src/gtk/gsockgtk.cpp
--- wxGTK-2.6.4-orig/src/gtk/gsockgtk.cpp 2007-03-20 16:50:07.000000000 +0100
+++ wxGTK-2.6.4/src/gtk/gsockgtk.cpp 2009-06-11 13:28:59.000000000 +0200
@@ -14,8 +14,16 @@
#include <stdlib.h>
#include <stdio.h>
-#include <gdk/gdk.h>
-#include <glib.h>
+// Cannot include full gdk.h as it pulls in giotypes.h with
+// new GSocket conflicts since 2.21/2.22
+#include <gdk/gdkinput.h>
+// deprecated, copy from gdk.h
+gint gdk_input_add (gint source,
+ GdkInputCondition condition,
+ GdkInputFunction function,
+ gpointer data);
+void gdk_input_remove (gint tag);
+#include <glib/gtypes.h>
#include "wx/gsocket.h"
#include "wx/unix/gsockunx.h"
Index: compat-wxGTK26.spec
===================================================================
RCS file: /cvs/extras/rpms/compat-wxGTK26/devel/compat-wxGTK26.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- compat-wxGTK26.spec 7 Jun 2009 16:03:17 -0000 1.26
+++ compat-wxGTK26.spec 11 Jun 2009 11:35:21 -0000 1.27
@@ -1,6 +1,6 @@
Name: compat-wxGTK26
Version: 2.6.4
-Release: 8%{?dist}
+Release: 9%{?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
@@ -17,6 +17,7 @@ Patch3: wxGTK-2.6.3-g_thread_ini
Patch5: wxGTK-2.6.3-expat2.patch
Patch6: wxGTK-2.6.3-strconv.patch
Patch7: wxGTK-2.6.4-config-script.patch
+Patch8: wxGTK-2.6.4-gsocket-conflict.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel, zlib-devel >= 1.1.4
@@ -55,6 +56,7 @@ This package include files needed to lin
%patch5 -p1 -b .expat2
%patch6 -p1 -b .strconv
%patch7 -p1 -b .config-script
+%patch8 -p1 -b .gsocket-conflict
sed -i -e 's|/usr/lib\b|%{_libdir}|' configure
@@ -203,6 +205,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Jun 11 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.6.4-9
+- glib2 2.21.1's gio in Rawhide F-12 introduces a GSocket that
+ conflicts with wxGTK's GSocket class (gsocket.h): reduce the glib/gdk
+ headers that are included during build to avoid conflicting redefinitions
+
* Sun Jun 7 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.6.4-8
- target sparcv9 => setup-sparc.h
More information about the scm-commits
mailing list