update to 0.10.0

sorry, no changelog available

pkgsrc change: deal with 64-bit time_t on NetBSD-current - the selftests
succeed now

5 files changed, 68 insertions, 7 deletions

diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile
index 6abf60fbd70..afad3aa6f52 100644
--- a/devel/gobject-introspection/Makefile
+++ b/devel/gobject-introspection/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/11/16 20:08:16 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2011/01/12 20:23:34 drochner Exp $
 #
 
-DISTNAME=	gobject-introspection-0.9.12
+DISTNAME=	gobject-introspection-0.10.0
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gobject-introspection/0.9/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gobject-introspection/0.10/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	obache@NetBSD.org
@@ -23,6 +23,20 @@ PKGCONFIG_OVERRIDE+=	gobject-introspection-1.0.pc.in
 PKGCONFIG_OVERRIDE+=	gobject-introspection-no-export-1.0.pc.in
 PYTHON_VERSIONS_ACCEPTED=	26 25
 
+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
+.include "../../mk/bsd.prefs.mk"
+.if !empty(MACHINE_PLATFORM:MNetBSD-5.99*) || !empty(MACHINE_PLATFORM:MNetBSD-[6-9]*)
+SUBST_SED.timet=	-e 's,@TIMET_TYPENAME@,TYPE_INT64,g'
+SUBST_SED.timet+=	-e 's,@TIMET_CTYPE@,gint64,g'
+.else
+SUBST_SED.timet=	-e 's,@TIMET_TYPENAME@,TYPE_LONG,g'
+SUBST_SED.timet+=	-e 's,@TIMET_CTYPE@,glong,g'
+.endif
+
 TEST_TARGET=	check
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/devel/gobject-introspection/distinfo b/devel/gobject-introspection/distinfo
index 3ba5a0ad72d..490553b2747 100644
--- a/devel/gobject-introspection/distinfo
+++ b/devel/gobject-introspection/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/11/16 20:08:16 drochner Exp $
+$NetBSD: distinfo,v 1.2 2011/01/12 20:23:34 drochner Exp $
 
-SHA1 (gobject-introspection-0.9.12.tar.bz2) = 3781634d469d4697bb7f448562d9d70abe12268f
-RMD160 (gobject-introspection-0.9.12.tar.bz2) = c8e36f1bb9164fd21c205e39bd083bb361410164
-Size (gobject-introspection-0.9.12.tar.bz2) = 1050788 bytes
+SHA1 (gobject-introspection-0.10.0.tar.bz2) = 7566cdf983984aba79c49f33f095bbc702385387
+RMD160 (gobject-introspection-0.10.0.tar.bz2) = 167207999709514edb798191293da369386a2e66
+Size (gobject-introspection-0.10.0.tar.bz2) = 1085036 bytes
+SHA1 (patch-aa) = d7ebe6a0c81694fb537dc9cb67286fb9a0d60a9b
+SHA1 (patch-ab) = 5cb15e68a1f249f2975d661daf566cc2ec1f6102
+SHA1 (patch-ac) = 7f716a061473fcf9853a2a508b895b3a87050fa4
diff --git a/devel/gobject-introspection/patches/patch-aa b/devel/gobject-introspection/patches/patch-aa
new file mode 100644
index 00000000000..4b210d4efd5
--- /dev/null
+++ b/devel/gobject-introspection/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2011/01/12 20:23:34 drochner Exp $
+
+--- giscanner/ast.py.orig	2010-10-23 17:23:57.000000000 +0000
++++ giscanner/ast.py
+@@ -278,7 +278,7 @@ type_names['FILE*'] = TYPE_ANY
+ # the relevant methods, but on the other hand, since these types are just
+ # integers it's easy enough to expand them.
+ type_names['size_t'] = type_names['gsize']
+-type_names['time_t'] = TYPE_LONG
++type_names['time_t'] = @TIMET_TYPENAME@
+ type_names['off_t'] = type_names['gsize']
+ type_names['pid_t'] = TYPE_INT
+ type_names['uid_t'] = TYPE_UINT
diff --git a/devel/gobject-introspection/patches/patch-ab b/devel/gobject-introspection/patches/patch-ab
new file mode 100644
index 00000000000..e11002e4695
--- /dev/null
+++ b/devel/gobject-introspection/patches/patch-ab
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..feb55f3b32c
--- /dev/null
+++ b/devel/gobject-introspection/patches/patch-ac
@@ -0,0 +1,18 @@
+$NetBSD: patch-ac,v 1.1 2011/01/12 20:23:34 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
+@@ -2115,11 +2115,11 @@ call and can be released on return.</doc
+     </function>
+     <function name="test_timet" c:identifier="regress_test_timet">
+       <return-value transfer-ownership="none">
+-        <type name="glong" c:type="time_t"/>
++        <type name="@TIMET_CTYPE@" c:type="time_t"/>
+       </return-value>
+       <parameters>
+         <parameter name="in" transfer-ownership="none">
+-          <type name="glong" c:type="time_t"/>
++          <type name="@TIMET_CTYPE@" c:type="time_t"/>
+         </parameter>
+       </parameters>
+     </function>