Archives
Archives
| From: | "Ryan Hill (dirtyepic)" <dirtyepic@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in x11-libs/wxGTK/files: wxGTK-2.8.10.1-gsocket.patch |
| Date: | Thu, 06 Aug 2009 04:56:08 |
| Message-Id: | E1MYv1K-00058x-G7@stork.gentoo.org |
| 1 | dirtyepic 09/08/06 04:56:06 |
| 2 | |
| 3 | Added: wxGTK-2.8.10.1-gsocket.patch |
| 4 | Log: |
| 5 | Add patch from upstream to fix symbol conflict with GSocket struct from |
| 6 | developmental glib currently in gnome-overlay. Bug #278778. |
| 7 | (Portage version: 2.2_rc35/cvs/Linux x86_64) |
| 8 | |
| 9 | Revision Changes Path |
| 10 | 1.1 x11-libs/wxGTK/files/wxGTK-2.8.10.1-gsocket.patch |
| 11 | |
| 12 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/files/wxGTK-2.8.10.1-gsocket.patch?rev=1.1&view=markup |
| 13 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/files/wxGTK-2.8.10.1-gsocket.patch?rev=1.1&content-type=text/plain |
| 14 | |
| 15 | Index: wxGTK-2.8.10.1-gsocket.patch |
| 16 | =================================================================== |
| 17 | --- wxPython-src-2.8.10.1-orig/src/gtk/gsockgtk.cpp |
| 18 | +++ wxPython-src-2.8.10.1/src/gtk/gsockgtk.cpp |
| 19 | @@ -15,8 +15,13 @@ |
| 20 | #include <stdlib.h> |
| 21 | #include <stdio.h> |
| 22 | |
| 23 | +// newer versions of glib define its own GSocket but we unfortunately use this |
| 24 | +// name in our own (semi-)public header and so can't change it -- rename glib |
| 25 | +// one instead |
| 26 | +#define GSocket GlibGSocket |
| 27 | #include <gdk/gdk.h> |
| 28 | #include <glib.h> |
| 29 | +#undef GSocket |
| 30 | |
| 31 | #include "wx/gsocket.h" |
| 32 | #include "wx/unix/gsockunx.h" |