[pkgsrc/trunk]: pkgsrc/devel/glib2 Fix build on solaris 10 again...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fc05dd57c4e9
branches:  trunk
changeset: 582249:fc05dd57c4e9
user:      tez <tez%pkgsrc.org@localhost>
date:      Wed Nov 10 20:51:46 2010 +0000

description:
Fix build on solaris 10 again...
#define _XOPEN_SOURCE 600 in glib/tests/strfuncs.c and include the required
header to define the major() & minor() macros in gio/gdbusmessage.c
upstream bug https://bugzilla.gnome.org/show_bug.cgi?id=633390

diffstat:

 devel/glib2/distinfo         |   4 +++-
 devel/glib2/patches/patch-ch |  18 ++++++++++++++++++
 devel/glib2/patches/patch-ci |  16 ++++++++++++++++
 3 files changed, 37 insertions(+), 1 deletions(-)

diffs (57 lines):

diff -r b692c1c3dc24 -r fc05dd57c4e9 devel/glib2/distinfo
--- a/devel/glib2/distinfo      Wed Nov 10 20:22:54 2010 +0000
+++ b/devel/glib2/distinfo      Wed Nov 10 20:51:46 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.140 2010/11/08 04:11:47 drochner Exp $
+$NetBSD: distinfo,v 1.141 2010/11/10 20:51:46 tez Exp $
 
 SHA1 (glib-2.26.0.tar.bz2) = 9d7e9dce2add3fadc35079ad291a94f45ebcf706
 RMD160 (glib-2.26.0.tar.bz2) = 176441944f24c274398903ae1816eecfe2cff36b
@@ -25,3 +25,5 @@
 SHA1 (patch-ce) = 7192ae3bbf27ff92287a66ee090baa80a12cdc79
 SHA1 (patch-cf) = 41ed2146e19cf088456795d4f0e8dc4af4368e44
 SHA1 (patch-cg) = f65c5a23102d3dee12bee68bd126385b3c3fe632
+SHA1 (patch-ch) = df8444835b9954f902936c8b6fab5b44ac350db0
+SHA1 (patch-ci) = f0191fd416222617a2e95e95a05c3dcf6b6ce2d2
diff -r b692c1c3dc24 -r fc05dd57c4e9 devel/glib2/patches/patch-ch
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/glib2/patches/patch-ch      Wed Nov 10 20:51:46 2010 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-ch,v 1.1 2010/11/10 20:51:46 tez Exp $
+
+Fix build on Solaris 10
+
+--- glib/tests/strfuncs.c.orig 2010-11-10 12:28:34.624022400 -0600
++++ glib/tests/strfuncs.c      2010-11-10 12:29:38.527197100 -0600
+@@ -19,7 +19,11 @@
+  * if advised of the possibility of such damage.
+  */
+ 
++#ifdef __sun
++#define _XOPEN_SOURCE 600
++#else
+ #define _XOPEN_SOURCE
++#endif
+ #include <ctype.h>
+ #include <errno.h>
+ #include <locale.h>
diff -r b692c1c3dc24 -r fc05dd57c4e9 devel/glib2/patches/patch-ci
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/glib2/patches/patch-ci      Wed Nov 10 20:51:46 2010 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-ci,v 1.1 2010/11/10 20:51:46 tez Exp $
+
+needed for calls to major() & minor()
+
+--- gio/gdbusmessage.c.orig    2010-11-10 14:02:41.786659900 -0600
++++ gio/gdbusmessage.c 2010-11-10 14:03:53.567042800 -0600
+@@ -49,6 +49,9 @@
+ 
+ #ifdef G_OS_UNIX
+ #include "gunixfdlist.h"
++#ifdef __sun
++#include <sys/mkdev.h>
++#endif
+ #endif
+ 
+ #include "glibintl.h"