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

[Evangelos Foutras]

    Date: Sunday, December 30, 2018 @ 03:29:42
  Author: foutrelis
Revision: 342790

upgpkg: xfce4-session 4.12.1-10

Follow-up workaround for FS#61177. Leaving DBUS_SESSION_BUS_ADDRESS unset
prevents Chromium from connecting to the user bus and decrypting cookies:

    ERROR:bus.cc(396)] Failed to connect to the bus: Could not parse server
    address: Unknown address type (examples of valid types are "tcp" and on
    UNIX "unix")

Added:
  xfce4-session/trunk/0005-dbus-user-session.patch
Modified:
  xfce4-session/trunk/PKGBUILD
Deleted:
  xfce4-session/trunk/0005-dbus-launch.patch

------------------------------+
 0005-dbus-launch.patch       |   15 ---------------
 0005-dbus-user-session.patch |   18 ++++++++++++++++++
 PKGBUILD                     |   15 +++++++++------
 3 files changed, 27 insertions(+), 21 deletions(-)

Deleted: 0005-dbus-launch.patch
===================================================================
--- 0005-dbus-launch.patch	2018-12-29 23:09:57 UTC (rev 342789)
+++ 0005-dbus-launch.patch	2018-12-30 03:29:42 UTC (rev 342790)
@@ -1,15 +0,0 @@
-diff --git a/xfce4-session/main.c b/xfce4-session/main.c
-index 0c27a55..925069f 100644
---- a/xfce4-session/main.c
-+++ b/xfce4-session/main.c
-@@ -243,8 +243,10 @@ main (int argc, char **argv)
-   XfsmShutdown     *shutdown_helper;
-   gboolean          succeed = TRUE;
- 
-+#if 0
-   if (!xfsm_dbus_require_session (argc, argv))
-     return EXIT_SUCCESS;
-+#endif
- 
-   xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
- 

Added: 0005-dbus-user-session.patch
===================================================================
--- 0005-dbus-user-session.patch	                        (rev 0)
+++ 0005-dbus-user-session.patch	2018-12-30 03:29:42 UTC (rev 342790)
@@ -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	2018-12-30 05:05:04.201829621 +0200
++++ xfce4-session-4.12.1/scripts/xinitrc.in.in	2018-12-30 05:08:45.200127486 +0200
+@@ -95,6 +95,14 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then
+     unset f
+ fi
+ 
++# unless DBUS_SESSION_BUS_ADDRESS is set elsewhere
++if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
++    # use the user session bus if available
++    if [ -S "$XDG_RUNTIME_DIR/bus" -a -O "$XDG_RUNTIME_DIR/bus" ]; then
++        export DBUS_SESSION_BUS_ADDRESS="unix:path=$XDG_RUNTIME_DIR/bus"
++    fi
++fi
++
+ # run xfce4-session if installed
+ if which xfce4-session >/dev/null 2>&1; then
+ 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-29 23:09:57 UTC (rev 342789)
+++ PKGBUILD	2018-12-30 03:29:42 UTC (rev 342790)
@@ -3,7 +3,7 @@
 
 pkgname=xfce4-session
 pkgver=4.12.1
-pkgrel=9
+pkgrel=10
 pkgdesc="A session manager for Xfce"
 arch=('x86_64')
 url="http://www.xfce.org/"
@@ -22,8 +22,8 @@
         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
-        0004-screenlockers.patch        
-        0005-dbus-launch.patch
+        0004-screenlockers.patch
+        0005-dbus-user-session.patch
         xfce-polkit-gnome-authentication-agent-1.desktop)
 sha256sums=('97d7f2a2d0af7f3623b68d1f04091e02913b28f9555dab8b0d26c8a1299d08fd'
             '7ea702a1d3391d36958cff57496ba2474592dd915cf7569a65501522c2410cf1'
@@ -30,7 +30,7 @@
             '6bbd714008f31198f9631cdfb3ed8aac1c780f00d15b81c32c00860ae37521a6'
             'a717a0ee6289c9ce06a8e18c6a7cb5a6d6f1769c05c456a6a84843df6a0111da'
             '1d4063889af073c3de221e0bbd3cacc11dfc95ee11f6e530c6e35f7714a6e295'
-            '842258be04687cd0da898eb0d66668a9629ec444e9151fede50b0c18e7f61e54'
+            'cb9d9f2adf9748760fb24412b16d84b13ff29e2601d29f3a4ebb4eb7bcb27c24'
             '74c94c5f7893d714e04ec7d8b8520c978a5748757a0cdcf5128492f09f31b643')
 
 prepare() {
@@ -49,9 +49,12 @@
   # https://git.xfce.org/xfce/xfce4-session/commit/?id=495aac78058cd78e2d34505af204e72a1b4f19ac
   patch -Np1 -i ../0004-screenlockers.patch
 
-  # not not start dbus-session but fall back to socket
+  # 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-launch.patch
+  patch -Np1 -i ../0005-dbus-user-session.patch
 }
 
 build() {