Sun Dec 8 13:28:28 2013 UTC ()
Update gobject-introspection to 1.38.0

patch-ad removed as fixed in 82870258 (Bug 698438)

g-ir-scanner has a grown --xpath-assertions, --format and --inject options
Many bug fixes and translation updates.


(prlw1)
diff -r1.34 -r1.35 pkgsrc/devel/gobject-introspection/Makefile
diff -r1.5 -r1.6 pkgsrc/devel/gobject-introspection/PLIST
diff -r1.16 -r1.17 pkgsrc/devel/gobject-introspection/distinfo
diff -r1.2 -r0 pkgsrc/devel/gobject-introspection/patches/patch-ad
diff -r1.2 -r1.3 pkgsrc/devel/gobject-introspection/patches/patch-giscanner_dumper.py
diff -r1.3 -r1.4 pkgsrc/devel/gobject-introspection/patches/patch-giscanner_scannerlexer.l
cvs diff -r1.34 -r1.35 pkgsrc/devel/gobject-introspection/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/gobject-introspection/Makefile 2013/09/02 19:50:59 1.34
+++ pkgsrc/devel/gobject-introspection/Makefile 2013/12/08 13:28:27 1.35
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1# $NetBSD: Makefile,v 1.34 2013/09/02 19:50:59 adam Exp $ 1# $NetBSD: Makefile,v 1.35 2013/12/08 13:28:27 prlw1 Exp $
2# 2#
3 3
4DISTNAME= gobject-introspection-1.36.0 4DISTNAME= gobject-introspection-1.38.0
5PKGREVISION= 3 5CATEGORIES= devel gnome
6CATEGORIES= devel 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gobject-introspection/${PKGVERSION_NOREV:R}/}
7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gobject-introspection/1.36/} 
8EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
9 8
10MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://live.gnome.org/GObjectIntrospection 10HOMEPAGE= http://live.gnome.org/GObjectIntrospection
12COMMENT= GObject Introspection 11COMMENT= GObject Introspection
13LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2 12LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2
14 13
15DEPENDS+= ${PYPKGPREFIX}-cElementTree-[0-9]*:../../textproc/py-cElementTree 14DEPENDS+= ${PYPKGPREFIX}-cElementTree-[0-9]*:../../textproc/py-cElementTree
16 15
17GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
18USE_LIBTOOL= yes 17USE_LIBTOOL= yes
19USE_TOOLS+= pkg-config flex bison gmake 18USE_TOOLS+= pkg-config flex bison gmake
20GMAKE_REQD= 3.81 19GMAKE_REQD= 3.81
21 20
 21PKGCONFIG_OVERRIDE+= gobject-introspection-1.0.pc.in
