diff options
| author | plunky <plunky@pkgsrc.org> | 2009-10-23 12:26:13 +0000 |
|---|---|---|
| committer | plunky <plunky@pkgsrc.org> | 2009-10-23 12:26:13 +0000 |
| commit | b3ec5788764266879c507059e913d14d0dbce827 (patch) | |
| tree | 11ce097a906733dd68c34f2d85fd4f3174a94e6c /x11/wxGTK28 | |
| parent | 6ed41d82c6ff920a2137ee6f8bfe94f63ced9ad9 (diff) | |
| download | pkgsrc-b3ec5788764266879c507059e913d14d0dbce827.tar.gz | |
avoid conflicts with GSocket in glib >= 2.21 as per
http://trac.wxwidgets.org/ticket/10883
(fixes build)
Diffstat (limited to 'x11/wxGTK28')
| -rw-r--r-- | x11/wxGTK28/distinfo | 3 | ||||
| -rw-r--r-- | x11/wxGTK28/patches/patch-ad | 22 |
2 files changed, 24 insertions, 1 deletions
diff --git a/x11/wxGTK28/distinfo b/x11/wxGTK28/distinfo index eb4ff4291a2..3d2aa0a2066 100644 --- a/x11/wxGTK28/distinfo +++ b/x11/wxGTK28/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2009/08/05 20:58:56 drochner Exp $ +$NetBSD: distinfo,v 1.7 2009/10/23 12:26:13 plunky Exp $ SHA1 (wxGTK-2.8.10-libtool.diff.bz2) = 62ff30c26efdd73252bed2d07b82a9b9d3ef890f RMD160 (wxGTK-2.8.10-libtool.diff.bz2) = 64e1c32caa4bd6a0503bce4764e3ddc1cba68f8a @@ -9,6 +9,7 @@ Size (wxGTK-2.8.10.tar.bz2) = 9365627 bytes SHA1 (patch-aa) = 1a30c79f07ea8ea5dff02fad9b5e1ba8dadde01a SHA1 (patch-ab) = 82960daef0616824718f3c04929871aeb0e258a2 SHA1 (patch-ac) = 50cf253797f2dee8b9dab08d138d0070e25e7a8c +SHA1 (patch-ad) = b07a55257347633edb8997201c82f83619d1d650 SHA1 (patch-ba) = e47f8613835ce309daff09ae3265d44f37493579 SHA1 (patch-bb) = 52df734a1df364dc5599a2b9252a15b87cae13b1 SHA1 (patch-ca) = 4df0c2629c61fbf83a121eb16e490e9c2abb5ad8 diff --git a/x11/wxGTK28/patches/patch-ad b/x11/wxGTK28/patches/patch-ad new file mode 100644 index 00000000000..d4d9174191e --- /dev/null +++ b/x11/wxGTK28/patches/patch-ad @@ -0,0 +1,22 @@ +$NetBSD: patch-ad,v 1.1 2009/10/23 12:26:13 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:59:23.000000000 +0100 ++++ src/gtk/gsockgtk.cpp 2009-10-23 11:59:51.000000000 +0100 +@@ -15,8 +15,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" |