summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util/codeblocks/files/codeblocks-8.02-gsocket.patch')
-rw-r--r--dev-util/codeblocks/files/codeblocks-8.02-gsocket.patch35
1 files changed, 35 insertions, 0 deletions
diff --git a/dev-util/codeblocks/files/codeblocks-8.02-gsocket.patch b/dev-util/codeblocks/files/codeblocks-8.02-gsocket.patch
new file mode 100644
index 000000000000..57072e5168f7
--- /dev/null
+++ b/dev-util/codeblocks/files/codeblocks-8.02-gsocket.patch
@@ -0,0 +1,35 @@
+https://bugs.gentoo.org/307603
+http://svn.berlios.de/wsvn/codeblocks/?op=comp&compare[]=%2Ftrunk%2Fsrc%2Fplugins%2Fcontrib%2Fcodesnippets@5713&compare[]=%2Ftrunk%2Fsrc%2Fplugins%2Fcontrib%2Fcodesnippets@5716
+
+--- a/src/plugins/contrib/codesnippets/codesnippets.cpp
++++ b/src/plugins/contrib/codesnippets/codesnippets.cpp
+@@ -52,8 +52,12 @@
+ #include "memorymappedfile.h"
+
+ #if defined(__WXGTK__)
++ // hack to avoid name-conflict between wxWidgets GSocket and the one defined
++ // in newer glib-headers
++ #define GSocket GLibSocket
++ #include <gdk/gdkx.h>
++ #undef GSocket
+ #include "wx/gtk/win_gtk.h"
+- #include <gdk/gdkx.h>
+ #endif
+
+ // The plugin needs a flag ON to enable some code for the plugin
+--- a/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp
++++ b/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp
+@@ -49,8 +49,12 @@
+ #include "menuidentifiers.h"
+ #include "editsnippetframe.h"
+ #if defined(__WXGTK__)
++ // hack to avoid name-conflict between wxWidgets GSocket and the one defined
++ // in newer glib-headers
++ #define GSocket GLibSocket
++ #include <gdk/gdkx.h>
++ #undef GSocket
+ #include "wx/gtk/win_gtk.h"
+- #include <gdk/gdkx.h>
+ #endif
+
+ IMPLEMENT_DYNAMIC_CLASS(CodeSnippetsTreeCtrl, wxTreeCtrl)