22PKGCONFIG_OVERRIDE+= gobject-introspection-no-export-1.0.pc.in 22PKGCONFIG_OVERRIDE+= gobject-introspection-no-export-1.0.pc.in
23 23
24SUBST_CLASSES+= timet 24SUBST_CLASSES+= timet
25SUBST_STAGE.timet= pre-configure 25SUBST_STAGE.timet= pre-configure
26SUBST_FILES.timet= giscanner/ast.py 26SUBST_FILES.timet= giscanner/ast.py
27SUBST_FILES.timet+= tests/scanner/Regress-1.0-expected.gir 27SUBST_FILES.timet+= tests/scanner/Regress-1.0-expected.gir
28.include "../../mk/bsd.prefs.mk" 28.include "../../mk/bsd.prefs.mk"
29.if !empty(MACHINE_PLATFORM:MNetBSD-5.99*) || !empty(MACHINE_PLATFORM:MNetBSD-[6-9]*) || !empty(MACHINE_PLATFORM:MMirBSD) 29.if !empty(MACHINE_PLATFORM:MNetBSD-5.99*) || !empty(MACHINE_PLATFORM:MNetBSD-[6-9]*) || !empty(MACHINE_PLATFORM:MMirBSD)
30SUBST_SED.timet= -e 's,@TIMET_TYPENAME@,TYPE_INT64,g' 30SUBST_SED.timet= -e 's,@TIMET_TYPENAME@,TYPE_INT64,g'
31SUBST_SED.timet+= -e 's,@TIMET_CTYPE@,gint64,g' 31SUBST_SED.timet+= -e 's,@TIMET_CTYPE@,gint64,g'
32.else 32.else
33SUBST_SED.timet= -e 's,@TIMET_TYPENAME@,TYPE_LONG,g' 33SUBST_SED.timet= -e 's,@TIMET_TYPENAME@,TYPE_LONG,g'
34SUBST_SED.timet+= -e 's,@TIMET_CTYPE@,glong,g' 34SUBST_SED.timet+= -e 's,@TIMET_CTYPE@,glong,g'
cvs diff -r1.5 -r1.6 pkgsrc/devel/gobject-introspection/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/gobject-introspection/PLIST 2013/05/05 09:20:44 1.5
+++ pkgsrc/devel/gobject-introspection/PLIST 2013/12/08 13:28:27 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.5 2013/05/05 09:20:44 drochner Exp $ 1@comment $NetBSD: PLIST,v 1.6 2013/12/08 13:28:27 prlw1 Exp $
2bin/g-ir-annotation-tool 2bin/g-ir-annotation-tool
3bin/g-ir-compiler 3bin/g-ir-compiler
4bin/g-ir-generate 4bin/g-ir-generate
5bin/g-ir-scanner 5bin/g-ir-scanner
6include/gobject-introspection-1.0/giarginfo.h 6include/gobject-introspection-1.0/giarginfo.h
7include/gobject-introspection-1.0/gibaseinfo.h 7include/gobject-introspection-1.0/gibaseinfo.h
8include/gobject-introspection-1.0/gicallableinfo.h 8include/gobject-introspection-1.0/gicallableinfo.h
9include/gobject-introspection-1.0/giconstantinfo.h 9include/gobject-introspection-1.0/giconstantinfo.h
10include/gobject-introspection-1.0/gienuminfo.h 10include/gobject-introspection-1.0/gienuminfo.h
11include/gobject-introspection-1.0/gifieldinfo.h 11include/gobject-introspection-1.0/gifieldinfo.h
12include/gobject-introspection-1.0/gifunctioninfo.h 12include/gobject-introspection-1.0/gifunctioninfo.h
13include/gobject-introspection-1.0/giinterfaceinfo.h 13include/gobject-introspection-1.0/giinterfaceinfo.h
14include/gobject-introspection-1.0/giobjectinfo.h 14include/gobject-introspection-1.0/giobjectinfo.h
@@ -25,49 +25,56 @@ include/gobject-introspection-1.0/giunio @@ -25,49 +25,56 @@ include/gobject-introspection-1.0/giunio
25include/gobject-introspection-1.0/givfuncinfo.h 25include/gobject-introspection-1.0/givfuncinfo.h
26lib/girepository-1.0/DBus-1.0.typelib 26lib/girepository-1.0/DBus-1.0.typelib
27lib/girepository-1.0/DBusGLib-1.0.typelib 27lib/girepository-1.0/DBusGLib-1.0.typelib
28lib/girepository-1.0/GIRepository-2.0.typelib 28lib/girepository-1.0/GIRepository-2.0.typelib
29lib/girepository-1.0/GL-1.0.typelib 29lib/girepository-1.0/GL-1.0.typelib
30lib/girepository-1.0/GLib-2.0.typelib 30lib/girepository-1.0/GLib-2.0.typelib
31lib/girepository-1.0/GModule-2.0.typelib 31lib/girepository-1.0/GModule-2.0.typelib
32lib/girepository-1.0/GObject-2.0.typelib 32lib/girepository-1.0/GObject-2.0.typelib
33lib/girepository-1.0/Gio-2.0.typelib 33lib/girepository-1.0/Gio-2.0.typelib
34lib/girepository-1.0/cairo-1.0.typelib 34lib/girepository-1.0/cairo-1.0.typelib
35lib/girepository-1.0/fontconfig-2.0.typelib 35lib/girepository-1.0/fontconfig-2.0.typelib
36lib/girepository-1.0/freetype2-2.0.typelib 36lib/girepository-1.0/freetype2-2.0.typelib
37lib/girepository-1.0/libxml2-2.0.typelib 37lib/girepository-1.0/libxml2-2.0.typelib
 38lib/girepository-1.0/win32-1.0.typelib
