diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 06493bdbdc..99fd87ab0e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8872,7 +8872,7 @@ library.") (define-public gdm (package (name "gdm") - (version "46.2") + (version "48.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -8880,7 +8880,7 @@ library.") name "-" version ".tar.xz")) (sha256 (base32 - "12r6ppsdq9f0rlhfwldwhilshb1blp6m0944rm872lqn5914bqsf")) + "1pqaqg8ngs8y2nwysxm03cdllix3blpgkd7c6xg7pv4ky2pnvh0v")) (patches (search-patches "gdm-default-session.patch" diff --git a/gnu/packages/patches/gdm-default-session.patch b/gnu/packages/patches/gdm-default-session.patch index 27f7035bfb..3858a75794 100644 --- a/gnu/packages/patches/gdm-default-session.patch +++ b/gnu/packages/patches/gdm-default-session.patch @@ -55,21 +55,15 @@ diff --git a/libgdm/gdm-sessions.c b/libgdm/gdm-sessions.c index d8b4d5cd..7ed8de91 100644 --- a/libgdm/gdm-sessions.c +++ b/libgdm/gdm-sessions.c -@@ -275,7 +275,7 @@ collect_sessions (void) +@@ -347,15 +347,10 @@ collect_sessions (void) "/etc/X11/sessions/", DMCONFDIR "/Sessions/", DATADIR "/gdm/BuiltInSessions/", - DATADIR "/xsessions/", -+ "/run/current-system/profile/share/xsessions/" ++ "/run/current-system/profile/share/xsessions/", }; - const gchar *supported_session_types_env = NULL; - g_auto (GStrv) supported_session_types = NULL; -@@ -288,29 +288,17 @@ collect_sessions (void) - names_seen_before = g_hash_table_new (g_str_hash, g_str_equal); xorg_search_array = g_ptr_array_new_with_free_func (g_free); -- const gchar * const *system_data_dirs = g_get_system_data_dirs (); -- - for (i = 0; system_data_dirs[i]; i++) { - session_dir = g_build_filename (system_data_dirs[i], "xsessions", NULL); - g_ptr_array_add (xorg_search_array, session_dir); @@ -78,6 +72,7 @@ index d8b4d5cd..7ed8de91 100644 for (i = 0; i < G_N_ELEMENTS (xorg_search_dirs); i++) { g_ptr_array_add (xorg_search_array, g_strdup (xorg_search_dirs[i])); } +@@ -363,16 +358,11 @@ collect_sessions (void) #ifdef ENABLE_WAYLAND_SUPPORT const char *wayland_search_dirs[] = { diff --git a/gnu/packages/patches/gdm-remove-hardcoded-xwayland-path.patch b/gnu/packages/patches/gdm-remove-hardcoded-xwayland-path.patch index 83d56ddf69..b9d8e412a4 100644 --- a/gnu/packages/patches/gdm-remove-hardcoded-xwayland-path.patch +++ b/gnu/packages/patches/gdm-remove-hardcoded-xwayland-path.patch @@ -4,24 +4,28 @@ diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-facto index 7de7b99c..065325f4 100644 --- a/daemon/gdm-local-display-factory.c +++ b/daemon/gdm-local-display-factory.c -@@ -245,9 +245,9 @@ struct GdmDisplayServerConfiguration { +@@ -261,11 +261,11 @@ struct GdmDisplayServerConfiguration { const char *session_type; } display_server_configuration[] = { #ifdef ENABLE_WAYLAND_SUPPORT - { "wayland", GDM_KEY_WAYLAND_ENABLE, "/usr/bin/Xwayland", "wayland" }, + { "wayland", GDM_KEY_WAYLAND_ENABLE, "", "wayland" }, #endif + #ifdef ENABLE_X11_SUPPORT - { "xorg", GDM_KEY_XORG_ENABLE, "/usr/bin/Xorg", "x11" }, + { "xorg", GDM_KEY_XORG_ENABLE, "", "x11" }, + #endif { NULL, NULL, NULL }, }; -@@ -269,9 +269,6 @@ display_server_enabled (GdmLocalDisplayFactory *factory, - if (!gdm_settings_direct_get_boolean (key, &enabled) || !enabled) +@@ -289,11 +289,6 @@ display_server_enabled (GdmLocalDisplayFactory *factory, return FALSE; + #endif +-#ifdef ENABLE_X11_SUPPORT - if (!g_file_test (binary, G_FILE_TEST_IS_EXECUTABLE)) - return FALSE; +-#endif - return TRUE; }