diff options
| author | jperkin <jperkin@pkgsrc.org> | 2013-10-04 15:36:30 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2013-10-04 15:36:30 +0000 |
| commit | c7675d77952cc37909f4ca2bc2a5ec883dce168c (patch) | |
| tree | a8669ef8e18a07872bbc2c62268722008c01b613 /devel | |
| parent | 409210f1eb5978ab66b0c5ad54ada0ef59aca6f7 (diff) | |
| download | pkgsrc-c7675d77952cc37909f4ca2bc2a5ec883dce168c.tar.gz | |
Support __inline__ for older OSX.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/gobject-introspection/distinfo | 4 | ||||
| -rw-r--r-- | devel/gobject-introspection/patches/patch-giscanner_scannerlexer.l | 14 |
2 files changed, 12 insertions, 6 deletions
diff --git a/devel/gobject-introspection/distinfo b/devel/gobject-introspection/distinfo index 7b7c99b4f39..5d2bf39f0c3 100644 --- a/devel/gobject-introspection/distinfo +++ b/devel/gobject-introspection/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.15 2013/05/15 19:17:59 adam Exp $ +$NetBSD: distinfo,v 1.16 2013/10/04 15:36:30 jperkin Exp $ SHA1 (gobject-introspection-1.36.0.tar.xz) = 8f0945bda62f2bc2a5ce36e8a1ea7d4753ab0517 RMD160 (gobject-introspection-1.36.0.tar.xz) = bcc541a021ca409395a82fc4dd52a1353679908a @@ -7,4 +7,4 @@ SHA1 (patch-aa) = d7ebe6a0c81694fb537dc9cb67286fb9a0d60a9b SHA1 (patch-ac) = 52174e01aa90a5cf75cfe2f255826c1e46f8e183 SHA1 (patch-ad) = 0c67a1bb64e4e39eb9a4829e53744199a0f64fb6 SHA1 (patch-giscanner_dumper.py) = 76f0173e9d8bafbc69ebe41d01b1d79fe8fbbd5b -SHA1 (patch-giscanner_scannerlexer.l) = 9636a0884c2ac718f1b5bfc588d691f707ea310e +SHA1 (patch-giscanner_scannerlexer.l) = 77d0c624ee28684d496af9f4a58ac771f3c693ae diff --git a/devel/gobject-introspection/patches/patch-giscanner_scannerlexer.l b/devel/gobject-introspection/patches/patch-giscanner_scannerlexer.l index 43c2636e5ba..719d94a5552 100644 --- a/devel/gobject-introspection/patches/patch-giscanner_scannerlexer.l +++ b/devel/gobject-introspection/patches/patch-giscanner_scannerlexer.l @@ -1,7 +1,8 @@ -$NetBSD: patch-giscanner_scannerlexer.l,v 1.2 2013/05/05 09:20:44 drochner Exp $ +$NetBSD: patch-giscanner_scannerlexer.l,v 1.3 2013/10/04 15:36:30 jperkin Exp $ -Ignore __asm volatile as per PR pkg/46017 -https://bugzilla.gnome.org/show_bug.cgi?id=678794 +* Ignore __asm volatile as per PR pkg/46017 + https://bugzilla.gnome.org/show_bug.cgi?id=678794 +* Support __inline__ for older OSX. --- giscanner/scannerlexer.l.orig 2012-12-18 16:27:16.000000000 +0000 +++ giscanner/scannerlexer.l @@ -14,7 +15,12 @@ https://bugzilla.gnome.org/show_bug.cgi?id=678794 "__asm" { if (!parse_ignored_macro()) REJECT; } "__asm__" { if (!parse_ignored_macro()) REJECT; } "__attribute__" { if (!parse_ignored_macro()) REJECT; } -@@ -145,6 +147,8 @@ stringtext ([^\\\"])|(\\.) +@@ -141,10 +143,13 @@ stringtext ([^\\\"])|(\\.) + "__const" { return CONST; } + "__extension__" { return EXTENSION; } + "__inline" { return INLINE; } ++"__inline__" { return INLINE; } + "__nonnull" { if (!parse_ignored_macro()) REJECT; } "__signed__" { return SIGNED; } "__restrict" { return RESTRICT; } "__typeof" { if (!parse_ignored_macro()) REJECT; } |