Wed May 15 19:17:59 2013 UTC ()
patch-giscanner_dumper.py correction


(adam)
diff -r1.14 -r1.15 pkgsrc/devel/gobject-introspection/distinfo
diff -r1.1 -r1.2 pkgsrc/devel/gobject-introspection/patches/patch-giscanner_dumper.py
cvs diff -r1.14 -r1.15 pkgsrc/devel/gobject-introspection/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/gobject-introspection/distinfo 2013/05/15 15:46:52 1.14
+++ pkgsrc/devel/gobject-introspection/distinfo 2013/05/15 19:17:59 1.15
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.14 2013/05/15 15:46:52 adam Exp $ 1$NetBSD: distinfo,v 1.15 2013/05/15 19:17:59 adam Exp $
2 2
3SHA1 (gobject-introspection-1.36.0.tar.xz) = 8f0945bda62f2bc2a5ce36e8a1ea7d4753ab0517 3SHA1 (gobject-introspection-1.36.0.tar.xz) = 8f0945bda62f2bc2a5ce36e8a1ea7d4753ab0517
4RMD160 (gobject-introspection-1.36.0.tar.xz) = bcc541a021ca409395a82fc4dd52a1353679908a 4RMD160 (gobject-introspection-1.36.0.tar.xz) = bcc541a021ca409395a82fc4dd52a1353679908a
5Size (gobject-introspection-1.36.0.tar.xz) = 1201108 bytes 5Size (gobject-introspection-1.36.0.tar.xz) = 1201108 bytes
6SHA1 (patch-aa) = d7ebe6a0c81694fb537dc9cb67286fb9a0d60a9b 6SHA1 (patch-aa) = d7ebe6a0c81694fb537dc9cb67286fb9a0d60a9b
7SHA1 (patch-ac) = 52174e01aa90a5cf75cfe2f255826c1e46f8e183 7SHA1 (patch-ac) = 52174e01aa90a5cf75cfe2f255826c1e46f8e183
8SHA1 (patch-ad) = 0c67a1bb64e4e39eb9a4829e53744199a0f64fb6 8SHA1 (patch-ad) = 0c67a1bb64e4e39eb9a4829e53744199a0f64fb6
9SHA1 (patch-giscanner_dumper.py) = 318342c8cbb406bb548aa6cb2de25590c06feb42 9SHA1 (patch-giscanner_dumper.py) = 76f0173e9d8bafbc69ebe41d01b1d79fe8fbbd5b
10SHA1 (patch-giscanner_scannerlexer.l) = 9636a0884c2ac718f1b5bfc588d691f707ea310e 10SHA1 (patch-giscanner_scannerlexer.l) = 9636a0884c2ac718f1b5bfc588d691f707ea310e
cvs diff -r1.1 -r1.2 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 15:46:52 1.1
+++ pkgsrc/devel/gobject-introspection/patches/Attic/patch-giscanner_dumper.py 2013/05/15 19:17:59 1.2
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: patch-giscanner_dumper.py,v 1.1 2013/05/15 15:46:52 adam Exp $ 1$NetBSD: patch-giscanner_dumper.py,v 1.2 2013/05/15 19:17:59 adam Exp $
2 2
3Don't treat 'clang' as Visual C++ compiler. 3Don't treat 'clang' as Visual C++ compiler.
4 4
5--- work/gobject-introspection-1.36.0//giscanner/dumper.py.orig 2013-05-15 15:30:07.000000000 +0000 5--- giscanner/dumper.py.orig 2013-05-15 15:30:07.000000000 +0000
6+++ work/gobject-introspection-1.36.0//giscanner/dumper.py 6+++ giscanner/dumper.py
7@@ -86,11 +86,6 @@ class DumpCompiler(object): 7@@ -86,11 +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- if 'cl' in self._compiler_cmd:
15- self._pkgconfig_msvc_flags = '--msvc-syntax' 15- self._pkgconfig_msvc_flags = '--msvc-syntax'
16 self._uninst_srcdir = os.environ.get( 16 self._uninst_srcdir = os.environ.get(
17 'UNINSTALLED_INTROSPECTION_SRCDIR') 17 'UNINSTALLED_INTROSPECTION_SRCDIR')
18 self._packages = ['gio-2.0 gmodule-2.0'] 18 self._packages = ['gio-2.0 gmodule-2.0']