38lib/girepository-1.0/xfixes-4.0.typelib 39lib/girepository-1.0/xfixes-4.0.typelib
39lib/girepository-1.0/xft-2.0.typelib 40lib/girepository-1.0/xft-2.0.typelib
40lib/girepository-1.0/xlib-2.0.typelib 41lib/girepository-1.0/xlib-2.0.typelib
41lib/girepository-1.0/xrandr-1.3.typelib 42lib/girepository-1.0/xrandr-1.3.typelib
42lib/gobject-introspection/giscanner/__init__.py 43lib/gobject-introspection/giscanner/__init__.py
43lib/gobject-introspection/giscanner/__init__.pyc 44lib/gobject-introspection/giscanner/__init__.pyc
44lib/gobject-introspection/giscanner/__init__.pyo 45lib/gobject-introspection/giscanner/__init__.pyo
45lib/gobject-introspection/giscanner/_giscanner.la 46lib/gobject-introspection/giscanner/_giscanner.la
46lib/gobject-introspection/giscanner/annotationmain.py 47lib/gobject-introspection/giscanner/annotationmain.py
47lib/gobject-introspection/giscanner/annotationmain.pyc 48lib/gobject-introspection/giscanner/annotationmain.pyc
48lib/gobject-introspection/giscanner/annotationmain.pyo 49lib/gobject-introspection/giscanner/annotationmain.pyo
49lib/gobject-introspection/giscanner/annotationparser.py 50lib/gobject-introspection/giscanner/annotationparser.py
50lib/gobject-introspection/giscanner/annotationparser.pyc 51lib/gobject-introspection/giscanner/annotationparser.pyc
51lib/gobject-introspection/giscanner/annotationparser.pyo 52lib/gobject-introspection/giscanner/annotationparser.pyo
52lib/gobject-introspection/giscanner/ast.py 53lib/gobject-introspection/giscanner/ast.py
53lib/gobject-introspection/giscanner/ast.pyc 54lib/gobject-introspection/giscanner/ast.pyc
54lib/gobject-introspection/giscanner/ast.pyo 55lib/gobject-introspection/giscanner/ast.pyo
55lib/gobject-introspection/giscanner/cachestore.py 56lib/gobject-introspection/giscanner/cachestore.py
56lib/gobject-introspection/giscanner/cachestore.pyc 57lib/gobject-introspection/giscanner/cachestore.pyc
57lib/gobject-introspection/giscanner/cachestore.pyo 58lib/gobject-introspection/giscanner/cachestore.pyo
58lib/gobject-introspection/giscanner/codegen.py 59lib/gobject-introspection/giscanner/codegen.py
59lib/gobject-introspection/giscanner/codegen.pyc 60lib/gobject-introspection/giscanner/codegen.pyc
60lib/gobject-introspection/giscanner/codegen.pyo 61lib/gobject-introspection/giscanner/codegen.pyo
 62lib/gobject-introspection/giscanner/collections/__init__.py
 63lib/gobject-introspection/giscanner/collections/__init__.pyc
 64lib/gobject-introspection/giscanner/collections/__init__.pyo
 65lib/gobject-introspection/giscanner/collections/ordereddict.py
 66lib/gobject-introspection/giscanner/collections/ordereddict.pyc
 67lib/gobject-introspection/giscanner/collections/ordereddict.pyo
