From 8fe49b35b8f791994a9a5e1826037302f87d96921ef50456915a7e2431484c6f Mon Sep 17 00:00:00 2001 From: Guido Berhoerster Date: Wed, 5 Nov 2014 07:44:05 +0000 Subject: [PATCH 1/2] Accepting request 259713 from home:Ledest:misc fix bashisms in startxfce4 script OBS-URL: https://build.opensuse.org/request/show/259713 OBS-URL: https://build.opensuse.org/package/show/X11:xfce/xfce4-session?expand=0&rev=121 --- xfce4-session-4.10.1-fix-bashisms.patch | 21 +++++++++++++++++++++ xfce4-session.changes | 7 +++++++ xfce4-session.spec | 2 ++ 3 files changed, 30 insertions(+) create mode 100644 xfce4-session-4.10.1-fix-bashisms.patch diff --git a/xfce4-session-4.10.1-fix-bashisms.patch b/xfce4-session-4.10.1-fix-bashisms.patch new file mode 100644 index 0000000..fccfc75 --- /dev/null +++ b/xfce4-session-4.10.1-fix-bashisms.patch @@ -0,0 +1,21 @@ +diff -Ndurp xfce4-session-4.10.1/scripts/startxfce4.in xfce4-session-4.10.1-fix-bashisms/scripts/startxfce4.in +--- xfce4-session-4.10.1/scripts/startxfce4.in 2013-05-05 18:33:55.000000000 +0300 ++++ xfce4-session-4.10.1-fix-bashisms/scripts/startxfce4.in 2014-10-19 21:33:03.205621315 +0300 +@@ -24,7 +24,7 @@ then + OPTS="" + for OPT in $* + do +- if test "x$OPT" == "x--help" ++ if [ "x$OPT" = "x--help" ] + then + # print help and exit + echo "Usage:" +@@ -37,7 +37,7 @@ then + echo + + exit 0 +- elif test "x$OPT" == "x--with-ck-launch" ++ elif [ "x$OPT" = "x--with-ck-launch" ] + then + # try to launch xfce4-session with ck-launch-session in xinitrc + XFCE4_SESSION_WITH_CK="1" diff --git a/xfce4-session.changes b/xfce4-session.changes index 176ffee..31f4203 100644 --- a/xfce4-session.changes +++ b/xfce4-session.changes @@ -4,6 +4,13 @@ Mon Oct 20 19:03:13 UTC 2014 - gber@opensuse.org - fix typo in xfce4-session-set-desktop-name.patch.changes, DesktopNames instead of DesktopName +------------------------------------------------------------------- +Sun Oct 19 18:35:00 UTC 2014 - Led + +- fix bashisms in startxfce4 script +- add patches: + * xfce4-session-4.10.1-fix-bashisms.patch + ------------------------------------------------------------------- Sun Oct 19 08:27:57 UTC 2014 - gber@opensuse.org diff --git a/xfce4-session.spec b/xfce4-session.spec index 942dfe2..98d4add 100644 --- a/xfce4-session.spec +++ b/xfce4-session.spec @@ -34,6 +34,7 @@ Patch1: xfce4-session-adapt-session-scripts.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 Patch3: xfce4-session-set-desktop-name.patch +Patch4: xfce4-session-4.10.1-fix-bashisms.patch BuildRequires: iceauth BuildRequires: intltool BuildRequires: update-desktop-files @@ -123,6 +124,7 @@ This package provides the upstream look and feel for the Xfce Session Manager. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build xdt-autogen From e261b58ad5c74ceee71fedbd72daeaace246384dbeb17f9e3d575319e467c795 Mon Sep 17 00:00:00 2001 From: Guido Berhoerster Date: Wed, 5 Nov 2014 07:47:50 +0000 Subject: [PATCH 2/2] - fix bashisms in startxfce4 script (bxo#10828) * 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 --- xfce4-session-4.10.1-fix-bashisms.patch | 26 ++++++++++++++++++++----- xfce4-session.changes | 5 +++-- xfce4-session.spec | 1 + 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/xfce4-session-4.10.1-fix-bashisms.patch b/xfce4-session-4.10.1-fix-bashisms.patch index fccfc75..168a213 100644 --- a/xfce4-session-4.10.1-fix-bashisms.patch +++ b/xfce4-session-4.10.1-fix-bashisms.patch @@ -1,12 +1,25 @@ -diff -Ndurp xfce4-session-4.10.1/scripts/startxfce4.in xfce4-session-4.10.1-fix-bashisms/scripts/startxfce4.in ---- xfce4-session-4.10.1/scripts/startxfce4.in 2013-05-05 18:33:55.000000000 +0300 -+++ xfce4-session-4.10.1-fix-bashisms/scripts/startxfce4.in 2014-10-19 21:33:03.205621315 +0300 +From c55ce35bcdb030cd11ac5fe98ec749918e434157 Mon Sep 17 00:00:00 2001 +From: Eric Koegel +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 OPTS="" for OPT in $* do - if test "x$OPT" == "x--help" -+ if [ "x$OPT" = "x--help" ] ++ if test "x$OPT" = "x--help" then # print help and exit echo "Usage:" @@ -15,7 +28,10 @@ diff -Ndurp xfce4-session-4.10.1/scripts/startxfce4.in xfce4-session-4.10.1-fix- exit 0 - elif test "x$OPT" == "x--with-ck-launch" -+ elif [ "x$OPT" = "x--with-ck-launch" ] ++ elif test "x$OPT" = "x--with-ck-launch" then # try to launch xfce4-session with ck-launch-session in xinitrc XFCE4_SESSION_WITH_CK="1" +-- +cgit v0.10.1 + diff --git a/xfce4-session.changes b/xfce4-session.changes index 31f4203..7c96aae 100644 --- a/xfce4-session.changes +++ b/xfce4-session.changes @@ -7,9 +7,10 @@ Mon Oct 20 19:03:13 UTC 2014 - gber@opensuse.org ------------------------------------------------------------------- Sun Oct 19 18:35:00 UTC 2014 - Led -- fix bashisms in startxfce4 script +- fix bashisms in startxfce4 script (bxo#10828) - 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 diff --git a/xfce4-session.spec b/xfce4-session.spec index 98d4add..295bb00 100644 --- a/xfce4-session.spec +++ b/xfce4-session.spec @@ -34,6 +34,7 @@ Patch1: xfce4-session-adapt-session-scripts.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 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 BuildRequires: iceauth BuildRequires: intltool