me/guix
Archived
1
0
Fork 0
Code Activity

gnu: gdm: Update patch for GDM 3.34.

Browse source 
* gnu/packages/patches/gdm-default-session.patch: Update patch for new version
of GDM.
This commit is contained in:
Kei Kebreau 2020-04-18 18:34:51 -04:00
parent 123e429e4c
commit 45b320d9f8
No known key found for this signature in database
GPG key ID: E6A5EE3C19467A0D
1 changed files with 21 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
gnu/packages/patches/gdm-default-session.patch
View file

@ -5,11 +5,10 @@ and not in the directories listed in $XDG_DATA_DIRS. The latter includes
Fixes <https://bugs.gnu.org/37831>. Fixes <https://bugs.gnu.org/37831>.
diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c diff -ur a/daemon/gdm-session.c b/daemon/gdm-session.c
index 6a116a8..02c1458 100644 --- a/daemon/gdm-session.c 2019-09-25 10:40:24.000000000 -0400
--- a/daemon/gdm-session.c +++ b/daemon/gdm-session.c 2020-04-18 18:30:02.671856808 -0400
+++ b/daemon/gdm-session.c @@ -348,24 +348,18 @@
@@ -348,24 +348,18 @@ get_system_session_dirs (GdmSession *self)
GArray *search_array = NULL; GArray *search_array = NULL;
char **search_dirs; char **search_dirs;
int i; int i;
@ -35,7 +34,7 @@ index 6a116a8..02c1458 100644
g_array_append_vals (search_array, x_search_dirs, G_N_ELEMENTS (x_search_dirs)); g_array_append_vals (search_array, x_search_dirs, G_N_ELEMENTS (x_search_dirs));
#ifdef ENABLE_WAYLAND_SUPPORT #ifdef ENABLE_WAYLAND_SUPPORT
@@ -373,16 +367,7 @@ get_system_session_dirs (GdmSession *self) @@ -373,16 +367,7 @@
#ifdef ENABLE_USER_DISPLAY_SERVER #ifdef ENABLE_USER_DISPLAY_SERVER
g_array_prepend_val (search_array, wayland_search_dir); g_array_prepend_val (search_array, wayland_search_dir);
@ -52,40 +51,39 @@ index 6a116a8..02c1458 100644
g_array_append_val (search_array, wayland_search_dir); g_array_append_val (search_array, wayland_search_dir);
#endif #endif
} }
diff --git a/libgdm/gdm-sessions.c b/libgdm/gdm-sessions.c diff -ur a/libgdm/gdm-sessions.c b/libgdm/gdm-sessions.c
index afbc5c0..bb5e3e6 100644 --- a/libgdm/gdm-sessions.c 2019-10-07 04:53:35.000000000 -0400
--- a/libgdm/gdm-sessions.c +++ b/libgdm/gdm-sessions.c 2020-04-18 18:31:42.491348691 -0400
+++ b/libgdm/gdm-sessions.c @@ -245,19 +245,12 @@
@@ -238,19 +238,11 @@ collect_sessions (void)
"/etc/X11/sessions/", "/etc/X11/sessions/",
DMCONFDIR "/Sessions/", DMCONFDIR "/Sessions/",
DATADIR "/gdm/BuiltInSessions/", DATADIR "/gdm/BuiltInSessions/",
- DATADIR "/xsessions/", - DATADIR "/xsessions/",
- NULL
+ "/run/current-system/profile/share/xsessions/" + "/run/current-system/profile/share/xsessions/"
}; };
xorg_search_array = g_array_new (TRUE, TRUE, sizeof (char *)); 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 (); - const gchar * const *system_data_dirs = g_get_system_data_dirs ();
- -
- for (i = 0; system_data_dirs[i]; i++) { - for (i = 0; system_data_dirs[i]; i++) {
- session_dir = g_build_filename (system_data_dirs[i], "xsessions", NULL); - session_dir = g_build_filename (system_data_dirs[i], "xsessions", NULL);
- g_array_append_val (xorg_search_array, session_dir); - g_ptr_array_add (xorg_search_array, session_dir);
- } - }
- -
g_array_append_vals (xorg_search_array, xorg_search_dirs, G_N_ELEMENTS (xorg_search_dirs)); for (i = 0; i < G_N_ELEMENTS (xorg_search_dirs); i++) {
g_ptr_array_add (xorg_search_array, g_strdup (xorg_search_dirs[i]));
}
@@ -269,11 +262,6 @@
#ifdef ENABLE_WAYLAND_SUPPORT wayland_search_array = g_ptr_array_new_with_free_func (g_free);
@@ -261,11 +253,6 @@ collect_sessions (void)
wayland_search_array = g_array_new (TRUE, TRUE, sizeof (char *));
- for (i = 0; system_data_dirs[i]; i++) { - for (i = 0; system_data_dirs[i]; i++) {
- session_dir = g_build_filename (system_data_dirs[i], "wayland-sessions", NULL); - session_dir = g_build_filename (system_data_dirs[i], "wayland-sessions", NULL);
- g_array_append_val (wayland_search_array, session_dir); - g_ptr_array_add (wayland_search_array, session_dir);
- } - }
- -
g_array_append_vals (wayland_search_array, wayland_search_dirs, G_N_ELEMENTS (wayland_search_dirs)); for (i = 0; i < G_N_ELEMENTS (wayland_search_dirs); i++) {
#endif g_ptr_array_add (wayland_search_array, g_strdup (wayland_search_dirs[i]));
}