From 298dd71ffb74c85f4ae339f044ef5b2c7c510768 Mon Sep 17 00:00:00 2001 From: marcus Date: Wed, 12 Jul 2006 21:51:43 +0000 Subject: Fix build with new gnome-vfs. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6569 df743ca5-7f9a-e211-a948-0013205c9059 --- x11-toolkits/py-gnome2/Makefile | 3 +- x11-toolkits/py-gnome2/files/patch-configure | 40 ++++++++++++++++++++-- .../py-gnome2/files/patch-gnomevfs_vfsmodule.c | 10 ++++++ 3 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 x11-toolkits/py-gnome2/files/patch-gnomevfs_vfsmodule.c (limited to 'x11-toolkits/py-gnome2') diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile index e0531f214..d220ed93a 100644 --- a/x11-toolkits/py-gnome2/Makefile +++ b/x11-toolkits/py-gnome2/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/x11-toolkits/py-gnome2/Makefile,v 1.28 2006/06/11 23:17:14 marcus Exp $ +# $MCom: ports/x11-toolkits/py-gnome2/Makefile,v 1.29 2006/07/11 06:07:50 marcus Exp $ # PORTNAME= gnome PORTVERSION= 2.15.3 +PORTREVISION= 1 CATEGORIES= x11-toolkits python gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-python/${PORTVERSION:C/..$//} diff --git a/x11-toolkits/py-gnome2/files/patch-configure b/x11-toolkits/py-gnome2/files/patch-configure index e54a06f1d..7dec7a0d7 100644 --- a/x11-toolkits/py-gnome2/files/patch-configure +++ b/x11-toolkits/py-gnome2/files/patch-configure @@ -1,5 +1,5 @@ ---- configure.orig Tue Jul 11 01:57:24 2006 -+++ configure Tue Jul 11 01:58:12 2006 +--- configure.orig Wed Jul 12 16:09:33 2006 ++++ configure Wed Jul 12 17:44:40 2006 @@ -19021,7 +19021,7 @@ else fi @@ -9,3 +9,39 @@ LIBS="$LIBS $PYTHON_EMBED_LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ +@@ -20557,7 +20557,7 @@ if test -n "$PKG_CONFIG"; then + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_GNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= 2.9.3 pyorbit-2 >= 2.0.1" 2>/dev/null` ++ pkg_cv_GNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= 2.9.3 pyorbit-2 >= 2.0.1 bonobo-activation-2.0" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -20575,7 +20575,7 @@ if test -n "$PKG_CONFIG"; then + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_GNOMEVFS_LIBS=`$PKG_CONFIG --libs "gnome-vfs-2.0 >= 2.9.3 pyorbit-2 >= 2.0.1" 2>/dev/null` ++ pkg_cv_GNOMEVFS_LIBS=`$PKG_CONFIG --libs "gnome-vfs-2.0 >= 2.9.3 pyorbit-2 >= 2.0.1 bonobo-activation-2.0" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -20643,7 +20643,7 @@ if test -n "$PKG_CONFIG"; then + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_GNOME_VFS_MODULE_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-module-2.0 >= 2.9.3" 2>/dev/null` ++ pkg_cv_GNOME_VFS_MODULE_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-module-2.0 >= 2.9.3 bonobo-activation-2.0" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -20661,7 +20661,7 @@ if test -n "$PKG_CONFIG"; then + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_GNOME_VFS_MODULE_LIBS=`$PKG_CONFIG --libs "gnome-vfs-module-2.0 >= 2.9.3" 2>/dev/null` ++ pkg_cv_GNOME_VFS_MODULE_LIBS=`$PKG_CONFIG --libs "gnome-vfs-module-2.0 >= 2.9.3 bonobo-activation-2.0" 2>/dev/null` + else + pkg_failed=yes + fi diff --git a/x11-toolkits/py-gnome2/files/patch-gnomevfs_vfsmodule.c b/x11-toolkits/py-gnome2/files/patch-gnomevfs_vfsmodule.c new file mode 100644 index 000000000..2976568b3 --- /dev/null +++ b/x11-toolkits/py-gnome2/files/patch-gnomevfs_vfsmodule.c @@ -0,0 +1,10 @@ +--- gnomevfs/vfsmodule.c.orig Wed Jul 12 17:42:39 2006 ++++ gnomevfs/vfsmodule.c Wed Jul 12 17:41:07 2006 +@@ -7,6 +7,7 @@ + #include + #include + #include ++#include + #include + + static GHashTable *monitor_hash; -- cgit v1.2.3