[arch-commits] Commit in xfce4-session/repos (8 files)

Sat Dec 29 23:09:58 UTC 2018

Date: Saturday, December 29, 2018 @ 23:09:57
  Author: eworm
Revision: 342789

archrelease: copy trunk to testing-x86_64

Added:
  xfce4-session/repos/testing-x86_64/
  xfce4-session/repos/testing-x86_64/0001-Pass-VT-number-to-xinit-if-XDG_VTNR-is-set.patch
    (from rev 342788, xfce4-session/trunk/0001-Pass-VT-number-to-xinit-if-XDG_VTNR-is-set.patch)
  xfce4-session/repos/testing-x86_64/0002-Make-verbose-logging-conditional-Bug-11698.patch
    (from rev 342788, xfce4-session/trunk/0002-Make-verbose-logging-conditional-Bug-11698.patch)
  xfce4-session/repos/testing-x86_64/0003-xfce4-session-source-system-xinitrc-scripts.patch
    (from rev 342788, xfce4-session/trunk/0003-xfce4-session-source-system-xinitrc-scripts.patch)
  xfce4-session/repos/testing-x86_64/0004-screenlockers.patch
    (from rev 342788, xfce4-session/trunk/0004-screenlockers.patch)
  xfce4-session/repos/testing-x86_64/0005-dbus-launch.patch
    (from rev 342788, xfce4-session/trunk/0005-dbus-launch.patch)
  xfce4-session/repos/testing-x86_64/PKGBUILD
    (from rev 342788, xfce4-session/trunk/PKGBUILD)
  xfce4-session/repos/testing-x86_64/xfce-polkit-gnome-authentication-agent-1.desktop
    (from rev 342788, xfce4-session/trunk/xfce-polkit-gnome-authentication-agent-1.desktop)

--------------------------------------------------------+
 0001-Pass-VT-number-to-xinit-if-XDG_VTNR-is-set.patch  |   27 ++++
 0002-Make-verbose-logging-conditional-Bug-11698.patch  |   31 +++++
 0003-xfce4-session-source-system-xinitrc-scripts.patch |   18 +++
 0004-screenlockers.patch                               |   58 ++++++++++
 0005-dbus-launch.patch                                 |   15 ++
 PKGBUILD                                               |   80 +++++++++++++
 xfce-polkit-gnome-authentication-agent-1.desktop       |   87 +++++++++++++++
 7 files changed, 316 insertions(+)

Copied: xfce4-session/repos/testing-x86_64/0001-Pass-VT-number-to-xinit-if-XDG_VTNR-is-set.patch (from rev 342788, xfce4-session/trunk/0001-Pass-VT-number-to-xinit-if-XDG_VTNR-is-set.patch)
===================================================================

--- testing-x86_64/0001-Pass-VT-number-to-xinit-if-XDG_VTNR-is-set.patch	                        (rev 0)
+++ testing-x86_64/0001-Pass-VT-number-to-xinit-if-XDG_VTNR-is-set.patch	2018-12-29 23:09:57 UTC (rev 342789)
@@ -0,0 +1,27 @@
+From e740aad5d6761ce9a9df48a3d87ff29240433d19 Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos at foutrelis.com>
+Date: Tue, 24 Mar 2015 10:09:33 +0200
+Subject: [PATCH] Pass VT number to xinit if XDG_VTNR is set
+
+---
+ scripts/startxfce4.in | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/scripts/startxfce4.in b/scripts/startxfce4.in
+index d0a74a9..bf3201b 100644
+--- a/scripts/startxfce4.in
++++ b/scripts/startxfce4.in
+@@ -92,6 +92,10 @@ if test "x$DISPLAY" = "x"
+ then
+   echo "$0: Starting X server"
+   prog=xinit
++
++  if test ! "x$XDG_VTNR" = "x"; then
++    SERVERRC="vt$XDG_VTNR $SERVERRC"
++  fi
+ else
+   echo "$0: X server already running on display $DISPLAY"
+   prog=/bin/sh
+-- 
+2.3.4
+

