@@ 1,26 1,23 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: xdavidwu <xdavidwuph@gmail.com>
pkgname=dbus
-pkgver=1.14.0
+pkgver=1.15.0
pkgrel=0
pkgdesc="Freedesktop.org message bus system"
url="https://www.freedesktop.org/Software/dbus"
arch="all"
license="AFL-2.1 OR GPL-2.0-or-later"
depends_dev="util-linux-dev"
-makedepends="$depends_dev
- autoconf
- autoconf-archive
- automake
+makedepends="
+ $depends_dev
expat-dev
glib-dev
libsm-dev
- libtool
libx11-dev
+ meson
xmlto
systemd-dev
"
-checkdepends="xvfb-run"
pkggroups="messagebus"
install="$pkgname.pre-install $pkgname.post-install"
triggers="$pkgname.trigger=/usr/share/dbus-1/system.d"
@@ 35,41 32,24 @@ options="!check" # Introduces circular dependency with xorg-server (xvfb-run ->
# 1.12.16-r0:
# - CVE-2019-12749
-prepare() {
- default_prepare
- autoreconf -vif
-}
-
build() {
- ./configure \
- --build=$CBUILD \
- --host=$CHOST \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --with-xml=expat \
- --with-dbus-user=messagebus \
- --with-system-pid-file=/run/dbus/dbus.pid \
- --disable-verbose-mode \
- --disable-static \
- --enable-inotify \
- --disable-dnotify \
- --enable-modular-tests=yes \
- --disable-asserts \
- --enable-user-session \
- --enable-xml-docs \
- --with-session-socket-dir=/tmp \
- --with-x \
- --enable-systemd
- make
+ abuild-meson \
+ -Db_lto=true \
+ -Dinotify=enabled \
+ -Ddbus_user=messagebus \
+ -Dsystem_pid_file=/run/dbus/dbus.pid \
+ -Dsystemd=enabled \
+ . output
+
+ meson compile -C output
}
check() {
- xvfb-run make check
+ meson test -t 4 --no-rebuild --print-errorlogs -C output
}
package() {
- make -j1 DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" meson install --no-rebuild -C output
}
libs() {
@@ 88,5 68,5 @@ x11() {
sha512sums="
-9bf17a3ebb3cf44722c6fbf24ee56e9dc14d6882fc312f26c7f07459d969424bc2fb63a229139e011804ecc479a8f0eb1a0c83286f8d5a664c5979d12634179f dbus-1.14.0.tar.xz
+6f7e1d4ff525ce13c5f671f1b045a089c379cbfb777662ce7a55ffe4893a8ab2aaf38877a7b8f261823067a20f3b336437449eb353a97d30699496375e00bf1a dbus-1.15.0.tar.xz
"