Fri Oct 23 12:26:13 2009 UTC ()
avoid conflicts with GSocket in glib >= 2.21 as per

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

(fixes build)


(plunky)
diff -r1.6 -r1.7 pkgsrc/x11/wxGTK28/distinfo
diff -r0 -r1.1 pkgsrc/x11/wxGTK28/patches/patch-ad
cvs diff -r1.6 -r1.7 pkgsrc/x11/wxGTK28/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/wxGTK28/Attic/distinfo 2009/08/05 20:58:56 1.6
+++ pkgsrc/x11/wxGTK28/Attic/distinfo 2009/10/23 12:26:13 1.7
@@ -1,14 +1,15 @@ @@ -1,14 +1,15 @@
1$NetBSD: distinfo,v 1.6 2009/08/05 20:58:56 drochner Exp $ 1$NetBSD: distinfo,v 1.7 2009/10/23 12:26:13 plunky Exp $
2 2
3SHA1 (wxGTK-2.8.10-libtool.diff.bz2) = 62ff30c26efdd73252bed2d07b82a9b9d3ef890f 3SHA1 (wxGTK-2.8.10-libtool.diff.bz2) = 62ff30c26efdd73252bed2d07b82a9b9d3ef890f
4RMD160 (wxGTK-2.8.10-libtool.diff.bz2) = 64e1c32caa4bd6a0503bce4764e3ddc1cba68f8a 4RMD160 (wxGTK-2.8.10-libtool.diff.bz2) = 64e1c32caa4bd6a0503bce4764e3ddc1cba68f8a
5Size (wxGTK-2.8.10-libtool.diff.bz2) = 154573 bytes 5Size (wxGTK-2.8.10-libtool.diff.bz2) = 154573 bytes
6SHA1 (wxGTK-2.8.10.tar.bz2) = 1e4bee16a423efeef665ed70e82b6e7dc5468cf4 6SHA1 (wxGTK-2.8.10.tar.bz2) = 1e4bee16a423efeef665ed70e82b6e7dc5468cf4
7RMD160 (wxGTK-2.8.10.tar.bz2) = b007de9b19ef4830d9f484c0d12595a14e66d432 7RMD160 (wxGTK-2.8.10.tar.bz2) = b007de9b19ef4830d9f484c0d12595a14e66d432
8Size (wxGTK-2.8.10.tar.bz2) = 9365627 bytes 8Size (wxGTK-2.8.10.tar.bz2) = 9365627 bytes
9SHA1 (patch-aa) = 1a30c79f07ea8ea5dff02fad9b5e1ba8dadde01a 9SHA1 (patch-aa) = 1a30c79f07ea8ea5dff02fad9b5e1ba8dadde01a
10SHA1 (patch-ab) = 82960daef0616824718f3c04929871aeb0e258a2 10SHA1 (patch-ab) = 82960daef0616824718f3c04929871aeb0e258a2
11SHA1 (patch-ac) = 50cf253797f2dee8b9dab08d138d0070e25e7a8c 11SHA1 (patch-ac) = 50cf253797f2dee8b9dab08d138d0070e25e7a8c
 12SHA1 (patch-ad) = b07a55257347633edb8997201c82f83619d1d650
12SHA1 (patch-ba) = e47f8613835ce309daff09ae3265d44f37493579 13SHA1 (patch-ba) = e47f8613835ce309daff09ae3265d44f37493579
13SHA1 (patch-bb) = 52df734a1df364dc5599a2b9252a15b87cae13b1 14SHA1 (patch-bb) = 52df734a1df364dc5599a2b9252a15b87cae13b1
14SHA1 (patch-ca) = 4df0c2629c61fbf83a121eb16e490e9c2abb5ad8 15SHA1 (patch-ca) = 4df0c2629c61fbf83a121eb16e490e9c2abb5ad8
File Added: pkgsrc/x11/wxGTK28/patches/Attic/patch-ad
$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"