Update py-gobject3 to 3.4.0

Many bug fixes especially 32 vs 64-bit fixes, drop support for python < 2.6.
See http://git.gnome.org/browse/pygobject/plain/NEWS?id=3.4.0 for details.

5 files changed, 22 insertions, 46 deletions

diff --git a/devel/py-gobject3/Makefile b/devel/py-gobject3/Makefile
index c6135291dec..898b0cd795e 100644
--- a/devel/py-gobject3/Makefile
+++ b/devel/py-gobject3/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2012/10/03 22:14:01 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2012/10/08 21:15:03 prlw1 Exp $
 #
 
-DISTNAME=		pygobject-3.2.2
-PKGNAME=		${PYPKGPREFIX}-gobject3-3.2.2
-PKGREVISION=		4
+DISTNAME=		pygobject-3.4.0
+PKGNAME=		${PYPKGPREFIX}-gobject3-3.4.0
 CATEGORIES=		devel
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/pygobject/3.2/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/pygobject/3.4/}
 EXTRACT_SUFX=		.tar.xz
 
 MAINTAINER=		prlw1@cam.ac.uk
@@ -13,15 +12,13 @@ HOMEPAGE=		http://www.pygtk.org/
 COMMENT=		Python bindings for glib2 gobject
 LICENSE=		gnu-lgpl-v2.1
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 USE_TOOLS+=		pkg-config gmake
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		PYTHON=${PYTHONBIN:Q}
 
-PKGCONFIG_OVERRIDE+=	pygobject-3.2.pc.in
+PKGCONFIG_OVERRIDE+=	pygobject-3.4.pc.in
 PY_PATCHPLIST=		yes
 PLIST_SUBST+=		PYVERSSUFFIX=${PYVERSSUFFIX}
 CONFLICTS+=		${PYPKGPREFIX}-gtk2<2.8.4
@@ -29,10 +26,16 @@ CONFLICTS+=		${PYPKGPREFIX}-gobject<2.28.6nb4
 
 REPLACE_PYTHON+=	docs/xsl/fixxref.py.in
 
+# needed for tests only
+# https://bugzilla.gnome.org/show_bug.cgi?id=685094
+.include "../../graphics/cairo/buildlink3.mk"
+.include "../../graphics/cairo-gobject/buildlink3.mk"
+TEST_TARGET=    check
+
 .include "../../lang/python/extension.mk"
 .include "../../lang/python/application.mk"
 .include "../../graphics/py-cairo/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gobject-introspection=	gobject-introspection>=1.31.20
+BUILDLINK_API_DEPENDS.gobject-introspection=	gobject-introspection>=1.33.14
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-gobject3/PLIST b/devel/py-gobject3/PLIST
index de86072c29f..549f2159f2f 100644
--- a/devel/py-gobject3/PLIST
+++ b/devel/py-gobject3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2012/07/04 18:31:10 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.2 2012/10/08 21:15:03 prlw1 Exp $
 include/pygobject-3.0/pygobject.h
 lib/libpyglib-gi-2.0-python${PYVERSSUFFIX}.la
 lib/pkgconfig/pygobject-3.0.pc
@@ -24,6 +24,9 @@ ${PYSITELIB}/gi/_gobject/constants.pyo
 ${PYSITELIB}/gi/_gobject/propertyhelper.py
 ${PYSITELIB}/gi/_gobject/propertyhelper.pyc
 ${PYSITELIB}/gi/_gobject/propertyhelper.pyo
+${PYSITELIB}/gi/_gobject/signalhelper.py
+${PYSITELIB}/gi/_gobject/signalhelper.pyc
+${PYSITELIB}/gi/_gobject/signalhelper.pyo
 ${PYSITELIB}/gi/importer.py
 ${PYSITELIB}/gi/importer.pyc
 ${PYSITELIB}/gi/importer.pyo
