Update to 2.12.4:

Overview of Changes from gnome-python 2.12.3 to gnome-python 2.12.4
===================================================================
* python gnomevfs methods
 - Build problem when installation prefix != /usr fixed.

Overview of Changes from gnome-python 2.12.2 to gnome-python 2.12.3
===================================================================
* python gnomevfs methods
 - Again, fix handling of VFS errors from python vfs methods (Eitan Isaacson)
 - Don't map VFS method check_same_fs to move_func python method (Eitan)

Overview of Changes from gnome-python 2.12.1 to gnome-python 2.12.2
===================================================================
* gnomecanvas
 - Fix crash in gnomecanvas.Item.grab (Xavier Ordoquy, Gustavo)
* gnome.ui
 - Make 'custom_icon' arg of icon_lookup optional (Gustavo)
* python gnomevfs methods
 - Fix handling of VFS errors from python vfs methods (Eitan Isaacson)

Overview of Changes from gnome-python 2.12.0 to gnome-python 2.12.1
===================================================================
* Fix compilation on Mac OS X (dmacks@netspace.org)

Overview of Changes from gnome-python 2.11.3 to gnome-python 2.12.0
===================================================================
* gnomevfs
 - Fix invalid memory access in gnomevfs.async.xfer;
 - Add a new example of a GnomeVFS module written in python;
 - Install pygnomevfs.h for use by other python extensions;
* gnomecanvas
 - Demonstrate how to activate AA in the canvas example.

Overview of Changes from gnome-python 2.11.2 to gnome-python 2.11.3
===================================================================
* gnomecanvas
 - Compilation fixes with libgnomecanvas 2.11.x (Murray Cumming, Gustavo)
 - Add canvas-curve.py example demonstrating the use bezier objects
* gconf
 - Fix crash when passing the wrong number of arguments to
   client.get_pair (Gustavo)
* gnomevfs
 - New DNS-SD functions wrapped: dns_sd_browse_sync,
   dns_sd_resolve_sync, dns_sd_list_browse_domains_sync, and
   get_default_browse_domains (Gustavo)

4 files changed, 35 insertions, 4 deletions

diff --git a/x11/py-gnome2/Makefile b/x11/py-gnome2/Makefile
index 6a744c20d88..4f4b7620e9a 100644
--- a/x11/py-gnome2/Makefile
+++ b/x11/py-gnome2/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2006/07/11 17:09:07 joerg Exp $
+# $NetBSD: Makefile,v 1.39 2006/09/15 15:14:26 jmmv Exp $
 #
 
 DISTNAME=	gnome-python-2.12.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/gnome-python/gnome2/}
-PKGREVISION=	1
 CATEGORIES=	x11 python
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-python/2.12/}
 EXTRACT_SUFX=	.tar.bz2
@@ -26,6 +25,7 @@ PYTHON_VERSIONS_ACCEPTED=	24
 
 BUILDLINK_API_DEPENDS.GConf2+=	GConf2>=2.11.1
 .include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/libbonoboui/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
@@ -33,9 +33,10 @@ BUILDLINK_API_DEPENDS.GConf2+=	GConf2>=2.11.1
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 BUILDLINK_API_DEPENDS.pyorbit+=	${PYPKGPREFIX}-ORBit>=2.0.1
 .include "../../net/py-ORBit/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.9.0
+BUILDLINK_API_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.9.3
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.pygtk2+=	${PYPKGPREFIX}-gtk2>=2.6.2
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/py-gtk2/buildlink3.mk"
 
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/x11/py-gnome2/distinfo b/x11/py-gnome2/distinfo
index 433cfebff4a..58aa2ff16ac 100644
--- a/x11/py-gnome2/distinfo
+++ b/x11/py-gnome2/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.9 2006/06/22 00:14:39 joerg Exp $
+$NetBSD: distinfo,v 1.10 2006/09/15 15:14:26 jmmv Exp $
 
 SHA1 (gnome-python-2.12.4.tar.bz2) = 1a882ec8f314d458c4c115403e9e19521e135629
 RMD160 (gnome-python-2.12.4.tar.bz2) = cb2d2f27d82ecea6746169ab0976363131e110fe
 Size (gnome-python-2.12.4.tar.bz2) = 377341 bytes
 SHA1 (patch-aa) = efb2ca2b895f3023e5e60fb42cf6f460f6fce775
+SHA1 (patch-ab) = d547a4ac92364aed1f5d7f8041616760339aefd3
+SHA1 (patch-ac) = 1bbae51ab6eb363a986e55b1011445f40ca947d9
diff --git a/x11/py-gnome2/patches/patch-ab b/x11/py-gnome2/patches/patch-ab
new file mode 100644
index 00000000000..1e493f68daf
--- /dev/null
+++ b/x11/py-gnome2/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.1 2006/09/15 15:14:26 jmmv Exp $
+
+--- gnomevfs/vfsmodule.c.orig	2005-12-01 19:28:06.000000000 +0100
++++ gnomevfs/vfsmodule.c
+@@ -1,6 +1,7 @@
+ /* -*- mode: C; c-basic-offset: 4 -*- */
+ #include <pygobject.h>
+ #include "pygnomevfs-private.h"
++#include <bonobo-activation/bonobo-activation.h>
+ #include <libgnomevfs/gnome-vfs-utils.h>
+ #include <libgnomevfs/gnome-vfs-find-directory.h>
+ #include <libgnomevfs/gnome-vfs-address.h>
diff --git a/x11/py-gnome2/patches/patch-ac b/x11/py-gnome2/patches/patch-ac
new file mode 100644
index 00000000000..8fe500ac1f7
--- /dev/null
+++ b/x11/py-gnome2/patches/patch-ac
@@ -0,0 +1,16 @@
+$NetBSD: patch-ac,v 1.1 2006/09/15 15:14:26 jmmv Exp $
+
+--- gnomevfs/Makefile.in.orig	2006-03-12 22:30:10.000000000 +0100
++++ gnomevfs/Makefile.in
+@@ -269,9 +269,9 @@ common_ldflags = -module -avoid-version
+ 
+ # libgnomevfs binding
+ pkgpyexec_LTLIBRARIES = gnomevfs.la
+-gnomevfs_la_CFLAGS = $(GNOMEVFS_CFLAGS)
++gnomevfs_la_CFLAGS = $(GNOMEVFS_CFLAGS) $(BONOBO_ACTIVATION_CFLAGS)
+ gnomevfs_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initgnomevfs
+-gnomevfs_la_LIBADD = $(GNOMEVFS_LIBS)
++gnomevfs_la_LIBADD = $(GNOMEVFS_LIBS) $(BONOBO_ACTIVATION_LIBS)
+ gnomevfs_la_SOURCES = vfsmodule.c vfs-uri.c vfs-file-info.c vfs-dir-handle.c \
+  vfs-handle.c pygnomevfs.h pygnomevfs-private.h vfs-xfer-progress-info.c \
+  vfs-context.c vfs-async-handle.c vfs-volume.c vfs-drive.c vfs-volume-monitor.c