[arch-commits] Commit in dbus/trunk (2 files)

Jan Steffens heftig at archlinux.org
Thu Feb 16 22:29:06 UTC 2017


    Date: Thursday, February 16, 2017 @ 22:29:05
  Author: heftig
Revision: 289080

1.10.16-1

Modified:
  dbus/trunk/PKGBUILD
Deleted:
  dbus/trunk/0001-Drop-Install-sections-from-user-services.patch

-----------------------------------------------------+
 0001-Drop-Install-sections-from-user-services.patch |   44 ------------------
 PKGBUILD                                            |   12 ++--
 2 files changed, 5 insertions(+), 51 deletions(-)

Deleted: 0001-Drop-Install-sections-from-user-services.patch
===================================================================
--- 0001-Drop-Install-sections-from-user-services.patch	2017-02-16 22:27:33 UTC (rev 289079)
+++ 0001-Drop-Install-sections-from-user-services.patch	2017-02-16 22:29:05 UTC (rev 289080)
@@ -1,44 +0,0 @@
-From 09cb6d7b467f6d1c6685ee9ccc171f4dddbe1f42 Mon Sep 17 00:00:00 2001
-From: Simon McVittie <simon.mcvittie at 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 at 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=- at SYSTEMCTL@ --user set-environment DBUS_SESSION_BUS_ADDRESS=unix:path=%t/bus
--
--[Install]
--WantedBy=sockets.target
--Also=dbus.service
--- 
-2.9.3
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-02-16 22:27:33 UTC (rev 289079)
+++ PKGBUILD	2017-02-16 22:29:05 UTC (rev 289080)
@@ -6,7 +6,7 @@
 
 pkgbase=dbus
 pkgname=(dbus dbus-docs)
-pkgver=1.10.14
+pkgver=1.10.16
 pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
 url="https://wiki.freedesktop.org/www/Software/dbus/"
@@ -14,11 +14,9 @@
 license=(GPL custom)
 depends=(libsystemd expat)
 makedepends=(systemd xmlto docbook-xsl python yelp-tools doxygen git)
-_commit=449d6b313d2023360cf0af063cf23232901dd00b  # tags/dbus-1.10.14^0
-source=("git+https://anongit.freedesktop.org/git/dbus/dbus#commit=$_commit"
-        0001-Drop-Install-sections-from-user-services.patch)
-sha256sums=('SKIP'
-            '48135124680bd9ea2d7d2bd2a9f457608d97bd9aa7cb4f4396e26a1c2c91af3e')
+_commit=8b582cb10d7cf00af7a70496aec48af24edc542b  # tags/dbus-1.10.16^0
+source=("git+https://anongit.freedesktop.org/git/dbus/dbus#commit=$_commit")
+sha256sums=('SKIP')
 validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90'  # Simon McVittie <simon.mcvittie at collabora.co.uk>
               '3C8672A0F49637FE064AC30F52A43A1E4B77B059') # Simon McVittie <simon.mcvittie at collabora.co.uk>
 
@@ -29,7 +27,7 @@
 
 prepare() {
   cd $pkgbase
-  patch -Np1 -i ../0001-Drop-Install-sections-from-user-services.patch
+  git cherry-pick -n 09cb6d7b467f6d1c6685ee9ccc171f4dddbe1f42
   NOCONFIGURE=1 ./autogen.sh
 }
 



More information about the arch-commits mailing list