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

Accepting request 419575 from home:VictorYang:branches:GNOME:Factory

Browse Source 
bsc#981976 Gdm should stop after a few times fails

OBS-URL: https://build.opensuse.org/request/show/419575
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=318
This commit is contained in:
Dominique Leuenberger 2016-08-19 07:50:17 +00:00 committed by Git OBS Bridge
parent ee474edf7f
commit f4ca065274
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gdm-fails-to-restart-gnome-shell.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/daemon/gdm-display.c b/daemon/gdm-display.c
index ab84ba4..e1d0996 100644
--- a/daemon/gdm-display.c
+++ b/daemon/gdm-display.c
@@ -673,7 +673,7 @@ gdm_display_unmanage (GdmDisplay *self)
}
elapsed = g_timer_elapsed (self->priv->server_timer, NULL);
- if (elapsed < 3) {
+ if (elapsed < 10) {
g_warning ("GdmDisplay: display lasted %lf seconds", elapsed);
_gdm_display_set_status (self, GDM_DISPLAY_FAILED);
} else {

6
gdm.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Aug 16 09:10:42 UTC 2016 - tyang@suse.com
- Add gdm-fails-to-restart-gnome-shell.patch
bsc#981976 -- Gdm should stop after a few times fails
------------------------------------------------------------------- -------------------------------------------------------------------
Wed May 25 11:07:42 UTC 2016 - zaitor@opensuse.org Wed May 25 11:07:42 UTC 2016 - zaitor@opensuse.org

5
gdm.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package gdm # spec file for package gdm
# #
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -60,6 +60,8 @@ Patch34: gdm-default-wm.patch
Patch35: gdm-xauthlocalhostname.patch Patch35: gdm-xauthlocalhostname.patch
# PATCH-FIX-UPSTREAM gdm-plymouth-vt1.patch bnc#881676 fcrozat@suse.com -- switch to VT1 when quitting if gdm was starting with plymouth running # PATCH-FIX-UPSTREAM gdm-plymouth-vt1.patch bnc#881676 fcrozat@suse.com -- switch to VT1 when quitting if gdm was starting with plymouth running
Patch41: gdm-plymouth-vt1.patch Patch41: gdm-plymouth-vt1.patch
# PATCH-FIX-UPSTREAM gdm-fails-to-restart-gnome-shell.patch bsc#981976 tyang@suse.com -- Gdm should stop after a few times fails
Patch42: gdm-fails-to-restart-gnome-shell.patch
BuildRequires: check-devel BuildRequires: check-devel
# needed for directory ownership # needed for directory ownership
BuildRequires: dconf BuildRequires: dconf
@ -190,6 +192,7 @@ translation-update-upstream
%patch34 -p1 %patch34 -p1
#patch35 -p1 #patch35 -p1
%patch41 -p1 %patch41 -p1
%patch42 -p1
%build %build
NOCONFIGURE=1 sh autogen.sh NOCONFIGURE=1 sh autogen.sh