diff options
author | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-08-15 17:39:37 +0200 |
---|---|---|
committer | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-08-15 17:39:37 +0200 |
commit | 86bba1f117dca30257a6c39f756bf55ef9aeca6f (patch) | |
tree | ea9deafa8b535a9628374a07ff7bc38d5a6f4db2 | |
parent | 92910fe1806e2d3d4eaa211d38e3d73ac18486da (diff) |
dbus-glib: remove old versions
Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
-rw-r--r-- | recipes/dbus/dbus-glib-0.76/no-examples.patch | 8 | ||||
-rw-r--r-- | recipes/dbus/dbus-glib-0.76/no-introspect.patch | 14 | ||||
-rw-r--r-- | recipes/dbus/dbus-glib-0.76/run-with-tmp-session-bus.patch | 24 | ||||
-rw-r--r-- | recipes/dbus/dbus-glib-0.82/fix-async-dbus.patch | 115 | ||||
-rw-r--r-- | recipes/dbus/dbus-glib-0.82/no-examples.patch | 8 | ||||
-rw-r--r-- | recipes/dbus/dbus-glib-0.82/no-introspect.patch | 14 | ||||
-rw-r--r-- | recipes/dbus/dbus-glib-0.82/run-with-tmp-session-bus.patch | 24 | ||||
-rw-r--r-- | recipes/dbus/dbus-glib_0.76.bb | 13 | ||||
-rw-r--r-- | recipes/dbus/dbus-glib_0.82.bb | 13 |
9 files changed, 0 insertions, 233 deletions
diff --git a/recipes/dbus/dbus-glib-0.76/no-examples.patch b/recipes/dbus/dbus-glib-0.76/no-examples.patch deleted file mode 100644 index 483153db74..0000000000 --- a/recipes/dbus/dbus-glib-0.76/no-examples.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- dbus-glib-0.70/dbus/Makefile.am.orig 2006-07-23 16:04:43.000000000 +0200 -+++ dbus-glib-0.70/dbus/Makefile.am 2006-07-23 16:04:52.000000000 +0200 -@@ -1,4 +1,4 @@ --SUBDIRS = . examples -+SUBDIRS = . - - INCLUDES=-I$(top_srcdir) $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS) -DDBUS_COMPILATION=1 -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" - diff --git a/recipes/dbus/dbus-glib-0.76/no-introspect.patch b/recipes/dbus/dbus-glib-0.76/no-introspect.patch deleted file mode 100644 index 9115801f71..0000000000 --- a/recipes/dbus/dbus-glib-0.76/no-introspect.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: dbus-glib-0.73/tools/Makefile.am -=================================================================== ---- dbus-glib-0.73.orig/tools/Makefile.am 2006-10-25 21:10:36.000000000 +0200 -+++ dbus-glib-0.73/tools/Makefile.am 2006-10-27 10:07:35.000000000 +0200 -@@ -3,9 +3,6 @@ - nodist_libdbus_glib_HEADERS = dbus-glib-bindings.h - libdbus_glibdir = $(includedir)/dbus-1.0/dbus - --dbus-glib-bindings.h: dbus-bus-introspect.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT) -- $(top_builddir)/dbus/dbus-binding-tool --mode=glib-client --prefix=dbus_bus --output=dbus-glib-bindings.h dbus-bus-introspect.xml -- - BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml - - if USE_INTROSPECT_XML diff --git a/recipes/dbus/dbus-glib-0.76/run-with-tmp-session-bus.patch b/recipes/dbus/dbus-glib-0.76/run-with-tmp-session-bus.patch deleted file mode 100644 index a04f404f75..0000000000 --- a/recipes/dbus/dbus-glib-0.76/run-with-tmp-session-bus.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: dbus-glib-0.76/tools/run-with-tmp-session-bus.sh -=================================================================== ---- dbus-glib-0.76.orig/tools/run-with-tmp-session-bus.sh 2008-06-13 16:31:54.000000000 +0100 -+++ dbus-glib-0.76/tools/run-with-tmp-session-bus.sh 2008-06-13 16:32:54.000000000 +0100 -@@ -30,17 +30,15 @@ - echo "escaped service dir is: $ESCAPED_SERVICE_DIR" >&2 - - ## create a configuration file based on the standard session.conf --cat $DBUS_TOP_SRCDIR/tools/session.conf | \ -+cat $datadir/tools/session.conf | \ - sed -e 's/<servicedir>.*$/<servicedir>'$ESCAPED_SERVICE_DIR'<\/servicedir>/g' | \ - sed -e 's/<include.*$//g' \ - > $CONFIG_FILE - - echo "Created configuration file $CONFIG_FILE" >&2 - --PATH=$DBUS_TOP_BUILDDIR/bus:$PATH --export PATH - ## the libtool script found by the path search should already do this, but --LD_LIBRARY_PATH=$DBUS_TOP_BUILDDIR/dbus/.libs:$LD_LIBRARY_PATH -+LD_LIBRARY_PATH=$libdir:$LD_LIBRARY_PATH - export PATH - unset DBUS_SESSION_BUS_ADDRESS - unset DBUS_SESSION_BUS_PID diff --git a/recipes/dbus/dbus-glib-0.82/fix-async-dbus.patch b/recipes/dbus/dbus-glib-0.82/fix-async-dbus.patch deleted file mode 100644 index 0cea12431f..0000000000 --- a/recipes/dbus/dbus-glib-0.82/fix-async-dbus.patch +++ /dev/null @@ -1,115 +0,0 @@ -diff -ur dbus-glib-0.78/dbus/dbus-gproxy.c patched/dbus-glib-0.78/dbus/dbus-gproxy.c ---- dbus-glib-0.78/dbus/dbus-gproxy.c 2008-11-17 19:45:50.000000000 +0100 -+++ patched/dbus-glib-0.78/dbus/dbus-gproxy.c 2009-01-30 18:12:51.000000000 +0100 -@@ -2175,6 +2175,41 @@ - return NULL; - } - -+struct dbus_g_proxy_begin_call_internal_helper_args -+{ -+ DBusGProxy *proxy; -+ DBusGProxyCallNotify notify; -+ guint call_id; -+ gpointer user_data; -+ GDestroyNotify destroy; -+}; -+ -+static void -+dbus_g_proxy_begin_call_internal_helper (DBusPendingCall *pending, void *user_data) -+{ -+ struct dbus_g_proxy_begin_call_internal_helper_args *t1 = user_data; -+ DBusGProxyPrivate *priv = DBUS_G_PROXY_GET_PRIVATE(t1->proxy); -+ GPendingNotifyClosure *closure; -+ -+ -+ t1->call_id = ++priv->call_id_counter; -+ -+ if (t1->notify != NULL) -+ { -+ closure = g_new (GPendingNotifyClosure, 1); -+ closure->proxy = t1->proxy; /* No need to ref as the lifecycle is tied to proxy */ -+ closure->call_id = t1->call_id; -+ closure->func = t1->notify; -+ closure->data = t1->user_data; -+ closure->free_data_func = t1->destroy; -+ dbus_pending_call_set_notify (pending, d_pending_call_notify, -+ closure, -+ d_pending_call_free); -+ } -+ -+ g_hash_table_insert (priv->pending_calls, GUINT_TO_POINTER (t1->call_id), pending); -+} -+ - static guint - dbus_g_proxy_begin_call_internal (DBusGProxy *proxy, - const char *method, -@@ -2182,52 +2217,42 @@ - gpointer user_data, - GDestroyNotify destroy, - GValueArray *args, -- int timeout) -+ int timeout) - { -+ struct dbus_g_proxy_begin_call_internal_helper_args t1; -+ - DBusMessage *message; - DBusPendingCall *pending; -- GPendingNotifyClosure *closure; -- guint call_id; - DBusGProxyPrivate *priv = DBUS_G_PROXY_GET_PRIVATE(proxy); - -+ t1.proxy = proxy; -+ t1.notify = notify; -+ t1.user_data = user_data; -+ t1.destroy = destroy; -+ - pending = NULL; - - message = dbus_g_proxy_marshal_args_to_message (proxy, method, args); - if (!message) - goto oom; - -- if (!dbus_connection_send_with_reply (priv->manager->connection, -- message, -- &pending, -- timeout)) -+ if (!dbus_connection_send_with_reply_setup (priv->manager->connection, -+ message, -+ &pending, -+ dbus_g_proxy_begin_call_internal_helper, -+ &t1, -+ timeout)) - goto oom; - dbus_message_unref (message); -- -+ - /* If we got a NULL pending, that means the connection was disconnected, -- * and we need to abort this call. -+ * and we need to abort this call. - * https://bugs.freedesktop.org/show_bug.cgi?id=12675 - */ - if (pending == NULL) - return 0; - -- call_id = ++priv->call_id_counter; -- -- if (notify != NULL) -- { -- closure = g_new (GPendingNotifyClosure, 1); -- closure->proxy = proxy; /* No need to ref as the lifecycle is tied to proxy */ -- closure->call_id = call_id; -- closure->func = notify; -- closure->data = user_data; -- closure->free_data_func = destroy; -- dbus_pending_call_set_notify (pending, d_pending_call_notify, -- closure, -- d_pending_call_free); -- } -- -- g_hash_table_insert (priv->pending_calls, GUINT_TO_POINTER (call_id), pending); -- -- return call_id; -+ return t1.call_id; - oom: - g_error ("Out of memory"); - return 0; diff --git a/recipes/dbus/dbus-glib-0.82/no-examples.patch b/recipes/dbus/dbus-glib-0.82/no-examples.patch deleted file mode 100644 index 483153db74..0000000000 --- a/recipes/dbus/dbus-glib-0.82/no-examples.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- dbus-glib-0.70/dbus/Makefile.am.orig 2006-07-23 16:04:43.000000000 +0200 -+++ dbus-glib-0.70/dbus/Makefile.am 2006-07-23 16:04:52.000000000 +0200 -@@ -1,4 +1,4 @@ --SUBDIRS = . examples -+SUBDIRS = . - - INCLUDES=-I$(top_srcdir) $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS) -DDBUS_COMPILATION=1 -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" - diff --git a/recipes/dbus/dbus-glib-0.82/no-introspect.patch b/recipes/dbus/dbus-glib-0.82/no-introspect.patch deleted file mode 100644 index f667c06879..0000000000 --- a/recipes/dbus/dbus-glib-0.82/no-introspect.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: dbus-glib-0.82/tools/Makefile.am -=================================================================== ---- dbus-glib-0.82.orig/tools/Makefile.am -+++ dbus-glib-0.82/tools/Makefile.am -@@ -3,9 +3,6 @@ - nodist_libdbus_glib_HEADERS = dbus-glib-bindings.h - libdbus_glibdir = $(includedir)/dbus-1.0/dbus - --dbus-glib-bindings.h: dbus-bus-introspect.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT) -- $(DBUS_BINDING_TOOL) --mode=glib-client --prefix=dbus_bus --output=dbus-glib-bindings.h dbus-bus-introspect.xml -- - BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml - - if USE_INTROSPECT_XML diff --git a/recipes/dbus/dbus-glib-0.82/run-with-tmp-session-bus.patch b/recipes/dbus/dbus-glib-0.82/run-with-tmp-session-bus.patch deleted file mode 100644 index a04f404f75..0000000000 --- a/recipes/dbus/dbus-glib-0.82/run-with-tmp-session-bus.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: dbus-glib-0.76/tools/run-with-tmp-session-bus.sh -=================================================================== ---- dbus-glib-0.76.orig/tools/run-with-tmp-session-bus.sh 2008-06-13 16:31:54.000000000 +0100 -+++ dbus-glib-0.76/tools/run-with-tmp-session-bus.sh 2008-06-13 16:32:54.000000000 +0100 -@@ -30,17 +30,15 @@ - echo "escaped service dir is: $ESCAPED_SERVICE_DIR" >&2 - - ## create a configuration file based on the standard session.conf --cat $DBUS_TOP_SRCDIR/tools/session.conf | \ -+cat $datadir/tools/session.conf | \ - sed -e 's/<servicedir>.*$/<servicedir>'$ESCAPED_SERVICE_DIR'<\/servicedir>/g' | \ - sed -e 's/<include.*$//g' \ - > $CONFIG_FILE - - echo "Created configuration file $CONFIG_FILE" >&2 - --PATH=$DBUS_TOP_BUILDDIR/bus:$PATH --export PATH - ## the libtool script found by the path search should already do this, but --LD_LIBRARY_PATH=$DBUS_TOP_BUILDDIR/dbus/.libs:$LD_LIBRARY_PATH -+LD_LIBRARY_PATH=$libdir:$LD_LIBRARY_PATH - export PATH - unset DBUS_SESSION_BUS_ADDRESS - unset DBUS_SESSION_BUS_PID diff --git a/recipes/dbus/dbus-glib_0.76.bb b/recipes/dbus/dbus-glib_0.76.bb deleted file mode 100644 index b8c675aefb..0000000000 --- a/recipes/dbus/dbus-glib_0.76.bb +++ /dev/null @@ -1,13 +0,0 @@ -require dbus-glib.inc - -PR = "${INC_PR}.1" - -SRC_URI_virtclass-native += "file://run-with-tmp-session-bus.patch" - -do_install_virtclass-native_prepend() { - install -d ${D}${datadir}/dbus - install -m 0644 tools/dbus-bus-introspect.xml ${D}${datadir}/dbus -} - -SRC_URI[md5sum] = "d3b716a7e798faa1c6a867675f00306a" -SRC_URI[sha256sum] = "8bc083faaf3efdd444a8a44bbcbfea501a7b547736fda3c2d83bfdc9b5b672a3" diff --git a/recipes/dbus/dbus-glib_0.82.bb b/recipes/dbus/dbus-glib_0.82.bb deleted file mode 100644 index fabf574501..0000000000 --- a/recipes/dbus/dbus-glib_0.82.bb +++ /dev/null @@ -1,13 +0,0 @@ -require dbus-glib.inc - -PR = "${INC_PR}.1" - -SRC_URI_virtclass-native += "file://run-with-tmp-session-bus.patch" - -do_install_virtclass-native_prepend() { - install -d ${D}${datadir}/dbus - install -m 0644 dbus-bus-introspect.xml ${D}${datadir}/dbus -} - -SRC_URI[md5sum] = "aa2a4517de0e9144be3bce2cf8cdd924" -SRC_URI[sha256sum] = "ddfb062797341b5c5a22555ffe80138953cc61a67ba805647b2746f519bfbde1" |