From 663aec16cfb848d94e15d0e9fa6b62309203b3bc Mon Sep 17 00:00:00 2001
From: drochner <drochner@pkgsrc.org>
Date: Tue, 1 Jun 2010 17:28:31 +0000
Subject: fix 2 build errors: -inconsistency of .hidden attributes, leading to
 link error on amd64,  reported by Tobias Nygren -trick NetBSD's
 arpa/nameser_compat.h into using the system provided  endianess definitions
 -- it has its own ifdefs but misses eg. ppc,  fixes build error on macppc
 reported by Erik Bertelsen

---
 devel/glib2/distinfo         |  4 +++-
 devel/glib2/patches/patch-ce | 12 ++++++++++++
 devel/glib2/patches/patch-cf | 14 ++++++++++++++
 3 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 devel/glib2/patches/patch-ce
 create mode 100644 devel/glib2/patches/patch-cf

(limited to 'devel')

diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index 4db29a1eb74..a5a86023a21 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.135 2010/05/31 18:30:06 wiz Exp $
+$NetBSD: distinfo,v 1.136 2010/06/01 17:28:31 drochner Exp $
 
 SHA1 (glib-2.24.1.tar.bz2) = d4835bb1618fc1e1dfe88ef8443c12fcae69f90e
 RMD160 (glib-2.24.1.tar.bz2) = c6ce09654c1bd28b8844435d150fcb51e6f4e872
@@ -19,3 +19,5 @@ SHA1 (patch-ba) = b235c2037bce84e0cdd9c87abaac274550ec0c95
 SHA1 (patch-cb) = 0f084c33fb67fbb8e12448034450699da26289ff
 SHA1 (patch-cc) = dd73079b727bca9013465204dc3b53b76a280e54
 SHA1 (patch-cd) = aaada4d63aaac18f71ac9fdbff15e8ef0579cf39
+SHA1 (patch-ce) = db3176ee99f7d786d87b32b45348b77b7038080d
+SHA1 (patch-cf) = 41ed2146e19cf088456795d4f0e8dc4af4368e44
diff --git a/devel/glib2/patches/patch-ce b/devel/glib2/patches/patch-ce
new file mode 100644
index 00000000000..552be10d426
--- /dev/null
+++ b/devel/glib2/patches/patch-ce
@@ -0,0 +1,12 @@
+$NetBSD: patch-ce,v 1.1 2010/06/01 17:28:31 drochner Exp $
+
+--- glib/gatomic-gcc.c.orig	2010-06-01 15:18:24.000000000 +0000
++++ glib/gatomic-gcc.c
+@@ -22,6 +22,7 @@
+ 
+ #include "glib.h"
+ #include "galias.h"
++#include "gthreadprivate.h"
+ 
+ gint
+ g_atomic_int_exchange_and_add (volatile gint G_GNUC_MAY_ALIAS *atomic,
diff --git a/devel/glib2/patches/patch-cf b/devel/glib2/patches/patch-cf
new file mode 100644
index 00000000000..68368a0e6f9
--- /dev/null
+++ b/devel/glib2/patches/patch-cf
@@ -0,0 +1,14 @@
+$NetBSD: patch-cf,v 1.1 2010/06/01 17:28:31 drochner Exp $
+
+--- gio/libasyncns/g-asyncns.h.orig	2010-06-01 15:28:52.000000000 +0000
++++ gio/libasyncns/g-asyncns.h
+@@ -27,6 +27,9 @@
+ 
+ /* asyncns.c removed this for #580301, but that appears to have been wrong */
+ #if HAVE_ARPA_NAMESER_COMPAT_H
++#ifdef __NetBSD__
++#include <sys/param.h>
++#endif
+ #include <arpa/nameser_compat.h>
+ #endif
+ 
-- 
cgit v1.2.3