update to 1.36.0, mostly from Patrick Welche

This switches to the new stable release branch.

7 files changed, 99 insertions, 117 deletions

diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile
index afefb8af058..054603881b5 100644
--- a/devel/gobject-introspection/Makefile
+++ b/devel/gobject-introspection/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.29 2013/02/16 11:20:45 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2013/05/05 09:20:44 drochner Exp $
 #
 
-DISTNAME=	gobject-introspection-1.34.2
-PKGREVISION=	1
+DISTNAME=	gobject-introspection-1.36.0
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gobject-introspection/1.34/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gobject-introspection/1.36/}
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -24,8 +23,7 @@ PKGCONFIG_OVERRIDE+=	gobject-introspection-no-export-1.0.pc.in
 SUBST_CLASSES+=	timet
 SUBST_STAGE.timet=	pre-configure
 SUBST_FILES.timet=	giscanner/ast.py
-SUBST_FILES.timet+=	tests/scanner/Foo-1.0-expected.gir \
-			tests/scanner/Regress-1.0-expected.gir
+SUBST_FILES.timet+=	tests/scanner/Regress-1.0-expected.gir
 .include "../../mk/bsd.prefs.mk"
 .if !empty(MACHINE_PLATFORM:MNetBSD-5.99*) || !empty(MACHINE_PLATFORM:MNetBSD-[6-9]*) || !empty(MACHINE_PLATFORM:MMirBSD)
 SUBST_SED.timet=	-e 's,@TIMET_TYPENAME@,TYPE_INT64,g'
@@ -46,7 +44,7 @@ CONFIGURE_ARGS+=	--disable-tests
 #.include "../../graphics/cairo-gobject/buildlink3.mk"
 #TEST_TARGET=	check
 
-BUILDLINK_API_DEPENDS.glib2+= glib2>=2.34.1
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.36.0
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libffi/buildlink3.mk"
 .include "../../lang/python/application.mk"
diff --git a/devel/gobject-introspection/PLIST b/devel/gobject-introspection/PLIST
index fffa190d5a3..645dcdd8c26 100644
--- a/devel/gobject-introspection/PLIST
+++ b/devel/gobject-introspection/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2012/10/07 10:23:51 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.5 2013/05/05 09:20:44 drochner Exp $
 bin/g-ir-annotation-tool
 bin/g-ir-compiler
 bin/g-ir-generate
@@ -49,9 +49,6 @@ lib/gobject-introspection/giscanner/annotationmain.pyo
 lib/gobject-introspection/giscanner/annotationparser.py
 lib/gobject-introspection/giscanner/annotationparser.pyc
 lib/gobject-introspection/giscanner/annotationparser.pyo
-lib/gobject-introspection/giscanner/annotationpatterns.py
-lib/gobject-introspection/giscanner/annotationpatterns.pyc
-lib/gobject-introspection/giscanner/annotationpatterns.pyo
 lib/gobject-introspection/giscanner/ast.py
 lib/gobject-introspection/giscanner/ast.pyc
 lib/gobject-introspection/giscanner/ast.pyo
@@ -64,6 +61,45 @@ lib/gobject-introspection/giscanner/codegen.pyo
 lib/gobject-introspection/giscanner/docmain.py
 lib/gobject-introspection/giscanner/docmain.pyc
 lib/gobject-introspection/giscanner/docmain.pyo
+lib/gobject-introspection/giscanner/doctemplates/C/class.tmpl
+lib/gobject-introspection/giscanner/doctemplates/C/constructor.tmpl
+lib/gobject-introspection/giscanner/doctemplates/C/default.tmpl
+lib/gobject-introspection/giscanner/doctemplates/C/enum.tmpl
+lib/gobject-introspection/giscanner/doctemplates/C/function.tmpl
+lib/gobject-introspection/giscanner/doctemplates/C/method.tmpl
+lib/gobject-introspection/giscanner/doctemplates/C/namespace.tmpl
+lib/gobject-introspection/giscanner/doctemplates/C/property.tmpl
+lib/gobject-introspection/giscanner/doctemplates/C/record.tmpl
+lib/gobject-introspection/giscanner/doctemplates/C/signal.tmpl
+lib/gobject-introspection/giscanner/doctemplates/C/vfunc.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Gjs/class.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Gjs/constructor.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Gjs/default.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Gjs/enum.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Gjs/function.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Gjs/method.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Gjs/namespace.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Gjs/property.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Gjs/record.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Gjs/signal.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Gjs/vfunc.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Python/class.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Python/constructor.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Python/default.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Python/enum.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Python/function.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Python/method.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Python/namespace.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Python/property.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Python/record.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Python/signal.tmpl
+lib/gobject-introspection/giscanner/doctemplates/Python/vfunc.tmpl
+lib/gobject-introspection/giscanner/doctemplates/base.tmpl
+lib/gobject-introspection/giscanner/doctemplates/class.tmpl
+lib/gobject-introspection/giscanner/doctemplates/namespace.tmpl
+lib/gobject-introspection/giscanner/docwriter.py
+lib/gobject-introspection/giscanner/docwriter.pyc
+lib/gobject-introspection/giscanner/docwriter.pyo
 lib/gobject-introspection/giscanner/dumper.py
 lib/gobject-introspection/giscanner/dumper.pyc
 lib/gobject-introspection/giscanner/dumper.pyo
