summaryrefslogtreecommitdiff
path: root/pcr
diff options
context:
space:
mode:
authorOmar Vega Ramos <ovruni@gnu.org.pe>2016-09-11 13:20:05 -0500
committerOmar Vega Ramos <ovruni@gnu.org.pe>2016-09-11 13:20:05 -0500
commit83156266fc0021c744dd9da0dd94ad100a096719 (patch)
treecbe25255667590b96926b3cb34006e050618daf8 /pcr
parentbad520f6d8b6ba01f86256aa05013536bb7fce62 (diff)
dbus-x11: add new package to [pcr]
Diffstat (limited to 'pcr')
-rw-r--r--pcr/dbus-x11/0001-Drop-Install-sections-from-user-services.patch44
-rw-r--r--pcr/dbus-x11/PKGBUILD62
2 files changed, 106 insertions, 0 deletions
diff --git a/pcr/dbus-x11/0001-Drop-Install-sections-from-user-services.patch b/pcr/dbus-x11/0001-Drop-Install-sections-from-user-services.patch
new file mode 100644
index 000000000..e62daccaf
--- /dev/null
+++ b/pcr/dbus-x11/0001-Drop-Install-sections-from-user-services.patch
@@ -0,0 +1,44 @@
+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
+
diff --git a/pcr/dbus-x11/PKGBUILD b/pcr/dbus-x11/PKGBUILD
new file mode 100644
index 000000000..a642506c3
--- /dev/null
+++ b/pcr/dbus-x11/PKGBUILD
@@ -0,0 +1,62 @@
+# Maintainer (Arch): Jan de Groot <jgc@archlinux.org>
+# Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor (Arch): Tom Gundersen <teg@jklm.no>
+# Contributor (Arch): Link Dupont <link@subpop.net>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
+
+pkgname=dbus-x11
+_pkgname=dbus
+pkgver=1.10.10
+pkgrel=3
+pkgdesc="Freedesktop.org message bus system"
+url="https://wiki.freedesktop.org/www/Software/dbus/"
+arch=(i686 x86_64 armv7h)
+license=(GPL custom)
+provides=('libdbus' 'dbus')
+conflicts=('libdbus' 'dbus')
+replaces=(libdbus)
+depends=(libsystemd expat dbus-docs)
+makedepends=(systemd xmlto docbook-xsl python yelp-tools doxygen)
+source=(https://dbus.freedesktop.org/releases/$_pkgname/$_pkgname-$pkgver.tar.gz
+ 0001-Drop-Install-sections-from-user-services.patch)
+sha256sums=('9d8f1d069ab4d1a0255d7b400ea3bcef4430c42e729b1012abb2890e3f739a43'
+ '48135124680bd9ea2d7d2bd2a9f457608d97bd9aa7cb4f4396e26a1c2c91af3e')
+
+prepare() {
+ cd $_pkgname-$pkgver
+ patch -Np1 -i ../0001-Drop-Install-sections-from-user-services.patch
+ autoreconf -fvi
+}
+
+build() {
+ cd $_pkgname-$pkgver
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+ --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=dbus \
+ --with-system-pid-file=/run/dbus/pid \
+ --with-system-socket=/run/dbus/system_bus_socket \
+ --with-console-auth-dir=/run/console/ \
+ --enable-inotify --disable-static \
+ --disable-verbose-mode --disable-asserts \
+ --with-systemdsystemunitdir=/usr/lib/systemd/system \
+ --enable-systemd --enable-user-session \
+ --enable-x11-autolaunch
+ make
+}
+
+check() {
+ cd $_pkgname-$pkgver
+ make check
+}
+
+package() {
+ cd $_pkgname-$pkgver
+
+ make DESTDIR="$pkgdir" install
+
+ rm -r "$pkgdir/var/run"
+
+ install -Dm644 COPYING "$pkgdir/usr/share/licenses/$_pkgname/COPYING"
+
+ # Split docs
+ rm -r "$pkgdir/usr/share/doc"
+}