Commit fd37dcc6 authored by Baruch Siach's avatar Baruch Siach Committed by Peter Korsgaard
Browse files

dbus: bump to version 1.8.4 



Upstream removed support for libxml2 as xml backend, select expat
unconditionally.

Signed-off-by: default avatarBaruch Siach <baruch@tkos.co.il>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 8a92adb4

package/dbus/Config.in

+1 −22
Original line number Diff line number Diff line
@@ -3,33 +3,12 @@ config BR2_PACKAGE_DBUS 
	depends on BR2_TOOLCHAIN_HAS_THREADS

	# uses fork()

	depends on BR2_USE_MMU

	select BR2_PACKAGE_EXPAT

	help

	  The D-Bus message bus system.



	  http://www.freedesktop.org/wiki/Software/dbus



if BR2_PACKAGE_DBUS



choice

	prompt "XML library to use"

	default BR2_DBUS_EXPAT

	help

	  Select the XML library to use with D-Bus. Select Expat

	  unless you have specific reasons for using libxml2 as

	  Expat is significant smaller.



	config BR2_DBUS_EXPAT

		bool "Expat"

		select BR2_PACKAGE_EXPAT



	config BR2_DBUS_LIBXML2

		bool "libxml2"

		select BR2_PACKAGE_LIBXML2



endchoice



endif



comment "dbus needs a toolchain w/ threads"

	depends on BR2_USE_MMU

	depends on !BR2_TOOLCHAIN_HAS_THREADS

package/dbus/dbus.mk

+3 −10
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#

################################################################################



DBUS_VERSION = 1.6.18

DBUS_VERSION = 1.8.4

DBUS_SITE = http://dbus.freedesktop.org/releases/dbus

DBUS_LICENSE = AFLv2.1 GPLv2+

DBUS_LICENSE_FILES = COPYING
@@ -14,7 +14,7 @@ define DBUS_PERMISSIONS 
/usr/libexec/dbus-daemon-launch-helper f 4755 0 0 - - - - -

endef



DBUS_DEPENDENCIES = host-pkgconf

DBUS_DEPENDENCIES = host-pkgconf expat



DBUS_CONF_ENV = ac_cv_have_abstract_sockets=yes

DBUS_CONF_OPT = --with-dbus-user=dbus \
@@ -27,6 +27,7 @@ DBUS_CONF_OPT = --with-dbus-user=dbus \ 
		--disable-static \

		--disable-dnotify \

		--localstatedir=/var \

		--with-xml=expat \

		--with-system-socket=/var/run/dbus/system_bus_socket \

		--with-system-pid-file=/var/run/messagebus.pid
@@ -43,14 +44,6 @@ ifeq ($(BR2_microblaze),y) 
DBUS_CONF_OPT += --disable-inotify

endif



ifeq ($(BR2_DBUS_EXPAT),y)

DBUS_CONF_OPT += --with-xml=expat

DBUS_DEPENDENCIES += expat

else

DBUS_CONF_OPT += --with-xml=libxml

DBUS_DEPENDENCIES += libxml2

endif



ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y)

DBUS_CONF_OPT += --with-x

DBUS_DEPENDENCIES += xlib_libX11