diff --git a/devel/py-gobject3/buildlink3.mk b/devel/py-gobject3/buildlink3.mk
index edbc5aa6395..01d5ccfcbcf 100644
--- a/devel/py-gobject3/buildlink3.mk
+++ b/devel/py-gobject3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2012/09/20 12:00:00 prlw1 Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2012/10/08 21:15:03 prlw1 Exp $
 
 BUILDLINK_TREE+=	py-gobject3
 
@@ -8,7 +8,7 @@ PY_GOBJECT3_BUILDLINK3_MK:=
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.py-gobject3+=	${PYPKGPREFIX}-gobject3>=3.2.2
-BUILDLINK_ABI_DEPENDS.py-gobject3?=	${PYPKGPREFIX}-gobject3>=3.2.2nb3
+BUILDLINK_ABI_DEPENDS.py-gobject3?=	${PYPKGPREFIX}-gobject3>=3.4.0
 BUILDLINK_PKGSRCDIR.py-gobject3?=	../../devel/py-gobject3
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/devel/py-gobject3/distinfo b/devel/py-gobject3/distinfo
index da35c6c66f0..dfe15ad0e27 100644
--- a/devel/py-gobject3/distinfo
+++ b/devel/py-gobject3/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/09/20 12:00:00 prlw1 Exp $
+$NetBSD: distinfo,v 1.3 2012/10/08 21:15:03 prlw1 Exp $
 
-SHA1 (pygobject-3.2.2.tar.xz) = b34405357d69412657904775a207a4a8357a934d
-RMD160 (pygobject-3.2.2.tar.xz) = 090fa4941fa30e68882e25856d92230ebdd0cea9
-Size (pygobject-3.2.2.tar.xz) = 564712 bytes
-SHA1 (patch-gi_pygi-argument.c) = 8df8557487944c54dabfbab66097278311f99752
+SHA1 (pygobject-3.4.0.tar.xz) = cd987de5794835bd47710b3c2c68514ea02eeebd
+RMD160 (pygobject-3.4.0.tar.xz) = c2085e99c4e39d4c4f7567bcadff1612addbf4fb
+Size (pygobject-3.4.0.tar.xz) = 607804 bytes
diff --git a/devel/py-gobject3/patches/patch-gi_pygi-argument.c b/devel/py-gobject3/patches/patch-gi_pygi-argument.c
deleted file mode 100644
index 13e5fcdd920..00000000000
--- a/devel/py-gobject3/patches/patch-gi_pygi-argument.c
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-gi_pygi-argument.c,v 1.1 2012/09/20 12:00:00 prlw1 Exp $
-
-commit 4e4c87e3: Fix 64bit integer convertion from GValue
-https://bugzilla.gnome.org/show_bug.cgi?id=683596
-
---- gi/pygi-argument.c.orig	2012-05-14 16:49:12.000000000 +0000
-+++ gi/pygi-argument.c
-@@ -1836,15 +1836,19 @@ _pygi_argument_from_g_value(const GValue
-         case GI_TYPE_TAG_INT8:
-         case GI_TYPE_TAG_INT16:
-         case GI_TYPE_TAG_INT32:
--        case GI_TYPE_TAG_INT64:
-             arg.v_int = g_value_get_int (value);
-             break;
-+        case GI_TYPE_TAG_INT64:
-+            arg.v_int64 = g_value_get_int64 (value);
-+            break;
-         case GI_TYPE_TAG_UINT8:
-         case GI_TYPE_TAG_UINT16:
-         case GI_TYPE_TAG_UINT32:
--        case GI_TYPE_TAG_UINT64:
-             arg.v_uint = g_value_get_uint (value);
-             break;
-+        case GI_TYPE_TAG_UINT64:
-+            arg.v_uint64 = g_value_get_uint64 (value);
-+            break;
-         case GI_TYPE_TAG_UNICHAR:
-             arg.v_uint32 = g_value_get_schar (value);
-             break;