Patch gnomemeeting 1.2.2 to use the new dbus used by gnome 2.12

(Portage version: 2.0.52-r1)

4 files changed, 47 insertions, 95 deletions

diff --git a/net-im/gnomemeeting/ChangeLog b/net-im/gnomemeeting/ChangeLog
index fe6ccffa2187..5f2c2e2625ee 100644
--- a/net-im/gnomemeeting/ChangeLog
+++ b/net-im/gnomemeeting/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/gnomemeeting
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/ChangeLog,v 1.59 2005/09/12 20:11:10 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/ChangeLog,v 1.60 2005/09/13 20:00:05 dang Exp $
+
+  13 Sep 2005; <dang@gentoo.org> files/gnomemeeting-1.2.2-dbus.diff,
+  gnomemeeting-1.2.2.ebuild:
+  Patch gnomemeeting 1.2.2 to use the new dbus used by gnome 2.12
 
 *gnomemeeting-1.2.2 (12 Sep 2005)
 
diff --git a/net-im/gnomemeeting/Manifest b/net-im/gnomemeeting/Manifest
index 2617e7d32cac..3be4741cfecb 100644
--- a/net-im/gnomemeeting/Manifest
+++ b/net-im/gnomemeeting/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 48cdac5c28606b38f8643fc327d9df4a gnomemeeting-1.2.1.ebuild 2998
 MD5 5e442d151db50f960aa0ed3ef72c081a gnomemeeting-1.00.ebuild 2043
 MD5 9adb1bf9d688e8be734b36bc0e54c110 gnomemeeting-1.0.2.ebuild 2286
@@ -8,7 +5,7 @@ MD5 2eca81a5c31cfef1cd02675db4e996c6 gnomemeeting-1.0.2-r1.ebuild 2288
 MD5 698cb54471981882511cf00e76533a54 gnomemeeting-0.98.5.ebuild 1855
 MD5 a90d873b38a939fba966f9b04e58ac42 gnomemeeting-0.98.0.ebuild 1687
 MD5 600e50cb52f072809c3f46a0fe8d02ed gnomemeeting-0.98.5-r1.ebuild 1860
-MD5 d0e2d6d889786438a6d56b2c5eadb40f gnomemeeting-1.2.2.ebuild 2827
+MD5 dc2a65a64a5838dcc6d0dbec718b6e26 gnomemeeting-1.2.2.ebuild 2925
 MD5 db0d9b664dde5a97c2f72ee191704be0 ChangeLog 10032
 MD5 eed4f567de688fc863665054fba871e6 metadata.xml 722
 MD5 0c651ec46c87a73e45039d9ab14fddd0 files/gnomemeeting-1.0.2-configure.diff 1304
@@ -21,13 +18,6 @@ MD5 637cd5da4664cab0b50c709e88908a31 files/digest-gnomemeeting-1.2.1 71
 MD5 22a027be44dee7bbf4a030a0392bcda8 files/digest-gnomemeeting-1.2.2 71
 MD5 1eeb16dcd662b2829936876613f02611 files/digest-gnomemeeting-0.98.5-r1 73
 MD5 0cc72cbb5df4cb6b2ac1e8d7953f79f0 files/gnomemeeting-1.00-gcc34.patch 892
