From 0e397b5e44f2e4e20e4eab4751cc9105245dd867 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 22 Jun 2007 13:02:33 +0000 Subject: [PATCH] Upgrade to dbus-glib 0.73 git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1987 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- .../cross.patch | 0 .../no-introspect.patch | 15 +++++---------- .../run-with-tmp-session-bus.patch | 0 ...ib-native_0.72.bb => dbus-glib-native_0.73.bb} | 0 .../dbus/{dbus-glib_0.72.bb => dbus-glib_0.73.bb} | 0 5 files changed, 5 insertions(+), 10 deletions(-) rename meta/packages/dbus/{dbus-glib-0.72 => dbus-glib-0.73}/cross.patch (100%) rename meta/packages/dbus/{dbus-glib-0.72 => dbus-glib-0.73}/no-introspect.patch (52%) rename meta/packages/dbus/{dbus-glib-native-0.72 => dbus-glib-native-0.73}/run-with-tmp-session-bus.patch (100%) rename meta/packages/dbus/{dbus-glib-native_0.72.bb => dbus-glib-native_0.73.bb} (100%) rename meta/packages/dbus/{dbus-glib_0.72.bb => dbus-glib_0.73.bb} (100%) diff --git a/meta/packages/dbus/dbus-glib-0.72/cross.patch b/meta/packages/dbus/dbus-glib-0.73/cross.patch similarity index 100% rename from meta/packages/dbus/dbus-glib-0.72/cross.patch rename to meta/packages/dbus/dbus-glib-0.73/cross.patch diff --git a/meta/packages/dbus/dbus-glib-0.72/no-introspect.patch b/meta/packages/dbus/dbus-glib-0.73/no-introspect.patch similarity index 52% rename from meta/packages/dbus/dbus-glib-0.72/no-introspect.patch rename to meta/packages/dbus/dbus-glib-0.73/no-introspect.patch index 607f0acc9c..9115801f71 100644 --- a/meta/packages/dbus/dbus-glib-0.72/no-introspect.patch +++ b/meta/packages/dbus/dbus-glib-0.73/no-introspect.patch @@ -1,8 +1,8 @@ -Index: dbus-glib-0.72/tools/Makefile.am +Index: dbus-glib-0.73/tools/Makefile.am =================================================================== ---- dbus-glib-0.72.orig/tools/Makefile.am 2006-10-25 21:10:36.000000000 +0200 -+++ dbus-glib-0.72/tools/Makefile.am 2006-10-27 10:07:35.000000000 +0200 -@@ -3,14 +3,8 @@ +--- 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 @@ -11,9 +11,4 @@ Index: dbus-glib-0.72/tools/Makefile.am - BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml --dbus-bus-introspect.xml: -- DBUS_TOP_BUILDDIR=$(top_builddir) dbus-daemon --introspect > dbus-bus-introspect.xml.tmp && mv dbus-bus-introspect.xml.tmp dbus-bus-introspect.xml -- - EXTRA_DIST = run-with-tmp-session-bus.sh session.conf - - CLEANFILES = \ + if USE_INTROSPECT_XML diff --git a/meta/packages/dbus/dbus-glib-native-0.72/run-with-tmp-session-bus.patch b/meta/packages/dbus/dbus-glib-native-0.73/run-with-tmp-session-bus.patch similarity index 100% rename from meta/packages/dbus/dbus-glib-native-0.72/run-with-tmp-session-bus.patch rename to meta/packages/dbus/dbus-glib-native-0.73/run-with-tmp-session-bus.patch diff --git a/meta/packages/dbus/dbus-glib-native_0.72.bb b/meta/packages/dbus/dbus-glib-native_0.73.bb similarity index 100% rename from meta/packages/dbus/dbus-glib-native_0.72.bb rename to meta/packages/dbus/dbus-glib-native_0.73.bb diff --git a/meta/packages/dbus/dbus-glib_0.72.bb b/meta/packages/dbus/dbus-glib_0.73.bb similarity index 100% rename from meta/packages/dbus/dbus-glib_0.72.bb rename to meta/packages/dbus/dbus-glib_0.73.bb -- 2.40.1