diff options
| author | Christian Melki <christian.melki@t2data.com> | 2022-04-14 14:08:09 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2022-04-22 08:58:10 +0200 |
| commit | 083faa476f86bf50d7559bad962cfbc0d26cfb9c (patch) | |
| tree | 3ab049fdfaa142a8053961447b3b57285a60a031 /rules/dbus.make | |
| parent | d7ab5159ee919e968e5729c264703f03a825e9b8 (diff) | |
| download | ptxdist-083faa476f86bf50d7559bad962cfbc0d26cfb9c.tar.gz ptxdist-083faa476f86bf50d7559bad962cfbc0d26cfb9c.tar.xz | |
dbus: Version bump. 1.12.22 -> 1.14.0
Major version.
https://github.com/freedesktop/dbus/blob/master/NEWS
* Change compression format of tarball. xz seems to be
the new preferred method.
* Only --with-x=auto or no work now. The rest is broken. But
--enable-x11-autolaunch will still cause a failure if no X is found, so
that's ok.
Signed-off-by: Christian Melki <christian.melki@t2data.com>
Message-Id: <20220414120809.2062306-1-christian.melki@t2data.com>
[mol: add new configure options]
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/dbus.make')
| -rw-r--r-- | rules/dbus.make | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/rules/dbus.make b/rules/dbus.make index e0d596879..90a0347fe 100644 --- a/rules/dbus.make +++ b/rules/dbus.make @@ -16,10 +16,10 @@ PACKAGES-$(PTXCONF_DBUS) += dbus # # Paths and names # -DBUS_VERSION := 1.12.22 -DBUS_MD5 := c6430ac3be48162b1b62a92d99a1d448 +DBUS_VERSION := 1.14.0 +DBUS_MD5 := ddd5570aff05191dbee8e42d751f1b7d DBUS := dbus-$(DBUS_VERSION) -DBUS_SUFFIX := tar.gz +DBUS_SUFFIX := tar.xz DBUS_URL := http://dbus.freedesktop.org/releases/dbus/$(DBUS).$(DBUS_SUFFIX) DBUS_SOURCE := $(SRCDIR)/$(DBUS).$(DBUS_SUFFIX) DBUS_DIR := $(BUILDDIR)/$(DBUS) @@ -61,6 +61,7 @@ DBUS_CONF_OPT := \ --disable-console-owner-file \ --disable-launchd \ --$(call ptx/endis, PTXCONF_DBUS_SYSTEMD)-systemd \ + --enable-traditional-activation \ --disable-embedded-tests \ --disable-modular-tests \ --disable-tests \ @@ -70,13 +71,14 @@ DBUS_CONF_OPT := \ --$(call ptx/endis, PTXCONF_DBUS_X)-x11-autolaunch \ --disable-compile-warnings \ --disable-Werror \ + --disable-qt-help \ --disable-relocation \ --disable-stats \ --$(call ptx/endis, PTXCONF_DBUS_SYSTEMD)-user-session \ --with-system-socket=/run/dbus/system_bus_socket \ --with-dbus-user=messagebus \ --without-valgrind \ - --$(call ptx/wwo, PTXCONF_DBUS_X)-x$(call ptx/ifdef,PTXCONF_DBUS_X,=$(SYSROOT)/usr,) \ + --with-x=$(call ptx/ifdef,PTXCONF_DBUS_X,auto,no) \ --with-systemdsystemunitdir=/usr/lib/systemd/system \ --with-systemduserunitdir=/usr/lib/systemd/user |