[arch-commits] Commit in xfce4-session/trunk (3 files)

[Evangelos Foutras]

    Date: Tuesday, January 8, 2019 @ 06:44:17
  Author: foutrelis
Revision: 343102

upgpkg: xfce4-session 4.12.1-11

- Remove DBUS_SESSION_BUS_ADDRESS patch (unneeded since systemd 240.0-2).
- Rename "source system xinitrc scripts" patch.

Added:
  xfce4-session/trunk/0003-source-system-xinitrc-scripts.patch
    (from rev 343101, xfce4-session/trunk/0003-xfce4-session-source-system-xinitrc-scripts.patch)
Modified:
  xfce4-session/trunk/PKGBUILD
Deleted:
  xfce4-session/trunk/0003-xfce4-session-source-system-xinitrc-scripts.patch

--------------------------------------------------------+
 0003-source-system-xinitrc-scripts.patch               |   18 +++++++++++++++
 0003-xfce4-session-source-system-xinitrc-scripts.patch |   18 ---------------
 PKGBUILD                                               |   15 ++----------
 3 files changed, 21 insertions(+), 30 deletions(-)

Copied: xfce4-session/trunk/0003-source-system-xinitrc-scripts.patch (from rev 343101, xfce4-session/trunk/0003-xfce4-session-source-system-xinitrc-scripts.patch)
===================================================================
--- 0003-source-system-xinitrc-scripts.patch	                        (rev 0)
+++ 0003-source-system-xinitrc-scripts.patch	2019-01-08 06:44:17 UTC (rev 343102)
@@ -0,0 +1,18 @@
+diff -upr xfce4-session-4.12.1.orig/scripts/xinitrc.in.in xfce4-session-4.12.1/scripts/xinitrc.in.in
+--- xfce4-session-4.12.1.orig/scripts/xinitrc.in.in	2015-03-16 09:29:52.000000000 +0200
++++ xfce4-session-4.12.1/scripts/xinitrc.in.in	2017-03-03 04:11:03.591724694 +0200
+@@ -87,6 +87,14 @@ cat /dev/null $XRESOURCES | xrdb -nocpp
+ # load local modmap
+ test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap
+ 
++# source system xinitrc scripts
++if [ -d /etc/X11/xinit/xinitrc.d ]; then
++    for f in /etc/X11/xinit/xinitrc.d/?*.sh; do
++        [ -x "$f" ] && . "$f"
++    done
++    unset f
++fi
++
+ # run xfce4-session if installed
+ if which xfce4-session >/dev/null 2>&1; then
+ 

Deleted: 0003-xfce4-session-source-system-xinitrc-scripts.patch
===================================================================
--- 0003-xfce4-session-source-system-xinitrc-scripts.patch	2019-01-08 06:42:29 UTC (rev 343101)
+++ 0003-xfce4-session-source-system-xinitrc-scripts.patch	2019-01-08 06:44:17 UTC (rev 343102)
@@ -1,18 +0,0 @@
-diff -upr xfce4-session-4.12.1.orig/scripts/xinitrc.in.in xfce4-session-4.12.1/scripts/xinitrc.in.in
---- xfce4-session-4.12.1.orig/scripts/xinitrc.in.in	2015-03-16 09:29:52.000000000 +0200
-+++ xfce4-session-4.12.1/scripts/xinitrc.in.in	2017-03-03 04:11:03.591724694 +0200
-@@ -87,6 +87,14 @@ cat /dev/null $XRESOURCES | xrdb -nocpp
- # load local modmap
- test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap
- 
-+# source system xinitrc scripts
-+if [ -d /etc/X11/xinit/xinitrc.d ]; then
-+    for f in /etc/X11/xinit/xinitrc.d/?*.sh; do
-+        [ -x "$f" ] && . "$f"
-+    done
-+    unset f
-+fi
-+
- # run xfce4-session if installed
- if which xfce4-session >/dev/null 2>&1; then
- 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-01-08 06:42:29 UTC (rev 343101)
+++ PKGBUILD	2019-01-08 06:44:17 UTC (rev 343102)
@@ -3,7 +3,7 @@
 
 pkgname=xfce4-session
 pkgver=4.12.1
-pkgrel=10
+pkgrel=11
 pkgdesc="A session manager for Xfce"
 arch=('x86_64')
 url="http://www.xfce.org/"
@@ -21,9 +21,8 @@
 source=(https://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
         0001-Pass-VT-number-to-xinit-if-XDG_VTNR-is-set.patch
         0002-Make-verbose-logging-conditional-Bug-11698.patch
-        0003-xfce4-session-source-system-xinitrc-scripts.patch
+        0003-source-system-xinitrc-scripts.patch
         0004-screenlockers.patch
-        0005-dbus-user-session.patch
         xfce-polkit-gnome-authentication-agent-1.desktop)
 sha256sums=('97d7f2a2d0af7f3623b68d1f04091e02913b28f9555dab8b0d26c8a1299d08fd'
             '7ea702a1d3391d36958cff57496ba2474592dd915cf7569a65501522c2410cf1'
@@ -30,7 +29,6 @@
             '6bbd714008f31198f9631cdfb3ed8aac1c780f00d15b81c32c00860ae37521a6'
             'a717a0ee6289c9ce06a8e18c6a7cb5a6d6f1769c05c456a6a84843df6a0111da'
             '1d4063889af073c3de221e0bbd3cacc11dfc95ee11f6e530c6e35f7714a6e295'
-            'cb9d9f2adf9748760fb24412b16d84b13ff29e2601d29f3a4ebb4eb7bcb27c24'
             '74c94c5f7893d714e04ec7d8b8520c978a5748757a0cdcf5128492f09f31b643')
 
 prepare() {
@@ -43,18 +41,11 @@
   patch -Np1 -i ../0002-Make-verbose-logging-conditional-Bug-11698.patch
 
   # https://bugzilla.xfce.org/show_bug.cgi?id=12754
-  patch -Np1 -i ../0003-xfce4-session-source-system-xinitrc-scripts.patch
+  patch -Np1 -i ../0003-source-system-xinitrc-scripts.patch
 
   # https://git.xfce.org/xfce/xfce4-session/commit/?id=e940818853582290af21bf38d73ee26143d500ad
   # https://git.xfce.org/xfce/xfce4-session/commit/?id=495aac78058cd78e2d34505af204e72a1b4f19ac
   patch -Np1 -i ../0004-screenlockers.patch
-
-  # The idea of having a magic fallback for when DBUS_SESSION_BUS_ADDRESS is
-  # empty is nice and all but all hell breaks lose (Xfce doesn't start and/or
-  # Chromium can't access its cookies). Magic is bad; just set the silly var!
-  # (It feels like this should be a script under /etc/X11/xinit/xinitrc.d/.)
-  # https://bugs.archlinux.org/task/61177
-  patch -Np1 -i ../0005-dbus-user-session.patch
 }
 
 build() {