diff options
author | ozgursarier | 2017-05-30 17:34:05 +0300 |
---|---|---|
committer | ozgursarier | 2017-05-30 17:34:05 +0300 |
commit | 46e52747c8b70f6db170b6d98e1d708f84a336bf (patch) | |
tree | f016f7e417d1499d57fae15316801cdda8d22d81 | |
parent | 51bb5e2fda4346617c6b7eb006226e813f915c69 (diff) | |
download | aur-46e52747c8b70f6db170b6d98e1d708f84a336bf.tar.gz |
Update to 1.10.18-1
-rw-r--r-- | .SRCINFO | 12 | ||||
-rw-r--r-- | 0001-Drop-Install-sections-from-user-services.patch | 44 | ||||
-rw-r--r-- | PKGBUILD | 22 | ||||
-rw-r--r-- | dbus.sysusers | 1 |
4 files changed, 23 insertions, 56 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Sun Jan 15 17:33:34 UTC 2017 +# Tue May 30 14:33:54 UTC 2017 pkgbase = dbus-x11 pkgdesc = Freedesktop.org message bus system - pkgver = 1.10.14 + pkgver = 1.10.18 pkgrel = 1 url = https://wiki.freedesktop.org/www/Software/dbus/ arch = i686 @@ -21,13 +21,15 @@ pkgbase = dbus-x11 depends = expat provides = libdbus provides = dbus + provides = dbus-docs conflicts = libdbus conflicts = dbus + conflicts = dbus-docs replaces = libdbus - source = git+https://anongit.freedesktop.org/git/dbus/dbus#commit=449d6b313d2023360cf0af063cf23232901dd00b - source = 0001-Drop-Install-sections-from-user-services.patch + source = git+https://anongit.freedesktop.org/git/dbus/dbus#commit=73961ee58cf47315b14e30fbde6d0eea825c987b + source = dbus.sysusers sha256sums = SKIP - sha256sums = 48135124680bd9ea2d7d2bd2a9f457608d97bd9aa7cb4f4396e26a1c2c91af3e + sha256sums = 1ce179ba3a92ad34941d8ac7f53d01d42cbc91d43ada1136492b78c10b5d693d pkgname = dbus-x11 diff --git a/0001-Drop-Install-sections-from-user-services.patch b/0001-Drop-Install-sections-from-user-services.patch deleted file mode 100644 index e62daccaf279..000000000000 --- a/0001-Drop-Install-sections-from-user-services.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 09cb6d7b467f6d1c6685ee9ccc171f4dddbe1f42 Mon Sep 17 00:00:00 2001 -From: Simon McVittie <simon.mcvittie@collabora.co.uk> -Date: Sat, 7 Nov 2015 13:03:47 +0100 -Subject: [PATCH] Drop [Install] sections from user services - -We install the symlink to enable dbus.socket statically, so it doesn't -make much sense to invoke `systemctl enable` on it; and -dbus.service should normally be started by socket activation -(or possibly an explicit dependency) rather than manually. - -Bug: https://bugs.freedesktop.org/show_bug.cgi?id=92402 -Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk> -Reviewed-by: Lennart Poettering ---- - bus/systemd-user/dbus.service.in | 3 --- - bus/systemd-user/dbus.socket.in | 4 ---- - 2 files changed, 7 deletions(-) - -diff --git a/bus/systemd-user/dbus.service.in b/bus/systemd-user/dbus.service.in -index b41f522b8af8c174..4355d72844079cc5 100644 ---- a/bus/systemd-user/dbus.service.in -+++ b/bus/systemd-user/dbus.service.in -@@ -6,6 +6,3 @@ Requires=dbus.socket - [Service] - ExecStart=@EXPANDED_BINDIR@/dbus-daemon --session --address=systemd: --nofork --nopidfile --systemd-activation - ExecReload=@EXPANDED_BINDIR@/dbus-send --print-reply --session --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig -- --[Install] --Also=dbus.socket -diff --git a/bus/systemd-user/dbus.socket.in b/bus/systemd-user/dbus.socket.in -index 4793d1d4ff1dc13e..304ac4034208f811 100644 ---- a/bus/systemd-user/dbus.socket.in -+++ b/bus/systemd-user/dbus.socket.in -@@ -4,7 +4,3 @@ Description=D-Bus User Message Bus Socket - [Socket] - ListenStream=%t/bus - ExecStartPost=-@SYSTEMCTL@ --user set-environment DBUS_SESSION_BUS_ADDRESS=unix:path=%t/bus -- --[Install] --WantedBy=sockets.target --Also=dbus.service --- -2.9.3 - @@ -5,22 +5,22 @@ # Contributor: Link Dupont <link@subpop.net> pkgname=dbus-x11 -pkgver=1.10.14 +pkgver=1.10.18 pkgrel=1 pkgdesc="Freedesktop.org message bus system" url="https://wiki.freedesktop.org/www/Software/dbus/" arch=(i686 x86_64) license=(GPL custom) -provides=('libdbus' 'dbus') -conflicts=('libdbus' 'dbus') +provides=('libdbus' 'dbus' 'dbus-docs') +conflicts=('libdbus' 'dbus' 'dbus-docs') replaces=(libdbus) depends=(libsystemd expat) makedepends=(systemd xmlto docbook-xsl python yelp-tools doxygen git libx11) -_commit=449d6b313d2023360cf0af063cf23232901dd00b # tags/dbus-1.10.14^0 +_commit=73961ee58cf47315b14e30fbde6d0eea825c987b # tags/dbus-1.10.18^0 source=("git+https://anongit.freedesktop.org/git/dbus/dbus#commit=$_commit" - 0001-Drop-Install-sections-from-user-services.patch) + 'dbus.sysusers') sha256sums=('SKIP' - '48135124680bd9ea2d7d2bd2a9f457608d97bd9aa7cb4f4396e26a1c2c91af3e') + '1ce179ba3a92ad34941d8ac7f53d01d42cbc91d43ada1136492b78c10b5d693d') validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90' # Simon McVittie <simon.mcvittie@collabora.co.uk> '3C8672A0F49637FE064AC30F52A43A1E4B77B059') # Simon McVittie <simon.mcvittie@collabora.co.uk> @@ -31,7 +31,7 @@ pkgver() { prepare() { cd ${pkgname%-*} - patch -Np1 -i ../0001-Drop-Install-sections-from-user-services.patch + git cherry-pick -n 09cb6d7b467f6d1c6685ee9ccc171f4dddbe1f42 NOCONFIGURE=1 ./autogen.sh } @@ -64,6 +64,14 @@ package() { install -Dm644 COPYING "$pkgdir/usr/share/licenses/${pkgname%-*}/COPYING" + # systemd-sysusers + install -Dm644 "$srcdir/dbus.sysusers" "$pkgdir/usr/lib/sysusers.d/dbus.conf" + # Split docs mv "$pkgdir/usr/share/doc" "$srcdir" + + install -d "$pkgdir/usr/share/licenses" + ln -s dbus "$pkgdir/usr/share/licenses/dbus-docs" + + mv doc "$pkgdir/usr/share" } diff --git a/dbus.sysusers b/dbus.sysusers new file mode 100644 index 000000000000..6e8dcec11386 --- /dev/null +++ b/dbus.sysusers @@ -0,0 +1 @@ +u dbus 81 |