Fix dbus version detection.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4524 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 11 insertions, 98 deletions

diff --git a/graphics/evince/files/patch-configure b/graphics/evince/files/patch-configure
new file mode 100644
index 000000000..c3e7f7db3
--- /dev/null
+++ b/graphics/evince/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Wed Aug 17 14:48:42 2005
++++ configure	Wed Aug 17 14:49:07 2005
+@@ -24377,7 +24377,7 @@
+ _ACEOF
+ 
+ 
+-	DBUS_VERSION=`$PKG_CONFIG --modversion dbus-glib-1 | sed 's/0\.\([0-9]*\)\.\?\([0-9]*\)/\1/'`
++	DBUS_VERSION=`$PKG_CONFIG --modversion dbus-glib-1 | sed 's/0\.\([0-9]*\)\.\{0,1\}\([0-9]*\)/\1/'`
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define DBUS_VERSION $DBUS_VERSION
diff --git a/graphics/evince/files/patch-shell_ev-application.c b/graphics/evince/files/patch-shell_ev-application.c
deleted file mode 100644
index 22e9926c1..000000000
--- a/graphics/evince/files/patch-shell_ev-application.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- shell/ev-application.c.orig	Tue Aug 16 13:36:09 2005
-+++ shell/ev-application.c	Tue Aug 16 13:50:19 2005
-@@ -83,13 +83,8 @@ ev_application_register_service (EvAppli
- 		return FALSE;
- 	}
- 
--#if DBUS_VERSION == 33
--	dbus_g_object_class_install_info (G_OBJECT_GET_CLASS (application),
--					  &dbus_glib_ev_application_object_info);
--#else
- 	dbus_g_object_type_install_info (EV_TYPE_APPLICATION,
- 					 &dbus_glib_ev_application_object_info);
--#endif
- 
- 	dbus_g_connection_register_g_object (connection,
- 					     "/org/gnome/evince/Evince",
diff --git a/graphics/evince/files/patch-shell_main.c b/graphics/evince/files/patch-shell_main.c
deleted file mode 100644
index 0c539eb19..000000000
--- a/graphics/evince/files/patch-shell_main.c
+++ /dev/null
@@ -1,82 +0,0 @@
---- shell/main.c.orig	Tue Aug 16 13:51:21 2005
-+++ shell/main.c	Tue Aug 16 13:52:17 2005
-@@ -75,9 +75,6 @@ load_files_remote (const char **files)
- 	GError *error = NULL;
- 	DBusGConnection *connection;
- 	gboolean result = FALSE;
--#if DBUS_VERSION < 35
--	DBusGPendingCall *call;
--#endif
- 	DBusGProxy *remote_object;
- 
- 	connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
-@@ -93,29 +90,11 @@ load_files_remote (const char **files)
-                                                    "/org/gnome/evince/Evince",
-                                                    "org.gnome.evince.Application");
- 	if (!files) {
--#if DBUS_VERSION <= 33
--		call = dbus_g_proxy_begin_call (remote_object, "OpenWindow", DBUS_TYPE_INVALID);
--
--		if (!dbus_g_proxy_end_call (remote_object, call, &error, DBUS_TYPE_INVALID)) {
--			g_warning (error->message);
--			g_clear_error (&error);
--			return FALSE;
--		}
--#elif DBUS_VERSION == 34
--		call = dbus_g_proxy_begin_call (remote_object, "OpenWindow", G_TYPE_INVALID);
--
--		if (!dbus_g_proxy_end_call (remote_object, call, &error, G_TYPE_INVALID)) {
--			g_warning (error->message);
--			g_clear_error (&error);
--			return FALSE;
--		}
--#else
- 		if (!dbus_g_proxy_call (remote_object, "OpenWindow", &error, G_TYPE_INVALID)) {
- 			g_warning (error->message);
- 			g_clear_error (&error);
- 			return FALSE;
- 		}
--#endif
- 		return TRUE;
- 	}
- 
-@@ -125,31 +104,6 @@ load_files_remote (const char **files)
- 
- 		uri = gnome_vfs_make_uri_from_shell_arg (files[i]);
- 		page_label = ev_page_label ? ev_page_label : ""; 
--#if DBUS_VERSION <= 33
--		call = dbus_g_proxy_begin_call (remote_object, "OpenURI",
--						DBUS_TYPE_STRING, &uri,
--						DBUS_TYPE_STRING, &page_label,
--						DBUS_TYPE_INVALID);
--
--		if (!dbus_g_proxy_end_call (remote_object, call, &error, DBUS_TYPE_INVALID)) {
--			g_warning (error->message);
--			g_clear_error (&error);
--			g_free (uri);
--			continue;
--		}
--#elif DBUS_VERSION == 34
--		call = dbus_g_proxy_begin_call (remote_object, "OpenURI",
--						G_TYPE_STRING, uri,
--						G_TYPE_STRING, page_label,
--						G_TYPE_INVALID);
--
--		if (!dbus_g_proxy_end_call (remote_object, call, &error, G_TYPE_INVALID)) {
--			g_warning (error->message);
--			g_clear_error (&error);
--			g_free (uri);
--			continue;
--		}
--#else
- 		if (!dbus_g_proxy_call (remote_object, "OpenURI", &error,
- 					G_TYPE_STRING, uri,
- 					G_TYPE_STRING, page_label,
-@@ -159,7 +113,6 @@ load_files_remote (const char **files)
- 			g_free (uri);
- 			continue;
- 		}
--#endif
- 		g_free (uri);
- 		result = TRUE;
-         }