summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Gryniewicz <dang@gentoo.org>2005-09-13 20:00:06 +0000
committerDaniel Gryniewicz <dang@gentoo.org>2005-09-13 20:00:06 +0000
commita8d83d9500eeed19edf4e020f2e702df8e7f99de (patch)
treed65be073db933f323b0dbc7d23bcf62477695bf0 /net-im/gnomemeeting/files
parentMark 0.1.3 stable on alpha (diff)
downloadgentoo-2-a8d83d9500eeed19edf4e020f2e702df8e7f99de.tar.gz
gentoo-2-a8d83d9500eeed19edf4e020f2e702df8e7f99de.tar.bz2
gentoo-2-a8d83d9500eeed19edf4e020f2e702df8e7f99de.zip
Patch gnomemeeting 1.2.2 to use the new dbus used by gnome 2.12
(Portage version: 2.0.52-r1)
Diffstat (limited to 'net-im/gnomemeeting/files')
-rw-r--r--net-im/gnomemeeting/files/gnomemeeting-1.2.2-dbus.diff116
1 files changed, 35 insertions, 81 deletions
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: