diff --git a/0001-gdm-x-session-Allow-adding-nocursor-argument-to-Xorg.patch b/0001-gdm-x-session-Allow-adding-nocursor-argument-to-Xorg.patch deleted file mode 100644 index cd88004..0000000 --- a/0001-gdm-x-session-Allow-adding-nocursor-argument-to-Xorg.patch +++ /dev/null @@ -1,152 +0,0 @@ -From e879ecad55b43157122b782039881f7264236f98 Mon Sep 17 00:00:00 2001 -From: Joan Torres Lopez -Date: Wed, 16 Jul 2025 16:11:22 +0200 -Subject: [PATCH] gdm-x-session: Allow adding -nocursor argument to Xorg - -Use NoCursor option in xorg section in custom.conf to add -nocursor argument -to Xorg. - -diff --git a/common/gdm-settings-keys.h b/common/gdm-settings-keys.h -index 4b3a1ff..08015a2 100644 ---- a/common/gdm-settings-keys.h -+++ b/common/gdm-settings-keys.h -@@ -59,6 +59,8 @@ G_BEGIN_DECLS - #define GDM_KEY_WILLING "xdmcp/Willing" - #define GDM_KEY_ALLOW_MULTIPLE_SESSIONS_PER_USER "xdmcp/AllowMultipleSessionsPerUser" - -+#define GDM_KEY_XORG_NOCURSOR "xorg/NoCursor" -+ - #define GDM_KEY_MULTICAST "chooser/Multicast" - #define GDM_KEY_MULTICAST_ADDR "chooser/MulticastAddr" - -diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c -index 12ce720..fc871b2 100644 ---- a/daemon/gdm-session.c -+++ b/daemon/gdm-session.c -@@ -2943,6 +2943,7 @@ gdm_session_start_session (GdmSession *self, - gboolean run_launcher = FALSE; - gboolean allow_remote_connections = FALSE; - gboolean run_separate_bus = FALSE; -+ gboolean xorg_nocursor = FALSE; - char *command; - char *program; - gboolean register_session; -@@ -2992,12 +2993,15 @@ gdm_session_start_session (GdmSession *self, - allow_remote_connections = TRUE; - } - -+ gdm_settings_direct_get_boolean (GDM_KEY_XORG_NOCURSOR, &xorg_nocursor); -+ - if (run_launcher) { - if (is_x11) { -- program = g_strdup_printf (LIBEXECDIR "/gdm-x-session %s%s %s\"%s\"", -+ program = g_strdup_printf (LIBEXECDIR "/gdm-x-session %s%s%s%s\"%s\"", - register_session ? "--register-session " : "", - run_xsession_script? "--run-script " : "", - allow_remote_connections? "--allow-remote-connections " : "", -+ xorg_nocursor? "--xorg-nocursor " : "", - command); - } else { - program = g_strdup_printf (LIBEXECDIR "/gdm-wayland-session %s\"%s\"", -@@ -3032,8 +3036,9 @@ gdm_session_start_session (GdmSession *self, - */ - if (run_launcher) { - if (is_x11) { -- program = g_strdup_printf (LIBEXECDIR "/gdm-x-session %s\"dbus-run-session -- %s\"", -+ program = g_strdup_printf (LIBEXECDIR "/gdm-x-session %s%s\"dbus-run-session -- %s\"", - register_session ? "--register-session " : "", -+ xorg_nocursor ? "--xorg-nocursor " : "", - self->selected_program); - } else { - program = g_strdup_printf (LIBEXECDIR "/gdm-wayland-session %s\"dbus-run-session -- %s\"", -diff --git a/daemon/gdm-x-session.c b/daemon/gdm-x-session.c -index 0b07ab5..c3c9a89 100644 ---- a/daemon/gdm-x-session.c -+++ b/daemon/gdm-x-session.c -@@ -197,6 +197,7 @@ out: - static gboolean - spawn_x_server (State *state, - gboolean allow_remote_connections, -+ gboolean nocursor, - GCancellable *cancellable) - { - GPtrArray *arguments = NULL; -@@ -289,6 +290,11 @@ spawn_x_server (State *state, - if (state->debug_enabled) { - g_ptr_array_add (arguments, "-core"); - } -+ -+ if (nocursor) { -+ g_ptr_array_add (arguments, "-nocursor"); -+ } -+ - g_ptr_array_add (arguments, NULL); - - subprocess = g_subprocess_launcher_spawnv (launcher, -@@ -874,11 +880,13 @@ main (int argc, - gboolean ret; - int exit_status = EX_OK; - static gboolean register_session = FALSE; -+ static gboolean xorg_nocursor = FALSE; - - static GOptionEntry entries [] = { - { "run-script", 'r', 0, G_OPTION_ARG_NONE, &run_script, N_("Run program through /etc/gdm/Xsession wrapper script"), NULL }, - { "allow-remote-connections", 'a', 0, G_OPTION_ARG_NONE, &allow_remote_connections, N_("Listen on TCP socket"), NULL }, - { "register-session", 0, 0, G_OPTION_ARG_NONE, ®ister_session, "Register session after a delay", NULL }, -+ { "xorg-nocursor", 0, 0, G_OPTION_ARG_NONE, &xorg_nocursor, "Add -nocursor argument to Xorg command", NULL }, - { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_STRING_ARRAY, &args, "", "" }, - { NULL } - }; -@@ -924,7 +932,7 @@ main (int argc, - - g_unix_signal_add (SIGTERM, (GSourceFunc) on_sigterm, state); - -- ret = spawn_x_server (state, allow_remote_connections, state->cancellable); -+ ret = spawn_x_server (state, allow_remote_connections, xorg_nocursor, state->cancellable); - - if (!ret) { - g_printerr ("Unable to run X server\n"); -diff --git a/data/gdm.schemas.in b/data/gdm.schemas.in -index 929d13d..bcf19ba 100644 ---- a/data/gdm.schemas.in -+++ b/data/gdm.schemas.in -@@ -144,6 +144,12 @@ - b - false - -+ -+ -+ xorg/NoCursor -+ b -+ false -+ - - - -diff --git a/docs/C/index.docbook b/docs/C/index.docbook -index 134b9bc..aaf285e 100644 ---- a/docs/C/index.docbook -+++ b/docs/C/index.docbook -@@ -1601,6 +1601,22 @@ gdm:.my.domain - - - -+ -+ -+ [xorg] -+ -+ -+ NoCursor -+ -+ NoCursor=true -+ -+ If true the Xorg server launched to start a user session will -+ be have the -nocursor argument. -+ -+ -+ -+ -+ - - - diff --git a/gdm.spec b/gdm.spec index 678622d..04574c1 100644 --- a/gdm.spec +++ b/gdm.spec @@ -11,7 +11,7 @@ Name: gdm Epoch: 1 Version: 40.1 -Release: 35%{?dist} +Release: 36%{?dist} Summary: The GNOME Display Manager License: GPLv2+ @@ -83,8 +83,6 @@ Patch99930001: 0001-data-add-system-dconf-databases-to-gdm-profile.patch Patch99950001: 0001-data-Disable-network-configuration-on-login-screen.patch -Patch99960001: 0001-gdm-x-session-Allow-adding-nocursor-argument-to-Xorg.patch - BuildRequires: accountsservice-devel BuildRequires: audit-libs-devel >= %{libauditver} BuildRequires: dconf @@ -373,6 +371,10 @@ dconf update || : %{_libdir}/pkgconfig/gdm-pam-extensions.pc %changelog +* Thu Jul 31 2025 Joan Torres - 40.1-36 +- Remove adding -nocursor option. Using a cursor-theme already allows this. + Related: RHEL-81194 + * Wed Jul 16 2025 Joan Torres - 40.1-35 - Instead of allowing adding custom parameters to Xorg, only allow adding -nocursor. Allowing adding custom parameters