Copied: xfce4-session/repos/testing-x86_64/0002-Make-verbose-logging-conditional-Bug-11698.patch (from rev 342788, xfce4-session/trunk/0002-Make-verbose-logging-conditional-Bug-11698.patch)
===================================================================
--- testing-x86_64/0002-Make-verbose-logging-conditional-Bug-11698.patch	                        (rev 0)
+++ testing-x86_64/0002-Make-verbose-logging-conditional-Bug-11698.patch	2018-12-29 23:09:57 UTC (rev 342789)
@@ -0,0 +1,31 @@
+From 26f9ae8df629f02af0773df2ed82db6b85c5b556 Mon Sep 17 00:00:00 2001
+From: Eric Koegel <eric.koegel at gmail.com>
+Date: Sat, 28 Mar 2015 16:57:24 +0300
+Subject: [PATCH] Make verbose logging conditional (Bug #11698)
+
+Bug report and patch submitted by Zhihao Yuan
+
+Signed-off-by: Eric Koegel <eric.koegel at gmail.com>
+---
+ xfce4-session/xfsm-global.h | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/xfce4-session/xfsm-global.h b/xfce4-session/xfsm-global.h
+index d2e0c29..d458712 100644
+--- a/xfce4-session/xfsm-global.h
++++ b/xfce4-session/xfsm-global.h
+@@ -49,7 +49,10 @@ extern XfsmSplashScreen *splash_screen;
+ #if defined(G_HAVE_ISO_VARARGS)
+ 
+ #define xfsm_verbose(...)\
+-    xfsm_verbose_real (__func__, __FILE__, __LINE__, __VA_ARGS__)
++G_STMT_START{ \
++  if (G_UNLIKELY (verbose)) \
++    xfsm_verbose_real (__func__, __FILE__, __LINE__, __VA_ARGS__); \
++}G_STMT_END
+ 
+ #else
+ 
+-- 
+2.13.2
+

Copied: xfce4-session/repos/testing-x86_64/0003-xfce4-session-source-system-xinitrc-scripts.patch (from rev 342788, xfce4-session/trunk/0003-xfce4-session-source-system-xinitrc-scripts.patch)
===================================================================
--- testing-x86_64/0003-xfce4-session-source-system-xinitrc-scripts.patch	                        (rev 0)
+++ testing-x86_64/0003-xfce4-session-source-system-xinitrc-scripts.patch	2018-12-29 23:09:57 UTC (rev 342789)
@@ -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
+ 

Copied: xfce4-session/repos/testing-x86_64/0004-screenlockers.patch (from rev 342788, xfce4-session/trunk/0004-screenlockers.patch)
===================================================================
--- testing-x86_64/0004-screenlockers.patch	                        (rev 0)
+++ testing-x86_64/0004-screenlockers.patch	2018-12-29 23:09:57 UTC (rev 342789)
@@ -0,0 +1,58 @@
+From e940818853582290af21bf38d73ee26143d500ad Mon Sep 17 00:00:00 2001
+From: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
+Date: Wed, 25 Mar 2015 17:03:02 +0100
+Subject: Make screenlockers configurable through xfconf
+
+Signed-off-by: Eric Koegel <eric.koegel at gmail.com>
+---
+ scripts/xflock4 | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/scripts/xflock4 b/scripts/xflock4
+index ec4d05d..7d857d3 100644
+--- a/scripts/xflock4
++++ b/scripts/xflock4
+@@ -24,8 +24,12 @@
+ PATH=/bin:/usr/bin
+ export PATH
+ 
++# First test for the command set in the session's xfconf channel
++LOCK_CMD=$(xfconf-query -c xfce4-session -p /general/LockCommand)
++
+ # Lock by xscreensaver or gnome-screensaver, if a respective daemon is running
+ for lock_cmd in \
++    "$LOCK_CMD" \
+     "xscreensaver-command -lock" \
+     "gnome-screensaver-command --lock"
+ do
+From 495aac78058cd78e2d34505af204e72a1b4f19ac Mon Sep 17 00:00:00 2001
+From: Eric Koegel <eric.koegel at gmail.com>
+Date: Sat, 28 Mar 2015 06:16:10 +0300
+Subject: Xflock: bypass null/blank LockCommand parameter (Bug #11764)
+
+Commit http://git.xfce.org/xfce/xfce4-session/commit/?id=e940818853582290af21bf38d73ee26143d500ad
+breaks xflock4 functionality if the xfconf LockCommand parameter doesn't exist or
+is a blank entry. The
+$lock_cmd >/dev/null 2>&1 && exit
+will run a blank (empty string) and then exist, never getting to the other items
+in the list.
+Bug report and patch provided by ToZ.
+---
+ scripts/xflock4 | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/scripts/xflock4 b/scripts/xflock4
+index 7d857d3..32770b4 100644
+--- a/scripts/xflock4
++++ b/scripts/xflock4
+@@ -33,7 +33,9 @@ for lock_cmd in \
+     "xscreensaver-command -lock" \
+     "gnome-screensaver-command --lock"
+ do
+-    $lock_cmd >/dev/null 2>&1 && exit
++    if [ ! -z "$lock_cmd" ]; then
++        $lock_cmd >/dev/null 2>&1 && exit
++    fi
+ done
+ 
+ # else run another access locking utility, if installed

Copied: xfce4-session/repos/testing-x86_64/0005-dbus-launch.patch (from rev 342788, xfce4-session/trunk/0005-dbus-launch.patch)
===================================================================
--- testing-x86_64/0005-dbus-launch.patch	                        (rev 0)
+++ testing-x86_64/0005-dbus-launch.patch	2018-12-29 23:09:57 UTC (rev 342789)
@@ -0,0 +1,15 @@
+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");
+ 

Copied: xfce4-session/repos/testing-x86_64/PKGBUILD (from rev 342788, xfce4-session/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2018-12-29 23:09:57 UTC (rev 342789)
@@ -0,0 +1,80 @@
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: tobias <tobias funnychar archlinux.org>
+
+pkgname=xfce4-session
+pkgver=4.12.1
+pkgrel=9
+pkgdesc="A session manager for Xfce"
+arch=('x86_64')
+url="http://www.xfce.org/"
+license=('GPL2')
+groups=('xfce4')
+depends=('libxfce4ui' 'libwnck' 'libsm' 'polkit' 'xorg-iceauth' 'xorg-xinit'
+         'xorg-xrdb' 'which' 'polkit-gnome' 'hicolor-icon-theme')
+makedepends=('intltool')
+optdepends=('gnome-keyring: for keyring support when GNOME compatibility is enabled'
+            'xscreensaver: for locking screen with xflock4'
+            'gnome-screensaver: for locking screen with xflock4'
+            'xlockmore: for locking screen with xflock4'
+            'slock: for locking screen with xflock4')
+replaces=('xfce-utils')
+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
+        0004-screenlockers.patch        
+        0005-dbus-launch.patch
+        xfce-polkit-gnome-authentication-agent-1.desktop)
+sha256sums=('97d7f2a2d0af7f3623b68d1f04091e02913b28f9555dab8b0d26c8a1299d08fd'
+            '7ea702a1d3391d36958cff57496ba2474592dd915cf7569a65501522c2410cf1'
+            '6bbd714008f31198f9631cdfb3ed8aac1c780f00d15b81c32c00860ae37521a6'
+            'a717a0ee6289c9ce06a8e18c6a7cb5a6d6f1769c05c456a6a84843df6a0111da'
+            '1d4063889af073c3de221e0bbd3cacc11dfc95ee11f6e530c6e35f7714a6e295'
+            '842258be04687cd0da898eb0d66668a9629ec444e9151fede50b0c18e7f61e54'
+            '74c94c5f7893d714e04ec7d8b8520c978a5748757a0cdcf5128492f09f31b643')
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # https://bugzilla.xfce.org/show_bug.cgi?id=11759
+  patch -Np1 -i ../0001-Pass-VT-number-to-xinit-if-XDG_VTNR-is-set.patch
+
+  # https://bugzilla.xfce.org/show_bug.cgi?id=11698
+  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
+
+  # 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
+
+  # not not start dbus-session but fall back to socket
+  # https://bugs.archlinux.org/task/61177
+  patch -Np1 -i ../0005-dbus-launch.patch
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib/xfce4 \
+    --localstatedir=/var \
+    --disable-static \
+    --disable-debug
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+
+  # Provide a default PolicyKit Authentication Agent (FS#42569)
+  install -d "$pkgdir/etc/xdg/autostart"
+  cp "$srcdir/xfce-polkit-gnome-authentication-agent-1.desktop" \
+    "$pkgdir/etc/xdg/autostart/"
+}
+
+# vim:set ts=2 sw=2 et:

Copied: xfce4-session/repos/testing-x86_64/xfce-polkit-gnome-authentication-agent-1.desktop (from rev 342788, xfce4-session/trunk/xfce-polkit-gnome-authentication-agent-1.desktop)
===================================================================
--- testing-x86_64/xfce-polkit-gnome-authentication-agent-1.desktop	                        (rev 0)
+++ testing-x86_64/xfce-polkit-gnome-authentication-agent-1.desktop	2018-12-29 23:09:57 UTC (rev 342789)
@@ -0,0 +1,87 @@
+[Desktop Entry]
+Name=PolicyKit Authentication Agent
+Name[ar]=مدير الاستيثاق PolicyKit
+Name[be]=PolicyKit - аґент аўтэнтыфікацыі
+Name[bn_IN]=PolicyKit অনুমোদনের এজেন্ট
+Name[ca]=Agent d'autenticació del PolicyKit
+Name[cs]=Ověřovací agent PolicyKit
+Name[da]=Godkendelsesprogrammet PolicyKit
+Name[de]=Legitimationsdienst von PolicyKit
+Name[el]=Πράκτορας πιστοποίησης PolicyKit
+Name[en_GB]=PolicyKit Authentication Agent
+Name[es]=Agente de autenticación de PolicyKit
+Name[eu]=PolicyKit autentifikatzeko agentea
+Name[fi]=PolicytKit-tunnistautumisohjelma
+Name[fr]=Agent d'authentification de PolicyKit
+Name[gl]=Axente de autenticación PolicyKit
+Name[gu]=PolicyKit સત્તાધિકરણ એજન્ટ
+Name[hi]=PolicyKit प्रमाणीकरण प्रतिनिधि
+Name[hu]=PolicyKit hitelesítési ügynök
+Name[it]=Agente di autenticazione per PolicyKit
+Name[ja]=PolicyKit 認証エージェント
+Name[kn]=PolicyKit ದೃಢೀಕರಣ ಮಧ್ಯವರ್ತಿ
+Name[lt]=PolicyKit tapatybės nustatymo agentas
+Name[ml]=പോളിസിക്കിറ്റ് ഓഥന്റിക്കേഷന്‍ ഏജന്റ്
+Name[mr]=PolicyKit ऑथेंटीकेशन एजेंट
+Name[or]=PolicyKit ବୈଧିକରଣ ସଦସ୍ୟ
+Name[pa]=ਪਾਲਸੀਕਿੱਟ ਪਰਮਾਣਕਿਤਾ ਏਜੰਟ
+Name[pl]=Agent uwierzytelniania PolicyKit
+Name[pt]=Agente de Autenticação PolicyKit
+Name[pt_BR]=Agente de autenticação PolicyKit
+Name[ro]=Agent de autentificare PolicyKit
+Name[sk]=Agent PolicyKit na overovanie totožnosti
+Name[sl]=PolicyKit program overjanja
+Name[sv]=Autentiseringsagent för PolicyKit
+Name[ta]=PolicyKit அங்கீகார முகவர்
+Name[te]=పాలసీకిట్ ధృవీకరణ ప్రతినిధి
+Name[th]=ตัวกลางสำหรับยืนยันตัวบุคคล PolicyKit
+Name[uk]=Агент автентифікації PolicyKit
+Name[zh_CN]=PolicyKit 认证代理
+Name[zh_HK]=PolicyKit 驗證代理程式
+Name[zh_TW]=PolicyKit 驗證代理程式
+Comment=PolicyKit Authentication Agent
+Comment[ar]=مدير الاستيثاق PolicyKit
+Comment[be]=PolicyKit - аґент аўтэнтыфікацыі
+Comment[bn_IN]=PolicyKit অনুমোদনের এজেন্ট
+Comment[ca]=Agent d'autenticació del PolicyKit
+Comment[cs]=Ověřovací agent PolicyKit
+Comment[da]=Godkendelsesprogrammet PolicyKit
+Comment[de]=Legitimationsdienst von PolicyKit
+Comment[el]=Πράκτορας πιστοποίησης PolicyKit
+Comment[en_GB]=PolicyKit Authentication Agent
+Comment[es]=Agente de autenticación de PolicyKit
+Comment[eu]=PolicyKit autentifikatzeko agentea
+Comment[fi]=PolicytKit-tunnistautumisohjelma
+Comment[fr]=Agent d'authentification de PolicyKit
+Comment[gl]=Axente de autenticación PolicyKit
+Comment[gu]=PolicyKit સત્તાધિકરણ એજન્ટ
+Comment[hi]=PolicyKit प्रमाणीकरण प्रतिनिधि
+Comment[hu]=PolicyKit hitelesítési ügynök
+Comment[it]=Agente di autenticazione per PolicyKit
+Comment[ja]=PolicyKit 認証エージェント
+Comment[kn]=PolicyKit ದೃಢೀಕರಣ ಮಧ್ಯವರ್ತಿ
+Comment[lt]=PolicyKit tapatybės nustatymo agentas
+Comment[ml]=പോളിസിക്കിറ്റ് ഓഥന്റിക്കേഷന്‍ ഏജന്റ്
+Comment[mr]=PolicyKit ऑथेंटीकेशन एजेंट
+Comment[or]=PolicyKit ବୈଧିକରଣ ସଦସ୍ୟ
+Comment[pa]=ਪਾਲਸੀਕਿੱਟ ਪਰਮਾਣਕਿਤਾ ਏਜੰਟ
+Comment[pl]=Agent uwierzytelniania PolicyKit
+Comment[pt]=Agente de Autenticação PolicyKit
+Comment[pt_BR]=Agente de autenticação PolicyKit
+Comment[ro]=Agent de autentificare PolicyKit
+Comment[sk]=Agent PolicyKit na overovanie totožnosti
+Comment[sl]=PolicyKit program overjanja
+Comment[sv]=Autentiseringsagent för PolicyKit
+Comment[ta]=PolicyKit அங்கீகார முகவர்
+Comment[te]=పాలసీకిట్ ధృవీకరణ ప్రతినిధి
+Comment[th]=ตัวกลางสำหรับยืนยันตัวบุคคล PolicyKit
+Comment[uk]=Агент автентифікації PolicyKit
+Comment[zh_CN]=PolicyKit 认证代理
+Comment[zh_HK]=PolicyKit 驗證代理程式
+Comment[zh_TW]=PolicyKit 驗證代理程式
+Exec=/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
+Terminal=false
+Type=Application
+Categories=
+NoDisplay=true
+OnlyShowIn=XFCE;