61lib/gobject-introspection/giscanner/docmain.py 68lib/gobject-introspection/giscanner/docmain.py
62lib/gobject-introspection/giscanner/docmain.pyc 69lib/gobject-introspection/giscanner/docmain.pyc
63lib/gobject-introspection/giscanner/docmain.pyo 70lib/gobject-introspection/giscanner/docmain.pyo
64lib/gobject-introspection/giscanner/doctemplates/C/class.tmpl 71lib/gobject-introspection/giscanner/doctemplates/C/class.tmpl
65lib/gobject-introspection/giscanner/doctemplates/C/constructor.tmpl 72lib/gobject-introspection/giscanner/doctemplates/C/constructor.tmpl
66lib/gobject-introspection/giscanner/doctemplates/C/default.tmpl 73lib/gobject-introspection/giscanner/doctemplates/C/default.tmpl
67lib/gobject-introspection/giscanner/doctemplates/C/enum.tmpl 74lib/gobject-introspection/giscanner/doctemplates/C/enum.tmpl
68lib/gobject-introspection/giscanner/doctemplates/C/function.tmpl 75lib/gobject-introspection/giscanner/doctemplates/C/function.tmpl
69lib/gobject-introspection/giscanner/doctemplates/C/method.tmpl 76lib/gobject-introspection/giscanner/doctemplates/C/method.tmpl
70lib/gobject-introspection/giscanner/doctemplates/C/namespace.tmpl 77lib/gobject-introspection/giscanner/doctemplates/C/namespace.tmpl
71lib/gobject-introspection/giscanner/doctemplates/C/property.tmpl 78lib/gobject-introspection/giscanner/doctemplates/C/property.tmpl
72lib/gobject-introspection/giscanner/doctemplates/C/record.tmpl 79lib/gobject-introspection/giscanner/doctemplates/C/record.tmpl
73lib/gobject-introspection/giscanner/doctemplates/C/signal.tmpl 80lib/gobject-introspection/giscanner/doctemplates/C/signal.tmpl
@@ -114,29 +121,26 @@ lib/gobject-introspection/giscanner/girw @@ -114,29 +121,26 @@ lib/gobject-introspection/giscanner/girw
114lib/gobject-introspection/giscanner/girwriter.pyo 121lib/gobject-introspection/giscanner/girwriter.pyo
115lib/gobject-introspection/giscanner/introspectablepass.py 122lib/gobject-introspection/giscanner/introspectablepass.py
116lib/gobject-introspection/giscanner/introspectablepass.pyc 123lib/gobject-introspection/giscanner/introspectablepass.pyc
117lib/gobject-introspection/giscanner/introspectablepass.pyo 124lib/gobject-introspection/giscanner/introspectablepass.pyo
118lib/gobject-introspection/giscanner/libtoolimporter.py 125lib/gobject-introspection/giscanner/libtoolimporter.py
119lib/gobject-introspection/giscanner/libtoolimporter.pyc 126lib/gobject-introspection/giscanner/libtoolimporter.pyc
120lib/gobject-introspection/giscanner/libtoolimporter.pyo 127lib/gobject-introspection/giscanner/libtoolimporter.pyo
121lib/gobject-introspection/giscanner/maintransformer.py 128lib/gobject-introspection/giscanner/maintransformer.py
122lib/gobject-introspection/giscanner/maintransformer.pyc 129lib/gobject-introspection/giscanner/maintransformer.pyc
123lib/gobject-introspection/giscanner/maintransformer.pyo 130lib/gobject-introspection/giscanner/maintransformer.pyo
124lib/gobject-introspection/giscanner/message.py 131lib/gobject-introspection/giscanner/message.py
125lib/gobject-introspection/giscanner/message.pyc 132lib/gobject-introspection/giscanner/message.pyc
126lib/gobject-introspection/giscanner/message.pyo 133lib/gobject-introspection/giscanner/message.pyo
127lib/gobject-introspection/giscanner/odict.py 
128lib/gobject-introspection/giscanner/odict.pyc 
129lib/gobject-introspection/giscanner/odict.pyo 
130lib/gobject-introspection/giscanner/scannermain.py 134lib/gobject-introspection/giscanner/scannermain.py
131lib/gobject-introspection/giscanner/scannermain.pyc 135lib/gobject-introspection/giscanner/scannermain.pyc
132lib/gobject-introspection/giscanner/scannermain.pyo 136lib/gobject-introspection/giscanner/scannermain.pyo
133lib/gobject-introspection/giscanner/sectionparser.py 137lib/gobject-introspection/giscanner/sectionparser.py
134lib/gobject-introspection/giscanner/sectionparser.pyc 138lib/gobject-introspection/giscanner/sectionparser.pyc
135lib/gobject-introspection/giscanner/sectionparser.pyo 139lib/gobject-introspection/giscanner/sectionparser.pyo
136lib/gobject-introspection/giscanner/shlibs.py 140lib/gobject-introspection/giscanner/shlibs.py
137lib/gobject-introspection/giscanner/shlibs.pyc 141lib/gobject-introspection/giscanner/shlibs.pyc
138lib/gobject-introspection/giscanner/shlibs.pyo 142lib/gobject-introspection/giscanner/shlibs.pyo
139lib/gobject-introspection/giscanner/sourcescanner.py 143lib/gobject-introspection/giscanner/sourcescanner.py
140lib/gobject-introspection/giscanner/sourcescanner.pyc 144lib/gobject-introspection/giscanner/sourcescanner.pyc
141lib/gobject-introspection/giscanner/sourcescanner.pyo 145lib/gobject-introspection/giscanner/sourcescanner.pyo
142lib/gobject-introspection/giscanner/testcodegen.py 146lib/gobject-introspection/giscanner/testcodegen.py
@@ -160,26 +164,27 @@ man/man1/g-ir-scanner.1 @@ -160,26 +164,27 @@ man/man1/g-ir-scanner.1
160share/aclocal/introspection.m4 164share/aclocal/introspection.m4
161share/gir-1.0/DBus-1.0.gir 165share/gir-1.0/DBus-1.0.gir
162share/gir-1.0/DBusGLib-1.0.gir 166share/gir-1.0/DBusGLib-1.0.gir
163share/gir-1.0/GIRepository-2.0.gir 167share/gir-1.0/GIRepository-2.0.gir
164share/gir-1.0/GL-1.0.gir 168share/gir-1.0/GL-1.0.gir
165share/gir-1.0/GLib-2.0.gir 169share/gir-1.0/GLib-2.0.gir
166share/gir-1.0/GModule-2.0.gir 170share/gir-1.0/GModule-2.0.gir
167share/gir-1.0/GObject-2.0.gir 171share/gir-1.0/GObject-2.0.gir
168share/gir-1.0/Gio-2.0.gir 172share/gir-1.0/Gio-2.0.gir
169share/gir-1.0/cairo-1.0.gir 173share/gir-1.0/cairo-1.0.gir
170share/gir-1.0/fontconfig-2.0.gir 174share/gir-1.0/fontconfig-2.0.gir
171share/gir-1.0/freetype2-2.0.gir 175share/gir-1.0/freetype2-2.0.gir
172share/gir-1.0/libxml2-2.0.gir 176share/gir-1.0/libxml2-2.0.gir
 177share/gir-1.0/win32-1.0.gir
