diff --git a/gdm-3.26.0.tar.xz b/gdm-3.26.0.tar.xz deleted file mode 100644 index 4fa767b..0000000 --- a/gdm-3.26.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:afb8cac6b027bed672e9d6af0c5e70033352455425d6fa254478652ee3dce8d9 -size 1115552 diff --git a/gdm-3.26.1.tar.xz b/gdm-3.26.1.tar.xz new file mode 100644 index 0000000..8afcb6d --- /dev/null +++ b/gdm-3.26.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2bfaa3664281461261e1e38be5b961cfa15da7284edbe416440b9cfc8f9504d6 +size 1114660 diff --git a/gdm-check-for-Xwayland.patch b/gdm-check-for-Xwayland.patch deleted file mode 100644 index 25243d6..0000000 --- a/gdm-check-for-Xwayland.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: gdm-3.26.0/daemon/gdm-local-display-factory.c -=================================================================== ---- gdm-3.26.0.orig/daemon/gdm-local-display-factory.c 2017-09-11 23:10:09.000000000 +0200 -+++ gdm-3.26.0/daemon/gdm-local-display-factory.c 2017-09-18 14:26:43.229623628 +0200 -@@ -450,7 +450,7 @@ - #ifdef ENABLE_WAYLAND_SUPPORT - gboolean wayland_enabled = FALSE; - if (gdm_settings_direct_get_boolean (GDM_KEY_WAYLAND_ENABLE, &wayland_enabled)) { -- if (wayland_enabled) { -+ if (wayland_enabled && g_file_test ("/usr/bin/Xwayland", G_FILE_TEST_IS_EXECUTABLE) ) { - session_type = "wayland"; - } - } diff --git a/gdm-plymouth-vt1.patch b/gdm-plymouth-vt1.patch index 08694f2..7ac2055 100644 --- a/gdm-plymouth-vt1.patch +++ b/gdm-plymouth-vt1.patch @@ -1,7 +1,7 @@ -Index: gdm-3.12.2/daemon/main.c +Index: gdm-3.26.1/daemon/main.c =================================================================== ---- gdm-3.12.2.orig/daemon/main.c -+++ gdm-3.12.2/daemon/main.c +--- gdm-3.26.1.orig/daemon/main.c ++++ gdm-3.26.1/daemon/main.c @@ -33,6 +33,8 @@ #include #include @@ -11,7 +11,7 @@ Index: gdm-3.12.2/daemon/main.c #include #include -@@ -308,6 +310,23 @@ block_sigusr1 (void) +@@ -302,6 +304,23 @@ block_sigusr1 (void) sigprocmask (SIG_BLOCK, &mask, NULL); } @@ -35,15 +35,15 @@ Index: gdm-3.12.2/daemon/main.c int main (int argc, char **argv) -@@ -317,6 +336,7 @@ main (int argc, +@@ -310,6 +329,7 @@ main (int argc, + GOptionContext *context; GError *error = NULL; - int ret; gboolean res; + gboolean plymouth_running = FALSE; static gboolean do_timed_exit = FALSE; static gboolean print_version = FALSE; static gboolean fatal_warnings = FALSE; -@@ -400,6 +420,8 @@ main (int argc, +@@ -383,6 +403,8 @@ main (int argc, g_chdir ("/"); @@ -52,15 +52,14 @@ Index: gdm-3.12.2/daemon/main.c main_loop = g_main_loop_new (NULL, FALSE); g_unix_signal_add (SIGTERM, on_shutdown_signal_cb, main_loop); -@@ -429,6 +451,11 @@ main (int argc, - g_printerr ("%s\n", error->message); - g_clear_error (&error); - } -+ +@@ -405,6 +427,10 @@ main (int argc, + + g_main_loop_unref (main_loop); + + if (plymouth_running) { + jump_to_vt (1); + } + - return ret; + return EXIT_SUCCESS; } diff --git a/gdm-xauthlocalhostname.patch b/gdm-xauthlocalhostname.patch index dcff529..76982f8 100644 --- a/gdm-xauthlocalhostname.patch +++ b/gdm-xauthlocalhostname.patch @@ -1,8 +1,8 @@ -diff --git a/common/gdm-common.c b/common/gdm-common.c -index 31fc810..fbf5978 100644 ---- a/common/gdm-common.c -+++ b/common/gdm-common.c -@@ -591,6 +591,8 @@ gdm_get_script_environment (const char *username, +Index: gdm-3.26.1/common/gdm-common.c +=================================================================== +--- gdm-3.26.1.orig/common/gdm-common.c ++++ gdm-3.26.1/common/gdm-common.c +@@ -591,6 +591,8 @@ gdm_get_script_environment (const char * if (display_hostname) { g_hash_table_insert (hash, g_strdup ("REMOTE_HOST"), g_strdup (display_hostname)); @@ -26,11 +26,11 @@ index 31fc810..fbf5978 100644 + return g_strdup ("localhost"); + } +} -diff --git a/common/gdm-common.h b/common/gdm-common.h -index 8d83a12..bc13d70 100644 ---- a/common/gdm-common.h -+++ b/common/gdm-common.h -@@ -54,6 +54,7 @@ const char * gdm_make_temp_dir (char *template); +Index: gdm-3.26.1/common/gdm-common.h +=================================================================== +--- gdm-3.26.1.orig/common/gdm-common.h ++++ gdm-3.26.1/common/gdm-common.h +@@ -54,6 +54,7 @@ const char * gdm_make_temp_dir char *gdm_generate_random_bytes (gsize size, GError **error); gboolean gdm_goto_login_session (GError **error); @@ -38,11 +38,11 @@ index 8d83a12..bc13d70 100644 GPtrArray *gdm_get_script_environment (const char *username, const char *display_name, -diff --git a/daemon/gdm-display-access-file.c b/daemon/gdm-display-access-file.c -index 02ec0a0..5cc18a4 100644 ---- a/daemon/gdm-display-access-file.c -+++ b/daemon/gdm-display-access-file.c -@@ -443,13 +443,10 @@ _get_auth_info_for_display (GdmDisplayAccessFile *file, +Index: gdm-3.26.1/daemon/gdm-display-access-file.c +=================================================================== +--- gdm-3.26.1.orig/daemon/gdm-display-access-file.c ++++ gdm-3.26.1/daemon/gdm-display-access-file.c +@@ -443,13 +443,10 @@ _get_auth_info_for_display (GdmDisplayAc * * https://bugs.freedesktop.org/show_bug.cgi?id=43425 */ @@ -59,11 +59,11 @@ index 02ec0a0..5cc18a4 100644 } else { *family = FamilyWild; gdm_display_get_remote_hostname (display, address, NULL); -diff --git a/daemon/gdm-launch-environment.c b/daemon/gdm-launch-environment.c -index a30276b..fded306 100644 ---- a/daemon/gdm-launch-environment.c -+++ b/daemon/gdm-launch-environment.c -@@ -194,6 +194,11 @@ build_launch_environment (GdmLaunchEnvironment *launch_environment, +Index: gdm-3.26.1/daemon/gdm-launch-environment.c +=================================================================== +--- gdm-3.26.1.orig/daemon/gdm-launch-environment.c ++++ gdm-3.26.1/daemon/gdm-launch-environment.c +@@ -201,6 +201,11 @@ build_launch_environment (GdmLaunchEnvir g_hash_table_insert (hash, g_strdup ("GDM_SEAT_ID"), g_strdup (seat_id)); } @@ -75,11 +75,11 @@ index a30276b..fded306 100644 g_hash_table_insert (hash, g_strdup ("PATH"), g_strdup (g_getenv ("PATH"))); g_hash_table_insert (hash, g_strdup ("RUNNING_UNDER_GDM"), g_strdup ("true")); -diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c -index b839fea..83fb807 100644 ---- a/daemon/gdm-session.c -+++ b/daemon/gdm-session.c -@@ -2548,6 +2548,14 @@ set_up_session_environment (GdmSession *self) +Index: gdm-3.26.1/daemon/gdm-session.c +=================================================================== +--- gdm-3.26.1.orig/daemon/gdm-session.c ++++ gdm-3.26.1/daemon/gdm-session.c +@@ -2570,6 +2570,14 @@ set_up_session_environment (GdmSession * } } diff --git a/gdm.changes b/gdm.changes index 97dc1db..2402a7d 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Wed Oct 4 16:30:20 UTC 2017 - dimstar@opensuse.org + +- Update to version 3.26.1: + + Check for Xwayland before agreeing to do wayland. + + Misc wayland fixes. + + Xdmcp fixes. + + Minor clean ups. + + Allow gnome initial-setup to be forced from kernel command + line. + + Updated translations. +- Drop gdm-check-for-Xwayland.patch: fixed upstream. +- Rebase gdm-plymouth-vt1.patch and gdm-xauthlocalhostname.patch. + ------------------------------------------------------------------- Thu Sep 28 07:33:15 UTC 2017 - xwang@suse.com diff --git a/gdm.spec b/gdm.spec index 0340bf8..d982854 100644 --- a/gdm.spec +++ b/gdm.spec @@ -25,7 +25,7 @@ %define enable_split_authentication 0 Name: gdm -Version: 3.26.0 +Version: 3.26.1 Release: 0 Summary: The GNOME Display Manager License: GPL-2.0+ @@ -62,8 +62,6 @@ Patch41: gdm-plymouth-vt1.patch Patch42: gdm-fails-to-restart-gnome-shell.patch # PATCH-FIX-SLE gdm-default-wm-sle12.patch bnc#881659 cxiong@suse.com -- set default/fallback session type to SLE Classic Patch49: gdm-default-wm-sle12.patch -# PATCH-FIX-UPSTREAM gdm-check-for-Xwayland.patch bgo#787837 fcrozat@suse.com -- Don't try Wayland if Xwayland isn't installed -Patch50: gdm-check-for-Xwayland.patch # PATCH-FIX-SLE gdm-ignore-SLE-CLASSIC-MODE.patch bsc#1060630 xwang@suse.com -- ignore env SLE_CLASSIC_MODE variable when switching from sle-classic session to gnome-classic session Patch51: gdm-ignore-SLE-CLASSIC-MODE.patch BuildRequires: check-devel @@ -207,7 +205,6 @@ translation-update-upstream %patch49 -p1 %patch51 -p1 %endif -%patch50 -p1 %build NOCONFIGURE=1 sh autogen.sh