diff options
| author | plunky <plunky@pkgsrc.org> | 2009-10-23 10:55:06 +0000 |
|---|---|---|
| committer | plunky <plunky@pkgsrc.org> | 2009-10-23 10:55:06 +0000 |
| commit | cafb3ba732a54d8927249a19af0d729c0dd536b3 (patch) | |
| tree | 34c701099bc852ff990f4bf9f43e85e49bb253a5 | |
| parent | 09bf566b495c70a4951074d1c3d6699420b5a1eb (diff) | |
| download | pkgsrc-cafb3ba732a54d8927249a19af0d729c0dd536b3.tar.gz | |
avoid conflicts with GSocket in glib >= 2.21 in a similar way to
http://trac.wxwidgets.org/ticket/10883
(just fixes build)
| -rw-r--r-- | x11/wxGTK24/distinfo | 3 | ||||
| -rw-r--r-- | x11/wxGTK24/patches/patch-al | 24 |
2 files changed, 26 insertions, 1 deletions
diff --git a/x11/wxGTK24/distinfo b/x11/wxGTK24/distinfo index 6bc4d275b3f..34b484ac1e1 100644 --- a/x11/wxGTK24/distinfo +++ b/x11/wxGTK24/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2009/01/19 16:36:40 shattered Exp $ +$NetBSD: distinfo,v 1.8 2009/10/23 10:55:06 plunky Exp $ SHA1 (wxGTK-2.4.2.tar.bz2) = 3f1ebacaaf8eb5510c14ee10bafbc5f225be842c RMD160 (wxGTK-2.4.2.tar.bz2) = 8076d1ba31c9b23becb241cbad5a83763fee776e @@ -14,3 +14,4 @@ SHA1 (patch-ah) = 24cc32f7eda53f4704422363902f72239eda2253 SHA1 (patch-ai) = c5d301c2cb45397329d9a817d9278707a2d3b97f SHA1 (patch-aj) = 9f74442617e6a869c5ff253591bba3f9da3a9e0c SHA1 (patch-ak) = 3f26086c8f16ac972db89c21f665c187570937cc +SHA1 (patch-al) = bceed88db708c83afca0fe3adb5c923f9bc661b0 diff --git a/x11/wxGTK24/patches/patch-al b/x11/wxGTK24/patches/patch-al new file mode 100644 index 00000000000..1b36e806f12 --- /dev/null +++ b/x11/wxGTK24/patches/patch-al @@ -0,0 +1,24 @@ +$NetBSD: patch-al,v 1.1 2009/10/23 10:55:06 plunky Exp $ + +avoid conflicts with GSocket in glib >= 2.21 in a similar way to + + http://trac.wxwidgets.org/ticket/10883 + +--- src/gtk/gsockgtk.c.orig 2009-10-23 11:09:19.000000000 +0100 ++++ src/gtk/gsockgtk.c 2009-10-23 11:09:36.000000000 +0100 +@@ -13,8 +13,15 @@ + #include <stdlib.h> + #include <stdio.h> + ++// 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 GlibGSocket ++#define _GSocket _GlibGSocket + #include <gdk/gdk.h> + #include <glib.h> ++#undef GSocket ++#undef _GSocket + + #include "wx/gsocket.h" + #include "wx/unix/gsockunx.h" |