173share/gir-1.0/xfixes-4.0.gir 178share/gir-1.0/xfixes-4.0.gir
174share/gir-1.0/xft-2.0.gir 179share/gir-1.0/xft-2.0.gir
175share/gir-1.0/xlib-2.0.gir 180share/gir-1.0/xlib-2.0.gir
176share/gir-1.0/xrandr-1.3.gir 181share/gir-1.0/xrandr-1.3.gir
177share/gobject-introspection-1.0/Makefile.introspection 182share/gobject-introspection-1.0/Makefile.introspection
178share/gobject-introspection-1.0/gdump.c 183share/gobject-introspection-1.0/gdump.c
179share/gobject-introspection-1.0/tests/annotation.c 184share/gobject-introspection-1.0/tests/annotation.c
180share/gobject-introspection-1.0/tests/annotation.h 185share/gobject-introspection-1.0/tests/annotation.h
181share/gobject-introspection-1.0/tests/drawable.c 186share/gobject-introspection-1.0/tests/drawable.c
182share/gobject-introspection-1.0/tests/drawable.h 187share/gobject-introspection-1.0/tests/drawable.h
183share/gobject-introspection-1.0/tests/everything.c 188share/gobject-introspection-1.0/tests/everything.c
184share/gobject-introspection-1.0/tests/everything.h 189share/gobject-introspection-1.0/tests/everything.h
185share/gobject-introspection-1.0/tests/foo.c 190share/gobject-introspection-1.0/tests/foo.c
cvs diff -r1.16 -r1.17 pkgsrc/devel/gobject-introspection/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/gobject-introspection/distinfo 2013/10/04 15:36:30 1.16
+++ pkgsrc/devel/gobject-introspection/distinfo 2013/12/08 13:28:27 1.17
@@ -1,10 +1,9 @@ @@ -1,10 +1,9 @@
1$NetBSD: distinfo,v 1.16 2013/10/04 15:36:30 jperkin Exp $ 1$NetBSD: distinfo,v 1.17 2013/12/08 13:28:27 prlw1 Exp $
2 2
3SHA1 (gobject-introspection-1.36.0.tar.xz) = 8f0945bda62f2bc2a5ce36e8a1ea7d4753ab0517 3SHA1 (gobject-introspection-1.38.0.tar.xz) = 51f3053f6b806efea41a38ea13d2e6ce494cf7af
4RMD160 (gobject-introspection-1.36.0.tar.xz) = bcc541a021ca409395a82fc4dd52a1353679908a 4RMD160 (gobject-introspection-1.38.0.tar.xz) = f01089754ce1586c8517ab0fafeb1f96843a8d5c
5Size (gobject-introspection-1.36.0.tar.xz) = 1201108 bytes 5Size (gobject-introspection-1.38.0.tar.xz) = 1226324 bytes
6SHA1 (patch-aa) = d7ebe6a0c81694fb537dc9cb67286fb9a0d60a9b 6SHA1 (patch-aa) = d7ebe6a0c81694fb537dc9cb67286fb9a0d60a9b
7SHA1 (patch-ac) = 52174e01aa90a5cf75cfe2f255826c1e46f8e183 7SHA1 (patch-ac) = 52174e01aa90a5cf75cfe2f255826c1e46f8e183
8SHA1 (patch-ad) = 0c67a1bb64e4e39eb9a4829e53744199a0f64fb6 8SHA1 (patch-giscanner_dumper.py) = f2acdc734b7b93429e3179ffaf53c94c0e16e819
9SHA1 (patch-giscanner_dumper.py) = 76f0173e9d8bafbc69ebe41d01b1d79fe8fbbd5b 9SHA1 (patch-giscanner_scannerlexer.l) = 371bf94fd9e4d76ab78c2d14d7dc41da83c1aa35
10SHA1 (patch-giscanner_scannerlexer.l) = 77d0c624ee28684d496af9f4a58ac771f3c693ae 
File Deleted: pkgsrc/devel/gobject-introspection/patches/Attic/patch-ad
cvs diff -r1.2 -r1.3 pkgsrc/devel/gobject-introspection/patches/Attic/patch-giscanner_dumper.py (expand / switch to unified diff)

