rpm/gdm
SHA256
1
0
Fork 0
forked from pool/gdm
Code Pull Requests Activity

Accepting request 962025 from home:xiaoguang_wang:branches:GNOME:Factory

Browse Source 
- Add gdm-restart-session-when-X-server-restart.patch:
  Avoiding the blank screen when X server restarts with
  GDM_DISABLE_USER_DISPLAY_SERVER=1 (bsc#1196974).

OBS-URL: https://build.opensuse.org/request/show/962025
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=494
This commit is contained in:
Dominique Leuenberger 2022-03-21 09:04:49 +00:00 committed by Git OBS Bridge
parent ff575a20ea
commit b8cf289df8
3 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gdm-restart-session-when-X-server-restart.patch Normal file
View File

@ -0,0 +1,30 @@
Index: gdm-41.3/daemon/gdm-local-display-factory.c
===================================================================
--- gdm-41.3.orig/daemon/gdm-local-display-factory.c
+++ gdm-41.3/daemon/gdm-local-display-factory.c
@@ -541,8 +541,10 @@ on_display_status_changed (GdmDisplay
* ensures we get a new login screen when the user logs out,
* if there isn't one.
*/
+ g_debug ("GdmLocalDisplayFactory: session_class = %s active_vt = %u", session_class, factory->active_vt);
if (is_local &&
- (g_strcmp0 (session_class, "greeter") != 0 || factory->active_vt == GDM_INITIAL_VT)) {
+ (g_strcmp0 (session_class, "greeter") != 0 || factory->active_vt == GDM_INITIAL_VT
+ || factory->active_vt == 0)) {
/* reset num failures */
factory->num_failures = 0;
Index: gdm-41.3/daemon/gdm-manager.c
===================================================================
--- gdm-41.3.orig/daemon/gdm-manager.c
+++ gdm-41.3/daemon/gdm-manager.c
@@ -1548,7 +1548,8 @@ on_display_status_changed (GdmDisplay *d
}
#endif
- g_object_set_data (G_OBJECT (display), "gdm-user-session", NULL);
+ if (getenv ("GDM_DISABLE_USER_DISPLAY_SERVER") == NULL )
+ g_object_set_data (G_OBJECT (display), "gdm-user-session", NULL);
if (display == manager->priv->automatic_login_display) {
g_clear_weak_pointer (&manager->priv->automatic_login_display);

7
gdm.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Mar 16 00:53:48 UTC 2022 - Xiaoguang Wang <xiaoguang.wang@suse.com>
- Add gdm-restart-session-when-X-server-restart.patch:
Avoiding the blank screen when X server restarts with
GDM_DISABLE_USER_DISPLAY_SERVER=1 (bsc#1196974).
-------------------------------------------------------------------
Wed Feb 16 08:33:14 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>

3
gdm.spec
View File

@ -76,6 +76,8 @@ Patch15: gdm-disable-wayland-on-mgag200-chipsets.patch
Patch1000: gdm-disable-gnome-initial-setup.patch
# PATCH-FIX-SLE gdm-add-runtime-option-to-disable-starting-X-server-as-u.patch bnc#1188912 jsc#SLE-17880 xwang@suse.com -- Add runtime option to start X under root instead of regular user.
Patch1001: gdm-add-runtime-option-to-disable-starting-X-server-as-u.patch
# PATCH-FIX-SLE gdm-restart-session-when-X-server-restart.patch bsc#1196974 xwang@suse.com -- Fix blank screen when X restarts with GDM_DISABLE_USER_DISPLAY_SERVER=1.
Patch1002: gdm-restart-session-when-X-server-restart.patch
BuildRequires: check-devel
# dconf and gnome-session-core are needed for directory ownership
BuildRequires: dconf
@ -243,6 +245,7 @@ running display manager.
%if 0%{?sle_version}
%patch1000 -p1
%patch1001 -p1
%patch1002 -p1
%endif
%build