diff --git a/pkg.info b/pkg.info index d38154c..7a814ea 100644 --- a/pkg.info +++ b/pkg.info @@ -1,10 +1,9 @@ name: dbus description: Freedesktop.org message bus system -version: 1.14.10 -revision: 6 +version: 1.16.2 url: https://www.freedesktop.org/wiki/Software/dbus license: AFL2.1 or GPL2-or-later architecture: any -depends: ["glibc"] -make_depends: ["bash","binutils","coreutils","diffutils","gawk","gcc","glibc","grep","make","pkgconf","sed","util-linux"] +depends: ["expat","glibc","elogind","libcap"] +make_depends: ["docbook-xsl-nons","glib","meson","python3","xmlto"] type: source diff --git a/source.sh b/source.sh index 00eaadd..67adcca 100644 --- a/source.sh +++ b/source.sh @@ -15,38 +15,46 @@ prepare() { # The build function is executed in the source directory # This function is used to compile the source code build() { - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --runstatedir=/run \ - --enable-user-session \ - --disable-static \ - --disable-doxygen-docs \ - --disable-xml-docs \ - --with-systemduserunitdir=no \ - --with-systemdsystemunitdir=no \ - --docdir=/usr/share/doc/dbus \ - --with-system-socket=/run/dbus/system_bus_socket - make + mkdir build + cd build + + meson setup --prefix=/usr \ + --buildtype=release \ + --wrap-mode=nofallback \ + -Dsystemd=disabled .. + meson compile } # The check function is executed in the source directory # This function is used to run tests to verify the package has been compiled correctly check() { - make check + cd build + + meson test --print-errorlogs } # The package function is executed in the source directory # This function is used to move the compiled files into the output directory package() { - make DESTDIR="$BPM_OUTPUT" install - chown root:messagebus "$BPM_OUTPUT"/usr/libexec/dbus-daemon-launch-helper - chmod 4750 "$BPM_OUTPUT"/usr/libexec/dbus-daemon-launch-helper - ln -sfv /etc/machine-id "$BPM_OUTPUT"/var/lib/dbus + cd build + + meson install --destdir="$BPM_OUTPUT" - install -Dm644 "$BPM_WORKDIR"/dbus-reload.bpmhook "$BPM_OUTPUT"/var/lib/bpm/hooks/dbus-reload.bpmhook + # Fix dbus-daemon-launch-helper binary ownership and permissions + chown 0:18 "$BPM_OUTPUT"/usr/libexec/dbus-daemon-launch-helper + chmod 4750 "$BPM_OUTPUT"/usr/libexec/dbus-daemon-launch-helper + + # Symlink dbus machine-id to /etc/machine-id + install -d "$BPM_OUTPUT"/etc/ + ln -sfv /var/lib/dbus/machine-id "$BPM_OUTPUT"/etc/machine-id + + # Install dbus service install -Dm755 "$BPM_WORKDIR"/dbus-reload.sh "$BPM_OUTPUT"/usr/sbin/dbus-reload install -Dm644 "$BPM_WORKDIR"/dbus.esv "$BPM_OUTPUT"/etc/esvm/services/dbus.esv + # Install dbus BPM hook + install -Dm644 "$BPM_WORKDIR"/dbus-reload.bpmhook "$BPM_OUTPUT"/var/lib/bpm/hooks/dbus-reload.bpmhook + + # Install package license install -Dm644 "$BPM_SOURCE"/COPYING "$BPM_OUTPUT"/usr/share/licenses/dbus/COPYING }