update to 1.30.0

This switches to the new release branch.

6 files changed, 84 insertions, 15 deletions

diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile
index e542ae8d612..5940563a43d 100644
--- a/devel/gobject-introspection/Makefile
+++ b/devel/gobject-introspection/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2012/02/06 12:39:51 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2012/02/10 15:14:56 drochner Exp $
 #
 
-DISTNAME=	gobject-introspection-0.10.8
-PKGREVISION=	2
+DISTNAME=	gobject-introspection-1.30.0
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gobject-introspection/0.10/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gobject-introspection/1.30/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -44,8 +43,11 @@ SUBST_SED.timet+=	-e 's,@TIMET_CTYPE@,glong,g'
 # not executable
 CHECK_INTERPRETER_SKIP+= lib/gobject-introspection/giscanner/*.py
 
+# needed for test only
+#.include "../../graphics/cairo/buildlink3.mk"
 TEST_TARGET=	check
 
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.30.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 86f38baf2aa..7e3c156b046 100644
--- a/devel/gobject-introspection/PLIST
+++ b/devel/gobject-introspection/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/11/16 20:08:16 drochner Exp $
+@comment $NetBSD: PLIST,v 1.2 2012/02/10 15:14:56 drochner Exp $
 bin/g-ir-annotation-tool
 bin/g-ir-compiler
+bin/g-ir-doc-tool
 bin/g-ir-generate
 bin/g-ir-scanner
 include/gobject-introspection-1.0/giarginfo.h
@@ -8,7 +9,6 @@ include/gobject-introspection-1.0/gibaseinfo.h
 include/gobject-introspection-1.0/gicallableinfo.h
 include/gobject-introspection-1.0/giconstantinfo.h
 include/gobject-introspection-1.0/gienuminfo.h
-include/gobject-introspection-1.0/gierrordomaininfo.h
 include/gobject-introspection-1.0/gifieldinfo.h
 include/gobject-introspection-1.0/gifunctioninfo.h
 include/gobject-introspection-1.0/giinterfaceinfo.h
@@ -59,9 +59,15 @@ 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/config.py
-lib/gobject-introspection/giscanner/config.pyc
-lib/gobject-introspection/giscanner/config.pyo
+lib/gobject-introspection/giscanner/docbookdescription.py
+lib/gobject-introspection/giscanner/docbookdescription.pyc
+lib/gobject-introspection/giscanner/docbookdescription.pyo
+lib/gobject-introspection/giscanner/docbookwriter.py
+lib/gobject-introspection/giscanner/docbookwriter.pyc
+lib/gobject-introspection/giscanner/docbookwriter.pyo
+lib/gobject-introspection/giscanner/docmain.py
+lib/gobject-introspection/giscanner/docmain.pyc
+lib/gobject-introspection/giscanner/docmain.pyo
 lib/gobject-introspection/giscanner/dumper.py
 lib/gobject-introspection/giscanner/dumper.pyc
 lib/gobject-introspection/giscanner/dumper.pyo
@@ -83,6 +89,9 @@ 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/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
@@ -147,7 +156,6 @@ 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-GIErrorDomainInfo.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
@@ -160,6 +168,7 @@ 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
@@ -170,7 +179,6 @@ 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.devhelp
 share/gtk-doc/html/gi/gi.devhelp2
 share/gtk-doc/html/gi/girepository.html
 share/gtk-doc/html/gi/glib.html
diff --git a/devel/gobject-introspection/distinfo b/devel/gobject-introspection/distinfo
index 7061cfa23f5..2f57a0eb23b 100644
--- a/devel/gobject-introspection/distinfo
+++ b/devel/gobject-introspection/distinfo
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.6 2011/05/13 17:12:19 drochner Exp $
+$NetBSD: distinfo,v 1.7 2012/02/10 15:14:56 drochner Exp $
 
-SHA1 (gobject-introspection-0.10.8.tar.bz2) = 410268f5fd16cf0e219038c7dfe393249161b446
-RMD160 (gobject-introspection-0.10.8.tar.bz2) = f542f75920ee95c067563f14215127c3ff95f304
-Size (gobject-introspection-0.10.8.tar.bz2) = 1024874 bytes
+SHA1 (gobject-introspection-1.30.0.tar.bz2) = 58a313e758917ae0760c5147b6dd72af840927cf
+RMD160 (gobject-introspection-1.30.0.tar.bz2) = ebc44388f628ae80ad2150afeb7df3fc49032309
+Size (gobject-introspection-1.30.0.tar.bz2) = 1279723 bytes
 SHA1 (patch-aa) = d7ebe6a0c81694fb537dc9cb67286fb9a0d60a9b
 SHA1 (patch-ab) = 5cb15e68a1f249f2975d661daf566cc2ec1f6102
 SHA1 (patch-ac) = 7f716a061473fcf9853a2a508b895b3a87050fa4
+SHA1 (patch-ad) = 4086722fa0f51c332536002db36b9edbe2e71a2a
+SHA1 (patch-ae) = c29edcabecc236f40fd69fb909c45e1a2eddaa6d
+SHA1 (patch-af) = 974878388616ca066902d0f3cd20b5dd5c1b3c10
diff --git a/devel/gobject-introspection/patches/patch-ad b/devel/gobject-introspection/patches/patch-ad
new file mode 100644
index 00000000000..83bb7ddad04
--- /dev/null
+++ b/devel/gobject-introspection/patches/patch-ad
@@ -0,0 +1,26 @@
+$NetBSD: patch-ad,v 1.1 2012/02/10 15:14:56 drochner Exp $
+
+--- configure.orig	2011-11-28 14:34:23.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
+ 
+ { $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"
+ fi
+ 
diff --git a/devel/gobject-introspection/patches/patch-ae b/devel/gobject-introspection/patches/patch-ae
new file mode 100644
index 00000000000..99f9802c8e4
--- /dev/null
+++ b/devel/gobject-introspection/patches/patch-ae
@@ -0,0 +1,15 @@
+$NetBSD: patch-ae,v 1.1 2012/02/10 15:14:56 drochner Exp $
+
+compatibility with Python<2.7
+
+--- giscanner/docbookdescription.py.orig	2011-08-30 01:07:30.000000000 +0000
++++ giscanner/docbookdescription.py
+@@ -1,7 +1,7 @@
+ 
+ TAG_PROGRAM_LISTING = '<programlisting'
+ TAG_CDATA = '<![CDATA['
+-TAGS = {TAG_PROGRAM_LISTING, TAG_CDATA, ']]>', '</programlisting>'}
++TAGS = [TAG_PROGRAM_LISTING, TAG_CDATA, ']]>', '</programlisting>']
+ 
+ def get_formatted_description(description):
+     desc = description.replace("|[", "<informalexample><programlisting>") \
diff --git a/devel/gobject-introspection/patches/patch-af b/devel/gobject-introspection/patches/patch-af
new file mode 100644
index 00000000000..f0b87f573af
--- /dev/null
+++ b/devel/gobject-introspection/patches/patch-af
@@ -0,0 +1,15 @@
+$NetBSD: patch-af,v 1.1 2012/02/10 15:14:56 drochner Exp $
+
+deal with CC env var consisting of multiple words
+
+--- giscanner/sourcescanner.py.orig	2011-09-03 18:42:14.000000000 +0000
++++ giscanner/sourcescanner.py
+@@ -274,7 +274,7 @@ class SourceScanner(object):
+ 
+         defines = ['__GI_SCANNER__']
+         undefs = []
+-        cpp_args = [os.environ.get('CC', 'cc'), '-E', '-C', '-I.', '-']
++        cpp_args = os.environ.get('CC', 'cc').split() + ['-E', '-C', '-I.', '-']
+ 
+         cpp_args += self._cpp_options
+         proc = subprocess.Popen(cpp_args,