[arch-commits] Commit in xfce4-session/trunk (5 files)
Evangelos Foutras
foutrelis at archlinux.org
Sun Aug 11 23:54:33 UTC 2019
Date: Sunday, August 11, 2019 @ 23:54:33
Author: foutrelis
Revision: 359658
upgpkg: xfce4-session 4.14.0-1
New upstream release.
Modified:
xfce4-session/trunk/PKGBUILD
Deleted:
xfce4-session/trunk/0001-Pass-VT-number-to-xinit-if-XDG_VTNR-is-set.patch
xfce4-session/trunk/0002-Make-verbose-logging-conditional-Bug-11698.patch
xfce4-session/trunk/0003-source-system-xinitrc-scripts.patch
xfce4-session/trunk/0004-screenlockers.patch
-------------------------------------------------------+
0001-Pass-VT-number-to-xinit-if-XDG_VTNR-is-set.patch | 27 -------
0002-Make-verbose-logging-conditional-Bug-11698.patch | 31 --------
0003-source-system-xinitrc-scripts.patch | 18 ----
0004-screenlockers.patch | 58 ----------------
PKGBUILD | 33 +--------
5 files changed, 6 insertions(+), 161 deletions(-)
Deleted: 0001-Pass-VT-number-to-xinit-if-XDG_VTNR-is-set.patch
===================================================================
--- 0001-Pass-VT-number-to-xinit-if-XDG_VTNR-is-set.patch 2019-08-11 23:27:11 UTC (rev 359657)
+++ 0001-Pass-VT-number-to-xinit-if-XDG_VTNR-is-set.patch 2019-08-11 23:54:33 UTC (rev 359658)
@@ -1,27 +0,0 @@
-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
-
Deleted: 0002-Make-verbose-logging-conditional-Bug-11698.patch
===================================================================
--- 0002-Make-verbose-logging-conditional-Bug-11698.patch 2019-08-11 23:27:11 UTC (rev 359657)
+++ 0002-Make-verbose-logging-conditional-Bug-11698.patch 2019-08-11 23:54:33 UTC (rev 359658)
@@ -1,31 +0,0 @@
-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
-
Deleted: 0003-source-system-xinitrc-scripts.patch
===================================================================
--- 0003-source-system-xinitrc-scripts.patch 2019-08-11 23:27:11 UTC (rev 359657)
+++ 0003-source-system-xinitrc-scripts.patch 2019-08-11 23:54:33 UTC (rev 359658)
@@ -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
-
Deleted: 0004-screenlockers.patch
===================================================================
--- 0004-screenlockers.patch 2019-08-11 23:27:11 UTC (rev 359657)
+++ 0004-screenlockers.patch 2019-08-11 23:54:33 UTC (rev 359658)
@@ -1,58 +0,0 @@
-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
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-08-11 23:27:11 UTC (rev 359657)
+++ PKGBUILD 2019-08-11 23:54:33 UTC (rev 359658)
@@ -2,50 +2,29 @@
# Contributor: tobias <tobias funnychar archlinux.org>
pkgname=xfce4-session
-pkgver=4.12.1
-pkgrel=11
+pkgver=4.14.0
+pkgrel=1
pkgdesc="A session manager for Xfce"
arch=('x86_64')
url="https://www.xfce.org/"
license=('GPL2')
groups=('xfce4')
-depends=('libxfce4ui' 'libwnck' 'libsm' 'polkit' 'xorg-iceauth' 'xorg-xinit'
- 'xorg-xrdb' 'which' 'polkit-gnome' 'hicolor-icon-theme')
+depends=('libxfce4ui' 'libwnck3' 'xfconf' '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'
+ 'xfce4-screensaver: for locking screen with xflock4'
'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-source-system-xinitrc-scripts.patch
- 0004-screenlockers.patch
xfce-polkit-gnome-authentication-agent-1.desktop)
-sha256sums=('97d7f2a2d0af7f3623b68d1f04091e02913b28f9555dab8b0d26c8a1299d08fd'
- '7ea702a1d3391d36958cff57496ba2474592dd915cf7569a65501522c2410cf1'
- '6bbd714008f31198f9631cdfb3ed8aac1c780f00d15b81c32c00860ae37521a6'
- 'a717a0ee6289c9ce06a8e18c6a7cb5a6d6f1769c05c456a6a84843df6a0111da'
- '1d4063889af073c3de221e0bbd3cacc11dfc95ee11f6e530c6e35f7714a6e295'
+sha256sums=('14fb6db74eb69eb400673856ba307a0e57f577cf77c3561a5910151e3d52043f'
'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-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
}
build() {
More information about the arch-commits
mailing list