From ef375852e3cbdf25f7231e19d3d59248512a04bf Mon Sep 17 00:00:00 2001
From: Hugo Villeneuve <hugo@hugovil.com>
Date: Tue, 9 Dec 2014 23:15:27 -0500
Subject: [PATCH] Upgrade to dbus-1.8.12

---
 config/packages-list |  4 ++--
 stage4/pkg/dbus      | 11 ++++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/config/packages-list b/config/packages-list
index 7d9eb53..ab004e6 100644
--- a/config/packages-list
+++ b/config/packages-list
@@ -53,8 +53,8 @@ CUPS_PDF="cups-pdf-2.5.1"
 CURL="curl-7.27.0"
 CVS="cvs-1.11.23"
 
-DBUS="dbus-1.4.16"
-DBUS_GLIB="dbus-glib-0.98"
+DBUS="dbus-1.8.12"
+DBUS_GLIB="dbus-glib-0.102"
 DDCLIENT="ddclient-3.6.7"
 DEJAGNU="dejagnu-1.4.4"
 DEJAVUFONTS="dejavu-fonts-ttf-2.33"
diff --git a/stage4/pkg/dbus b/stage4/pkg/dbus
index 1da1f86..a5ba346 100644
--- a/stage4/pkg/dbus
+++ b/stage4/pkg/dbus
@@ -7,8 +7,12 @@ hvconfig_pre()
         -g messagebus -s /bin/false messagebus
 
     CONFIGURE_OPTS+=" \
-        --libexecdir=/usr/lib/dbus-1.0 \
-        --localstatedir=/var"
+        --localstatedir=/var \
+        --disable-doxygen-docs \
+        --disable-static \
+        --disable-systemd \
+        --without-systemdsystemunitdir \
+        --with-console-auth-dir=/run/console/"
 }
 
 hvbuild_post()
@@ -19,6 +23,7 @@ hvbuild_post()
     # script-name start stop
     bootscript_add_rc3 dbus 92 20
 
-    # Without this, VLC was giving an error.
+    # Generate D-Bus UUID to avoid warnings when compiling some packages
+    # without dbus running (without this, VLC was giving an error).
     dbus-uuidgen > /var/lib/dbus/machine-id
 }
-- 
2.20.1