Archives
Archives
| From: | "Ryan Hill (dirtyepic)" <dirtyepic@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in dev-util/codeblocks/files: codeblocks-8.02-gsocket.patch |
| Date: | Thu, 06 May 2010 06:08:15 |
| Message-Id: | 20100506060810.07FE429638@corvid.gentoo.org |
| 1 | dirtyepic 10/05/06 06:08:09 |
| 2 | |
| 3 | Added: codeblocks-8.02-gsocket.patch |
| 4 | Log: |
| 5 | Patch from upstream to fix building with USE="pch contrib" and new glib |
| 6 | versions. (bug #307603) |
| 7 | (Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 8 | |
| 9 | Revision Changes Path |
| 10 | 1.1 dev-util/codeblocks/files/codeblocks-8.02-gsocket.patch |
| 11 | |
| 12 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/codeblocks/files/codeblocks-8.02-gsocket.patch?rev=1.1&view=markup |
| 13 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/codeblocks/files/codeblocks-8.02-gsocket.patch?rev=1.1&content-type=text/plain |
| 14 | |
| 15 | Index: codeblocks-8.02-gsocket.patch |
| 16 | =================================================================== |
| 17 | https://bugs.gentoo.org/307603 |
| 18 | http://svn.berlios.de/wsvn/codeblocks/?op=comp&compare[]=%2Ftrunk%2Fsrc%2Fplugins%2Fcontrib%2Fcodesnippets@5713&compare[]=%2Ftrunk%2Fsrc%2Fplugins%2Fcontrib%2Fcodesnippets@5716 |
| 19 | |
| 20 | --- a/src/plugins/contrib/codesnippets/codesnippets.cpp |
| 21 | +++ b/src/plugins/contrib/codesnippets/codesnippets.cpp |
| 22 | @@ -52,8 +52,12 @@ |
| 23 | #include "memorymappedfile.h" |
| 24 | |
| 25 | #if defined(__WXGTK__) |
| 26 | + // hack to avoid name-conflict between wxWidgets GSocket and the one defined |
| 27 | + // in newer glib-headers |
| 28 | + #define GSocket GLibSocket |
| 29 | + #include <gdk/gdkx.h> |
| 30 | + #undef GSocket |
| 31 | #include "wx/gtk/win_gtk.h" |
| 32 | - #include <gdk/gdkx.h> |
| 33 | #endif |
| 34 | |
| 35 | // The plugin needs a flag ON to enable some code for the plugin |
| 36 | --- a/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp |
| 37 | +++ b/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp |
| 38 | @@ -49,8 +49,12 @@ |
| 39 | #include "menuidentifiers.h" |
| 40 | #include "editsnippetframe.h" |
| 41 | #if defined(__WXGTK__) |
| 42 | + // hack to avoid name-conflict between wxWidgets GSocket and the one defined |
| 43 | + // in newer glib-headers |
| 44 | + #define GSocket GLibSocket |
| 45 | + #include <gdk/gdkx.h> |
| 46 | + #undef GSocket |
| 47 | #include "wx/gtk/win_gtk.h" |
| 48 | - #include <gdk/gdkx.h> |
| 49 | #endif |
| 50 | |
| 51 | IMPLEMENT_DYNAMIC_CLASS(CodeSnippetsTreeCtrl, wxTreeCtrl) |