@@ -85,27 +121,6 @@ lib/gobject-introspection/giscanner/libtoolimporter.pyo
 lib/gobject-introspection/giscanner/maintransformer.py
 lib/gobject-introspection/giscanner/maintransformer.pyc
 lib/gobject-introspection/giscanner/maintransformer.pyo
-lib/gobject-introspection/giscanner/mallard-C-class.tmpl
-lib/gobject-introspection/giscanner/mallard-C-default.tmpl
-lib/gobject-introspection/giscanner/mallard-C-enum.tmpl
-lib/gobject-introspection/giscanner/mallard-C-function.tmpl
-lib/gobject-introspection/giscanner/mallard-C-namespace.tmpl
-lib/gobject-introspection/giscanner/mallard-C-property.tmpl
-lib/gobject-introspection/giscanner/mallard-C-record.tmpl
-lib/gobject-introspection/giscanner/mallard-C-signal.tmpl
-lib/gobject-introspection/giscanner/mallard-C-vfunc.tmpl
-lib/gobject-introspection/giscanner/mallard-Python-class.tmpl
-lib/gobject-introspection/giscanner/mallard-Python-default.tmpl
-lib/gobject-introspection/giscanner/mallard-Python-enum.tmpl
-lib/gobject-introspection/giscanner/mallard-Python-function.tmpl
-lib/gobject-introspection/giscanner/mallard-Python-namespace.tmpl
-lib/gobject-introspection/giscanner/mallard-Python-property.tmpl
-lib/gobject-introspection/giscanner/mallard-Python-record.tmpl
-lib/gobject-introspection/giscanner/mallard-Python-signal.tmpl
-lib/gobject-introspection/giscanner/mallard-Python-vfunc.tmpl
-lib/gobject-introspection/giscanner/mallardwriter.py
-lib/gobject-introspection/giscanner/mallardwriter.pyc
-lib/gobject-introspection/giscanner/mallardwriter.pyo
 lib/gobject-introspection/giscanner/message.py
 lib/gobject-introspection/giscanner/message.pyc
 lib/gobject-introspection/giscanner/message.pyo
@@ -115,6 +130,9 @@ lib/gobject-introspection/giscanner/odict.pyo
 lib/gobject-introspection/giscanner/scannermain.py
 lib/gobject-introspection/giscanner/scannermain.pyc
 lib/gobject-introspection/giscanner/scannermain.pyo
+lib/gobject-introspection/giscanner/sectionparser.py
+lib/gobject-introspection/giscanner/sectionparser.pyc
+lib/gobject-introspection/giscanner/sectionparser.pyo
 lib/gobject-introspection/giscanner/shlibs.py
 lib/gobject-introspection/giscanner/shlibs.pyc
 lib/gobject-introspection/giscanner/shlibs.pyo
@@ -158,49 +176,19 @@ share/gir-1.0/xlib-2.0.gir
 share/gir-1.0/xrandr-1.3.gir
 share/gobject-introspection-1.0/Makefile.introspection
 share/gobject-introspection-1.0/gdump.c
+share/gobject-introspection-1.0/tests/annotation.c
+share/gobject-introspection-1.0/tests/annotation.h
+share/gobject-introspection-1.0/tests/drawable.c
+share/gobject-introspection-1.0/tests/drawable.h
 share/gobject-introspection-1.0/tests/everything.c
 share/gobject-introspection-1.0/tests/everything.h
+share/gobject-introspection-1.0/tests/foo.c
+share/gobject-introspection-1.0/tests/foo.h
 share/gobject-introspection-1.0/tests/gimarshallingtests.c
 share/gobject-introspection-1.0/tests/gimarshallingtests.h
 share/gobject-introspection-1.0/tests/regress.c
 share/gobject-introspection-1.0/tests/regress.h
