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.

6 files changed, 29 insertions, 56 deletions

diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile
index 7ad90b3833b..021f06e3c9f 100644
--- a/devel/gobject-introspection/Makefile
+++ b/devel/gobject-introspection/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.34 2013/09/02 19:50:59 adam Exp $
+# $NetBSD: Makefile,v 1.35 2013/12/08 13:28:27 prlw1 Exp $
 #
 
-DISTNAME=	gobject-introspection-1.36.0
-PKGREVISION=	3
-CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gobject-introspection/1.36/}
+DISTNAME=	gobject-introspection-1.38.0
+CATEGORIES=	devel gnome
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gobject-introspection/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -19,6 +18,7 @@ USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config flex bison gmake
 GMAKE_REQD=	3.81
 
+PKGCONFIG_OVERRIDE+=	gobject-introspection-1.0.pc.in
 PKGCONFIG_OVERRIDE+=	gobject-introspection-no-export-1.0.pc.in
 
 SUBST_CLASSES+=	timet
diff --git a/devel/gobject-introspection/PLIST b/devel/gobject-introspection/PLIST
index 645dcdd8c26..116e59bcbcf 100644
--- a/devel/gobject-introspection/PLIST
+++ b/devel/gobject-introspection/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2013/05/05 09:20:44 drochner Exp $
+@comment $NetBSD: PLIST,v 1.6 2013/12/08 13:28:27 prlw1 Exp $
 bin/g-ir-annotation-tool
 bin/g-ir-compiler
 bin/g-ir-generate
@@ -35,6 +35,7 @@ lib/girepository-1.0/cairo-1.0.typelib
 lib/girepository-1.0/fontconfig-2.0.typelib
 lib/girepository-1.0/freetype2-2.0.typelib
 lib/girepository-1.0/libxml2-2.0.typelib
+lib/girepository-1.0/win32-1.0.typelib
 lib/girepository-1.0/xfixes-4.0.typelib
 lib/girepository-1.0/xft-2.0.typelib
 lib/girepository-1.0/xlib-2.0.typelib
@@ -58,6 +59,12 @@ lib/gobject-introspection/giscanner/cachestore.pyo
 lib/gobject-introspection/giscanner/codegen.py
 lib/gobject-introspection/giscanner/codegen.pyc
 lib/gobject-introspection/giscanner/codegen.pyo
+lib/gobject-introspection/giscanner/collections/__init__.py
+lib/gobject-introspection/giscanner/collections/__init__.pyc
+lib/gobject-introspection/giscanner/collections/__init__.pyo
+lib/gobject-introspection/giscanner/collections/ordereddict.py
+lib/gobject-introspection/giscanner/collections/ordereddict.pyc
+lib/gobject-introspection/giscanner/collections/ordereddict.pyo
 lib/gobject-introspection/giscanner/docmain.py
 lib/gobject-introspection/giscanner/docmain.pyc
 lib/gobject-introspection/giscanner/docmain.pyo
@@ -124,9 +131,6 @@ lib/gobject-introspection/giscanner/maintransformer.pyo
 lib/gobject-introspection/giscanner/message.py
 lib/gobject-introspection/giscanner/message.pyc
 lib/gobject-introspection/giscanner/message.pyo
-lib/gobject-introspection/giscanner/odict.py
-lib/gobject-introspection/giscanner/odict.pyc
-lib/gobject-introspection/giscanner/odict.pyo
 lib/gobject-introspection/giscanner/scannermain.py
 lib/gobject-introspection/giscanner/scannermain.pyc
 lib/gobject-introspection/giscanner/scannermain.pyo
@@ -170,6 +174,7 @@ share/gir-1.0/cairo-1.0.gir
 share/gir-1.0/fontconfig-2.0.gir
 share/gir-1.0/freetype2-2.0.gir
 share/gir-1.0/libxml2-2.0.gir
+share/gir-1.0/win32-1.0.gir
 share/gir-1.0/xfixes-4.0.gir
 share/gir-1.0/xft-2.0.gir
 share/gir-1.0/xlib-2.0.gir
diff --git a/devel/gobject-introspection/distinfo b/devel/gobject-introspection/distinfo
index 5d2bf39f0c3..a363f202755 100644
--- a/devel/gobject-introspection/distinfo
+++ b/devel/gobject-introspection/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.16 2013/10/04 15:36:30 jperkin Exp $
+$NetBSD: distinfo,v 1.17 2013/12/08 13:28:27 prlw1 Exp $
 
-SHA1 (gobject-introspection-1.36.0.tar.xz) = 8f0945bda62f2bc2a5ce36e8a1ea7d4753ab0517
-RMD160 (gobject-introspection-1.36.0.tar.xz) = bcc541a021ca409395a82fc4dd52a1353679908a
-Size (gobject-introspection-1.36.0.tar.xz) = 1201108 bytes
+SHA1 (gobject-introspection-1.38.0.tar.xz) = 51f3053f6b806efea41a38ea13d2e6ce494cf7af
+RMD160 (gobject-introspection-1.38.0.tar.xz) = f01089754ce1586c8517ab0fafeb1f96843a8d5c
+Size (gobject-introspection-1.38.0.tar.xz) = 1226324 bytes
 SHA1 (patch-aa) = d7ebe6a0c81694fb537dc9cb67286fb9a0d60a9b
 SHA1 (patch-ac) = 52174e01aa90a5cf75cfe2f255826c1e46f8e183
