[neon/3rdparty/sddm/Neon/unstable] debian: Cherry-pick upstream commit to re-add sourcing of /etc/profile and /home/coucouf/.profile for users with fish as their default shell.

[Aurélien COUDERC]

Git commit aab1d31c284274f7338623607da1a99bb06b119b by Aurélien COUDERC.
Committed on 17/03/2021 at 21:41.
Pushed by jriddell into branch 'Neon/unstable'.

Cherry-pick upstream commit to re-add sourcing of /etc/profile and /home/coucouf/.profile for users with fish as their default shell.

M  +2    -3    debian/Xsession
M  +7    -0    debian/changelog
M  +1    -0    debian/patches/series
A  +31   -0    debian/patches/upstream-8ad3c5afd-re-add-fish-profile-sourcing.diff
M  +2    -3    debian/wayland-session

https://invent.kde.org/neon/3rdparty/sddm/commit/aab1d31c284274f7338623607da1a99bb06b119b

diff --git a/debian/Xsession b/debian/Xsession
index 5c2fab9..049e949 100755
--- a/debian/Xsession
+++ b/debian/Xsession
@@ -38,9 +38,8 @@ case $SHELL in
     rm -f $xsess_tmp
     ;;
   */fish)
-    # Fish is not a POSIX 1003.1 compatible shell
-    # https://github.com/fish-shell/fish-shell/issues/3665
-    # [ -f /etc/profile ] && . /etc/profile
+    [ -f /etc/profile ] && . /etc/profile
+    [ -f $HOME/.profile ] && . $HOME/.profile
     xsess_tmp=`mktemp /tmp/xsess-env-XXXXXX`
     $SHELL --login -c "/bin/sh -c 'export -p' > $xsess_tmp"
     . $xsess_tmp
diff --git a/debian/changelog b/debian/changelog
index bdb98ea..3d6c578 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sddm (0.19.0-3) UNRELEASED; urgency=medium
+
+  * Cherry-pick upstream commit to re-add sourcing of /etc/profile and
+    $HOME/.profile for users with fish as their default shell.
+
+ -- Aurélien COUDERC <coucouf at debian.org>  Sun, 14 Mar 2021 14:44:29 +0100
+
 sddm (0.19.0-2) unstable; urgency=medium
 
   [ Norbert Preining ]
diff --git a/debian/patches/series b/debian/patches/series
index 6166035..13e26c1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 05_add_debian_themes.diff
 06_nvidia_prime_setup.diff
 upstream-2f034906d-use-only-basename-of-session.patch
+upstream-8ad3c5afd-re-add-fish-profile-sourcing.diff
diff --git a/debian/patches/upstream-8ad3c5afd-re-add-fish-profile-sourcing.diff b/debian/patches/upstream-8ad3c5afd-re-add-fish-profile-sourcing.diff
new file mode 100644
index 0000000..1ec83cb
--- /dev/null
+++ b/debian/patches/upstream-8ad3c5afd-re-add-fish-profile-sourcing.diff
@@ -0,0 +1,31 @@
+Origin: https://github.com/sddm/sddm/commit/cf65e99eb8abfe2ee1ef7e2f7dc43862e83bf0ab
+From: soredake
+Date: Tue, 9 Mar 2021 07:28:11 +0000
+Subject: Add fish /etc/profile and $HOME/.profile sourcing
+---
+diff --git a/data/scripts/Xsession b/data/scripts/Xsession
+index 54498101..d0c2605f 100755
+--- a/data/scripts/Xsession
++++ b/data/scripts/Xsession
+@@ -39,6 +39,8 @@ case $SHELL in
+     rm -f $xsess_tmp
+     ;;
+   */fish)
++    [ -f /etc/profile ] && . /etc/profile
++    [ -f $HOME/.profile ] && . $HOME/.profile
+     xsess_tmp=`mktemp /tmp/xsess-env-XXXXXX`
+     $SHELL --login -c "/bin/sh -c 'export -p' > $xsess_tmp"
+     . $xsess_tmp
+diff --git a/data/scripts/wayland-session b/data/scripts/wayland-session
+index 1f905543..552a39f5 100755
+--- a/data/scripts/wayland-session
++++ b/data/scripts/wayland-session
+@@ -43,6 +43,8 @@ case $SHELL in
+     rm -f $wlsess_tmp
+     ;;
+   */fish)
++    [ -f /etc/profile ] && . /etc/profile
++    [ -f $HOME/.profile ] && . $HOME/.profile
+     xsess_tmp=`mktemp /tmp/xsess-env-XXXXXX`
+     $SHELL --login -c "/bin/sh -c 'export -p' > $xsess_tmp"
+     . $xsess_tmp
diff --git a/debian/wayland-session b/debian/wayland-session
index 55f2b35..74f0c47 100755
--- a/debian/wayland-session
+++ b/debian/wayland-session
@@ -36,9 +36,8 @@ case $SHELL in
     rm -f $wlsess_tmp
     ;;
   */fish)
-    # Fish is not a POSIX 1003.1 compatible shell
-    # https://github.com/fish-shell/fish-shell/issues/3665
-    # [ -f /etc/profile ] && . /etc/profile
+    [ -f /etc/profile ] && . /etc/profile
+    [ -f $HOME/.profile ] && . $HOME/.profile
     xsess_tmp=`mktemp /tmp/xsess-env-XXXXXX`
     $SHELL --login -c "/bin/sh -c 'export -p' > $xsess_tmp"
     . $xsess_tmp