-MD5 502d124d9459e770045a57078e9fcc9c files/gnomemeeting-1.2.2-dbus.diff 4549
+MD5 e154855fe35cc7fdcf276eaa2e4f2e4c files/gnomemeeting-1.2.2-dbus.diff 2007
 MD5 67fe9473695e53f1d3eb2093e925fa9b files/digest-gnomemeeting-1.00 70
 MD5 683dfd499a4dd803dd3cb8797a4d0efe files/gnomemeeting-1.2.1-configure.patch 669
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDJeM6omPajV0RnrERAgbbAJ4jv6QZXMJ902ihi4LSvlnEPZ7eVACaAqO/
-HxweBy0eKW2wSf/c1Bkx0Zs=
-=Qjcb
------END PGP SIGNATURE-----
diff --git a/net-im/gnomemeeting/files/gnomemeeting-1.2.2-dbus.diff b/net-im/gnomemeeting/files/gnomemeeting-1.2.2-dbus.diff
index 026d8015bff4..f1a2b76410af 100644
--- a/net-im/gnomemeeting/files/gnomemeeting-1.2.2-dbus.diff
+++ b/net-im/gnomemeeting/files/gnomemeeting-1.2.2-dbus.diff
@@ -1,92 +1,46 @@
---- gnomemeeting-1.2.2/configure.orig	2005-09-09 20:31:42.000000000 +0000
-+++ gnomemeeting-1.2.2/configure	2005-09-09 20:32:44.000000000 +0000
-@@ -23106,12 +23106,12 @@
-   if test "x$ac_cv_env_DBUS_CFLAGS_set" = "xset"; then
- 	pkg_cv_DBUS_CFLAGS=$ac_cv_env_DBUS_CFLAGS_value
- elif test -n "$PKG_CONFIG"; then
--	if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"dbus-1 = 0.22 dbus-glib-1 = 0.22\" >/dev/null 2>&1") >&5
--  ($PKG_CONFIG --exists "dbus-1 = 0.22 dbus-glib-1 = 0.22" >/dev/null 2>&1) 2>&5
-+	if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"dbus-1 >= 0.22 dbus-glib-1 >= 0.22\" >/dev/null 2>&1") >&5
-+  ($PKG_CONFIG --exists "dbus-1 >= 0.22 dbus-glib-1 >= 0.22" >/dev/null 2>&1) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--		pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 = 0.22 dbus-glib-1 = 0.22" 2>/dev/null`
-+		pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= 0.22 dbus-glib-1 >= 0.22" 2>/dev/null`
- 	else
- 		pkg_failed=yes
- 	fi
-@@ -23129,12 +23129,12 @@
-   if test "x$ac_cv_env_DBUS_LIBS_set" = "xset"; then
- 	pkg_cv_DBUS_LIBS=$ac_cv_env_DBUS_LIBS_value
- elif test -n "$PKG_CONFIG"; then
--	if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"dbus-1 = 0.22 dbus-glib-1 = 0.22\" >/dev/null 2>&1") >&5
--  ($PKG_CONFIG --exists "dbus-1 = 0.22 dbus-glib-1 = 0.22" >/dev/null 2>&1) 2>&5
-+	if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"dbus-1 >= 0.22 dbus-glib-1 >= 0.22\" >/dev/null 2>&1") >&5
-+  ($PKG_CONFIG --exists "dbus-1 >= 0.22 dbus-glib-1 >= 0.22" >/dev/null 2>&1) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--		pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1 = 0.22 dbus-glib-1 = 0.22" 2>/dev/null`
-+		pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1 >= 0.22 dbus-glib-1 >= 0.22" 2>/dev/null`
- 	else
- 		pkg_failed=yes
- 	fi
-@@ -23146,18 +23146,18 @@
- echo "${ECHO_T}$pkg_cv_DBUS_LIBS" >&6
- 
- if test $pkg_failed = yes; then
--	DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-1 = 0.22 dbus-glib-1 = 0.22"`
-+	DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-1 >= 0.22 dbus-glib-1 >= 0.22"`
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$DBUS_PKG_ERRORS" 1>&5
- 
--	{ { echo "$as_me:$LINENO: error: Package requirements (dbus-1 = 0.22 dbus-glib-1 = 0.22) were not met.
-+	{ { echo "$as_me:$LINENO: error: Package requirements (dbus-1 >= 0.22 dbus-glib-1 >= 0.22) were not met.
- Consider adjusting the PKG_CONFIG_PATH environment variable if you
- installed software in a non-standard prefix.
+diff --exclude-from=/home/dang/.diffrc -u -ruN gnomemeeting-1.2.2.orig/Makefile.am gnomemeeting-1.2.2/Makefile.am
+--- gnomemeeting-1.2.2.orig/Makefile.am	2004-12-02 11:45:19.000000000 -0500
++++ gnomemeeting-1.2.2/Makefile.am	2005-09-13 15:54:09.000000000 -0400
+@@ -37,7 +37,8 @@
+ 	gconftool-2 --shutdown
  
- Alternatively you may set the DBUS_CFLAGS and DBUS_LIBS environment variables
- to avoid the need to call pkg-config.  See the pkg-config man page for
- more details." >&5
--echo "$as_me: error: Package requirements (dbus-1 = 0.22 dbus-glib-1 = 0.22) were not met.
-+echo "$as_me: error: Package requirements (dbus-1 >= 0.22 dbus-glib-1 >= 0.22) were not met.
- Consider adjusting the PKG_CONFIG_PATH environment variable if you
- installed software in a non-standard prefix.
+ install-services: gnomemeeting.service
+-	cp gnomemeeting.service $(libdir)/dbus-1.0/services/
++	mkdir -p $(DESTDIR)$(libdir)/dbus-1.0/services/
++	cp gnomemeeting.service $(DESTDIR)$(libdir)/dbus-1.0/services/
  
---- gnomemeeting-1.2.2/configure.in.orig	2005-09-09 20:33:23.000000000 +0000
-+++ gnomemeeting-1.2.2/configure.in	2005-09-09 20:33:38.000000000 +0000
+ if GCONF_SCHEMAS_INSTALL
+ install-data-local: install-schemas 
+diff --exclude-from=/home/dang/.diffrc -u -ruN gnomemeeting-1.2.2.orig/configure.in gnomemeeting-1.2.2/configure.in
+--- gnomemeeting-1.2.2.orig/configure.in	2005-09-05 06:35:30.000000000 -0400
++++ gnomemeeting-1.2.2/configure.in	2005-09-13 15:52:48.000000000 -0400
 @@ -424,7 +424,7 @@
  fi
  
  if test x"${enable_dbus}" = xyes ; then
 -   PKG_CHECK_MODULES(DBUS,  dbus-1 = 0.22 dbus-glib-1 = 0.22)
-+   PKG_CHECK_MODULES(DBUS,  dbus-1 >= 0.22 dbus-glib-1 >= 0.22)
++   PKG_CHECK_MODULES(DBUS,  dbus-1 >= 0.36 dbus-glib-1 >= 0.36)
     GNOMEMEETING_CFLAGS="$GNOMEMEETING_CFLAGS $DBUS_CFLAGS -DHAS_DBUS"
     GNOMEMEETING_LIBS="$GNOMEMEETING_LIBS $DBUS_LIBS"
  fi
---- gnomemeeting-1.2.2/Makefile.am.orig	2005-09-09 20:38:42.000000000 +0000
-+++ gnomemeeting-1.2.2/Makefile.am	2005-09-09 20:38:55.000000000 +0000
-@@ -37,7 +37,7 @@
- 	gconftool-2 --shutdown
- 
- install-services: gnomemeeting.service
--	cp gnomemeeting.service $(libdir)/dbus-1.0/services/
-+	cp gnomemeeting.service $(DESTDIR)$(libdir)/dbus-1.0/services/
- 
- if GCONF_SCHEMAS_INSTALL
- install-data-local: install-schemas 
---- gnomemeeting-1.2.2/Makefile.in.orig	2005-09-09 20:37:49.000000000 +0000
-+++ gnomemeeting-1.2.2/Makefile.in	2005-09-09 20:38:30.000000000 +0000
-@@ -702,7 +702,10 @@
- 	gconftool-2 --shutdown
- 
- install-services: gnomemeeting.service
--	cp gnomemeeting.service $(libdir)/dbus-1.0/services/
-+	if [ ! -d $(DESTDIR)$(libdir)/dbus-1.0/services ]; then \
-+		mkdir -m755 -p $(DESTDIR)$(libdir)/dbus-1.0/services ; \
-+	fi
-+	cp gnomemeeting.service $(DESTDIR)$(libdir)/dbus-1.0/services/
+diff --exclude-from=/home/dang/.diffrc -u -ruN gnomemeeting-1.2.2.orig/src/dbus_component.cpp gnomemeeting-1.2.2/src/dbus_component.cpp
+--- gnomemeeting-1.2.2.orig/src/dbus_component.cpp	2005-04-06 16:10:34.000000000 -0400
++++ gnomemeeting-1.2.2/src/dbus_component.cpp	2005-09-13 15:52:48.000000000 -0400
+@@ -346,7 +346,7 @@
+     
+     if (self->owns_the_service == FALSE)
+       self->owns_the_service 
+-	= (dbus_bus_acquire_service (self->connection, 
++	= (dbus_bus_request_name (self->connection, 
+ 				     GM_DBUS_SERVICE, 0, NULL) >= 0);
+     
+  
+@@ -465,7 +465,7 @@
+ 			DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
+ 
+   if (dbus_message_is_signal (message,
+-                              DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL,
++                              DBUS_INTERFACE_LOCAL,
+                               "Disconnected"))
+     {
  
- @GCONF_SCHEMAS_INSTALL_TRUE@install-data-local: install-schemas 
- @GCONF_SCHEMAS_INSTALL_FALSE@install-data-local:
diff --git a/net-im/gnomemeeting/gnomemeeting-1.2.2.ebuild b/net-im/gnomemeeting/gnomemeeting-1.2.2.ebuild
index f6a590747d27..1620118ee4a8 100644
--- a/net-im/gnomemeeting/gnomemeeting-1.2.2.ebuild
+++ b/net-im/gnomemeeting/gnomemeeting-1.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-1.2.2.ebuild,v 1.1 2005/09/12 20:11:10 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-1.2.2.ebuild,v 1.2 2005/09/13 20:00:06 dang Exp $
 
 inherit gnome2 eutils flag-o-matic
 
@@ -39,6 +39,8 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12.0
 	>=dev-util/intltool-0.20
 	dev-lang/perl
+	>=sys-devel/automake-1.7
+	sys-devel/autoconf
 	gnome? ( app-text/scrollkeeper )"
 
 src_unpack() {
@@ -50,6 +52,8 @@ src_unpack() {
 
 	# Relax dbus version check and fix installation of service file
 	epatch ${FILESDIR}/${PN}-1.2.2-dbus.diff
+	WANT_AUTOMAKE=1.7 automake || die
+	autoconf || die
 }
 
 src_compile() {