-share/gtk-doc/html/gi/annotation-glossary.html
-share/gtk-doc/html/gi/gi-GIArgInfo.html
-share/gtk-doc/html/gi/gi-GIBaseInfo.html
-share/gtk-doc/html/gi/gi-GICallableInfo.html
-share/gtk-doc/html/gi/gi-GIConstantInfo.html
-share/gtk-doc/html/gi/gi-GIEnumInfo.html
-share/gtk-doc/html/gi/gi-GIFieldInfo.html
-share/gtk-doc/html/gi/gi-GIFunctionInfo.html
-share/gtk-doc/html/gi/gi-GIInterfaceInfo.html
-share/gtk-doc/html/gi/gi-GIObjectInfo.html
-share/gtk-doc/html/gi/gi-GIPropertyInfo.html
-share/gtk-doc/html/gi/gi-GIRegisteredTypeInfo.html
-share/gtk-doc/html/gi/gi-GISignalInfo.html
-share/gtk-doc/html/gi/gi-GIStructInfo.html
-share/gtk-doc/html/gi/gi-GITypeInfo.html
-share/gtk-doc/html/gi/gi-GIUnionInfo.html
-share/gtk-doc/html/gi/gi-GIVFuncInfo.html
-share/gtk-doc/html/gi/gi-ffi.html
-share/gtk-doc/html/gi/gi-gierrordomaininfo.html
-share/gtk-doc/html/gi/gi-gir-reference.html
-share/gtk-doc/html/gi/gi-gir.html
-share/gtk-doc/html/gi/gi-girepository.html
-share/gtk-doc/html/gi/gi-girffi.html
-share/gtk-doc/html/gi/gi-gtypelib.html
-share/gtk-doc/html/gi/gi-libgirepository.html
-share/gtk-doc/html/gi/gi-overview.html
-share/gtk-doc/html/gi/gi-repository-structs.html
-share/gtk-doc/html/gi/gi-struct-hierarchy.html
-share/gtk-doc/html/gi/gi-typelib.html
-share/gtk-doc/html/gi/gi.devhelp2
-share/gtk-doc/html/gi/girepository.html
-share/gtk-doc/html/gi/glib.html
-share/gtk-doc/html/gi/home.png
-share/gtk-doc/html/gi/index.html
-share/gtk-doc/html/gi/index.sgml
-share/gtk-doc/html/gi/left.png
-share/gtk-doc/html/gi/overview.png
-share/gtk-doc/html/gi/right.png
-share/gtk-doc/html/gi/style.css
-share/gtk-doc/html/gi/up.png
+share/gobject-introspection-1.0/tests/utility.c
+share/gobject-introspection-1.0/tests/utility.h
+share/gobject-introspection-1.0/tests/warnlib.c
+share/gobject-introspection-1.0/tests/warnlib.h
diff --git a/devel/gobject-introspection/distinfo b/devel/gobject-introspection/distinfo
index 611a0dfbe22..666fc531a81 100644
--- a/devel/gobject-introspection/distinfo
+++ b/devel/gobject-introspection/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.12 2012/11/15 14:56:34 drochner Exp $
+$NetBSD: distinfo,v 1.13 2013/05/05 09:20:44 drochner Exp $
 
-SHA1 (gobject-introspection-1.34.2.tar.xz) = 3c9824422ef485dafa341496a3d57bef217e2853
-RMD160 (gobject-introspection-1.34.2.tar.xz) = 83b766bb16500b799e23dcabff915e9863197862
-Size (gobject-introspection-1.34.2.tar.xz) = 1088768 bytes
+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 (patch-aa) = d7ebe6a0c81694fb537dc9cb67286fb9a0d60a9b
-SHA1 (patch-ab) = 5cb15e68a1f249f2975d661daf566cc2ec1f6102
-SHA1 (patch-ac) = 7f716a061473fcf9853a2a508b895b3a87050fa4
-SHA1 (patch-ad) = 4086722fa0f51c332536002db36b9edbe2e71a2a
-SHA1 (patch-giscanner_scannerlexer.l) = 69152ebb060b87083d32aff6ad2a6195c9987c59
+SHA1 (patch-ac) = 52174e01aa90a5cf75cfe2f255826c1e46f8e183
+SHA1 (patch-ad) = 0c67a1bb64e4e39eb9a4829e53744199a0f64fb6
+SHA1 (patch-giscanner_scannerlexer.l) = 9636a0884c2ac718f1b5bfc588d691f707ea310e
diff --git a/devel/gobject-introspection/patches/patch-ab b/devel/gobject-introspection/patches/patch-ab
deleted file mode 100644
index e11002e4695..00000000000
--- a/devel/gobject-introspection/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2011/01/12 20:23:34 drochner Exp $
-
---- tests/scanner/Foo-1.0-expected.gir.orig	2010-09-17 12:31:58.000000000 +0000
-+++ tests/scanner/Foo-1.0-expected.gir
-@@ -422,7 +422,7 @@ uses a C sugar return type.</doc>
-         </return-value>
-         <parameters>
-           <parameter name="time" transfer-ownership="none">
--            <type name="glong" c:type="time_t"/>
-+            <type name="@TIMET_CTYPE@" c:type="time_t"/>
-           </parameter>
-         </parameters>
-       </method>
diff --git a/devel/gobject-introspection/patches/patch-ac b/devel/gobject-introspection/patches/patch-ac
index feb55f3b32c..18c179b7549 100644
--- a/devel/gobject-introspection/patches/patch-ac
+++ b/devel/gobject-introspection/patches/patch-ac
@@ -1,8 +1,17 @@
-$NetBSD: patch-ac,v 1.1 2011/01/12 20:23:34 drochner Exp $
+$NetBSD: patch-ac,v 1.2 2013/05/05 09:20:44 drochner Exp $
 
