From 02d14214066c61a1de7d2575288e136b40da5e8b Mon Sep 17 00:00:00 2001
From: eweos-helper <134289199+eweos-helper[bot]@users.noreply.github.com>
Date: Thu, 26 Sep 2024 08:10:57 +0000
Subject: [PATCH] [dbus] 1.15.10-1: new upstream version, switch meson and
 enable tests

---
 PKGBUILD | 74 +++++++++++++++++++++++++++++---------------------------
 1 file changed, 38 insertions(+), 36 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index c1b127bb..1b993b8c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Yukari Chiba <i@0x7f.cc>
 
 pkgname=dbus
-pkgver=1.15.8
-pkgrel=5
+pkgver=1.15.10
+pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
 url="https://wiki.freedesktop.org/www/Software/dbus/"
 arch=(x86_64 aarch64 riscv64)
-license=(GPL custom)
-depends=(expat)
-makedepends=(python autoconf-archive linux-headers)
+license=(GPL-2.0-or-later custom)
+depends=(musl expat glib)
+makedepends=(python linux-headers meson ninja libxslt docbook-xsl)
 source=(
   "https://gitlab.freedesktop.org/dbus/${pkgname}/-/archive/${pkgname}-${pkgver}/dbus-${pkgname}-${pkgver}.tar.gz"
   dbus.service
@@ -22,7 +22,7 @@ provides=(
   libdbus
   libdbus-1.so
 )
-sha256sums=('3ae23cd28b96beac175eab0798d65c8e21e9fcf57132d840c170aaa7b21cd818'
+sha256sums=('62e68bb53e3a0df8b32c5c316e82379d34ccc17d714891f99f6b0473bd87ed0c'
             '5d134f6d22600337e0b577c53213d6dc9dddd83de8dcd17f8c56f632f76ed654'
             '16d5a4e3025b8c24f82ca37fa97b066b18efa872b84718e9a6c674da5d1a164e'
             'da9ac8ffa3d3e063bce04332b58215e3741f4be4040307d0317a3ba775d3d68a'
@@ -30,45 +30,47 @@ sha256sums=('3ae23cd28b96beac175eab0798d65c8e21e9fcf57132d840c170aaa7b21cd818'
             '7d8d45af88ad4b4e512b4d6d42bcbe982a539418f6368b56fc4bf25950484f9b'
             'fd03ccef383b40c60fa538481c276ea113709a161cc340c6db00adf99d9e7993')
 
-prepare()
-{
-  cd dbus-${pkgname}-${pkgver}
-  NOCONFIGURE=1 ./autogen.sh
-}
-
 build()
 {
-  cd dbus-${pkgname}-${pkgver}
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
+  ewe-meson "dbus-$pkgname-$pkgver" build \
     --libexecdir=/usr/lib/dbus-1.0 \
-    --runstatedir=/run \
-    --with-console-auth-dir=/run/console/ \
-    --with-dbus-user=dbus \
-    --with-system-pid-file=/run/dbus/pid \
-    --with-system-socket=/run/dbus/system_bus_socket \
-    --enable-inotify \
-    --enable-user-session \
-    --disable-static \
-    --without-x
-  make
+    --localstatedir=/var \
+    -Druntime_dir=/run \
+    -Ddbus_user=dbus \
+    -Dsystem_pid_file=/run/dbus/pid \
+    -Dsystem_socket=/run/dbus/system_bus_socket \
+    -Dinotify=enabled \
+    -Duser_session=true \
+    -Dx11_autolaunch=disabled \
+    -Ddoxygen_docs=disabled \
+    -Dducktype_docs=disabled \
+    -Dqt_help=disabled \
+    -Dselinux=disabled \
+    -Dapparmor=disabled \
+    -Dkqueue=disabled \
+    -Dlaunchd=disabled \
+    -Dlibaudit=disabled \
+    -Dsystemd=disabled
+
+  meson compile -C build
+}
+
+check () {
+  meson test -C build
 }
 
 package()
 {
-  DESTDIR="$pkgdir" make -C dbus-${pkgname}-${pkgver} install
+  meson install -C build --destdir="$pkgdir"
 
   rm -r "$pkgdir"/{etc,var}
-  rm -r "$pkgdir"/usr/lib/systemd
 
-  _dinit_install_services_ $srcdir/dbus.service
-  _dinit_install_user_services_ $srcdir/dbus.user.service
+  _dinit_install_services_ "$srcdir"/dbus.service
+  _dinit_install_user_services_ "$srcdir"/dbus.user.service
   _dinit_enable_user_services_ dbus
-  _dinit_install_helpers_ $srcdir/dbus-system-session
-  _dinit_install_user_helpers_ $srcdir/dbus-user-session
-  _install_sysusers_ $srcdir/dbus.sysusers
-  _install_tmpfiles_ $srcdir/dbus.tmpfiles
-  _install_license_ $srcdir/dbus-$pkgname-$pkgver/COPYING
+  _dinit_install_helpers_ "$srcdir"/dbus-system-session
+  _dinit_install_user_helpers_ "$srcdir"/dbus-user-session
+  _install_sysusers_ "$srcdir"/dbus.sysusers
+  _install_tmpfiles_ "$srcdir"/dbus.tmpfiles
+  _install_license_ "$srcdir/dbus-$pkgname-$pkgver/COPYING"
 }