← recipes

Commit 0add17e7

0
files
+0
added
-0
deleted
@@ -1,10 +1,12 @@
1 1 pkgname: dbus
2 2 pkgver: '1.16.2'
3 -pkgrel: '10'
3 +pkgrel: '11'
4 4 pkgdesc: 'Freedesktop.org message bus system'
5 5 url: 'https://www.freedesktop.org/wiki/Software/dbus/'
6 6 arch: x86_64
7 -depends: []
7 +depends:
8 +- systemd
9 +- expat
8 10 makedepends:
9 11 - python
10 12 - meson
@@ -21,11 +23,8 @@ hooks:
21 23 'post-install': |
22 24 name=dbus
23 25 version=1.16.2
24 - release=10
26 + release=11
25 27 dbus-uuidgen --ensure
26 - # Nazwa grupy w archiwum pakietu jest rozwiazywana na hoscie buildera,
27 - # dlatego helper moze trafic z grupa spoza systemu docelowego.
28 - # Ustawiamy ja tutaj - grupa messagebus istnieje (tworzy ja pre-install).
29 28 if [ -f /usr/lib/dbus-daemon-launch-helper ]; then
30 29 chown root:messagebus /usr/lib/dbus-daemon-launch-helper
31 30 chmod 4750 /usr/lib/dbus-daemon-launch-helper
@@ -33,10 +32,7 @@ hooks:
33 32 'pre-install': |
34 33 name=dbus
35 34 version=1.16.2
36 - release=10
37 - # Uzytkownik/grupa messagebus powstaja w chrootcie buildera, ale NIE na
38 - # systemie docelowym. Bez nich hook zwracal blad, a plik
39 - # usr/lib/dbus-daemon-launch-helper trafial z nieistniejaca grupa.
35 + release=11
40 36 if ! getent group messagebus >/dev/null; then
41 37 groupadd -r messagebus
42 38 fi
@@ -49,13 +45,22 @@ build: |
49 45 if ! (getent passwd messagebus > /dev/null); then
50 46 useradd -r -s /bin/false messagebus
51 47 fi
52 - meson setup --prefix /usr --buildtype plain --libexecdir lib --sbindir bin -D b_pie=true dbus-1.16.2 builddir --wrap-mode=nofallback
48 + meson setup \
49 + --prefix /usr \
50 + --buildtype plain \
51 + --libexecdir lib \
52 + --sbindir bin \
53 + -D b_pie=true \
54 + -D systemd=enabled \
55 + -D systemd_user_unit_dir=/usr/lib/systemd/user \
56 + -D user_session=true \
57 + dbus-1.16.2 builddir --wrap-mode=nofallback
53 58 meson compile -C builddir
54 59 DESTDIR=${PKGDIR} meson install -C builddir
55 60
56 61 package: |
57 62 chown -v root:messagebus ${PKGDIR}/usr/lib/dbus-daemon-launch-helper
58 - chmod -v 4750 ${PKGDIR}/usr/lib/dbus-daemon-launch-helper
63 + chmod -v 4750 ${PKGDIR}/usr/lib/dbus-daemon-launch-helper
59 64
60 65 ln -sfv /etc/machine-id ${PKGDIR}/var/lib/dbus
61 66 rm -f ${PKGDIR}/usr/bin/dbus-launch