SHA256
1
0
forked from pool/gdm

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
This commit is contained in:
Dominique Leuenberger 2017-09-18 14:05:25 +00:00 committed by Git OBS Bridge
parent e007513d55
commit 1dd030309a
3 changed files with 22 additions and 0 deletions

View File

@ -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";
}
}

View File

@ -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

View File

@ -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