desktop/gnome-session: Update wrapper script.

Signed-off-by: Dave Woodfall <dave@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

2 files changed, 17 insertions, 59 deletions

diff --git a/desktop/gnome-session/0002-gnome-session-add-profile-sourcing.patch b/desktop/gnome-session/0002-gnome-session-add-profile-sourcing.patch
index 5f273536e3..6628105660 100644
--- a/desktop/gnome-session/0002-gnome-session-add-profile-sourcing.patch
+++ b/desktop/gnome-session/0002-gnome-session-add-profile-sourcing.patch
@@ -1,62 +1,20 @@
 diff -Naur gnome-session-42.0/gnome-session/gnome-session.in gnome-session-42.0-patched/gnome-session/gnome-session.in
---- gnome-session-42.0/gnome-session/gnome-session.in	2022-08-03 19:15:53.227967625 -0000
-+++ gnome-session-42.0-patched/gnome-session/gnome-session.in	2022-08-03 19:17:49.002962878 -0000
-@@ -10,6 +10,58 @@
-     exec bash -c "exec -l '$SHELL' -c '$0 -l $*'"
-   else
-     shift
-+
-+    # Source some profile scripts in gnome so we dont have to
-+    # depend on a systemd locale service.
-+    # This code was copied from KDE's "wayland-session" script.
-+    # Copyright (C) 2015-2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
-+    # This file is extracted from kde-workspace (kdm/kfrontend/genkdmconf.c)
-+    # Copyright (C) 2001-2005 Oswald Buddenhagen <ossi@kde.org>
-+    # Added to gnome's "gnome-session" script by Bob Funk <bobfunk11@gmail.com>
-+    # Note that the respective logout scripts are not sourced.
-+    case $SHELL in
-+      */bash)
-+        [ -z "$BASH" ] && exec $SHELL $0 "$@"
-+        set +o posix
-+        [ -f /etc/profile ] && . /etc/profile
-+        if [ -f $HOME/.bash_profile ]; then
-+          . $HOME/.bash_profile
-+        elif [ -f $HOME/.bash_login ]; then
-+          . $HOME/.bash_login
-+        elif [ -f $HOME/.profile ]; then
-+          . $HOME/.profile
-+        fi
-+      ;;
-+      */zsh)
-+        [ -z "$ZSH_NAME" ] && exec $SHELL $0 "$@"
-+        [ -d /etc/zsh ] && zdir=/etc/zsh || zdir=/etc
-+        zhome=${ZDOTDIR:-$HOME}
-+        # zshenv is always sourced automatically.
-+        [ -f $zdir/zprofile ] && . $zdir/zprofile
-+        [ -f $zhome/.zprofile ] && . $zhome/.zprofile
-+        [ -f $zdir/zlogin ] && . $zdir/zlogin
-+        [ -f $zhome/.zlogin ] && . $zhome/.zlogin
-+        emulate -R sh
-+      ;;
-+      */csh|*/tcsh)
-+        # [t]cshrc is always sourced automatically.
-+        # Note that sourcing csh.login after .cshrc is non-standard.
-+        wlsess_tmp=`mktemp /tmp/wlsess-env-XXXXXX`
-+        $SHELL -c "if (-f /etc/csh.login) source /etc/csh.login; if (-f ~/.login) source ~/.login; /bin/sh -c 'export -p' >! $wlsess_tmp"
-+        . $wlsess_tmp
-+        rm -f $wlsess_tmp
-+      ;;
-+      */fish)
-+        xsess_tmp=`mktemp /tmp/xsess-env-XXXXXX`
-+        $SHELL --login -c "/bin/sh -c 'export -p' > $xsess_tmp"
-+        . $xsess_tmp
-+        rm -f $xsess_tmp
-+      ;;
-+      *) # Plain sh, ksh, and anything we do not know.
-+        [ -f /etc/profile ] && . /etc/profile
-+        [ -f $HOME/.profile ] && . $HOME/.profile
-+      ;;
-+  esac
+--- gnome-session-42.0/gnome-session/gnome-session.in	2022-03-21 15:13:31.651419000 -0500
++++ gnome-session-42.0-patched/gnome-session/gnome-session.in	2022-08-09 01:15:35.293264706 -0500
+@@ -13,6 +13,16 @@
    fi
  fi
  
++# Force blocaled to update LANG according to /etc/profile.d/lang.sh:
++if [ -f /etc/profile.d/lang.sh ]; then
++  (
++  source /etc/profile.d/lang.sh
++  busctl call org.freedesktop.locale1 /org/freedesktop/locale1 org.freedesktop.locale1 SetLocale "asb" 1 "LANG=$LANG" 0
++  )
++  # If we are GDM then source /etc/profile.d/lang.sh for real:
++  [ "x$XDG_SESSION_CLASS" = "xgreeter" ] && source /etc/profile.d/lang.sh
++fi
++
+ SETTING=$(G_MESSAGES_DEBUG='' gsettings get org.gnome.system.locale region)
+ REGION=${SETTING#\'}
+ REGION=${REGION%\'}
diff --git a/desktop/gnome-session/gnome-session.SlackBuild b/desktop/gnome-session/gnome-session.SlackBuild
index 1085048f06..efa256c6fa 100644
--- a/desktop/gnome-session/gnome-session.SlackBuild
+++ b/desktop/gnome-session/gnome-session.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=gnome-session
 VERSION=${VERSION:-42.0}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}