dbus: 1.14.10 -> 1.16.0; now depends on meson

dbus/.footprint

@@ -48,12 +48,10 @@ drwxr-xr-x	root/root	usr/lib/dbus-1.0/include/
 drwxr-xr-x	root/root	usr/lib/dbus-1.0/include/dbus/
 -rw-r--r--	root/root	usr/lib/dbus-1.0/include/dbus/dbus-arch-deps.h
 drwxr-xr-x	root/root	usr/lib/dbus/
--rwsr-x---	root/messagebus	usr/lib/dbus/dbus-daemon-launch-helper
+---s--x---	root/messagebus	usr/lib/dbus/dbus-daemon-launch-helper
--rw-r--r--	root/root	usr/lib/libdbus-1.a
+lrwxrwxrwx	root/root	usr/lib/libdbus-1.so -> libdbus-1.so.3
--rwxr-xr-x	root/root	usr/lib/libdbus-1.la
+lrwxrwxrwx	root/root	usr/lib/libdbus-1.so.3 -> libdbus-1.so.3.38.3
-lrwxrwxrwx	root/root	usr/lib/libdbus-1.so -> libdbus-1.so.3.32.4
+-rwxr-xr-x	root/root	usr/lib/libdbus-1.so.3.38.3
-lrwxrwxrwx	root/root	usr/lib/libdbus-1.so.3 -> libdbus-1.so.3.32.4
--rwxr-xr-x	root/root	usr/lib/libdbus-1.so.3.32.4
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/dbus-1.pc
 drwxr-xr-x	root/root	usr/sbin/

dbus/.signature

@@ -1,7 +1,8 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/U6therX6cbGtGS0+WrD9cAHTp0877afRUz4Y+JrljCeM2TwHlTWINMETdL6GfVoDDDtwRJlo5Tb92YgC39MqwM=
+RWSE3ohX2g5d/a3I42BMKnMSjNxjkk5Gb42Sf1bTC6tLeCRD//2boLMeCzzPAzE9WEGSWWtLaPXIacPJSqInjwK7xT3IUelWpwM=
-SHA256 (Pkgfile) = d6782ee6fd1906023641f9d7c8cfcc1211001a6069556beef9d9119e73ad24a2
+SHA256 (Pkgfile) = ad03d6867615efe65eb130dd8e5a7561e39517bf98369dcfe963dccc4be5b6ef
-SHA256 (.footprint) = 239f39c443493d433d99a58a1d3683c57af2f77d460d75e45c47d3a1f90b702e
+SHA256 (.footprint) = 74d5078939250998c0a0e5db60cbac68cf67980f6cbdb8bc9c791ec8a3dc994d
-SHA256 (dbus-1.14.10.tar.xz) = ba1f21d2bd9d339da2d4aa8780c09df32fea87998b73da24f49ab9df1e36a50f
+SHA256 (dbus-1.16.0.tar.xz) = 9f8ca5eb51cbe09951aec8624b86c292990ae2428b41b856e2bed17ec65c8849
+SHA256 (fix-daemon-location.patch) = 32862e56777619a479ebefc45589cb76207c836de24a8bca14aecb4552e42528
 SHA256 (rc.dbus) = 6d67e387a8b3296f7c5b88cbe5e5c4ec113ce9b36abc8da4b733aae624a6a6d6
 SHA256 (30-dbus.launch) = 18ea1e79698bb876f7f5fb298daae5ff6cd17c56764b087f8da2e1d5809af37a

dbus/Pkgfile

@@ -4,33 +4,36 @@
 # Depends on: expat
 
 name=dbus
-version=1.14.10
+version=1.16.0
 release=1
 source=(https://dbus.freedesktop.org/releases/dbus/$name-$version.tar.xz
-	rc.dbus 30-dbus.launch)
+    fix-daemon-location.patch
+    rc.dbus 30-dbus.launch)
 
 build() {
-	cd $name-$version
+    patch -Np1 -d $name-$version -i $SRC/fix-daemon-location.patch
+    meson setup $name-$version build \
+        --prefix=/usr \
+        --localstatedir=/var \
+        --sysconfdir=/etc \
+        --libexecdir=lib/dbus \
+        --buildtype=plain \
+        --wrap-mode nodownload \
+        -D b_lto=true \
+        -D b_pie=true \
+        -D dbus_daemondir=/usr/sbin \
+        -D dbus_user=messagebus \
+        -D runtime_dir=/run \
+        -D system_pid_file=/run/dbus/pid \
+        -D system_socket=/run/dbus/system_bus_socket
 
-	./configure \
+    meson compile -C build
-		--prefix=/usr \
+    DESTDIR=$PKG meson install -C build
-		--with-dbus-daemondir=/usr/sbin \
-		--localstatedir=/var \
-		--runstatedir=/run \
-		--sysconfdir=/etc \
-		--libexecdir=/usr/lib/dbus \
-		--with-dbus-user=messagebus \
-		--with-init-scripts=none \
-		--with-system-pid-file=/run/dbus/pid \
-		--with-system-socket=/run/dbus/system_bus_socket
 
-	make
+    install -D -m 0755 $SRC/rc.dbus $PKG/etc/rc.d/dbus
-	make DESTDIR=$PKG install
+    install -D -m 0755 $SRC/30-dbus.launch \
+        $PKG/etc/X11/xinit/xinitrc.d/30-dbus.launch.sh
 
-	install -D -m 0755 $SRC/rc.dbus $PKG/etc/rc.d/dbus
+    rm -r $PKG/usr/share/doc $PKG/run
-	install -D -m 0755 $SRC/30-dbus.launch \
+    rm -rf $PKG/usr/share/xml
-		$PKG/etc/X11/xinit/xinitrc.d/30-dbus.launch.sh
-
-	rm -r $PKG/usr/share/doc $PKG/var/run
-	rm -rf $PKG/usr/share/xml
 }

dbus/fix-daemon-location.patch

@@ -0,0 +1,11 @@
+diff -Naur dbus-1.16.0.orig/bus/meson.build dbus-1.16.0/bus/meson.build
+--- dbus-1.16.0.orig/bus/meson.build	2024-12-24 01:25:30.856267635 +0100
++++ dbus-1.16.0/bus/meson.build	2024-12-24 01:28:28.098900906 +0100
+@@ -139,6 +139,7 @@
+     include_directories: root_include,
+     link_with: libdbus_daemon_internal,
+     install: true,
++    install_dir: get_option('dbus_daemondir'),
+ )
+ 
+