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

[Jan Steffens]

    Date: Tuesday, October 27, 2015 @ 21:28:19
  Author: heftig
Revision: 249806

1.10.2

Modified:
  dbus/trunk/PKGBUILD
Deleted:
  dbus/trunk/0001-user-dbus.socket-Set-DBUS_SESSION_BUS_ADDRESS.patch

----------------------------------------------------------+
 0001-user-dbus.socket-Set-DBUS_SESSION_BUS_ADDRESS.patch |   25 -------------
 PKGBUILD                                                 |   15 ++-----
 2 files changed, 5 insertions(+), 35 deletions(-)

Deleted: 0001-user-dbus.socket-Set-DBUS_SESSION_BUS_ADDRESS.patch
===================================================================
--- 0001-user-dbus.socket-Set-DBUS_SESSION_BUS_ADDRESS.patch	2015-10-27 19:13:04 UTC (rev 249805)
+++ 0001-user-dbus.socket-Set-DBUS_SESSION_BUS_ADDRESS.patch	2015-10-27 20:28:19 UTC (rev 249806)
@@ -1,25 +0,0 @@
-From 53c3f6c20980a9375f4c699355e8f7963ed63d7f Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Thu, 22 Oct 2015 19:50:29 +0200
-Subject: [PATCH] user dbus.socket: Set DBUS_SESSION_BUS_ADDRESS
-
-As discussed in https://github.com/systemd/systemd/issues/1600
----
- bus/systemd-user/dbus.socket.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/bus/systemd-user/dbus.socket.in b/bus/systemd-user/dbus.socket.in
-index 77958f7..5535443 100644
---- a/bus/systemd-user/dbus.socket.in
-+++ b/bus/systemd-user/dbus.socket.in
-@@ -3,6 +3,7 @@ Description=D-Bus User Message Bus Socket
- 
- [Socket]
- ListenStream=%t/bus
-+ExecStartPost=@EXPANDED_BINDIR@/systemctl --user set-environment DBUS_SESSION_BUS_ADDRESS=unix:path=%t/bus
- 
- [Install]
- WantedBy=sockets.target
--- 
-2.6.2
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-10-27 19:13:04 UTC (rev 249805)
+++ PKGBUILD	2015-10-27 20:28:19 UTC (rev 249806)
@@ -5,25 +5,20 @@
 
 pkgbase=dbus
 pkgname=('dbus' 'libdbus')
-pkgver=1.10.0
-pkgrel=5
+pkgver=1.10.2
+pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
 arch=(i686 x86_64)
 license=('GPL' 'custom')
 makedepends=('libx11' 'systemd' 'xmlto' 'docbook-xsl')
-source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz{,.asc}
-        0001-user-dbus.socket-Set-DBUS_SESSION_BUS_ADDRESS.patch)
-md5sums=('5af6297348107a906c8449817a728b3b'
-         'SKIP'
-         'a97e2b8e5da583e38690d2ccd0424619')
+source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz{,.asc})
+md5sums=('2428919cc77b8d0028d65ee4d5dbef31'
+         'SKIP')
 validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90') # Simon McVittie <simon.mcvittie at collabora.co.uk>
 
 prepare() {
   cd dbus-$pkgver
-
-  # https://github.com/systemd/systemd/issues/1600
-  patch -Np1 -i ../0001-user-dbus.socket-Set-DBUS_SESSION_BUS_ADDRESS.patch
 }
 
 build() {