-SHA1 (patch-ad) = 0c67a1bb64e4e39eb9a4829e53744199a0f64fb6
-SHA1 (patch-giscanner_dumper.py) = 76f0173e9d8bafbc69ebe41d01b1d79fe8fbbd5b
-SHA1 (patch-giscanner_scannerlexer.l) = 77d0c624ee28684d496af9f4a58ac771f3c693ae
+SHA1 (patch-giscanner_dumper.py) = f2acdc734b7b93429e3179ffaf53c94c0e16e819
+SHA1 (patch-giscanner_scannerlexer.l) = 371bf94fd9e4d76ab78c2d14d7dc41da83c1aa35
diff --git a/devel/gobject-introspection/patches/patch-ad b/devel/gobject-introspection/patches/patch-ad
deleted file mode 100644
index 8ab7188f2b9..00000000000
--- a/devel/gobject-introspection/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2013/05/05 09:20:44 drochner Exp $
-
-https://bugzilla.gnome.org/show_bug.cgi?id=698438
-
---- configure.orig	2013-03-26 01:45:30.000000000 +0000
-+++ configure
-@@ -14623,7 +14623,7 @@ if test "x$os_win32" = "xyes"; then
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libraries required to link against libpython" >&5
- $as_echo_n "checking for libraries required to link against libpython... " >&6; }
--if test "x$PYTHON_LIBS" == x; then
-+if test "x$PYTHON_LIBS" = x; then
- 	PYTHON_LIBS=`$PYTHON-config --ldflags --libs`
- fi
- 
diff --git a/devel/gobject-introspection/patches/patch-giscanner_dumper.py b/devel/gobject-introspection/patches/patch-giscanner_dumper.py
index f437c29ca14..fe453a685aa 100644
--- a/devel/gobject-introspection/patches/patch-giscanner_dumper.py
+++ b/devel/gobject-introspection/patches/patch-giscanner_dumper.py
@@ -1,17 +1,18 @@
-$NetBSD: patch-giscanner_dumper.py,v 1.2 2013/05/15 19:17:59 adam Exp $
+$NetBSD: patch-giscanner_dumper.py,v 1.3 2013/12/08 13:28:27 prlw1 Exp $
 
 Don't treat 'clang' as Visual C++ compiler.
 
---- giscanner/dumper.py.orig	2013-05-15 15:30:07.000000000 +0000
+--- giscanner/dumper.py.orig	2013-09-24 13:41:09.000000000 +0000
 +++ giscanner/dumper.py
-@@ -86,11 +86,6 @@ class DumpCompiler(object):
+@@ -86,12 +86,6 @@ class DumpCompiler(object):
          self._linker_cmd = os.environ.get('CC', self._compiler_cmd)
          self._pkgconfig_cmd = os.environ.get('PKG_CONFIG', 'pkg-config')
          self._pkgconfig_msvc_flags = ''
 -        # Enable the --msvc-syntax pkg-config flag when
 -        # the Microsoft compiler is used
 -        # (This is the other way to check whether Visual C++ is used subsequently)
--        if 'cl' in self._compiler_cmd:
+-        args = self._compiler_cmd.split()
+-        if 'cl.exe' in args or 'cl' in args:
 -            self._pkgconfig_msvc_flags = '--msvc-syntax'
          self._uninst_srcdir = os.environ.get(
              'UNINSTALLED_INTROSPECTION_SRCDIR')
diff --git a/devel/gobject-introspection/patches/patch-giscanner_scannerlexer.l b/devel/gobject-introspection/patches/patch-giscanner_scannerlexer.l
index 719d94a5552..8792695f03e 100644
--- a/devel/gobject-introspection/patches/patch-giscanner_scannerlexer.l
+++ b/devel/gobject-introspection/patches/patch-giscanner_scannerlexer.l
@@ -1,21 +1,10 @@
-$NetBSD: patch-giscanner_scannerlexer.l,v 1.3 2013/10/04 15:36:30 jperkin Exp $
+$NetBSD: patch-giscanner_scannerlexer.l,v 1.4 2013/12/08 13:28:27 prlw1 Exp $
 
-* Ignore __asm volatile as per PR pkg/46017
-  https://bugzilla.gnome.org/show_bug.cgi?id=678794
-* Support __inline__ for older OSX.
+Support __inline__ for older OSX.
 
---- giscanner/scannerlexer.l.orig	2012-12-18 16:27:16.000000000 +0000
+--- giscanner/scannerlexer.l.orig	2013-07-10 16:13:23.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; }
-@@ -141,10 +143,13 @@ stringtext				([^\\\"])|(\\.)
+@@ -146,6 +146,7 @@ stringtext				([^\\\"])|(\\.)
  "__const"                               { return CONST; }
  "__extension__"                         { return EXTENSION; }
  "__inline"				{ return INLINE; }
@@ -23,9 +12,3 @@ $NetBSD: patch-giscanner_scannerlexer.l,v 1.3 2013/10/04 15:36:30 jperkin Exp $
  "__nonnull" 			        { if (!parse_ignored_macro()) REJECT; }
  "__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; }