SHA256
1
0
forked from pool/gdm

Accepting request 561124 from GNOME:Factory

- Add gdm-disable-gnome-initial-setup.patch (sle-only): Force
  gnome-initial-setup can't start before gdm, g-i-s will only
  serve for CJK people to choose the input-method after login
  (bnc#1067976).

OBS-URL: https://build.opensuse.org/request/show/561124
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gdm?expand=0&rev=201
This commit is contained in:
Dominique Leuenberger 2018-01-06 17:45:26 +00:00 committed by Git OBS Bridge
commit 146fabda77
3 changed files with 87 additions and 0 deletions

View File

@ -0,0 +1,76 @@
diff -Nura gdm-3.26.2.1/daemon/gdm-display.c gdm-3.26.2.1_new/daemon/gdm-display.c
--- gdm-3.26.2.1/daemon/gdm-display.c 2017-12-05 18:56:25.988123494 +0800
+++ gdm-3.26.2.1_new/daemon/gdm-display.c 2017-12-05 18:57:00.248398445 +0800
@@ -591,7 +591,7 @@
*/
look_for_existing_users_sync (self);
- self->priv->doing_initial_setup = wants_initial_setup (self);
+ self->priv->doing_initial_setup = FALSE;
g_object_ref (self);
ret = GDM_DISPLAY_GET_CLASS (self)->prepare (self);
@@ -1441,6 +1441,7 @@
self_destruct (self);
}
+#if 0
static gboolean
can_create_environment (const char *session_id)
{
@@ -1454,9 +1455,11 @@
return session_exists;
}
+#endif
#define ALREADY_RAN_INITIAL_SETUP_ON_THIS_BOOT GDM_RUN_DIR "/gdm.ran-initial-setup"
+#if 0
static gboolean
already_done_initial_setup_on_this_boot (void)
{
@@ -1591,6 +1594,7 @@
return enabled;
}
+#endif
void
gdm_display_start_greeter_session (GdmDisplay *self)
diff -Nura gdm-3.26.2.1/data/gdm.schemas gdm-3.26.2.1_new/data/gdm.schemas
--- gdm-3.26.2.1/data/gdm.schemas 2017-10-30 23:23:42.000000000 +0800
+++ gdm-3.26.2.1_new/data/gdm.schemas 2017-12-05 18:57:24.886596175 +0800
@@ -50,7 +50,7 @@
<schema>
<key>daemon/InitialSetupEnable</key>
<signature>b</signature>
- <default>true</default>
+ <default>false</default>
</schema>
<schema>
<key>daemon/WaylandEnable</key>
diff -Nura gdm-3.26.2.1/data/gdm.schemas.in gdm-3.26.2.1_new/data/gdm.schemas.in
--- gdm-3.26.2.1/data/gdm.schemas.in 2017-09-12 22:20:18.000000000 +0800
+++ gdm-3.26.2.1_new/data/gdm.schemas.in 2017-12-05 18:57:35.884684438 +0800
@@ -50,7 +50,7 @@
<schema>
<key>daemon/InitialSetupEnable</key>
<signature>b</signature>
- <default>true</default>
+ <default>false</default>
</schema>
<schema>
<key>daemon/WaylandEnable</key>
diff -Nura gdm-3.26.2.1/data/gdm.schemas.in.in gdm-3.26.2.1_new/data/gdm.schemas.in.in
--- gdm-3.26.2.1/data/gdm.schemas.in.in 2017-12-05 18:56:25.982123446 +0800
+++ gdm-3.26.2.1_new/data/gdm.schemas.in.in 2017-12-05 18:57:44.712755287 +0800
@@ -50,7 +50,7 @@
<schema>
<key>daemon/InitialSetupEnable</key>
<signature>b</signature>
- <default>true</default>
+ <default>false</default>
</schema>
<schema>
<key>daemon/WaylandEnable</key>

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Nov 28 02:50:25 UTC 2017 - qzhao@suse.com
- Add gdm-disable-gnome-initial-setup.patch (sle-only): Force
gnome-initial-setup can't start before gdm, g-i-s will only
serve for CJK people to choose the input-method after login
(bnc#1067976).
-------------------------------------------------------------------
Thu Nov 2 01:53:56 UTC 2017 - xwang@suse.com

View File

@ -66,6 +66,8 @@ Patch42: gdm-fails-to-restart-gnome-shell.patch
Patch49: gdm-default-wm-sle12.patch
# PATCH-FIX-SLE gdm-ignore-SLE-CLASSIC-MODE.patch bsc#1060630 xwang@suse.com -- ignore env SLE_CLASSIC_MODE variable when switching from sle-classic session to gnome-classic session
Patch51: gdm-ignore-SLE-CLASSIC-MODE.patch
# PATCH-FIX-SLE gdm-disable-gnome-initial-setup.patch bnc#1067976 qzhao@suse.com -- Disable gnome-initial-setup runs before gdm, g-i-s will only serve for CJK people to choose the input-method after login.
Patch52: gdm-disable-gnome-initial-setup.patch
BuildRequires: check-devel
# needed for directory ownership
BuildRequires: dconf
@ -215,6 +217,7 @@ translation-update-upstream
%if !0%{?is_opensuse}
%patch49 -p1
%patch51 -p1
%patch52 -p1
%endif
%build