--- pkgsrc/devel/gobject-introspection/patches/Attic/patch-giscanner_dumper.py 2013/05/15 19:17:59 1.2
+++ pkgsrc/devel/gobject-introspection/patches/Attic/patch-giscanner_dumper.py 2013/12/08 13:28:27 1.3
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1$NetBSD: patch-giscanner_dumper.py,v 1.2 2013/05/15 19:17:59 adam Exp $ 1$NetBSD: patch-giscanner_dumper.py,v 1.3 2013/12/08 13:28:27 prlw1 Exp $
2 2
3Don't treat 'clang' as Visual C++ compiler. 3Don't treat 'clang' as Visual C++ compiler.
4 4
5--- giscanner/dumper.py.orig 2013-05-15 15:30:07.000000000 +0000 5--- giscanner/dumper.py.orig 2013-09-24 13:41:09.000000000 +0000
6+++ giscanner/dumper.py 6+++ giscanner/dumper.py
7@@ -86,11 +86,6 @@ class DumpCompiler(object): 7@@ -86,12 +86,6 @@ class DumpCompiler(object):
8 self._linker_cmd = os.environ.get('CC', self._compiler_cmd) 8 self._linker_cmd = os.environ.get('CC', self._compiler_cmd)
9 self._pkgconfig_cmd = os.environ.get('PKG_CONFIG', 'pkg-config') 9 self._pkgconfig_cmd = os.environ.get('PKG_CONFIG', 'pkg-config')
10 self._pkgconfig_msvc_flags = '' 10 self._pkgconfig_msvc_flags = ''
11- # Enable the --msvc-syntax pkg-config flag when 11- # Enable the --msvc-syntax pkg-config flag when
12- # the Microsoft compiler is used 12- # the Microsoft compiler is used
13- # (This is the other way to check whether Visual C++ is used subsequently) 13- # (This is the other way to check whether Visual C++ is used subsequently)
14- if 'cl' in self._compiler_cmd: 14- args = self._compiler_cmd.split()
 15- if 'cl.exe' in args or 'cl' in args:
