From 39dd3f891945e5386b89bb3520cccf0d2db0e7dd Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 17 Jun 2012 13:55:12 +0200
Subject: [PATCH] dbus: update to dbus-1.6.0

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/sysutils/dbus-host/build                    |  4 +++-
 packages/sysutils/dbus/build                         |  6 +++---
 packages/sysutils/dbus/meta                          |  2 +-
 .../dbus/patches/dbus-1.4.20-speedup-0.1.patch       | 12 ------------
 4 files changed, 7 insertions(+), 17 deletions(-)
 delete mode 100644 packages/sysutils/dbus/patches/dbus-1.4.20-speedup-0.1.patch

diff --git a/packages/sysutils/dbus-host/build b/packages/sysutils/dbus-host/build
index e26328e36a..1c9f9c32f3 100755
--- a/packages/sysutils/dbus-host/build
+++ b/packages/sysutils/dbus-host/build
@@ -37,10 +37,12 @@ mkdir -p .build-host && cd .build-host
              --build=$HOST_NAME \
              --prefix=$ROOT/$TOOLCHAIN \
              --sysconfdir=$ROOT/$TOOLCHAIN/etc \
+             --enable-verbose-mode \
+             --enable-asserts \
+             --enable-checks \
              --disable-tests \
              --disable-xml-docs \
              --disable-doxygen-docs \
-             --enable-asserts=yes \
 
 make
 make install
diff --git a/packages/sysutils/dbus/build b/packages/sysutils/dbus/build
index d6130629b0..a769e20805 100755
--- a/packages/sysutils/dbus/build
+++ b/packages/sysutils/dbus/build
@@ -34,11 +34,11 @@ mkdir -p .build-target && cd .build-target
              --localstatedir=/var \
              --disable-static \
              --enable-shared \
+             --enable-verbose-mode \
+             --enable-asserts \
+             --enable-checks \
              --disable-tests \
              --disable-ansi \
-             --disable-verbose-mode \
-             --disable-asserts \
-             --disable-checks \
              --disable-xml-docs \
              --disable-doxygen-docs \
              --enable-abstract-sockets \
diff --git a/packages/sysutils/dbus/meta b/packages/sysutils/dbus/meta
index d438264a2d..a1b6c6c5cc 100644
--- a/packages/sysutils/dbus/meta
+++ b/packages/sysutils/dbus/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="dbus"
-PKG_VERSION="1.4.20"
+PKG_VERSION="1.6.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/sysutils/dbus/patches/dbus-1.4.20-speedup-0.1.patch b/packages/sysutils/dbus/patches/dbus-1.4.20-speedup-0.1.patch
deleted file mode 100644
index 81e3deb37f..0000000000
--- a/packages/sysutils/dbus/patches/dbus-1.4.20-speedup-0.1.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur dbus-1.4.16/dbus/dbus-message.c dbus-1.4.16.patch/dbus/dbus-message.c
---- dbus-1.4.16/dbus/dbus-message.c	2011-09-21 13:16:16.000000000 +0200
-+++ dbus-1.4.16.patch/dbus/dbus-message.c	2011-10-29 02:09:16.927338774 +0200
-@@ -3963,7 +3963,7 @@
-   DBusValidationMode mode;
-   dbus_uint32_t n_unix_fds = 0;
- 
--  mode = DBUS_VALIDATION_MODE_DATA_IS_UNTRUSTED;
-+  mode = DBUS_VALIDATION_MODE_WE_TRUST_THIS_DATA_ABSOLUTELY;
-   
-   oom = FALSE;
-