diff --git a/dbus-32/.footprint b/dbus-32/.footprint index 98af755e..d1526a09 100644 --- a/dbus-32/.footprint +++ b/dbus-32/.footprint @@ -9,11 +9,9 @@ drwxr-xr-x root/root usr/lib32/dbus-1.0/include/ drwxr-xr-x root/root usr/lib32/dbus-1.0/include/dbus/ -rw-r--r-- root/root usr/lib32/dbus-1.0/include/dbus/dbus-arch-deps.h drwxr-xr-x root/root usr/lib32/dbus/ --rwsr-x--- root/messagebus usr/lib32/dbus/dbus-daemon-launch-helper --rw-r--r-- root/root usr/lib32/libdbus-1.a --rwxr-xr-x root/root usr/lib32/libdbus-1.la -lrwxrwxrwx root/root usr/lib32/libdbus-1.so -> libdbus-1.so.3.32.4 -lrwxrwxrwx root/root usr/lib32/libdbus-1.so.3 -> libdbus-1.so.3.32.4 --rwxr-xr-x root/root usr/lib32/libdbus-1.so.3.32.4 +---s--x--- root/messagebus usr/lib32/dbus/dbus-daemon-launch-helper +lrwxrwxrwx root/root usr/lib32/libdbus-1.so -> libdbus-1.so.3 +lrwxrwxrwx root/root usr/lib32/libdbus-1.so.3 -> libdbus-1.so.3.38.3 +-rwxr-xr-x root/root usr/lib32/libdbus-1.so.3.38.3 drwxr-xr-x root/root usr/lib32/pkgconfig/ -rw-r--r-- root/root usr/lib32/pkgconfig/dbus-1.pc diff --git a/dbus-32/.signature b/dbus-32/.signature index 9349800f..4268d33e 100644 --- a/dbus-32/.signature +++ b/dbus-32/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXbXF/0Fk7s0hxgcj+bPJGfE9J8BClUYKyKlsurp5J+lbUXZ+CjXBYmie61n5n5B2GmDsqQHoeAjOqpyvFjNy2ws= -SHA256 (Pkgfile) = 958e16c1454c0f05b821364a8275d987d8b4e05bf4fb925dba9969e6a5f34902 -SHA256 (.footprint) = 6c98219856ef3c6450692966f285f8f47e0615025c59a26ba804c819c3fa149c -SHA256 (dbus-1.14.10.tar.xz) = ba1f21d2bd9d339da2d4aa8780c09df32fea87998b73da24f49ab9df1e36a50f +RWSwxGo/zH7eXXyPlRPO7set87Xy/0Kdph2VcX9ZGXzr5LNvnJa8l9kS30RoalB7MJg2CcXz2LBwkQrdsPr59nEWUL0ws1QOcws= +SHA256 (Pkgfile) = a9a9e98bc08f014ba72c7f8b3ad71a01a8d8777810acae9684028453a1e1114a +SHA256 (.footprint) = cc5d2f5e610f92fdbe4cdca8faa57615de713f88d52ad970f1376d2735e5855a +SHA256 (dbus-1.16.0.tar.xz) = 9f8ca5eb51cbe09951aec8624b86c292990ae2428b41b856e2bed17ec65c8849 diff --git a/dbus-32/Pkgfile b/dbus-32/Pkgfile index 2c46c4fb..54dbe779 100644 --- a/dbus-32/Pkgfile +++ b/dbus-32/Pkgfile @@ -4,29 +4,34 @@ # Depends on: dbus expat-32 name=dbus-32 -version=1.14.10 +version=1.16.0 release=1 source=(https://dbus.freedesktop.org/releases/dbus/dbus-$version.tar.xz) build() { - cd ${name%-*}-$version + [ -e '/usr/lib/pkgconfig/x11.pc' ] && [ ! -e '/usr/lib32/pkgconfig/x11.pc' ] && printf "\e[031mxorg-libx11 is detected on your system, please run: + prt-get depinst xorg-libx11-32 + before continuing with dbus-32.\033[0m\n" && + exit 1 -[ -e '/usr/lib/pkgconfig/x11.pc' ] && [ ! -e '/usr/lib32/pkgconfig/x11.pc' ] && printf "\e[031mxorg-libx11 is detected on your system, please run: -prt-get depinst xorg-libx11-32 -before continuing with dbus-32.\033[0m\n" && -exit 1 - - ./configure --prefix=/usr \ - --libdir=/usr/lib32 \ - --with-dbus-daemondir=/usr/sbin \ + meson setup dbus-$version build \ + --prefix=/usr \ --localstatedir=/var \ - --libexecdir=/usr/lib32/dbus \ - --with-dbus-user=messagebus \ - --with-init-scripts=none \ - --with-system-pid-file=/var/run/dbus/dbus.pid + --sysconfdir=/etc \ + --libdir=/usr/lib32 \ + --libexecdir=lib32/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 - make - make DESTDIR=$PKG install + meson compile -C build + DESTDIR=$PKG meson install -C build - rm -r $PKG/var $PKG/usr/{bin,etc,include,sbin,share} + rm -r $PKG/var $PKG/run $PKG/usr/{bin,include,share} $PKG/etc }