15- self._pkgconfig_msvc_flags = '--msvc-syntax' 16- self._pkgconfig_msvc_flags = '--msvc-syntax'
16 self._uninst_srcdir = os.environ.get( 17 self._uninst_srcdir = os.environ.get(
17 'UNINSTALLED_INTROSPECTION_SRCDIR') 18 'UNINSTALLED_INTROSPECTION_SRCDIR')
18 self._packages = ['gio-2.0 gmodule-2.0'] 19 self._packages = ['gio-2.0 gmodule-2.0']
cvs diff -r1.3 -r1.4 pkgsrc/devel/gobject-introspection/patches/Attic/patch-giscanner_scannerlexer.l (expand / switch to unified diff)

--- pkgsrc/devel/gobject-introspection/patches/Attic/patch-giscanner_scannerlexer.l 2013/10/04 15:36:30 1.3
+++ pkgsrc/devel/gobject-introspection/patches/Attic/patch-giscanner_scannerlexer.l 2013/12/08 13:28:27 1.4
@@ -1,31 +1,14 @@ @@ -1,31 +1,14 @@
1$NetBSD: patch-giscanner_scannerlexer.l,v 1.3 2013/10/04 15:36:30 jperkin Exp $ 1$NetBSD: patch-giscanner_scannerlexer.l,v 1.4 2013/12/08 13:28:27 prlw1 Exp $
2 2
3* Ignore __asm volatile as per PR pkg/46017 3Support __inline__ for older OSX.
4 https://bugzilla.gnome.org/show_bug.cgi?id=678794 
5* Support __inline__ for older OSX. 
6 4
7--- giscanner/scannerlexer.l.orig 2012-12-18 16:27:16.000000000 +0000 5--- giscanner/scannerlexer.l.orig 2013-07-10 16:13:23.000000000 +0000
8+++ giscanner/scannerlexer.l 6+++ giscanner/scannerlexer.l
9@@ -134,6 +134,8 @@ stringtext ([^\\\"])|(\\.) 7@@ -146,6 +146,7 @@ stringtext ([^\\\"])|(\\.)
10 "," { return ','; } 
11 "->" { return ARROW; } 
12  
13+"__asm"[\t\f\v\r ]+"volatile" { if (!parse_ignored_macro()) REJECT; } 
14+"__asm__"[\t\f\v\r ]+"volatile" { if (!parse_ignored_macro()) REJECT; } 
15 "__asm" { if (!parse_ignored_macro()) REJECT; } 
16 "__asm__" { if (!parse_ignored_macro()) REJECT; } 
17 "__attribute__" { if (!parse_ignored_macro()) REJECT; } 
18@@ -141,10 +143,13 @@ stringtext ([^\\\"])|(\\.) 
19 "__const" { return CONST; } 8 "__const" { return CONST; }
20 "__extension__" { return EXTENSION; } 9 "__extension__" { return EXTENSION; }
21 "__inline" { return INLINE; } 10 "__inline" { return INLINE; }
22+"__inline__" { return INLINE; } 11+"__inline__" { return INLINE; }
23 "__nonnull" { if (!parse_ignored_macro()) REJECT; } 12 "__nonnull" { if (!parse_ignored_macro()) REJECT; }
24 "__signed__" { return SIGNED; } 13 "__signed__" { return SIGNED; }
25 "__restrict" { return RESTRICT; } 14 "__restrict" { return RESTRICT; }
26 "__typeof" { if (!parse_ignored_macro()) REJECT; } 
27+"__volatile" { if (!parse_ignored_macro()) REJECT; } 
28+"__volatile__" { if (!parse_ignored_macro()) REJECT; } 
29 "_Bool" { return BOOL; } 
30  
31 "G_GINT64_CONSTANT" { return INTL_CONST; }