[pkgsrc/trunk]: pkgsrc/x11/wxGTK28 avoid conflicts with GSocket in glib >= 2....

[plunky <plunky%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/67110e1c0659
branches:  trunk
changeset: 400611:67110e1c0659
user:      plunky <plunky%pkgsrc.org@localhost>
date:      Fri Oct 23 12:26:13 2009 +0000

description:
avoid conflicts with GSocket in glib >= 2.21 as per

        http://trac.wxwidgets.org/ticket/10883

(fixes build)

diffstat:

 x11/wxGTK28/distinfo         |   3 ++-
 x11/wxGTK28/patches/patch-ad |  22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletions(-)

diffs (43 lines):

diff -r 1f72fa38c701 -r 67110e1c0659 x11/wxGTK28/distinfo
--- a/x11/wxGTK28/distinfo      Fri Oct 23 11:16:55 2009 +0000
+++ b/x11/wxGTK28/distinfo      Fri Oct 23 12:26:13 2009 +0000
@@ -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 @@
 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 -r 1f72fa38c701 -r 67110e1c0659 x11/wxGTK28/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/wxGTK28/patches/patch-ad      Fri Oct 23 12:26:13 2009 +0000
@@ -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"