[arch-commits] Commit in dbus/repos (6 files)
Jan Steffens
heftig at archlinux.org
Thu Oct 22 17:55:29 UTC 2015
Date: Thursday, October 22, 2015 @ 19:55:29
Author: heftig
Revision: 249656
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
dbus/repos/testing-i686/
dbus/repos/testing-i686/0001-user-dbus.socket-Set-DBUS_SESSION_BUS_ADDRESS.patch
(from rev 249655, dbus/trunk/0001-user-dbus.socket-Set-DBUS_SESSION_BUS_ADDRESS.patch)
dbus/repos/testing-i686/PKGBUILD
(from rev 249655, dbus/trunk/PKGBUILD)
dbus/repos/testing-x86_64/
dbus/repos/testing-x86_64/0001-user-dbus.socket-Set-DBUS_SESSION_BUS_ADDRESS.patch
(from rev 249655, dbus/trunk/0001-user-dbus.socket-Set-DBUS_SESSION_BUS_ADDRESS.patch)
dbus/repos/testing-x86_64/PKGBUILD
(from rev 249655, dbus/trunk/PKGBUILD)
-------------------------------------------------------------------------+
testing-i686/0001-user-dbus.socket-Set-DBUS_SESSION_BUS_ADDRESS.patch | 25 +++
testing-i686/PKGBUILD | 72 ++++++++++
testing-x86_64/0001-user-dbus.socket-Set-DBUS_SESSION_BUS_ADDRESS.patch | 25 +++
testing-x86_64/PKGBUILD | 72 ++++++++++
4 files changed, 194 insertions(+)
Copied: dbus/repos/testing-i686/0001-user-dbus.socket-Set-DBUS_SESSION_BUS_ADDRESS.patch (from rev 249655, dbus/trunk/0001-user-dbus.socket-Set-DBUS_SESSION_BUS_ADDRESS.patch)
===================================================================
--- testing-i686/0001-user-dbus.socket-Set-DBUS_SESSION_BUS_ADDRESS.patch (rev 0)
+++ testing-i686/0001-user-dbus.socket-Set-DBUS_SESSION_BUS_ADDRESS.patch 2015-10-22 17:55:29 UTC (rev 249656)
@@ -0,0 +1,25 @@
+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
+
Copied: dbus/repos/testing-i686/PKGBUILD (from rev 249655, dbus/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2015-10-22 17:55:29 UTC (rev 249656)
@@ -0,0 +1,72 @@
+# $Id$
+# Maintainer: Tom Gundersen <teg at jklm.no>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Link Dupont <link at subpop.net>
+
+pkgbase=dbus
+pkgname=('dbus' 'libdbus')
+pkgver=1.10.0
+pkgrel=5
+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')
+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() {
+ cd dbus-$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-verbose-mode --disable-static \
+ --disable-tests --disable-asserts \
+ --with-systemdsystemunitdir=/usr/lib/systemd/system \
+ --enable-systemd --enable-user-session
+ make
+}
+
+package_dbus(){
+ depends=('libdbus' 'expat')
+ optdepends=('libx11: dbus-launch support')
+ provides=('dbus-core')
+ conflicts=('dbus-core')
+ replaces=('dbus-core')
+
+ cd dbus-$pkgver
+
+ # Disable installation of libdbus
+ sed -i -e 's/^SUBDIRS = dbus/SUBDIRS =/' Makefile
+
+ make DESTDIR="$pkgdir" install
+
+ rm -r "${pkgdir}/var/run"
+ rm -r "${pkgdir}/usr/lib/pkgconfig"
+
+ install -Dm644 COPYING "$pkgdir/usr/share/licenses/dbus/COPYING"
+}
+
+package_libdbus(){
+ pkgdesc="DBus library"
+ depends=('libsystemd')
+
+ cd dbus-$pkgver
+ make DESTDIR="$pkgdir" -C dbus install
+ make DESTDIR="$pkgdir" install-data-am
+ install -Dm644 COPYING "${pkgdir}/usr/share/licenses/libdbus/COPYING"
+}
Copied: dbus/repos/testing-x86_64/0001-user-dbus.socket-Set-DBUS_SESSION_BUS_ADDRESS.patch (from rev 249655, dbus/trunk/0001-user-dbus.socket-Set-DBUS_SESSION_BUS_ADDRESS.patch)
===================================================================
--- testing-x86_64/0001-user-dbus.socket-Set-DBUS_SESSION_BUS_ADDRESS.patch (rev 0)
+++ testing-x86_64/0001-user-dbus.socket-Set-DBUS_SESSION_BUS_ADDRESS.patch 2015-10-22 17:55:29 UTC (rev 249656)
@@ -0,0 +1,25 @@
+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
+
Copied: dbus/repos/testing-x86_64/PKGBUILD (from rev 249655, dbus/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2015-10-22 17:55:29 UTC (rev 249656)
@@ -0,0 +1,72 @@
+# $Id$
+# Maintainer: Tom Gundersen <teg at jklm.no>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Link Dupont <link at subpop.net>
+
+pkgbase=dbus
+pkgname=('dbus' 'libdbus')
+pkgver=1.10.0
+pkgrel=5
+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')
+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() {
+ cd dbus-$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-verbose-mode --disable-static \
+ --disable-tests --disable-asserts \
+ --with-systemdsystemunitdir=/usr/lib/systemd/system \
+ --enable-systemd --enable-user-session
+ make
+}
+
+package_dbus(){
+ depends=('libdbus' 'expat')
+ optdepends=('libx11: dbus-launch support')
+ provides=('dbus-core')
+ conflicts=('dbus-core')
+ replaces=('dbus-core')
+
+ cd dbus-$pkgver
+
+ # Disable installation of libdbus
+ sed -i -e 's/^SUBDIRS = dbus/SUBDIRS =/' Makefile
+
+ make DESTDIR="$pkgdir" install
+
+ rm -r "${pkgdir}/var/run"
+ rm -r "${pkgdir}/usr/lib/pkgconfig"
+
+ install -Dm644 COPYING "$pkgdir/usr/share/licenses/dbus/COPYING"
+}
+
+package_libdbus(){
+ pkgdesc="DBus library"
+ depends=('libsystemd')
+
+ cd dbus-$pkgver
+ make DESTDIR="$pkgdir" -C dbus install
+ make DESTDIR="$pkgdir" install-data-am
+ install -Dm644 COPYING "${pkgdir}/usr/share/licenses/libdbus/COPYING"
+}
More information about the arch-commits
mailing list