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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1f72fa38c701
branches:  trunk
changeset: 400610:1f72fa38c701
user:      plunky <plunky%pkgsrc.org@localhost>
date:      Fri Oct 23 11:16:55 2009 +0000

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

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

diffstat:

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

diffs (40 lines):

diff -r 62da44d5c6a9 -r 1f72fa38c701 x11/wxGTK26/distinfo
--- a/x11/wxGTK26/distinfo      Fri Oct 23 10:55:06 2009 +0000
+++ b/x11/wxGTK26/distinfo      Fri Oct 23 11:16:55 2009 +0000
@@ -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 @@
 SHA1 (patch-aa) = 0ef5ae28b70a3290e37363193248365f4cf03cec
 SHA1 (patch-ab) = 3e9c6bc0df33e466390a4f6483b1c84e2eb9257b
 SHA1 (patch-ac) = 50bd7d4291e44dac1d2bbbae1b12167177f5ef01
+SHA1 (patch-ad) = fb51bb80451d39ba2bba53d42722327888b4a0be
diff -r 62da44d5c6a9 -r 1f72fa38c701 x11/wxGTK26/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/wxGTK26/patches/patch-ad      Fri Oct 23 11:16:55 2009 +0000
@@ -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"