Compare commits
No commits in common. "c8" and "c8s" have entirely different histories.
|
@ -0,0 +1 @@
|
||||||
|
3233201cc82fa736997ddee7e54cb7f61c9d0074 SOURCES/gnome-session-3.28.1.tar.xz
|
|
@ -1,63 +0,0 @@
|
||||||
From a42ccfa0e8be2e658d081c3637ff0f43e2b38d3c Mon Sep 17 00:00:00 2001
|
|
||||||
From: Takao Fujiwara <tfujiwar@redhat.com>
|
|
||||||
Date: Tue, 22 Oct 2019 20:44:04 +0900
|
|
||||||
Subject: [PATCH] gnome-session: avoid setting LC_ unless LANG and region
|
|
||||||
disagree
|
|
||||||
|
|
||||||
At the moment, gnome-session explicitly sets the various LC_ variables
|
|
||||||
to the user configured region.
|
|
||||||
|
|
||||||
That's unnecessary, though. If the LC_ variables are unset,
|
|
||||||
applications know to use LANG. Furthermore, setting the LC_ variables
|
|
||||||
makes it so you can't override them with LANG anymore.
|
|
||||||
|
|
||||||
This commit makes sure the LC_ variables only get set when absolutely
|
|
||||||
necesary. That is, when they are different than LANG.
|
|
||||||
|
|
||||||
https://gitlab.gnome.org/GNOME/gnome-session/issues/37
|
|
||||||
---
|
|
||||||
gnome-session/gnome-session.in | 14 +++++++++-----
|
|
||||||
1 file changed, 9 insertions(+), 5 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/gnome-session/gnome-session.in b/gnome-session/gnome-session.in
|
|
||||||
index 7d967d34..90566f1d 100755
|
|
||||||
--- a/gnome-session/gnome-session.in
|
|
||||||
+++ b/gnome-session/gnome-session.in
|
|
||||||
@@ -1,25 +1,29 @@
|
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
if [ "x$XDG_SESSION_TYPE" = "xwayland" ] &&
|
|
||||||
[ "x$XDG_SESSION_CLASS" != "xgreeter" ] &&
|
|
||||||
[ -n "$SHELL" ]; then
|
|
||||||
if [ "$1" != '-l' ]; then
|
|
||||||
exec bash -c "exec -l '$SHELL' -c '$0 -l $*'"
|
|
||||||
else
|
|
||||||
shift
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
SETTING=$(gsettings get org.gnome.system.locale region)
|
|
||||||
REGION=${SETTING#\'}
|
|
||||||
REGION=${REGION%\'}
|
|
||||||
|
|
||||||
if [ -n "$REGION" ]; then
|
|
||||||
- export LC_TIME=$REGION
|
|
||||||
- export LC_NUMERIC=$REGION
|
|
||||||
- export LC_MONETARY=$REGION
|
|
||||||
- export LC_MEASUREMENT=$REGION
|
|
||||||
- export LC_PAPER=$REGION
|
|
||||||
+ unset LC_TIME LC_NUMERIC LC_MONETARY LC_MEASUREMENT LC_PAPER
|
|
||||||
+
|
|
||||||
+ if [ "$LANG" != "$REGION" ] ; then
|
|
||||||
+ export LC_TIME=$REGION
|
|
||||||
+ export LC_NUMERIC=$REGION
|
|
||||||
+ export LC_MONETARY=$REGION
|
|
||||||
+ export LC_MEASUREMENT=$REGION
|
|
||||||
+ export LC_PAPER=$REGION
|
|
||||||
+ fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
exec @libexecdir@/gnome-session-binary "$@"
|
|
||||||
--
|
|
||||||
2.41.0.rc2
|
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
Type=Application
|
Type=Application
|
||||||
Name=GNOME Shell Kiosk Mode
|
Name=Mutter
|
||||||
Comment=Window manager
|
Comment=Window manager
|
||||||
Exec=env DCONF_PROFILE=redhatkiosk /usr/bin/gnome-shell --mode=redhat-kiosk
|
Exec=env DCONF_PROFILE=redhat-kiosk /usr/bin/gnome-shell --mode=redhat-kiosk
|
||||||
Categories=GNOME;GTK;Core;
|
Categories=GNOME;GTK;Core;
|
||||||
OnlyShowIn=GNOME;
|
OnlyShowIn=GNOME;
|
||||||
NoDisplay=true
|
NoDisplay=true
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
Name=Kiosk (with on-screen keyboard)
|
Name=Kiosk (with on-screen keyboard)
|
||||||
Comment=Kiosk mode with on-screen keyboard
|
Comment=Kiosk mode with on-screen keyboard
|
||||||
Exec=/usr/bin/env DCONF_PROFILE=redhatkiosk /usr/bin/gnome-session --session=redhat-kiosk-with-keyboard
|
Exec=/usr/bin/env DCONF_PROFILE=redhat-kiosk /usr/bin/gnome-session --session=redhat-kiosk-with-keyboard
|
||||||
DesktopNames=Red-Hat-Kiosk;GNOME;
|
DesktopNames=Red-Hat-Kiosk;GNOME;
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,7 @@ EOF
|
||||||
touch ~/.config/gnome-initial-setup-done
|
touch ~/.config/gnome-initial-setup-done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
export DCONF_PROFILE=redhatkiosk
|
export DCONF_PROFILE=redhat-kiosk
|
||||||
systemctl --user import-environment DCONF_PROFILE
|
systemctl --user import-environment DCONF_PROFILE
|
||||||
|
|
||||||
exec ~/.local/bin/redhat-kiosk "$@"
|
exec ~/.local/bin/redhat-kiosk "$@"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
user-db:user
|
user-db:user
|
||||||
system-db:redhatkiosk
|
system-db:redhat-kiosk
|
||||||
system-db:local
|
system-db:local
|
||||||
system-db:site
|
system-db:site
|
||||||
system-db:distro
|
system-db:distro
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
|
|
||||||
Name: gnome-session
|
Name: gnome-session
|
||||||
Version: 3.28.1
|
Version: 3.28.1
|
||||||
Release: 21%{?dist}
|
Release: 19%{?dist}
|
||||||
Summary: GNOME session manager
|
Summary: GNOME session manager
|
||||||
|
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
|
@ -56,10 +56,6 @@ Patch20001: 0001-Fedora-Set-grub-boot-flags-on-shutdown-reboot.patch
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1877997
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1877997
|
||||||
Patch30001: 0001-main-only-log-check-accelerated-errors-when-debuggin.patch
|
Patch30001: 0001-main-only-log-check-accelerated-errors-when-debuggin.patch
|
||||||
|
|
||||||
# Allow user to override language settings
|
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=2170474
|
|
||||||
Patch40001: 0001-gnome-session-avoid-setting-LC_-unless-LANG-and-regi.patch
|
|
||||||
|
|
||||||
BuildRequires: meson
|
BuildRequires: meson
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
BuildRequires: pkgconfig(egl)
|
BuildRequires: pkgconfig(egl)
|
||||||
|
@ -168,9 +164,9 @@ install -D $RPM_SOURCE_DIR/redhat-kiosk -t $RPM_BUILD_ROOT%{_bindir}
|
||||||
|
|
||||||
install -D $RPM_SOURCE_DIR/20-redhat-kiosk.conf -t $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d
|
install -D $RPM_SOURCE_DIR/20-redhat-kiosk.conf -t $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d
|
||||||
|
|
||||||
install -D $RPM_SOURCE_DIR/50-redhat-kiosk.dconf $RPM_BUILD_ROOT%{_sysconfdir}/dconf/db/redhatkiosk.d/50-redhat-kiosk
|
install -D $RPM_SOURCE_DIR/50-redhat-kiosk.dconf $RPM_BUILD_ROOT%{_sysconfdir}/dconf/db/redhat-kiosk.d/50-redhat-kiosk
|
||||||
install -D $RPM_SOURCE_DIR/50-redhat-kiosk.dconf.locks $RPM_BUILD_ROOT%{_sysconfdir}/dconf/db/redhatkiosk.d/locks/50-redhat-kiosk
|
install -D $RPM_SOURCE_DIR/50-redhat-kiosk.dconf.locks $RPM_BUILD_ROOT%{_sysconfdir}/dconf/db/redhat-kiosk.d/locks/50-redhat-kiosk
|
||||||
install -D $RPM_SOURCE_DIR/redhat-kiosk.dconf.profile $RPM_BUILD_ROOT%{_sysconfdir}/dconf/profile/redhatkiosk
|
install -D $RPM_SOURCE_DIR/redhat-kiosk.dconf.profile $RPM_BUILD_ROOT%{_sysconfdir}/dconf/profile/redhat-kiosk
|
||||||
|
|
||||||
install -D $RPM_SOURCE_DIR/20-redhat-kiosk.conf -t $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d
|
install -D $RPM_SOURCE_DIR/20-redhat-kiosk.conf -t $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d
|
||||||
|
|
||||||
|
@ -179,12 +175,6 @@ install -D $RPM_SOURCE_DIR/20-redhat-kiosk.conf -t $RPM_BUILD_ROOT%{_datadir}/X1
|
||||||
%ldconfig_scriptlets
|
%ldconfig_scriptlets
|
||||||
|
|
||||||
%posttrans
|
%posttrans
|
||||||
|
|
||||||
# These files weren't packaged correctly in gnome-session-3.28.1-19.el8 so manually prune them
|
|
||||||
rmdir %{_sysconfdir}/dconf/db/redhat-kiosk.d/locks 2> /dev/null || :
|
|
||||||
rmdir %{_sysconfdir}/dconf/db/redhat-kiosk.d 2> /dev/null || :
|
|
||||||
rm -f %{_sysconfdir}/dconf/db/redhat-kiosk 2> /dev/null || :
|
|
||||||
|
|
||||||
dconf update
|
dconf update
|
||||||
|
|
||||||
%files xsession
|
%files xsession
|
||||||
|
@ -195,12 +185,9 @@ dconf update
|
||||||
%{_datadir}/wayland-sessions/*
|
%{_datadir}/wayland-sessions/*
|
||||||
|
|
||||||
%files kiosk-session
|
%files kiosk-session
|
||||||
%dir %{_sysconfdir}/dconf/db/redhatkiosk.d/locks
|
%{_sysconfdir}/dconf/db/redhat-kiosk.d/50-redhat-kiosk
|
||||||
%dir %{_sysconfdir}/dconf/db/redhatkiosk.d
|
%{_sysconfdir}/dconf/db/redhat-kiosk.d/locks/50-redhat-kiosk
|
||||||
%ghost %{_sysconfdir}/dconf/db/redhatkiosk
|
%{_sysconfdir}/dconf/profile/redhat-kiosk
|
||||||
%{_sysconfdir}/dconf/db/redhatkiosk.d/50-redhat-kiosk
|
|
||||||
%{_sysconfdir}/dconf/db/redhatkiosk.d/locks/50-redhat-kiosk
|
|
||||||
%{_sysconfdir}/dconf/profile/redhatkiosk
|
|
||||||
%{_datadir}/applications/com.redhat.Kiosk.Script.desktop
|
%{_datadir}/applications/com.redhat.Kiosk.Script.desktop
|
||||||
%{_datadir}/applications/com.redhat.Kiosk.WindowManager.desktop
|
%{_datadir}/applications/com.redhat.Kiosk.WindowManager.desktop
|
||||||
%{_datadir}/applications/com.redhat.KioskWithKeyboard.WindowManager.desktop
|
%{_datadir}/applications/com.redhat.KioskWithKeyboard.WindowManager.desktop
|
||||||
|
@ -228,15 +215,6 @@ dconf update
|
||||||
%{_datadir}/glib-2.0/schemas/org.gnome.SessionManager.gschema.xml
|
%{_datadir}/glib-2.0/schemas/org.gnome.SessionManager.gschema.xml
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed May 31 2023 Ray Strode <rstrode@redhat.com> - 3.28.1-21
|
|
||||||
- Allow users to override language settings in environment
|
|
||||||
Resolves: #2170474
|
|
||||||
|
|
||||||
* Wed Mar 01 2023 Ray Strode <rstrode@redhat.com> - 3.28.1-20
|
|
||||||
- Work around dconf log spew by renaming dconf profile
|
|
||||||
Related: 2070976
|
|
||||||
Resolves: #2174414
|
|
||||||
|
|
||||||
* Tue Feb 28 2023 Ray Strode <rstrode@redhat.com> - 3.28.1-19
|
* Tue Feb 28 2023 Ray Strode <rstrode@redhat.com> - 3.28.1-19
|
||||||
- Another fix
|
- Another fix
|
||||||
Related: #2070976
|
Related: #2070976
|
||||||
|
|
Loading…
Reference in New Issue