rpm/xfce4-session
SHA256
1
0
Fork 0
forked from pool/xfce4-session
Code Pull Requests Activity

- fix bashisms in startxfce4 script (bxo#10828)

Browse Source 
* xfce4-session-4.10.1-fix-bashisms.patch (backported from
    upstream git)

OBS-URL: https://build.opensuse.org/package/show/X11:xfce/xfce4-session?expand=0&rev=122
This commit is contained in:
Guido Berhoerster 2014-11-05 07:47:50 +00:00 committed by Git OBS Bridge
parent 8fe49b35b8
commit e261b58ad5
3 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
xfce4-session-4.10.1-fix-bashisms.patch
View File

@ -1,12 +1,25 @@
diff -Ndurp xfce4-session-4.10.1/scripts/startxfce4.in xfce4-session-4.10.1-fix-bashisms/scripts/startxfce4.in From c55ce35bcdb030cd11ac5fe98ec749918e434157 Mon Sep 17 00:00:00 2001
--- xfce4-session-4.10.1/scripts/startxfce4.in 2013-05-05 18:33:55.000000000 +0300 From: Eric Koegel <eric.koegel@gmail.com>
+++ xfce4-session-4.10.1-fix-bashisms/scripts/startxfce4.in 2014-10-19 21:33:03.205621315 +0300 Date: Sun, 20 Jul 2014 18:09:22 +0300
Subject: Non-POSIX compliant test used in startxfce4 (Bug 10828)
Patch and bug report by seejay
The command line arguments "--help" and "--with-ck-launch"
can't be used on systems which have a non-bash /bin/sh
(e.g. Debian, as far as I'm aware). This is due to the use
of "==" instead of "=" in test commands, which is a bash
extension.
diff --git a/scripts/startxfce4.in b/scripts/startxfce4.in
index b346d8f..d0a74a9 100644
--- a/scripts/startxfce4.in
+++ b/scripts/startxfce4.in
@@ -24,7 +24,7 @@ then @@ -24,7 +24,7 @@ then
OPTS="" OPTS=""
for OPT in $* for OPT in $*
do do
- if test "x$OPT" == "x--help" - if test "x$OPT" == "x--help"
+ if [ "x$OPT" = "x--help" ] + if test "x$OPT" = "x--help"
then then
# print help and exit # print help and exit
echo "Usage:" echo "Usage:"
@ -15,7 +28,10 @@ diff -Ndurp xfce4-session-4.10.1/scripts/startxfce4.in xfce4-session-4.10.1-fix-
exit 0 exit 0
- elif test "x$OPT" == "x--with-ck-launch" - elif test "x$OPT" == "x--with-ck-launch"
+ elif [ "x$OPT" = "x--with-ck-launch" ] + elif test "x$OPT" = "x--with-ck-launch"
then then
# try to launch xfce4-session with ck-launch-session in xinitrc # try to launch xfce4-session with ck-launch-session in xinitrc
XFCE4_SESSION_WITH_CK="1" XFCE4_SESSION_WITH_CK="1"
--
cgit v0.10.1

5
xfce4-session.changes
View File

@ -7,9 +7,10 @@ Mon Oct 20 19:03:13 UTC 2014 - gber@opensuse.org
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Oct 19 18:35:00 UTC 2014 - Led <ledest@gmail.com> Sun Oct 19 18:35:00 UTC 2014 - Led <ledest@gmail.com>
- fix bashisms in startxfce4 script - fix bashisms in startxfce4 script (bxo#10828)
- add patches: - add patches:
* xfce4-session-4.10.1-fix-bashisms.patch * xfce4-session-4.10.1-fix-bashisms.patch (backported from
upstream git)
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Oct 19 08:27:57 UTC 2014 - gber@opensuse.org Sun Oct 19 08:27:57 UTC 2014 - gber@opensuse.org

1
xfce4-session.spec
View File

@ -34,6 +34,7 @@ Patch1: xfce4-session-adapt-session-scripts.patch
Patch2: xfce4-session-systemd-suspend-hibernate-support.patch Patch2: xfce4-session-systemd-suspend-hibernate-support.patch
# PATCH-FIX-UPSTREAM xfce4-session-set-desktop-name.patch bxo#11239 gber@opensuse.org -- Set DesktopNames property in the xsession file # PATCH-FIX-UPSTREAM xfce4-session-set-desktop-name.patch bxo#11239 gber@opensuse.org -- Set DesktopNames property in the xsession file
Patch3: xfce4-session-set-desktop-name.patch Patch3: xfce4-session-set-desktop-name.patch
# PATCH-FIX-UPSTREAM xfce4-session-4.10.1-fix-bashisms.patch bxo#10828 ledest@gmail.com -- Fix bashisms in startxfce4 script (backported from upstream git)
Patch4: xfce4-session-4.10.1-fix-bashisms.patch Patch4: xfce4-session-4.10.1-fix-bashisms.patch
BuildRequires: iceauth BuildRequires: iceauth
BuildRequires: intltool BuildRequires: intltool