From 1dd030309a71d3b4b56e3bf8e72112532ad30bb53bd808110aa7ebc38eef754f Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 18 Sep 2017 14:05:25 +0000 Subject: [PATCH] Accepting request 527041 from home:fcrozat:branches:GNOME:Factory - Add gdm-check-for-Xwayland.patch: don't try wayland session if Xwayland isn't installed on the system (bgo#787837). OBS-URL: https://build.opensuse.org/request/show/527041 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=350 --- gdm-check-for-Xwayland.patch | 13 +++++++++++++ gdm.changes | 6 ++++++ gdm.spec | 3 +++ 3 files changed, 22 insertions(+) create mode 100644 gdm-check-for-Xwayland.patch diff --git a/gdm-check-for-Xwayland.patch b/gdm-check-for-Xwayland.patch new file mode 100644 index 0000000..25243d6 --- /dev/null +++ b/gdm-check-for-Xwayland.patch @@ -0,0 +1,13 @@ +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.changes b/gdm.changes index 97c1341..6945ad6 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Sep 18 12:29:08 UTC 2017 - fcrozat@suse.com + +- Add gdm-check-for-Xwayland.patch: don't try wayland session if + Xwayland isn't installed on the system (bgo#787837). + ------------------------------------------------------------------- Tue Sep 12 19:02:43 UTC 2017 - luc14n0@linuxmail.org diff --git a/gdm.spec b/gdm.spec index ca09ed1..bf6aa12 100644 --- a/gdm.spec +++ b/gdm.spec @@ -62,6 +62,8 @@ 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 BuildRequires: check-devel # needed for directory ownership BuildRequires: dconf @@ -202,6 +204,7 @@ translation-update-upstream %if !0%{?is_opensuse} %patch49 -p1 %endif +%patch50 -p1 %build NOCONFIGURE=1 sh autogen.sh