dbus-glib: 0.76 -> 0.78

7 files changed, 16 insertions, 2 deletions

diff --git a/meta/packages/dbus/dbus-glib-0.78/fix_asneeded.patch b/meta/packages/dbus/dbus-glib-0.78/fix_asneeded.patch
new file mode 100644
index 0000000000..a0aaec3720
--- /dev/null
+++ b/meta/packages/dbus/dbus-glib-0.78/fix_asneeded.patch
@@ -0,0 +1,13 @@
+Index: dbus-glib-0.78/dbus/Makefile.am
+===================================================================
+--- dbus-glib-0.78.orig/dbus/Makefile.am        2009-01-15 15:14:29.000000000 +0000
++++ dbus-glib-0.78/dbus/Makefile.am     2009-01-15 15:14:46.000000000 +0000
+@@ -104,7 +104,7 @@
+ 
+ dbus_bash_completion_helper_SOURCES =                  \
+        dbus-bash-completion-helper.c
+-dbus_bash_completion_helper_LDADD=$(DBUS_LIBS) $(DBUS_GLIB_LIBS) -lexpat libdbus-gtool.la libdbus-glib-1.la
++dbus_bash_completion_helper_LDADD=$(DBUS_LIBS) $(DBUS_GLIB_LIBS) libdbus-gtool.la libdbus-glib-1.la -lexpat
+ 
+ 
+ EXTRA_DIST=dbus-gmarshal.list make-dbus-glib-error-switch.sh make-dbus-glib-error-enum.sh dbus-bash-completion.sh.in
diff --git a/meta/packages/dbus/dbus-glib-0.76/native-binding-tool.patch b/meta/packages/dbus/dbus-glib-0.78/native-binding-tool.patch
index 1bdac5a390..1bdac5a390 100644
--- a/meta/packages/dbus/dbus-glib-0.76/native-binding-tool.patch
+++ b/meta/packages/dbus/dbus-glib-0.78/native-binding-tool.patch
diff --git a/meta/packages/dbus/dbus-glib-0.76/no-examples.patch b/meta/packages/dbus/dbus-glib-0.78/no-examples.patch
index 483153db74..483153db74 100644
--- a/meta/packages/dbus/dbus-glib-0.76/no-examples.patch
+++ b/meta/packages/dbus/dbus-glib-0.78/no-examples.patch
diff --git a/meta/packages/dbus/dbus-glib-0.76/run-with-tmp-session-bus.patch b/meta/packages/dbus/dbus-glib-0.78/run-with-tmp-session-bus.patch
index a04f404f75..a04f404f75 100644
--- a/meta/packages/dbus/dbus-glib-0.76/run-with-tmp-session-bus.patch
+++ b/meta/packages/dbus/dbus-glib-0.78/run-with-tmp-session-bus.patch
diff --git a/meta/packages/dbus/dbus-glib-native_0.76.bb b/meta/packages/dbus/dbus-glib-native_0.78.bb
index fe69b2dfc1..81be0e123f 100644
--- a/meta/packages/dbus/dbus-glib-native_0.76.bb
+++ b/meta/packages/dbus/dbus-glib-native_0.78.bb
@@ -3,7 +3,7 @@ inherit native
 
 DEPENDS = "glib-2.0-native dbus-native"
 
-PR = "r3"
+PR = "r0"
 
 SRC_URI += "file://run-with-tmp-session-bus.patch;patch=1"
 
diff --git a/meta/packages/dbus/dbus-glib.inc b/meta/packages/dbus/dbus-glib.inc
index 6a922b6da9..7d811f9129 100644
--- a/meta/packages/dbus/dbus-glib.inc
+++ b/meta/packages/dbus/dbus-glib.inc
@@ -5,6 +5,7 @@ LICENSE = "GPL"
 DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus"
 
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
+           file://fix_asneeded.patch;patch=1 \
            file://no-examples.patch;patch=1"
 
 inherit autotools_stage pkgconfig gettext
diff --git a/meta/packages/dbus/dbus-glib_0.76.bb b/meta/packages/dbus/dbus-glib_0.78.bb
index 22b882e2f7..f7a1760557 100644
--- a/meta/packages/dbus/dbus-glib_0.76.bb
+++ b/meta/packages/dbus/dbus-glib_0.78.bb
@@ -1,6 +1,6 @@
 require dbus-glib.inc
 
-PR = "r4"
+PR = "r0"
 
 do_configure_prepend() {
         cp -p ${STAGING_DATADIR_NATIVE}/dbus/dbus-glib-bindings.h ${S}/tools/