[arch-commits] Commit in xorg-xinit/trunk (PKGBUILD fs46369.patch)

[Jan Steffens]

    Date: Monday, September 21, 2015 @ 17:11:09
  Author: heftig
Revision: 247033

FS#46369: Don't unset DBUS_SESSION_BUS_ADDRESS

Added:
  xorg-xinit/trunk/fs46369.patch
Modified:
  xorg-xinit/trunk/PKGBUILD

---------------+
 PKGBUILD      |    5 ++++-
 fs46369.patch |   11 +++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-09-21 09:08:07 UTC (rev 247032)
+++ PKGBUILD	2015-09-21 15:11:09 UTC (rev 247033)
@@ -4,7 +4,7 @@
 
 pkgname=xorg-xinit
 pkgver=1.3.4
-pkgrel=2
+pkgrel=3
 pkgdesc="X.Org initialisation program "
 arch=('i686' 'x86_64')
 license=('custom')
@@ -17,11 +17,13 @@
 source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2
         06_move_serverauthfile_into_tmp.diff
         fs25361.patch
+        fs46369.patch
         xserverrc)
 options=(!emptydirs)
 sha256sums=('75d88d7397a07e01db253163b7c7a00b249b3d30e99489f2734cac9a0c7902b3'
             'a5c6ced5822bbb3145e0f30a4b12995782ca6d80ff2d927851ec91b5e41212cb'
             '431335ceb84f75aaa96fba285a596f61a63629f94756f8063e4f621ae143629b'
+            '6e2c44b997e604db167f00168e8b6c68257be50447d7a80856b4aa910f52351e'
             '86835010b5350c41035495b7b845db0eecf1e4b7eeaf152b12a881fa502e5387')
 
 prepare() {
@@ -28,6 +30,7 @@
   cd xinit-${pkgver}
   patch -Np1 -i ../06_move_serverauthfile_into_tmp.diff
   patch -Np1 -i ../fs25361.patch
+  patch -Np1 -i ../fs46369.patch
   sed -i -e 's/XSLASHGLOB.sh/XSLASHGLOB/' xinitrc.cpp
 }
 

Added: fs46369.patch
===================================================================
--- fs46369.patch	                        (rev 0)
+++ fs46369.patch	2015-09-21 15:11:09 UTC (rev 247033)
@@ -0,0 +1,11 @@
+diff -u -r xinit-1.3.4/startx.cpp xinit-1.3.4-dbus/startx.cpp
+--- xinit-1.3.4/startx.cpp	2015-09-21 17:07:29.732240308 +0200
++++ xinit-1.3.4-dbus/startx.cpp	2015-09-21 17:07:59.255424644 +0200
+@@ -11,7 +11,6 @@
+ XCOMM Site administrators are STRONGLY urged to write nicer versions.
+ XCOMM
+ 
+-unset DBUS_SESSION_BUS_ADDRESS
+ unset SESSION_MANAGER
+ 
+ #ifdef __APPLE__