diff options
Diffstat (limited to 'net-im/ekiga/files/ekiga-1.99.0-dbus.diff')
| -rw-r--r-- | net-im/ekiga/files/ekiga-1.99.0-dbus.diff | 92 |
1 files changed, 0 insertions, 92 deletions
diff --git a/net-im/ekiga/files/ekiga-1.99.0-dbus.diff b/net-im/ekiga/files/ekiga-1.99.0-dbus.diff deleted file mode 100644 index 026d801..0000000 --- a/net-im/ekiga/files/ekiga-1.99.0-dbus.diff +++ /dev/null @@ -1,92 +0,0 @@ ---- 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. - - 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. - ---- 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 -@@ -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) - 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/ - - @GCONF_SCHEMAS_INSTALL_TRUE@install-data-local: install-schemas - @GCONF_SCHEMAS_INSTALL_FALSE@install-data-local: |