diff options
| author | plunky <plunky> | 2009-10-23 11:16:55 +0000 |
|---|---|---|
| committer | plunky <plunky> | 2009-10-23 11:16:55 +0000 |
| commit | c67c8f60d13d27692b30319729b6651b49250eaf (patch) | |
| tree | a088b32c3af8ec0090d8607ea0f9e2fad321014a /x11/wxGTK26 | |
| parent | 063ea153c826dbd407dfb68cffd78a6472665bd9 (diff) | |
| download | pkgsrc-c67c8f60d13d27692b30319729b6651b49250eaf.tar.gz | |
avoid conflicts with GSocket in glib >= 2.21 as per
http://trac.wxwidgets.org/ticket/10883
Diffstat (limited to 'x11/wxGTK26')
| -rw-r--r-- | x11/wxGTK26/distinfo | 3 | ||||
| -rw-r--r-- | x11/wxGTK26/patches/patch-ad | 22 |
2 files changed, 24 insertions, 1 deletions
diff --git a/x11/wxGTK26/distinfo b/x11/wxGTK26/distinfo index bf4d60eac16..f400cc69d39 100644 --- a/x11/wxGTK26/distinfo +++ b/x11/wxGTK26/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2009/01/08 21:58:17 shattered Exp $ +$NetBSD: distinfo,v 1.3 2009/10/23 11:16:55 plunky Exp $ SHA1 (wxGTK-2.6.3-libtool.diff3.bz2) = 657566a9384a4bc160dffd26678b5e0c6a1cb5b2 RMD160 (wxGTK-2.6.3-libtool.diff3.bz2) = 233af8dd61317ed1771c1862c6cec65f131b6de0 @@ -9,3 +9,4 @@ Size (wxGTK-2.6.3.tar.bz2) = 7213119 bytes SHA1 (patch-aa) = 0ef5ae28b70a3290e37363193248365f4cf03cec SHA1 (patch-ab) = 3e9c6bc0df33e466390a4f6483b1c84e2eb9257b SHA1 (patch-ac) = 50bd7d4291e44dac1d2bbbae1b12167177f5ef01 +SHA1 (patch-ad) = fb51bb80451d39ba2bba53d42722327888b4a0be diff --git a/x11/wxGTK26/patches/patch-ad b/x11/wxGTK26/patches/patch-ad new file mode 100644 index 00000000000..fd0faf74566 --- /dev/null +++ b/x11/wxGTK26/patches/patch-ad @@ -0,0 +1,22 @@ +$NetBSD: patch-ad,v 1.1 2009/10/23 11:16:55 plunky Exp $ + +avoid conflicts with GSocket in glib >= 2.21 as per + + http://trac.wxwidgets.org/ticket/10883 + +--- src/gtk/gsockgtk.cpp.orig 2009-10-23 11:43:01.000000000 +0100 ++++ src/gtk/gsockgtk.cpp 2009-10-23 11:43:04.000000000 +0100 +@@ -14,8 +14,13 @@ + #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 + #include <gdk/gdk.h> + #include <glib.h> ++#undef GSocket + + #include "wx/gsocket.h" + #include "wx/unix/gsockunx.h" |