Compare commits
No commits in common. "c8" and "c9-beta" have entirely different histories.
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
SOURCES/gnome-session-3.28.1.tar.xz
|
||||
SOURCES/gnome-session-40.1.1.tar.xz
|
||||
|
||||
1
.gnome-session.metadata
Normal file
1
.gnome-session.metadata
Normal file
@ -0,0 +1 @@
|
||||
497bcbe97f8d665618438d352c555373393f89d7 SOURCES/gnome-session-40.1.1.tar.xz
|
||||
@ -1,4 +1,4 @@
|
||||
From 15be30033e5b24a8c84a4d4338da0e8a3930303a Mon Sep 17 00:00:00 2001
|
||||
From e3d6f1c1d342d0c74f2125ea0efa2a9669aaa8df Mon Sep 17 00:00:00 2001
|
||||
From: Hans de Goede <hdegoede@redhat.com>
|
||||
Date: Tue, 14 Aug 2018 14:49:59 +0200
|
||||
Subject: [PATCH] Fedora: Set grub boot-flags on shutdown / reboot
|
||||
@ -18,37 +18,10 @@ the boot-menu not being hidden.
|
||||
1 file changed, 12 insertions(+)
|
||||
|
||||
diff --git a/gnome-session/gsm-manager.c b/gnome-session/gsm-manager.c
|
||||
index 3cf421cd..924767af 100644
|
||||
index 6839a02d..589efb02 100644
|
||||
--- a/gnome-session/gsm-manager.c
|
||||
+++ b/gnome-session/gsm-manager.c
|
||||
@@ -3629,51 +3629,63 @@ on_shutdown_prepared (GsmSystem *system,
|
||||
gboolean success,
|
||||
GsmManager *manager)
|
||||
{
|
||||
g_debug ("GsmManager: on_shutdown_prepared, success: %d", success);
|
||||
g_signal_handlers_disconnect_by_func (system, on_shutdown_prepared, manager);
|
||||
|
||||
if (success) {
|
||||
/* move to end-session phase */
|
||||
g_assert (manager->priv->phase == GSM_MANAGER_PHASE_QUERY_END_SESSION);
|
||||
manager->priv->phase++;
|
||||
start_phase (manager);
|
||||
} else {
|
||||
disconnect_shell_dialog_signals (manager);
|
||||
gsm_shell_close_end_session_dialog (manager->priv->shell);
|
||||
/* back to running phase */
|
||||
cancel_end_session (manager);
|
||||
}
|
||||
}
|
||||
|
||||
static gboolean
|
||||
do_query_end_session_exit (GsmManager *manager)
|
||||
{
|
||||
gboolean reboot = FALSE;
|
||||
gboolean shutdown = FALSE;
|
||||
|
||||
switch (manager->priv->logout_type) {
|
||||
case GSM_MANAGER_LOGOUT_LOGOUT:
|
||||
@@ -3823,10 +3823,22 @@ do_query_end_session_exit (GsmManager *manager)
|
||||
break;
|
||||
case GSM_MANAGER_LOGOUT_REBOOT:
|
||||
case GSM_MANAGER_LOGOUT_REBOOT_INTERACT:
|
||||
@ -71,20 +44,6 @@ index 3cf421cd..924767af 100644
|
||||
shutdown = TRUE;
|
||||
break;
|
||||
default:
|
||||
g_warning ("Unexpected logout type %d in do_query_end_session_exit()",
|
||||
manager->priv->logout_type);
|
||||
break;
|
||||
}
|
||||
|
||||
if (reboot || shutdown) {
|
||||
g_signal_connect (manager->priv->system, "shutdown-prepared",
|
||||
G_CALLBACK (on_shutdown_prepared), manager);
|
||||
gsm_system_prepare_shutdown (manager->priv->system, reboot);
|
||||
return FALSE; /* don't leave query end session yet */
|
||||
}
|
||||
|
||||
return TRUE; /* go to end session phase */
|
||||
}
|
||||
--
|
||||
2.31.1
|
||||
2.28.0
|
||||
|
||||
|
||||
@ -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,4 +1,4 @@
|
||||
From ae60cb25636b6f68d087591de11fd681f6f8c918 Mon Sep 17 00:00:00 2001
|
||||
From 63d74edc4b112669fdce14d88d37e2dd0315ff7e Mon Sep 17 00:00:00 2001
|
||||
From: Ray Strode <rstrode@redhat.com>
|
||||
Date: Tue, 19 Nov 2019 09:29:16 -0500
|
||||
Subject: [PATCH] gnome-session: don't validate shell before using it
|
||||
@ -15,10 +15,10 @@ shell validity checks when deciding to run though a login shell.
|
||||
1 file changed, 1 insertion(+), 4 deletions(-)
|
||||
|
||||
diff --git a/gnome-session/gnome-session.in b/gnome-session/gnome-session.in
|
||||
index ce63df56..7d967d34 100755
|
||||
index ddd1a591..b4b1f8fa 100755
|
||||
--- a/gnome-session/gnome-session.in
|
||||
+++ b/gnome-session/gnome-session.in
|
||||
@@ -1,28 +1,25 @@
|
||||
@@ -1,32 +1,29 @@
|
||||
#!/bin/sh
|
||||
|
||||
if [ "x$XDG_SESSION_TYPE" = "xwayland" ] &&
|
||||
@ -35,19 +35,23 @@ index ce63df56..7d967d34 100755
|
||||
fi
|
||||
fi
|
||||
|
||||
SETTING=$(gsettings get org.gnome.system.locale region)
|
||||
SETTING=$(G_MESSAGES_DEBUG='' 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.21.0
|
||||
2.32.0
|
||||
|
||||
|
||||
@ -0,0 +1,126 @@
|
||||
From 51949dd2b944604742406a7464eb945cb5b610e9 Mon Sep 17 00:00:00 2001
|
||||
From: Benjamin Berg <bberg@redhat.com>
|
||||
Date: Mon, 15 Nov 2021 14:56:14 +0100
|
||||
Subject: [PATCH 1/2] main: Lower fallback warning when running in GDM
|
||||
|
||||
It is currently expected for the fallback to happen. So hide the errors,
|
||||
but still log a single message to inform users about it.
|
||||
---
|
||||
gnome-session/main.c | 11 +++++++----
|
||||
1 file changed, 7 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/gnome-session/main.c b/gnome-session/main.c
|
||||
index 443bc045..45ec6597 100644
|
||||
--- a/gnome-session/main.c
|
||||
+++ b/gnome-session/main.c
|
||||
@@ -512,100 +512,103 @@ main (int argc, char **argv)
|
||||
exit (1);
|
||||
}
|
||||
|
||||
env_override_autostart_dirs = g_getenv ("GNOME_SESSION_AUTOSTART_DIR");
|
||||
|
||||
if (env_override_autostart_dirs != NULL && env_override_autostart_dirs[0] != '\0') {
|
||||
env_override_autostart_dirs_v = g_strsplit (env_override_autostart_dirs, ":", 0);
|
||||
gsm_util_set_autostart_dirs (env_override_autostart_dirs_v);
|
||||
} else {
|
||||
gsm_util_set_autostart_dirs (override_autostart_dirs);
|
||||
|
||||
/* Export the override autostart dirs parameter to the environment
|
||||
* in case we are running on systemd. */
|
||||
if (override_autostart_dirs) {
|
||||
g_autofree char *autostart_dirs = NULL;
|
||||
autostart_dirs = g_strjoinv (":", override_autostart_dirs);
|
||||
g_setenv ("GNOME_SESSION_AUTOSTART_DIR", autostart_dirs, TRUE);
|
||||
}
|
||||
}
|
||||
|
||||
gsm_util_export_activation_environment (&error);
|
||||
if (error) {
|
||||
g_warning ("Failed to upload environment to DBus: %s", error->message);
|
||||
g_clear_error (&error);
|
||||
}
|
||||
|
||||
session_name = opt_session_name;
|
||||
|
||||
#ifdef HAVE_SYSTEMD
|
||||
gsm_util_export_user_environment (&error);
|
||||
- if (error) {
|
||||
+ if (error && !g_getenv ("RUNNING_UNDER_GDM")) {
|
||||
g_warning ("Failed to upload environment to systemd: %s", error->message);
|
||||
g_clear_error (&error);
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef ENABLE_SYSTEMD_SESSION
|
||||
if (use_systemd && !systemd_service) {
|
||||
g_autofree gchar *gnome_session_target;
|
||||
const gchar *session_type;
|
||||
|
||||
session_type = g_getenv ("XDG_SESSION_TYPE");
|
||||
|
||||
/* We really need to resolve the session name at this point,
|
||||
* which requires talking to GSettings internally. */
|
||||
if (IS_STRING_EMPTY (session_name)) {
|
||||
session_name = _gsm_manager_get_default_session (NULL);
|
||||
}
|
||||
|
||||
/* Reset all failed units; we are going to start a lof ot things and
|
||||
* really do not want to run into errors because units have failed
|
||||
* in a previous session
|
||||
*/
|
||||
gsm_util_systemd_reset_failed (&error);
|
||||
- if (error) {
|
||||
+ if (error && !g_getenv ("RUNNING_UNDER_GDM")) {
|
||||
g_warning ("Failed to reset failed state of units: %s", error->message);
|
||||
g_clear_error (&error);
|
||||
}
|
||||
|
||||
/* We don't escape the name (i.e. we leave any '-' intact). */
|
||||
gnome_session_target = g_strdup_printf ("gnome-session-%s@%s.target", session_type, session_name);
|
||||
if (gsm_util_start_systemd_unit (gnome_session_target, "fail", &error)) {
|
||||
/* We started the unit, open fifo and sleep forever. */
|
||||
systemd_leader_run ();
|
||||
exit(0);
|
||||
}
|
||||
|
||||
/* We could not start the unit, fall back. */
|
||||
- g_warning ("Falling back to non-systemd startup procedure due to error: %s", error->message);
|
||||
- g_clear_error (&error);
|
||||
+ if (g_getenv ("RUNNING_UNDER_GDM"))
|
||||
+ g_message ("Falling back to non-systemd startup procedure. This is expected to happen for GDM sessions.");
|
||||
+ else
|
||||
+ g_warning ("Falling back to non-systemd startup procedure due to error: %s", error->message);
|
||||
+ g_clear_error (&error);
|
||||
}
|
||||
#endif /* ENABLE_SYSTEMD_SESSION */
|
||||
|
||||
{
|
||||
gchar *ibus_path;
|
||||
|
||||
ibus_path = g_find_program_in_path("ibus-daemon");
|
||||
|
||||
if (ibus_path) {
|
||||
const gchar *p;
|
||||
p = g_getenv ("QT_IM_MODULE");
|
||||
if (!p || !*p)
|
||||
p = "ibus";
|
||||
gsm_util_setenv ("QT_IM_MODULE", p);
|
||||
p = g_getenv ("XMODIFIERS");
|
||||
if (!p || !*p)
|
||||
p = "@im=ibus";
|
||||
gsm_util_setenv ("XMODIFIERS", p);
|
||||
}
|
||||
|
||||
g_free (ibus_path);
|
||||
}
|
||||
|
||||
/* We want to use the GNOME menus which has the designed categories.
|
||||
*/
|
||||
gsm_util_setenv ("XDG_MENU_PREFIX", "gnome-");
|
||||
|
||||
/* Talk to logind before acquiring a name, since it does synchronous
|
||||
* calls at initialization time that invoke a main loop and if we
|
||||
* already owned a name, then we would service too early during
|
||||
--
|
||||
2.35.1
|
||||
|
||||
@ -1,107 +0,0 @@
|
||||
From 7cdf11b1b4b04f8cd366316f6c50a9bd0b4e67d3 Mon Sep 17 00:00:00 2001
|
||||
From: Ray Strode <rstrode@redhat.com>
|
||||
Date: Wed, 6 May 2020 13:45:50 -0400
|
||||
Subject: [PATCH] main: only log check-accelerated errors when debugging
|
||||
enabled
|
||||
|
||||
The journal currently gets spammed with messages like:
|
||||
|
||||
gnome-session: gnome-session-check-accelerated: GL Helper exited with code 512
|
||||
gnome-session: libEGL warning: DRI2: failed to authenticate
|
||||
gnome-session: gnome-session-check-accelerated: GLES Helper exited with code 512
|
||||
|
||||
if a the machine lacks accelerated graphics. But lacking accelerated
|
||||
graphics isn't actually an error (many servers do).
|
||||
|
||||
This commit changes the messages to only show when debugging is enabled.
|
||||
---
|
||||
gnome-session/main.c | 8 +++++++-
|
||||
1 file changed, 7 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gnome-session/main.c b/gnome-session/main.c
|
||||
index b1ac3850..0e75eecf 100644
|
||||
--- a/gnome-session/main.c
|
||||
+++ b/gnome-session/main.c
|
||||
@@ -193,72 +193,78 @@ require_dbus_session (int argc,
|
||||
g_return_val_if_fail (!g_str_has_prefix (argv[0], "dbus-launch"),
|
||||
TRUE);
|
||||
|
||||
/* +2 for our new arguments, +1 for NULL */
|
||||
new_argv = g_malloc ((argc + 3) * sizeof (*argv));
|
||||
|
||||
new_argv[0] = "dbus-launch";
|
||||
new_argv[1] = "--exit-with-session";
|
||||
for (i = 0; i < argc; i++) {
|
||||
new_argv[i + 2] = argv[i];
|
||||
}
|
||||
new_argv[i + 2] = NULL;
|
||||
|
||||
if (!execvp ("dbus-launch", new_argv)) {
|
||||
g_set_error (error,
|
||||
G_SPAWN_ERROR,
|
||||
G_SPAWN_ERROR_FAILED,
|
||||
"No session bus and could not exec dbus-launch: %s",
|
||||
g_strerror (errno));
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
/* Should not be reached */
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
check_gl (GError **error)
|
||||
{
|
||||
int status;
|
||||
+ g_autofree char *error_output = NULL;
|
||||
+
|
||||
char *argv[] = { LIBEXECDIR "/gnome-session-check-accelerated", NULL };
|
||||
|
||||
if (getenv ("DISPLAY") == NULL) {
|
||||
/* Not connected to X11, someone else will take care of checking GL */
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
- if (!g_spawn_sync (NULL, (char **) argv, NULL, 0, NULL, NULL, &gl_renderer, NULL,
|
||||
+ if (!g_spawn_sync (NULL, (char **) argv, NULL, 0, NULL, NULL, &gl_renderer, &error_output,
|
||||
&status, error)) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
+ if (error_output != NULL) {
|
||||
+ g_debug ("%s", error_output);
|
||||
+ }
|
||||
+
|
||||
return g_spawn_check_exit_status (status, error);
|
||||
}
|
||||
|
||||
static void
|
||||
initialize_gio (void)
|
||||
{
|
||||
char *disable_fuse = NULL;
|
||||
char *use_vfs = NULL;
|
||||
|
||||
disable_fuse = g_strdup (g_getenv ("GVFS_DISABLE_FUSE"));
|
||||
use_vfs = g_strdup (g_getenv ("GIO_USE_VFS"));
|
||||
|
||||
g_setenv ("GVFS_DISABLE_FUSE", "1", TRUE);
|
||||
g_setenv ("GIO_USE_VFS", "local", TRUE);
|
||||
g_vfs_get_default ();
|
||||
|
||||
if (use_vfs) {
|
||||
g_setenv ("GIO_USE_VFS", use_vfs, TRUE);
|
||||
g_free (use_vfs);
|
||||
} else {
|
||||
g_unsetenv ("GIO_USE_VFS");
|
||||
}
|
||||
|
||||
if (disable_fuse) {
|
||||
g_setenv ("GVFS_DISABLE_FUSE", disable_fuse, TRUE);
|
||||
g_free (disable_fuse);
|
||||
} else {
|
||||
g_unsetenv ("GVFS_DISABLE_FUSE");
|
||||
}
|
||||
}
|
||||
--
|
||||
2.33.1
|
||||
|
||||
@ -1,124 +0,0 @@
|
||||
From 06271eea2a12970fbe73b3d3f2c6ae5d79339379 Mon Sep 17 00:00:00 2001
|
||||
From: Ray Strode <rstrode@redhat.com>
|
||||
Date: Mon, 29 Jun 2020 15:15:48 -0400
|
||||
Subject: [PATCH] session-selector: show cursor explicitly
|
||||
|
||||
Normally the window manager would show the cursor at start up, but
|
||||
the session selector runs when no window manager is present.
|
||||
|
||||
This commit makes the session selector explicitly set a cursor, so
|
||||
users can interact with the dialog using the mouse.
|
||||
---
|
||||
tools/gnome-session-selector.c | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/tools/gnome-session-selector.c b/tools/gnome-session-selector.c
|
||||
index 71892c43..9225639e 100644
|
||||
--- a/tools/gnome-session-selector.c
|
||||
+++ b/tools/gnome-session-selector.c
|
||||
@@ -594,60 +594,61 @@ auto_save_next_session_if_needed (void)
|
||||
static int
|
||||
compare_sessions (GtkTreeModel *model,
|
||||
GtkTreeIter *a,
|
||||
GtkTreeIter *b,
|
||||
gpointer data)
|
||||
{
|
||||
char *name_a, *name_b;
|
||||
int result;
|
||||
|
||||
gtk_tree_model_get (model, a, 0, &name_a, -1);
|
||||
gtk_tree_model_get (model, b, 0, &name_b, -1);
|
||||
|
||||
result = g_utf8_collate (name_a, name_b);
|
||||
|
||||
g_free (name_a);
|
||||
g_free (name_b);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
static void
|
||||
on_map (GtkWidget *widget,
|
||||
gpointer data)
|
||||
{
|
||||
gdk_window_focus (gtk_widget_get_window (widget), GDK_CURRENT_TIME);
|
||||
}
|
||||
|
||||
int
|
||||
main (int argc, char *argv[])
|
||||
{
|
||||
+ GdkCursor *cursor;
|
||||
GtkWidget *window;
|
||||
GtkWidget *widget;
|
||||
GtkCellRenderer *cell;
|
||||
GtkTreeViewColumn *column;
|
||||
GtkTreeSelection *selection;
|
||||
GError *error;
|
||||
|
||||
if (getenv ("SESSION_MANAGER") != NULL)
|
||||
return 1;
|
||||
|
||||
gtk_init (&argc, &argv);
|
||||
if (argc > 1) {
|
||||
g_print ("create and select session\n");
|
||||
if (!create_and_select_session (argv[1]))
|
||||
return 1;
|
||||
else
|
||||
return 0;
|
||||
}
|
||||
|
||||
builder = gtk_builder_new ();
|
||||
gtk_builder_set_translation_domain (builder, GETTEXT_PACKAGE);
|
||||
|
||||
error = NULL;
|
||||
if (!gtk_builder_add_from_file (builder, GTKBUILDER_DIR "/" "session-selector.ui", &error)) {
|
||||
g_warning ("Could not load file 'session-selector.ui': %s", error->message);
|
||||
exit (1);
|
||||
}
|
||||
|
||||
window = (GtkWidget *) gtk_builder_get_object (builder, "main-window");
|
||||
|
||||
@@ -663,36 +664,40 @@ main (int argc, char *argv[])
|
||||
session_list = (GtkWidget *) gtk_builder_get_object (builder, "session-list");
|
||||
|
||||
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (session_list));
|
||||
gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
|
||||
|
||||
populate_session_list (session_list);
|
||||
|
||||
cell = gtk_cell_renderer_text_new ();
|
||||
g_signal_connect (cell, "edited", G_CALLBACK (on_row_edited), NULL);
|
||||
|
||||
column = gtk_tree_view_column_new_with_attributes ("", cell, "text", 0, NULL);
|
||||
gtk_tree_view_append_column (GTK_TREE_VIEW (session_list), GTK_TREE_VIEW_COLUMN (column));
|
||||
|
||||
g_signal_connect (session_list, "row-activated", G_CALLBACK (on_row_activated), NULL);
|
||||
|
||||
g_signal_connect (selection, "changed",
|
||||
G_CALLBACK (on_selection_changed), NULL);
|
||||
|
||||
widget = (GtkWidget *) gtk_builder_get_object (builder, "new-session");
|
||||
g_signal_connect (widget, "clicked", G_CALLBACK (on_new_session_clicked), NULL);
|
||||
widget = (GtkWidget *) gtk_builder_get_object (builder, "remove-session");
|
||||
g_signal_connect (widget, "clicked", G_CALLBACK (on_remove_session_clicked), NULL);
|
||||
widget = (GtkWidget *) gtk_builder_get_object (builder, "rename-session");
|
||||
g_signal_connect (widget, "clicked", G_CALLBACK (on_rename_session_clicked), NULL);
|
||||
widget = (GtkWidget *) gtk_builder_get_object (builder, "continue-button");
|
||||
g_signal_connect (widget, "clicked", G_CALLBACK (on_continue_clicked), NULL);
|
||||
|
||||
g_signal_connect (window, "map", G_CALLBACK (on_map), NULL);
|
||||
gtk_widget_show (window);
|
||||
|
||||
+ cursor = gdk_cursor_new_from_name (gtk_widget_get_display (window),
|
||||
+ "default");
|
||||
+ gdk_window_set_cursor (gtk_widget_get_window (window), cursor);
|
||||
+
|
||||
gtk_main ();
|
||||
|
||||
auto_save_next_session_if_needed ();
|
||||
|
||||
return 0;
|
||||
}
|
||||
--
|
||||
2.26.0
|
||||
|
||||
115
SOURCES/0002-main-Also-clear-error-when-running-under-GDM.patch
Normal file
115
SOURCES/0002-main-Also-clear-error-when-running-under-GDM.patch
Normal file
@ -0,0 +1,115 @@
|
||||
From d39c345191f83ba37d24c07a831c9bb91cdde079 Mon Sep 17 00:00:00 2001
|
||||
From: Benjamin Berg <bberg@redhat.com>
|
||||
Date: Sun, 17 Apr 2022 15:58:13 +0200
|
||||
Subject: [PATCH 2/2] main: Also clear error when running under GDM
|
||||
|
||||
Commit 0349a77ad875 ("main: Lower fallback warning when running in GDM")
|
||||
removed error logging when running under GDM. However, the error was not
|
||||
cleared afterwards, leaking it to later operations and causing other
|
||||
issues.
|
||||
|
||||
Closes: #105
|
||||
---
|
||||
gnome-session/main.c | 10 ++++------
|
||||
1 file changed, 4 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/gnome-session/main.c b/gnome-session/main.c
|
||||
index 45ec6597..6a683ae0 100644
|
||||
--- a/gnome-session/main.c
|
||||
+++ b/gnome-session/main.c
|
||||
@@ -512,88 +512,86 @@ main (int argc, char **argv)
|
||||
exit (1);
|
||||
}
|
||||
|
||||
env_override_autostart_dirs = g_getenv ("GNOME_SESSION_AUTOSTART_DIR");
|
||||
|
||||
if (env_override_autostart_dirs != NULL && env_override_autostart_dirs[0] != '\0') {
|
||||
env_override_autostart_dirs_v = g_strsplit (env_override_autostart_dirs, ":", 0);
|
||||
gsm_util_set_autostart_dirs (env_override_autostart_dirs_v);
|
||||
} else {
|
||||
gsm_util_set_autostart_dirs (override_autostart_dirs);
|
||||
|
||||
/* Export the override autostart dirs parameter to the environment
|
||||
* in case we are running on systemd. */
|
||||
if (override_autostart_dirs) {
|
||||
g_autofree char *autostart_dirs = NULL;
|
||||
autostart_dirs = g_strjoinv (":", override_autostart_dirs);
|
||||
g_setenv ("GNOME_SESSION_AUTOSTART_DIR", autostart_dirs, TRUE);
|
||||
}
|
||||
}
|
||||
|
||||
gsm_util_export_activation_environment (&error);
|
||||
if (error) {
|
||||
g_warning ("Failed to upload environment to DBus: %s", error->message);
|
||||
g_clear_error (&error);
|
||||
}
|
||||
|
||||
session_name = opt_session_name;
|
||||
|
||||
#ifdef HAVE_SYSTEMD
|
||||
gsm_util_export_user_environment (&error);
|
||||
- if (error && !g_getenv ("RUNNING_UNDER_GDM")) {
|
||||
+ if (error && !g_getenv ("RUNNING_UNDER_GDM"))
|
||||
g_warning ("Failed to upload environment to systemd: %s", error->message);
|
||||
- g_clear_error (&error);
|
||||
- }
|
||||
+ g_clear_error (&error);
|
||||
#endif
|
||||
|
||||
#ifdef ENABLE_SYSTEMD_SESSION
|
||||
if (use_systemd && !systemd_service) {
|
||||
g_autofree gchar *gnome_session_target;
|
||||
const gchar *session_type;
|
||||
|
||||
session_type = g_getenv ("XDG_SESSION_TYPE");
|
||||
|
||||
/* We really need to resolve the session name at this point,
|
||||
* which requires talking to GSettings internally. */
|
||||
if (IS_STRING_EMPTY (session_name)) {
|
||||
session_name = _gsm_manager_get_default_session (NULL);
|
||||
}
|
||||
|
||||
/* Reset all failed units; we are going to start a lof ot things and
|
||||
* really do not want to run into errors because units have failed
|
||||
* in a previous session
|
||||
*/
|
||||
gsm_util_systemd_reset_failed (&error);
|
||||
- if (error && !g_getenv ("RUNNING_UNDER_GDM")) {
|
||||
+ if (error && !g_getenv ("RUNNING_UNDER_GDM"))
|
||||
g_warning ("Failed to reset failed state of units: %s", error->message);
|
||||
- g_clear_error (&error);
|
||||
- }
|
||||
+ g_clear_error (&error);
|
||||
|
||||
/* We don't escape the name (i.e. we leave any '-' intact). */
|
||||
gnome_session_target = g_strdup_printf ("gnome-session-%s@%s.target", session_type, session_name);
|
||||
if (gsm_util_start_systemd_unit (gnome_session_target, "fail", &error)) {
|
||||
/* We started the unit, open fifo and sleep forever. */
|
||||
systemd_leader_run ();
|
||||
exit(0);
|
||||
}
|
||||
|
||||
/* We could not start the unit, fall back. */
|
||||
if (g_getenv ("RUNNING_UNDER_GDM"))
|
||||
g_message ("Falling back to non-systemd startup procedure. This is expected to happen for GDM sessions.");
|
||||
else
|
||||
g_warning ("Falling back to non-systemd startup procedure due to error: %s", error->message);
|
||||
g_clear_error (&error);
|
||||
}
|
||||
#endif /* ENABLE_SYSTEMD_SESSION */
|
||||
|
||||
{
|
||||
gchar *ibus_path;
|
||||
|
||||
ibus_path = g_find_program_in_path("ibus-daemon");
|
||||
|
||||
if (ibus_path) {
|
||||
const gchar *p;
|
||||
p = g_getenv ("QT_IM_MODULE");
|
||||
if (!p || !*p)
|
||||
p = "ibus";
|
||||
gsm_util_setenv ("QT_IM_MODULE", p);
|
||||
p = g_getenv ("XMODIFIERS");
|
||||
--
|
||||
2.35.1
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
Section "ServerFlags"
|
||||
Option "DontVTSwitch" "on"
|
||||
EndSection
|
||||
@ -1,38 +0,0 @@
|
||||
[org/gnome/desktop/a11y/applications]
|
||||
screen-keyboard-enabled=true
|
||||
|
||||
[org/gnome/desktop/interface]
|
||||
gtk-im-module='ibus'
|
||||
toolkit-accessibility=true
|
||||
|
||||
[org/gnome/desktop/lockdown]
|
||||
disable-command-line=true
|
||||
disable-lock-screen=true
|
||||
disable-application-handlers=true
|
||||
disable-user-switching=true
|
||||
user-administration-disabled=true
|
||||
|
||||
[org/gnome/desktop/wm/keybindings]
|
||||
always-on-top=@as []
|
||||
begin-move=@as []
|
||||
begin-resize=@as []
|
||||
close=@as []
|
||||
lower=@as []
|
||||
maximize=@as []
|
||||
maximize-horizontally=@as []
|
||||
maximize-vertically=@as []
|
||||
minimize=@as []
|
||||
panel-main-menu=@as []
|
||||
panel-run-dialog=@as []
|
||||
raise=@as []
|
||||
raise-or-lower=@as []
|
||||
show-desktop=@as []
|
||||
toggle-fullscreen=@as []
|
||||
toggle-maximized=@as []
|
||||
unmaximize=@as []
|
||||
|
||||
[org/gnome/desktop/wm/preferences]
|
||||
num-workspaces=1
|
||||
|
||||
[org/gnome/mutter]
|
||||
dynamic-workspaces=false
|
||||
@ -1,8 +0,0 @@
|
||||
/org/gnome/desktop/a11y/applications/screen-keyboard-enabled
|
||||
/org/gnome/desktop/interface/gtk-im-module
|
||||
/org/gnome/desktop/interface/toolkit-accessibility
|
||||
/org/gnome/desktop/lockdown/disable-command-line
|
||||
/org/gnome/desktop/lockdown/disable-lock-screen
|
||||
/org/gnome/desktop/lockdown/disable-application-handlers
|
||||
/org/gnome/desktop/lockdown/disable-user-switching
|
||||
/org/gnome/desktop/lockdown/user-administration-disabled
|
||||
@ -1,5 +0,0 @@
|
||||
[Desktop Entry]
|
||||
Name=Kiosk
|
||||
Type=Application
|
||||
Exec=redhat-kiosk
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
[Desktop Entry]
|
||||
Type=Application
|
||||
Name=Mutter
|
||||
Comment=Window manager
|
||||
Exec=/usr/bin/mutter
|
||||
Categories=GNOME;GTK;Core;
|
||||
OnlyShowIn=GNOME;
|
||||
NoDisplay=true
|
||||
X-GNOME-Autostart-Phase=DisplayServer
|
||||
X-GNOME-Provides=windowmanager;
|
||||
X-GNOME-Autostart-Notify=true
|
||||
X-GNOME-AutoRestart=false
|
||||
X-GNOME-HiddenUnderSystemd=true
|
||||
@ -1,6 +0,0 @@
|
||||
[Desktop Entry]
|
||||
Name=Kiosk
|
||||
Comment=Kiosk mode
|
||||
Exec=/usr/bin/gnome-session --session=redhat-kiosk
|
||||
DesktopNames=Red-Hat-Kiosk;GNOME;
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
[Desktop Entry]
|
||||
Type=Application
|
||||
Name=GNOME Shell Kiosk Mode
|
||||
Comment=Window manager
|
||||
Exec=env DCONF_PROFILE=redhatkiosk /usr/bin/gnome-shell --mode=redhat-kiosk
|
||||
Categories=GNOME;GTK;Core;
|
||||
OnlyShowIn=GNOME;
|
||||
NoDisplay=true
|
||||
X-GNOME-Autostart-Phase=DisplayServer
|
||||
X-GNOME-Provides=windowmanager;
|
||||
X-GNOME-Autostart-Notify=true
|
||||
X-GNOME-AutoRestart=false
|
||||
X-GNOME-HiddenUnderSystemd=true
|
||||
@ -1,6 +0,0 @@
|
||||
[Desktop Entry]
|
||||
Name=Kiosk (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
|
||||
DesktopNames=Red-Hat-Kiosk;GNOME;
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
if [ ! -e ~/.local/bin/redhat-kiosk ]; then
|
||||
mkdir -p ~/.local/bin ~/.config
|
||||
cat > ~/.local/bin/redhat-kiosk << EOF
|
||||
#!/bin/sh
|
||||
# This script is located in ~/.local/bin.
|
||||
# It's provided as an example script to show how
|
||||
# the kiosk session works. At the moment, the script
|
||||
# just starts a text editor open to itself, but it
|
||||
# should get customized to instead start a full screen
|
||||
# application designed for the kiosk deployment.
|
||||
# The "while true" bit just makes sure the application gets
|
||||
# restarted if it dies for whatever reason.
|
||||
|
||||
while true; do
|
||||
gedit ~/.local/bin/redhat-kiosk
|
||||
done
|
||||
|
||||
EOF
|
||||
|
||||
chmod +x ~/.local/bin/redhat-kiosk
|
||||
touch ~/.config/gnome-initial-setup-done
|
||||
fi
|
||||
|
||||
export DCONF_PROFILE=redhatkiosk
|
||||
systemctl --user import-environment DCONF_PROFILE
|
||||
|
||||
exec ~/.local/bin/redhat-kiosk "$@"
|
||||
@ -1,3 +0,0 @@
|
||||
[GNOME Session]
|
||||
Name=Kiosk
|
||||
RequiredComponents=com.redhat.KioskWithKeyboard.WindowManager;com.redhat.Kiosk.Script;
|
||||
@ -1,5 +0,0 @@
|
||||
user-db:user
|
||||
system-db:redhatkiosk
|
||||
system-db:local
|
||||
system-db:site
|
||||
system-db:distro
|
||||
@ -1,11 +0,0 @@
|
||||
{
|
||||
"parentMode": "user",
|
||||
"hasOverview": false,
|
||||
"hasRunDialog": false,
|
||||
"allowSettings": false,
|
||||
"panel": { "left": [""],
|
||||
"center": [],
|
||||
"right": ["keyboard"]
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
[GNOME Session]
|
||||
Name=Kiosk
|
||||
RequiredComponents=com.redhat.Kiosk.WindowManager;com.redhat.Kiosk.Script;
|
||||
@ -1,64 +1,44 @@
|
||||
%global _changelog_trimtime %(date +%s -d "1 year ago")
|
||||
|
||||
%define po_package gnome-session-3.0
|
||||
%define po_package gnome-session-40
|
||||
|
||||
%if 0%{?fedora}
|
||||
%else
|
||||
%global with_session_selector 1
|
||||
%endif
|
||||
|
||||
%global tarball_version %%(echo %{version} | tr '~' '.')
|
||||
|
||||
Name: gnome-session
|
||||
Version: 3.28.1
|
||||
Release: 21%{?dist}
|
||||
Version: 40.1.1
|
||||
Release: 9%{?dist}
|
||||
Summary: GNOME session manager
|
||||
|
||||
License: GPLv2+
|
||||
URL: http://www.gnome.org
|
||||
Source0: http://download.gnome.org/sources/gnome-session/3.28/%{name}-%{version}.tar.xz
|
||||
URL: https://gitlab.gnome.org/GNOME/gnome-session
|
||||
Source0: https://download.gnome.org/sources/gnome-session/40/%{name}-%{tarball_version}.tar.xz
|
||||
Source1: gnome.desktop
|
||||
Source2: gnome-xorg.desktop
|
||||
|
||||
Source3: com.redhat.Kiosk.Script.desktop
|
||||
|
||||
Source4: com.redhat.Kiosk.desktop
|
||||
Source5: com.redhat.KioskWithKeyboard.desktop
|
||||
|
||||
Source6: com.redhat.Kiosk.WindowManager.desktop
|
||||
Source7: com.redhat.KioskWithKeyboard.WindowManager.desktop
|
||||
Source8: redhat-kiosk.json
|
||||
|
||||
Source9: redhat-kiosk.session
|
||||
Source10: redhat-kiosk-with-keyboard.session
|
||||
|
||||
Source11: redhat-kiosk
|
||||
|
||||
Source12: 20-redhat-kiosk.conf
|
||||
|
||||
Source13: 50-redhat-kiosk.dconf
|
||||
Source14: 50-redhat-kiosk.dconf.locks
|
||||
Source15: redhat-kiosk.dconf.profile
|
||||
|
||||
Patch0: 0001-gnome-session-don-t-validate-shell-before-using-it.patch
|
||||
|
||||
# Blacklist NV30: https://bugzilla.redhat.com/show_bug.cgi?id=745202
|
||||
Patch1: gnome-session-3.3.92-nv30.patch
|
||||
Patch3: gnome-session-3.6.2-swrast.patch
|
||||
Patch10001: gnome-session-3.3.92-nv30.patch
|
||||
|
||||
Patch20001: gnome-session-3.6.2-swrast.patch
|
||||
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=772421
|
||||
Patch4: 0001-check-accelerated-gles-Use-eglGetPlatformDisplay-EXT.patch
|
||||
Patch30001: 0001-check-accelerated-gles-Use-eglGetPlatformDisplay-EXT.patch
|
||||
|
||||
Patch10001: 0001-session-selector-show-cursor-explicitly.patch
|
||||
# For https://fedoraproject.org/w/index.php?title=Changes/HiddenGrubMenu
|
||||
# This should go upstream once systemd has a generic interface for this
|
||||
Patch40001: 0001-Fedora-Set-grub-boot-flags-on-shutdown-reboot.patch
|
||||
|
||||
# Downstream patch to provide better grub integration
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1914925
|
||||
Patch20001: 0001-Fedora-Set-grub-boot-flags-on-shutdown-reboot.patch
|
||||
%if %{undefined centos}
|
||||
Patch50001: subscription-manager-support.patch
|
||||
%endif
|
||||
|
||||
# Make some debug spew only show up if debugging is enabled
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1877997
|
||||
Patch30001: 0001-main-only-log-check-accelerated-errors-when-debuggin.patch
|
||||
Patch60001: 0001-gnome-session-don-t-validate-shell-before-using-it.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
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=2044212
|
||||
Patch70001: 0001-main-Lower-fallback-warning-when-running-in-GDM.patch
|
||||
Patch70002: 0002-main-Also-clear-error-when-running-under-GDM.patch
|
||||
|
||||
BuildRequires: meson
|
||||
BuildRequires: gcc
|
||||
@ -79,26 +59,30 @@ BuildRequires: pkgconfig(xrender)
|
||||
BuildRequires: pkgconfig(xtrans)
|
||||
BuildRequires: pkgconfig(xtst)
|
||||
|
||||
# this is so the configure checks find /usr/bin/halt etc.
|
||||
BuildRequires: usermode
|
||||
|
||||
BuildRequires: gettext
|
||||
BuildRequires: intltool
|
||||
BuildRequires: xmlto
|
||||
BuildRequires: /usr/bin/xsltproc
|
||||
BuildRequires: python3-devel
|
||||
|
||||
# an artificial requires to make sure we get dconf, for now
|
||||
Requires: dconf
|
||||
|
||||
Requires: system-logos
|
||||
Requires: system-backgrounds
|
||||
Recommends: system-backgrounds
|
||||
|
||||
# Needed for gnome-settings-daemon
|
||||
Requires: control-center-filesystem
|
||||
|
||||
Requires: gsettings-desktop-schemas >= 0.1.7
|
||||
|
||||
# pull in dbus-x11, see bug 209924
|
||||
Requires: dbus-x11
|
||||
Requires: dbus
|
||||
|
||||
Conflicts: gnome-settings-daemon < 3.27.90
|
||||
%if %{undefined centos}
|
||||
Recommends: subscription-manager
|
||||
%endif
|
||||
|
||||
%description
|
||||
gnome-session manages a GNOME desktop or GDM login session. It starts up
|
||||
@ -107,6 +91,8 @@ the other core GNOME components and handles logout and saving the session.
|
||||
%package xsession
|
||||
Summary: Desktop file for gnome-session
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
Requires: xorg-x11-server-Xorg%{?_isa}
|
||||
Requires: gnome-shell
|
||||
|
||||
%description xsession
|
||||
Desktop file to add GNOME to display manager session menu.
|
||||
@ -114,24 +100,14 @@ Desktop file to add GNOME to display manager session menu.
|
||||
%package wayland-session
|
||||
Summary: Desktop file for wayland based gnome session
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
Requires: xorg-x11-server-Xwayland%{?_isa}
|
||||
Requires: xorg-x11-server-Xwayland%{?_isa} >= 1.20.99.1
|
||||
Requires: gnome-shell
|
||||
|
||||
%description wayland-session
|
||||
Desktop file to add GNOME on wayland to display manager session menu.
|
||||
|
||||
%package kiosk-session
|
||||
Summary: Desktop file for mutter based kiosk session
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
Requires: mutter
|
||||
Recommends: gedit
|
||||
Recommends: gnome-terminal
|
||||
Recommends: gnome-control-center
|
||||
|
||||
%description kiosk-session
|
||||
Desktop file to add basic session used for setting up kiosk applications.
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
%autosetup -p1 -n %{name}-%{tarball_version}
|
||||
|
||||
%build
|
||||
%meson \
|
||||
@ -151,67 +127,16 @@ cp $RPM_SOURCE_DIR/gnome.desktop $RPM_BUILD_ROOT%{_datadir}/wayland-sessions/gno
|
||||
cp $RPM_SOURCE_DIR/gnome-xorg.desktop $RPM_BUILD_ROOT%{_datadir}/xsessions
|
||||
cp $RPM_SOURCE_DIR/gnome-xorg.desktop $RPM_BUILD_ROOT%{_datadir}/xsessions/gnome.desktop
|
||||
|
||||
install -D $RPM_SOURCE_DIR/com.redhat.Kiosk.Script.desktop -t $RPM_BUILD_ROOT%{_datadir}/applications
|
||||
|
||||
install -D $RPM_SOURCE_DIR/com.redhat.Kiosk.WindowManager.desktop -t $RPM_BUILD_ROOT/%{_datadir}/applications
|
||||
install -D $RPM_SOURCE_DIR/com.redhat.KioskWithKeyboard.WindowManager.desktop -t $RPM_BUILD_ROOT/%{_datadir}/applications
|
||||
|
||||
install -D $RPM_SOURCE_DIR/com.redhat.Kiosk.desktop -t $RPM_BUILD_ROOT%{_datadir}/xsessions
|
||||
install -D $RPM_SOURCE_DIR/com.redhat.KioskWithKeyboard.desktop -t $RPM_BUILD_ROOT%{_datadir}/xsessions
|
||||
|
||||
install -D $RPM_SOURCE_DIR/redhat-kiosk.json -t $RPM_BUILD_ROOT%{_datadir}/gnome-shell/modes
|
||||
|
||||
install -D $RPM_SOURCE_DIR/redhat-kiosk.session -t $RPM_BUILD_ROOT%{_datadir}/gnome-session/sessions
|
||||
install -D $RPM_SOURCE_DIR/redhat-kiosk-with-keyboard.session -t $RPM_BUILD_ROOT%{_datadir}/gnome-session/sessions
|
||||
|
||||
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/50-redhat-kiosk.dconf $RPM_BUILD_ROOT%{_sysconfdir}/dconf/db/redhatkiosk.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/redhat-kiosk.dconf.profile $RPM_BUILD_ROOT%{_sysconfdir}/dconf/profile/redhatkiosk
|
||||
|
||||
install -D $RPM_SOURCE_DIR/20-redhat-kiosk.conf -t $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d
|
||||
|
||||
%find_lang %{po_package}
|
||||
|
||||
%ldconfig_scriptlets
|
||||
|
||||
%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
|
||||
|
||||
%files xsession
|
||||
%{_datadir}/xsessions/*
|
||||
%exclude %{_datadir}/xsessions/com.redhat.Kiosk.desktop
|
||||
|
||||
%files wayland-session
|
||||
%{_datadir}/wayland-sessions/*
|
||||
|
||||
%files kiosk-session
|
||||
%dir %{_sysconfdir}/dconf/db/redhatkiosk.d/locks
|
||||
%dir %{_sysconfdir}/dconf/db/redhatkiosk.d
|
||||
%ghost %{_sysconfdir}/dconf/db/redhatkiosk
|
||||
%{_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.WindowManager.desktop
|
||||
%{_datadir}/applications/com.redhat.KioskWithKeyboard.WindowManager.desktop
|
||||
%{_datadir}/gnome-shell/modes/redhat-kiosk.json
|
||||
%{_datadir}/xsessions/com.redhat.Kiosk.desktop
|
||||
%{_datadir}/xsessions/com.redhat.KioskWithKeyboard.desktop
|
||||
%{_datadir}/gnome-session/sessions/redhat-kiosk.session
|
||||
%{_datadir}/gnome-session/sessions/redhat-kiosk-with-keyboard.session
|
||||
%{_datadir}/X11/xorg.conf.d/20-redhat-kiosk.conf
|
||||
%{_bindir}/redhat-kiosk
|
||||
|
||||
%files -f %{po_package}.lang
|
||||
%doc AUTHORS NEWS README
|
||||
%license COPYING
|
||||
@ -221,100 +146,178 @@ dconf update
|
||||
%{_libexecdir}/gnome-session-check-accelerated
|
||||
%{_libexecdir}/gnome-session-check-accelerated-gl-helper
|
||||
%{_libexecdir}/gnome-session-check-accelerated-gles-helper
|
||||
%{_libexecdir}/gnome-session-ctl
|
||||
%{_libexecdir}/gnome-session-failed
|
||||
%{_datadir}/gnome-session/
|
||||
%{_datadir}/doc/gnome-session/dbus/gnome-session.html
|
||||
%{_datadir}/GConf/gsettings/gnome-session.convert
|
||||
%{_datadir}/glib-2.0/schemas/org.gnome.SessionManager.gschema.xml
|
||||
%{_userunitdir}/gnome-session*
|
||||
%{_userunitdir}/gnome-launched-.scope.d/
|
||||
|
||||
%changelog
|
||||
* Wed May 31 2023 Ray Strode <rstrode@redhat.com> - 3.28.1-21
|
||||
- Allow users to override language settings in environment
|
||||
Resolves: #2170474
|
||||
* Thu Jan 04 2024 Ray Strode <rstrode@redhat.com> - 40.1.1-9
|
||||
- Make subscription-manager dependency softer
|
||||
Related: RHEL-20449
|
||||
|
||||
* 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
|
||||
* Fri Jun 16 2023 Ray Strode <rstrode@redhat.com> - 40.1.1-8
|
||||
- Add hard dependency on subscription-manager
|
||||
Resolves: #2175675
|
||||
|
||||
* Tue Feb 28 2023 Ray Strode <rstrode@redhat.com> - 3.28.1-19
|
||||
- Another fix
|
||||
Related: #2070976
|
||||
* Tue Dec 13 2022 Ray Strode <rstrode@redhat.com> - 40.1.1-7
|
||||
- Demote expected log messages from warnings to debug level
|
||||
Resolves: #2044212
|
||||
|
||||
* Tue Feb 28 2023 Ray Strode <rstrode@redhat.com> - 3.28.1-18
|
||||
- Fix issue introduced in last build
|
||||
Related: #2070976
|
||||
* Fri Dec 3 2021 Ray Strode <rstrode@redhat.com> - 40.1.1-6
|
||||
- Add weak req on system-backgrounds now that it's split from system-logos
|
||||
Resolves: #2012244
|
||||
|
||||
* Tue Feb 28 2023 Ray Strode <rstrode@redhat.com> - 3.28.1-17
|
||||
- Don't force kiosk profile for user in non-kiosk sessions
|
||||
after the user has been used for a kiosk session once
|
||||
Related: #2070976
|
||||
* Mon Oct 25 2021 Ray Strode <rstrode@redhat.com> - 40.1.1-5
|
||||
- Make users with nologin as their shell fail to login
|
||||
Resolves: #2015519
|
||||
|
||||
* Tue Feb 28 2023 Ray Strode <rstrode@redhat.com> - 3.28.1-16
|
||||
- Fix glitch where enabling on-screen keyboard requires initial
|
||||
reboot
|
||||
Related: #2070976
|
||||
* Mon Sep 06 2021 Kalev Lember <klember@redhat.com> - 40.1.1-4
|
||||
- Forward port subscription manager support from RHEL 8
|
||||
- Resolves: #1937113
|
||||
|
||||
* Mon Feb 27 2023 Ray Strode <rstrode@redhat.com> - 3.28.1-15
|
||||
- Add new shell based variant of kiosk mode that supports
|
||||
on-screen keyboard
|
||||
Resolves: #2070976
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 40.1.1-3
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Tue Dec 21 2021 Ray Strode <rstrode@redhat.com> - 3.28.1-14
|
||||
- Make some debug spew only show up if debugging is enabled
|
||||
Resolves: #1877997
|
||||
* Tue Jul 27 2021 Ray Strode <rstrode@redhat.com> - 40.1.1-2
|
||||
- Update session files to match RHEL specifications
|
||||
Related: #1985099
|
||||
|
||||
* Mon Jul 26 2021 Ray Strode <rstrode@redhat.com> - 3.28.1-13
|
||||
- Add patch to tell grub boot was successful when user is
|
||||
able to explicitly request shutdown/reboot.
|
||||
Resolves: #1914925
|
||||
* Wed Apr 28 2021 Kalev Lember <klember@redhat.com> - 40.1.1-1
|
||||
- Update to 40.1.1
|
||||
|
||||
* Tue Jul 20 2021 Ray Strode <rstrode@redhat.com> - 3.28.1-12
|
||||
- Introduce gnome-wayland session to allow users that use
|
||||
Xorg on the login screen to try wayland for the user session.
|
||||
Related: #1962211
|
||||
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 40~beta-2
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
|
||||
* Fri Jun 04 2021 Ray Strode <rstrode@redhat.com> - 3.28.1-11
|
||||
- Exclude kiosk-session from xsession subpackage
|
||||
- Disable VT switching when kiosk-session is installed
|
||||
Related: #1955754
|
||||
* Tue Feb 23 2021 Kalev Lember <klember@redhat.com> - 40~beta-1
|
||||
- Update to 40.beta
|
||||
- Update upstream URLs
|
||||
|
||||
* Mon Jun 29 2020 Ray Strode <rstrode@redhat.com> - 3.28.1-10
|
||||
- Show cursor explicitly from session selector
|
||||
Resolves: #1624430
|
||||
* Mon Feb 1 2021 Olivier Fourdan <ofourdan@redhat.com> - 3.38.0-3
|
||||
- Add dependency on Xwayland standalone package
|
||||
|
||||
* Tue May 19 2020 Ray Strode <rstrode@redhat.com> - 3.28.1-9
|
||||
- Add kiosk-session subpackage to help users set up RHEL for
|
||||
kiosk/point-of-sale use.
|
||||
Resolves: #1739556
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.38.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Wed Nov 20 2019 Tomas Pelka <tpelka@redhat.com> - 3.28.1-8
|
||||
- rebuild and version bump to avoid future conflict with z-stream version
|
||||
Resolves: #1745147
|
||||
* Sat Sep 12 2020 Kalev Lember <klember@redhat.com> - 3.38.0-1
|
||||
- Update to 3.38.0
|
||||
|
||||
* Tue Nov 19 2019 Ray Strode <rstrode@redhat.com> - 3.28.1-7
|
||||
- make /sbin/nologin fail on wayland
|
||||
Resolves: #1745147
|
||||
* Thu Sep 3 2020 Hans de Goede <hdegoede@redhat.com> - 3.37.0-2
|
||||
- Remove downstream patch for the "Boot Options" menu
|
||||
- Simplify downstream patch for the "Hidden Grub Menu" integration
|
||||
|
||||
* Mon Jan 14 2019 Ray Strode <rstrode@redhat.com> - 3.28.1-6
|
||||
- Update desktop file names
|
||||
Related: #1647713
|
||||
* Mon Aug 17 2020 Kalev Lember <klember@redhat.com> - 3.37.0-1
|
||||
- Update to 3.37.0
|
||||
|
||||
* Thu Nov 01 2018 Ray Strode <rstrode@redhat.com> - 3.28.1-5
|
||||
- Drop usermode dependency, it's vestigial
|
||||
Resolves: #1643696
|
||||
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-4
|
||||
- Second attempt - Rebuilt for
|
||||
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Fri Sep 07 2018 Ray Strode <rstrode@redhat.com> - 3.28.1-4
|
||||
- Require system-backgrounds
|
||||
Related: #1626388
|
||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Wed Aug 22 2018 Ray Strode <rstrode@redhat.com> - 3.28.1-3
|
||||
- Rename GNOME to Standard
|
||||
Related: #1612915
|
||||
* Mon Mar 23 2020 Ray Strode <rstrode@redhat.com> - 3.36.0-2
|
||||
- Apply patch from upstream to allow Xorg after wayland.
|
||||
Resolves: #1815487
|
||||
|
||||
* Mon Aug 13 2018 Ray Strode <rstrode@redhat.com> - 3.28.1-2
|
||||
- BuildRequire python3 binary
|
||||
Resolves: #1615527
|
||||
* Sun Mar 08 2020 Kalev Lember <klember@redhat.com> - 3.36.0-1
|
||||
- Update to 3.36.0
|
||||
|
||||
* Thu Feb 20 2020 Debarshi Ray <rishi@fedoraproject.org> - 3.35.3-3
|
||||
- Own %%{_userunitdir}/gnome-launched-.scope.d
|
||||
|
||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.35.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Thu Jan 16 2020 Kalev Lember <klember@redhat.com> - 3.35.3-1
|
||||
- Update to 3.35.3
|
||||
|
||||
* Thu Jan 16 2020 Kalev Lember <klember@redhat.com> - 3.34.2-3
|
||||
- Rebuilt for libgnome-desktop soname bump
|
||||
|
||||
* Mon Dec 16 2019 Benjamin Berg <bberg@redhat.com> - 3.34.2-2
|
||||
- Add patches to run applications in transient scopes
|
||||
https://gitlab.gnome.org/GNOME/gnome-session/merge_requests/36
|
||||
- Add patches to quit gnome-session quickly if gnome-shell cannot start
|
||||
https://gitlab.gnome.org/GNOME/gnome-session/merge_requests/35
|
||||
|
||||
* Thu Nov 28 2019 Kalev Lember <klember@redhat.com> - 3.34.2-1
|
||||
- Update to 3.34.2
|
||||
|
||||
* Fri Oct 11 2019 Benjamin Berg <bberg@redhat.com> - 3.34.1-3
|
||||
- Add patches to ensure proper unit unloading after session shutdown
|
||||
https://gitlab.gnome.org/GNOME/gnome-session/merge_requests/28
|
||||
- Resolves: #1760366
|
||||
|
||||
* Tue Oct 08 2019 Benjamin Berg <bberg@redhat.com> - 3.34.1-2
|
||||
- Add patch to strip blacklisted variables from autostart applications environment
|
||||
https://gitlab.gnome.org/GNOME/gnome-session/merge_requests/27
|
||||
|
||||
* Mon Oct 07 2019 Kalev Lember <klember@redhat.com> - 3.34.1-1
|
||||
- Update to 3.34.1
|
||||
|
||||
* Mon Sep 23 2019 Benjamin Berg <bberg@redhat.com> - 3.34.0-3
|
||||
- Stop certain environment variables from leaking betweens sessions
|
||||
https://gitlab.gnome.org/GNOME/gnome-session/merge_requests/23
|
||||
- Resolves: #1753191
|
||||
|
||||
* Thu Sep 19 2019 Debarshi Ray <rishi@fedoraproject.org> - 3.34.0-2
|
||||
- Stop NOTIFY_SOCKET from leaking into the GNOME environment
|
||||
|
||||
* Wed Sep 11 2019 Kalev Lember <klember@redhat.com> - 3.34.0-1
|
||||
- Update to 3.34.0
|
||||
|
||||
* Wed Sep 04 2019 Kalev Lember <klember@redhat.com> - 3.33.92-1
|
||||
- Update to 3.33.92
|
||||
|
||||
* Mon Aug 26 2019 Kalev Lember <klember@redhat.com> - 3.33.90-1
|
||||
- Update to 3.33.90
|
||||
- Rebase downstream patches
|
||||
- Drop old versioned conflicts
|
||||
|
||||
* Mon Aug 12 2019 Kalev Lember <klember@redhat.com> - 3.33.4-1
|
||||
- Update to 3.33.4
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.32.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Sun Jul 21 2019 Kalev Lember <klember@redhat.com> - 3.32.0-2
|
||||
- Rebuilt for libgnome-desktop soname bump
|
||||
|
||||
* Wed Mar 13 2019 Kalev Lember <klember@redhat.com> - 3.32.0-1
|
||||
- Update to 3.32.0
|
||||
|
||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.31.4-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Mon Jan 07 2019 Kalev Lember <klember@redhat.com> - 3.31.4-1
|
||||
- Update to 3.31.4
|
||||
|
||||
* Thu Oct 11 2018 David Herrmann <dh.herrmann@gmail.com> - 3.30.1-3
|
||||
- Reduce 'dbus-x11' dependency to 'dbus'. The xinit scripts are no longer the
|
||||
canonical way to start dbus, but the 'dbus' package is nowadays required to
|
||||
provide a user and system bus to its dependents.
|
||||
|
||||
* Thu Sep 27 2018 Hans de Goede <hdegoede@redhat.com> - 3.30.1-2
|
||||
- Add downstream patches implementing the "Boot Options" menu from:
|
||||
https://wiki.gnome.org/Design/OS/BootOptions
|
||||
|
||||
* Wed Sep 26 2018 Kalev Lember <klember@redhat.com> - 3.30.1-1
|
||||
- Update to 3.30.1
|
||||
|
||||
* Thu Sep 06 2018 Kalev Lember <klember@redhat.com> - 3.30.0-1
|
||||
- Update to 3.30.0
|
||||
|
||||
* Mon Aug 13 2018 Kalev Lember <klember@redhat.com> - 3.29.90-1
|
||||
- Update to 3.29.90
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.28.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Tue Apr 10 2018 Kalev Lember <klember@redhat.com> - 3.28.1-1
|
||||
- Update to 3.28.1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user