From 91af75992db11150064bcfb9f16474cd3839d7e6 Mon Sep 17 00:00:00 2001
From: Dan Horák <sharkcz@fedoraproject.org>
Date: Jul 15 2009 06:30:11 +0000
Subject: - fix gsocket between glib >= 2.21 and wxGTK in rawhide


---

diff --git a/codeblocks-8.02-gsocket.patch b/codeblocks-8.02-gsocket.patch
new file mode 100644
index 0000000..8b8e0b4
--- /dev/null
+++ b/codeblocks-8.02-gsocket.patch
@@ -0,0 +1,36 @@
+diff --git a/src/plugins/contrib/codesnippets/codesnippets.cpp b/src/plugins/contrib/codesnippets/codesnippets.cpp
+index 499c815..fd2ab13 100644
+--- a/src/plugins/contrib/codesnippets/codesnippets.cpp
++++ b/src/plugins/contrib/codesnippets/codesnippets.cpp
+@@ -52,8 +52,13 @@
+ #include "memorymappedfile.h"
+ 
+ #if defined(__WXGTK__)
++    // 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 GlibSocket
+     #include "wx/gtk/win_gtk.h"
+     #include <gdk/gdkx.h>
++    #undef GlibSocket
+ #endif
+ 
+ // The plugin needs a flag ON to enable some code for the plugin
+diff --git a/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp b/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp
+index d33b08d..6a1905d 100644
+--- a/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp
++++ b/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp
+@@ -49,8 +49,13 @@
+ #include "menuidentifiers.h"
+ #include "editsnippetframe.h"
+ #if defined(__WXGTK__)
++    // 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 GlibSocket
+     #include "wx/gtk/win_gtk.h"
+     #include <gdk/gdkx.h>
++    #undef GlibSocket
+ #endif
+ 
+ IMPLEMENT_DYNAMIC_CLASS(CodeSnippetsTreeCtrl, wxTreeCtrl)
diff --git a/codeblocks.spec b/codeblocks.spec
index a7770a3..1a4a8aa 100644
--- a/codeblocks.spec
+++ b/codeblocks.spec
@@ -1,6 +1,6 @@
 Name:		codeblocks
 Version:	8.02
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPLv3+
@@ -23,6 +23,8 @@ Patch3:         codeblocks-run.patch
 Patch4:         codeblocks-8.02-gcc-detect.patch
 # fix for gcc 4.4/glibc 2.9.90 http://developer.berlios.de/patch/index.php?func=detailpatch&patch_id=2699&group_id=5358
 Patch5:         codeblocks-drop-const.patch
+# fix GSocket conflict between glib >= 2.21 and wxGTK
+Patch6:         codeblocks-8.02-gsocket.patch
 
 
 %description
@@ -78,6 +80,7 @@ Additional Code::Blocks plugins.
 %patch3 -p0 -b .run
 %patch4 -p0 -b .gcc-detect
 %patch5 -p1 -b .gcc44
+%patch6 -p1 -b .gsocket
 
 # convert EOLs
 find . -type f -and -not -name "*.cpp" -and -not -name "*.h" -and -not -name "*.png" -and -not -name "*.bmp" -and -not -name "*.c" -and -not -name "*.cxx" -and -not -name "*.ico" | sed "s/.*/\"\\0\"/" | xargs dos2unix --keepdate &> /dev/null
@@ -264,6 +267,9 @@ update-mime-database /usr/share/mime &> /dev/null || :
 
 
 %changelog
+* Mon Jun 15 2009 Dan Horák <dan[at]danny.cz> 8.02-8
+- fix gsocket between glib >= 2.21 and wxGTK in rawhide
+
 * Sat Feb 28 2009 Dan Horák <dan[at]danny.cz> 8.02-7
 - update desktop file (#487796)