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

Evangelos Foutras foutrelis at archlinux.org
Tue Mar 24 08:36:10 UTC 2015


    Date: Tuesday, March 24, 2015 @ 09:36:10
  Author: foutrelis
Revision: 234595

upgpkg: xfce4-session 4.12.1-2

Fix startxfce4 to pass the VT number to xinit since /etc/X11/xinit/xserverrc
no longer does this (FS#44285).

Added:
  xfce4-session/trunk/0001-Pass-VT-number-to-xinit-if-XDG_VTNR-is-set.patch
Modified:
  xfce4-session/trunk/PKGBUILD

-------------------------------------------------------+
 0001-Pass-VT-number-to-xinit-if-XDG_VTNR-is-set.patch |   27 ++++++++++++++++
 PKGBUILD                                              |   11 +++++-
 2 files changed, 37 insertions(+), 1 deletion(-)

Added: 0001-Pass-VT-number-to-xinit-if-XDG_VTNR-is-set.patch
===================================================================
--- 0001-Pass-VT-number-to-xinit-if-XDG_VTNR-is-set.patch	                        (rev 0)
+++ 0001-Pass-VT-number-to-xinit-if-XDG_VTNR-is-set.patch	2015-03-24 08:36:10 UTC (rev 234595)
@@ -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
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-03-24 07:21:45 UTC (rev 234594)
+++ PKGBUILD	2015-03-24 08:36:10 UTC (rev 234595)
@@ -4,7 +4,7 @@
 
 pkgname=xfce4-session
 pkgver=4.12.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A session manager for Xfce"
 arch=('i686' 'x86_64')
 url="http://www.xfce.org/"
@@ -21,10 +21,19 @@
 replaces=('xfce-utils')
 install=$pkgname.install
 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
         xfce-polkit-gnome-authentication-agent-1.desktop)
 sha256sums=('97d7f2a2d0af7f3623b68d1f04091e02913b28f9555dab8b0d26c8a1299d08fd'
+            '7ea702a1d3391d36958cff57496ba2474592dd915cf7569a65501522c2410cf1'
             '74c94c5f7893d714e04ec7d8b8520c978a5748757a0cdcf5128492f09f31b643')
 
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # https://bugs.archlinux.org/task/44285
+  patch -Np1 -i ../0001-Pass-VT-number-to-xinit-if-XDG_VTNR-is-set.patch
+}
+
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 



More information about the arch-commits mailing list