diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-08-18 23:31:24 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-08-18 23:31:24 +0800 |
| commit | d9d3501c3257df0b3177da75ebfe38c2bc1895b6 (patch) | |
| tree | 7640833fc192cb0b926cd15ad356f4ddf15fc6d6 | |
| parent | ec94f5df8775f4fb8025f1a0725370be3710711a (diff) | |
| download | marcuscom-ports-d9d3501c3257df0b3177da75ebfe38c2bc1895b6.tar marcuscom-ports-d9d3501c3257df0b3177da75ebfe38c2bc1895b6.tar.gz marcuscom-ports-d9d3501c3257df0b3177da75ebfe38c2bc1895b6.tar.bz2 marcuscom-ports-d9d3501c3257df0b3177da75ebfe38c2bc1895b6.tar.lz marcuscom-ports-d9d3501c3257df0b3177da75ebfe38c2bc1895b6.tar.xz marcuscom-ports-d9d3501c3257df0b3177da75ebfe38c2bc1895b6.tar.zst marcuscom-ports-d9d3501c3257df0b3177da75ebfe38c2bc1895b6.zip | |
Actualy import the NetBSD version, which is more correct then the PR version
in r18652. Also correct patch file name typo.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18653 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | devel/gobject-introspection/files/patch-giscanner_scannerlexer.1 | 12 | ||||
| -rw-r--r-- | devel/gobject-introspection/files/patch-giscanner_scannerlexer.l | 25 |
2 files changed, 25 insertions, 12 deletions
diff --git a/devel/gobject-introspection/files/patch-giscanner_scannerlexer.1 b/devel/gobject-introspection/files/patch-giscanner_scannerlexer.1 deleted file mode 100644 index c156795a9..000000000 --- a/devel/gobject-introspection/files/patch-giscanner_scannerlexer.1 +++ /dev/null @@ -1,12 +0,0 @@ ---- giscanner/scannerlexer.l.orig 2013-08-18 07:37:16.000000000 +0900 -+++ giscanner/scannerlexer.l 2013-08-18 07:40:32.000000000 +0900 -@@ -134,7 +134,7 @@ - "," { return ','; } - "->" { return ARROW; } - --"__asm" { if (!parse_ignored_macro()) REJECT; } -+"__asm"[\t\f\v\r ]+"volatile" { if (!parse_ignored_macro()) REJECT; } - "__asm__" { if (!parse_ignored_macro()) REJECT; } - "__attribute__" { if (!parse_ignored_macro()) REJECT; } - "__attribute" { if (!parse_ignored_macro()) REJECT; } - diff --git a/devel/gobject-introspection/files/patch-giscanner_scannerlexer.l b/devel/gobject-introspection/files/patch-giscanner_scannerlexer.l new file mode 100644 index 000000000..43c2636e5 --- /dev/null +++ b/devel/gobject-introspection/files/patch-giscanner_scannerlexer.l @@ -0,0 +1,25 @@ +$NetBSD: patch-giscanner_scannerlexer.l,v 1.2 2013/05/05 09:20:44 drochner Exp $ + +Ignore __asm volatile as per PR pkg/46017 +https://bugzilla.gnome.org/show_bug.cgi?id=678794 + +--- giscanner/scannerlexer.l.orig 2012-12-18 16:27:16.000000000 +0000 ++++ giscanner/scannerlexer.l +@@ -134,6 +134,8 @@ stringtext ([^\\\"])|(\\.) + "," { return ','; } + "->" { return ARROW; } + ++"__asm"[\t\f\v\r ]+"volatile" { if (!parse_ignored_macro()) REJECT; } ++"__asm__"[\t\f\v\r ]+"volatile" { if (!parse_ignored_macro()) REJECT; } + "__asm" { if (!parse_ignored_macro()) REJECT; } + "__asm__" { if (!parse_ignored_macro()) REJECT; } + "__attribute__" { if (!parse_ignored_macro()) REJECT; } +@@ -145,6 +147,8 @@ stringtext ([^\\\"])|(\\.) + "__signed__" { return SIGNED; } + "__restrict" { return RESTRICT; } + "__typeof" { if (!parse_ignored_macro()) REJECT; } ++"__volatile" { if (!parse_ignored_macro()) REJECT; } ++"__volatile__" { if (!parse_ignored_macro()) REJECT; } + "_Bool" { return BOOL; } + + "G_GINT64_CONSTANT" { return INTL_CONST; } |