[arch-commits] Commit in xfce4-session/trunk (PKGBUILD dbus-update-environment.patch)

[Evangelos Foutras]

    Date: Thursday, March 2, 2017 @ 23:51:45
  Author: foutrelis
Revision: 289904

upgpkg: xfce4-session 4.12.1-5

Remove patch that does not actually do anything because the code it touches
is never executed.

Modified:
  xfce4-session/trunk/PKGBUILD
Deleted:
  xfce4-session/trunk/dbus-update-environment.patch

-------------------------------+
 PKGBUILD                      |    7 +------
 dbus-update-environment.patch |   36 ------------------------------------
 2 files changed, 1 insertion(+), 42 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-02 22:46:05 UTC (rev 289903)
+++ PKGBUILD	2017-03-02 23:51:45 UTC (rev 289904)
@@ -4,7 +4,7 @@
 
 pkgname=xfce4-session
 pkgver=4.12.1
-pkgrel=4
+pkgrel=5
 pkgdesc="A session manager for Xfce"
 arch=('i686' 'x86_64')
 url="http://www.xfce.org/"
@@ -21,11 +21,9 @@
 replaces=('xfce-utils')
 source=(http://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
         0001-Pass-VT-number-to-xinit-if-XDG_VTNR-is-set.patch
-        dbus-update-environment.patch
         xfce-polkit-gnome-authentication-agent-1.desktop)
 sha256sums=('97d7f2a2d0af7f3623b68d1f04091e02913b28f9555dab8b0d26c8a1299d08fd'
             '7ea702a1d3391d36958cff57496ba2474592dd915cf7569a65501522c2410cf1'
-            '0a3f23c2ee1b73cec3ecb999b2cc1b5d97e7023482e42b418e6f14cd4f671c0b'
             '74c94c5f7893d714e04ec7d8b8520c978a5748757a0cdcf5128492f09f31b643')
 
 prepare() {
@@ -33,9 +31,6 @@
 
   # https://bugzilla.xfce.org/show_bug.cgi?id=11759
   patch -Np1 -i ../0001-Pass-VT-number-to-xinit-if-XDG_VTNR-is-set.patch
-
-  # Support using existing dbus-daemon
-  patch -Np1 -i ../dbus-update-environment.patch
 }
 
 build() {

Deleted: dbus-update-environment.patch
===================================================================
--- dbus-update-environment.patch	2017-03-02 22:46:05 UTC (rev 289903)
+++ dbus-update-environment.patch	2017-03-02 23:51:45 UTC (rev 289904)
@@ -1,36 +0,0 @@
-diff -u -r xfce4-session-4.12.1/scripts/xinitrc.in xfce4-session-4.12.1-dbus/scripts/xinitrc.in
---- xfce4-session-4.12.1/scripts/xinitrc.in	2015-03-16 08:29:52.000000000 +0100
-+++ xfce4-session-4.12.1-dbus/scripts/xinitrc.in	2015-09-25 18:23:46.069944338 +0200
-@@ -132,7 +132,13 @@
-     export DBUS_SESSION_BUS_ADDRESS
-   else
-     echo "Could not find dbus-launch; Xfce will not work properly" >&2
--    fi
-+  fi
-+else
-+  if which dbus-update-activation-environment >/dev/null 2>&1; then
-+    dbus-update-activation-environment --systemd --all
-+  else
-+    echo "Could not find dbus-update-activation-environment; Xfce will not work properly" >&2
-+  fi
- fi
- 
- # this is only necessary when running w/o xfce4-session
-diff -u -r xfce4-session-4.12.1/scripts/xinitrc.in.in xfce4-session-4.12.1-dbus/scripts/xinitrc.in.in
---- xfce4-session-4.12.1/scripts/xinitrc.in.in	2014-10-20 07:23:02.000000000 +0200
-+++ xfce4-session-4.12.1-dbus/scripts/xinitrc.in.in	2015-09-25 18:24:06.106572945 +0200
-@@ -132,7 +132,13 @@
-     export DBUS_SESSION_BUS_ADDRESS
-   else
-     echo "Could not find dbus-launch; Xfce will not work properly" >&2
--    fi
-+  fi
-+else
-+  if which dbus-update-activation-environment >/dev/null 2>&1; then
-+    dbus-update-activation-environment --systemd --all
-+  else
-+    echo "Could not find dbus-update-activation-environment; Xfce will not work properly" >&2
-+  fi
- fi
- 
- # this is only necessary when running w/o xfce4-session