diff options
| author | drochner <drochner@pkgsrc.org> | 2012-02-16 15:09:54 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2012-02-16 15:09:54 +0000 |
| commit | 9ee0642cd47059b678c489fb14ad8bba02c020d7 (patch) | |
| tree | eed0144afd054a9971b4210ede603c092812da72 /devel | |
| parent | cfa33ca2f81224ebd6ef6c8c1d4d7981a4640254 (diff) | |
| download | pkgsrc-9ee0642cd47059b678c489fb14ad8bba02c020d7.tar.gz | |
open(2) is variadic (at least in Posix and NetBSD), g_open is not,
don't mix them, the ABIs are incompatible at least on amd64
bump PKGREV
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/glib2/Makefile | 4 | ||||
| -rw-r--r-- | devel/glib2/distinfo | 3 | ||||
| -rw-r--r-- | devel/glib2/patches/patch-at | 25 |
3 files changed, 29 insertions, 3 deletions
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile index f1c8dd0ba6d..66746014f6f 100644 --- a/devel/glib2/Makefile +++ b/devel/glib2/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.194 2012/02/06 12:39:50 wiz Exp $ +# $NetBSD: Makefile,v 1.195 2012/02/16 15:09:54 drochner Exp $ .include "Makefile.common" .include "options.mk" -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= devel COMMENT= Some useful routines for C programming (glib2) diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo index 9cee3204aaf..acb7931ff10 100644 --- a/devel/glib2/distinfo +++ b/devel/glib2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.160 2012/01/31 18:36:01 drochner Exp $ +$NetBSD: distinfo,v 1.161 2012/02/16 15:09:54 drochner Exp $ SHA1 (glib-2.30.2.tar.bz2) = 70208757905037fa1f8b89797db0097c5e82a140 RMD160 (glib-2.30.2.tar.bz2) = efe0d8ae945dd3b20ca4835dcb45696fd0914c06 @@ -24,6 +24,7 @@ SHA1 (patch-ap) = 38a805f95e8f7ca35c73984be9142336c6a3ec4c SHA1 (patch-aq) = aa7087b91c7d0eca9f9895feb6924df95eccb372 SHA1 (patch-ar) = 27679e663399ffa1ca1ad95876084f05930bece3 SHA1 (patch-as) = 0d9b461d5bf6d267b50eac892d8ad8a82f90be18 +SHA1 (patch-at) = f4c4a2fbe84eb8b361fb342f3c3b0b5a226d1794 SHA1 (patch-ba) = 8d50fcbe3e9238bbf7bafee4c0ce627e34c3d9d2 SHA1 (patch-cb) = 0f084c33fb67fbb8e12448034450699da26289ff SHA1 (patch-cc) = dd73079b727bca9013465204dc3b53b76a280e54 diff --git a/devel/glib2/patches/patch-at b/devel/glib2/patches/patch-at new file mode 100644 index 00000000000..1287d0cb064 --- /dev/null +++ b/devel/glib2/patches/patch-at @@ -0,0 +1,25 @@ +$NetBSD: patch-at,v 1.1 2012/02/16 15:09:54 drochner Exp $ + +open() can be variadic, the ABI is incompatible eg. on amd64 + +--- glib/gstdio.h.orig 2011-08-29 18:29:04.000000000 +0000 ++++ glib/gstdio.h +@@ -62,7 +62,6 @@ typedef struct stat GStatBuf; + + #ifndef __GTK_DOC_IGNORE__ + #define g_chmod chmod +-#define g_open open + #define g_creat creat + #define g_rename rename + #define g_mkdir mkdir +@@ -77,6 +76,10 @@ typedef struct stat GStatBuf; + int g_access (const gchar *filename, + int mode); + ++int g_open (const gchar *filename, ++ int flags, ++ int mode); ++ + int g_chdir (const gchar *path); + + int g_unlink (const gchar *filename); |