From 1bd125691c08d4b8e205c36ad5e6ee1c7566593b943bea94f9da951d7a6677b5 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Tue, 28 Sep 2021 07:25:29 +0000
Subject: [PATCH] Accepting request 921936 from
 home:yfjiang:branches:GNOME:Factory

- Rebase gdm-disable-gnome-initial-setup.patch.

OBS-URL: https://build.opensuse.org/request/show/921936
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=485
---
 gdm-disable-gnome-initial-setup.patch | 20 ++++++++++----------
 gdm.changes                           |  5 +++++
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/gdm-disable-gnome-initial-setup.patch b/gdm-disable-gnome-initial-setup.patch
index 088e37c..bcf434e 100644
--- a/gdm-disable-gnome-initial-setup.patch
+++ b/gdm-disable-gnome-initial-setup.patch
@@ -1,8 +1,8 @@
-Index: gdm-40.0/daemon/gdm-display.c
+Index: gdm-41.0/daemon/gdm-display.c
 ===================================================================
---- gdm-40.0.orig/daemon/gdm-display.c
-+++ gdm-40.0/daemon/gdm-display.c
-@@ -570,7 +570,7 @@ gdm_display_prepare (GdmDisplay *self)
+--- gdm-41.0.orig/daemon/gdm-display.c
++++ gdm-41.0/daemon/gdm-display.c
+@@ -573,7 +573,7 @@ gdm_display_prepare (GdmDisplay *self)
                  exit (EXIT_FAILURE);
          }
  
@@ -11,7 +11,7 @@ Index: gdm-40.0/daemon/gdm-display.c
  
          g_object_ref (self);
          ret = GDM_DISPLAY_GET_CLASS (self)->prepare (self);
-@@ -1509,6 +1509,7 @@ on_launch_environment_session_died (GdmL
+@@ -1542,6 +1542,7 @@ on_launch_environment_session_died (GdmL
          self_destruct (self);
  }
  
@@ -19,7 +19,7 @@ Index: gdm-40.0/daemon/gdm-display.c
  static gboolean
  can_create_environment (const char *session_id)
  {
-@@ -1660,6 +1661,7 @@ wants_initial_setup (GdmDisplay *self)
+@@ -1693,6 +1694,7 @@ wants_initial_setup (GdmDisplay *self)
  
          return enabled;
  }
@@ -27,10 +27,10 @@ Index: gdm-40.0/daemon/gdm-display.c
  
  void
  gdm_display_start_greeter_session (GdmDisplay *self)
-Index: gdm-40.0/data/gdm.schemas.in
+Index: gdm-41.0/data/gdm.schemas.in
 ===================================================================
---- gdm-40.0.orig/data/gdm.schemas.in
-+++ gdm-40.0/data/gdm.schemas.in
+--- gdm-41.0.orig/data/gdm.schemas.in
++++ gdm-41.0/data/gdm.schemas.in
 @@ -50,7 +50,7 @@
      <schema>
        <key>daemon/InitialSetupEnable</key>
@@ -39,4 +39,4 @@ Index: gdm-40.0/data/gdm.schemas.in
 +      <default>false</default>
      </schema>
      <schema>
-       <key>daemon/WaylandEnable</key>
+       <key>daemon/PreferredDisplayServer</key>
diff --git a/gdm.changes b/gdm.changes
index ff6b2f7..1bc6c6f 100644
--- a/gdm.changes
+++ b/gdm.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep 28 06:51:26 UTC 2021 - Yifan Jiang <yfjiang@suse.com>
+
+- Rebase gdm-disable-gnome-initial-setup.patch.
+
 -------------------------------------------------------------------
 Tue Sep 21 14:37:07 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>