---- tests/scanner/Regress-1.0-expected.gir.orig	2010-12-17 17:03:58.000000000 +0000
+--- tests/scanner/Regress-1.0-expected.gir.orig	2013-03-06 22:53:19.000000000 +0000
 +++ tests/scanner/Regress-1.0-expected.gir
-@@ -2115,11 +2115,11 @@ call and can be released on return.</doc
+@@ -1403,7 +1403,7 @@ uses a C sugar return type.</doc>
+             <type name="FooObject" c:type="RegressFooObject*"/>
+           </instance-parameter>
+           <parameter name="time" transfer-ownership="none">
+-            <type name="glong" c:type="time_t"/>
++            <type name="@TIMET_CTYPE@" c:type="time_t"/>
+           </parameter>
+         </parameters>
+       </method>
+@@ -6007,11 +6007,11 @@ https://bugzilla.gnome.org/show_bug.cgi?
      </function>
      <function name="test_timet" c:identifier="regress_test_timet">
        <return-value transfer-ownership="none">
diff --git a/devel/gobject-introspection/patches/patch-ad b/devel/gobject-introspection/patches/patch-ad
index 83bb7ddad04..8ab7188f2b9 100644
--- a/devel/gobject-introspection/patches/patch-ad
+++ b/devel/gobject-introspection/patches/patch-ad
@@ -1,26 +1,15 @@
-$NetBSD: patch-ad,v 1.1 2012/02/10 15:14:56 drochner Exp $
+$NetBSD: patch-ad,v 1.2 2013/05/05 09:20:44 drochner Exp $
 
---- configure.orig	2011-11-28 14:34:23.000000000 +0000
+https://bugzilla.gnome.org/show_bug.cgi?id=698438
+
+--- configure.orig	2013-03-26 01:45:30.000000000 +0000
 +++ configure
-@@ -14400,7 +14400,7 @@ esac
- $as_echo_n "checking for headers required to compile python extensions... " >&6; }
- py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
- py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
--if test "x$PYTHON_INCLUDES" == x; then
-+if test "x$PYTHON_INCLUDES" = x; then
-   PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
-   if test "$py_prefix" != "$py_exec_prefix"; then
-     PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
-@@ -14429,10 +14429,10 @@ if test "x$os_win32" = "xyes"; then
+@@ -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="-L${py_prefix}/lib -lpython${PYTHON_VERSION}"
- fi
--if test "x$PYTHON_LIB_LOC" == x; then
-+if test "x$PYTHON_LIB_LOC" = x; then
- 	PYTHON_LIB_LOC="${py_prefix}/lib"
+ 	PYTHON_LIBS=`$PYTHON-config --ldflags --libs`
  fi
  
diff --git a/devel/gobject-introspection/patches/patch-giscanner_scannerlexer.l b/devel/gobject-introspection/patches/patch-giscanner_scannerlexer.l
index aa469764006..43c2636e5ba 100644
--- a/devel/gobject-introspection/patches/patch-giscanner_scannerlexer.l
+++ b/devel/gobject-introspection/patches/patch-giscanner_scannerlexer.l
@@ -1,8 +1,11 @@
-$NetBSD: patch-giscanner_scannerlexer.l,v 1.1 2012/02/15 16:42:36 martin Exp $
+$NetBSD: patch-giscanner_scannerlexer.l,v 1.2 2013/05/05 09:20:44 drochner Exp $
 
---- giscanner/scannerlexer.l.orig	2011-06-10 17:36:50.000000000 +0200
-+++ giscanner/scannerlexer.l	2012-02-15 16:10:33.000000000 +0100
-@@ -134,6 +134,8 @@
+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; }
  
@@ -11,3 +14,12 @@ $NetBSD: patch-giscanner_scannerlexer.l,v 1.1 2012/02/15 16:42:36 martin Exp $
  "__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; }