diff options
| author | tez <tez> | 2010-11-10 20:51:46 +0000 |
|---|---|---|
| committer | tez <tez> | 2010-11-10 20:51:46 +0000 |
| commit | 773ee2c63176b37ba25415082260adc7e6e4e0fc (patch) | |
| tree | 9153d08556c3669ec1d6be84d642b43d63293164 | |
| parent | 4acee73b262058d5a7aca4b154b7285df4bd8b6e (diff) | |
| download | pkgsrc-773ee2c63176b37ba25415082260adc7e6e4e0fc.tar.gz | |
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
| -rw-r--r-- | devel/glib2/distinfo | 4 | ||||
| -rw-r--r-- | devel/glib2/patches/patch-ch | 18 | ||||
| -rw-r--r-- | devel/glib2/patches/patch-ci | 16 |
3 files changed, 37 insertions, 1 deletions
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo index f35b81ac787..179e536afc6 100644 --- a/devel/glib2/distinfo +++ b/devel/glib2/distinfo @@ -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-cd) = aaada4d63aaac18f71ac9fdbff15e8ef0579cf39 SHA1 (patch-ce) = 7192ae3bbf27ff92287a66ee090baa80a12cdc79 SHA1 (patch-cf) = 41ed2146e19cf088456795d4f0e8dc4af4368e44 SHA1 (patch-cg) = f65c5a23102d3dee12bee68bd126385b3c3fe632 +SHA1 (patch-ch) = df8444835b9954f902936c8b6fab5b44ac350db0 +SHA1 (patch-ci) = f0191fd416222617a2e95e95a05c3dcf6b6ce2d2 diff --git a/devel/glib2/patches/patch-ch b/devel/glib2/patches/patch-ch new file mode 100644 index 00000000000..82259b6280e --- /dev/null +++ b/devel/glib2/patches/patch-ch @@ -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 --git a/devel/glib2/patches/patch-ci b/devel/glib2/patches/patch-ci new file mode 100644 index 00000000000..ed9f0b7970e --- /dev/null +++ b/devel/glib2/patches/patch-ci @@ -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" |