Accepting request 945940 from GNOME:Factory

OBS-URL: https://build.opensuse.org/request/show/945940
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gdm?expand=0&rev=240

gdm-41.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5738c4293a9f5a80d4a6e9e06f4d0df3e9f313ca7b61bfb4d8afaba983e200dc
-size 806668

gdm-41.3.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bb0b650a7cea90f09a33284fbd02975315407efc18e814009852d1bcad3437d4
+size 807452

gdm-daemon-Infer-session-type-from-desktop-file.patch

@@ -1,33 +0,0 @@
-From ae75f642859dcfdcfcaaffc617ebe7a68cf0bed7 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-Date: Wed, 29 Sep 2021 11:03:41 -0400
-Subject: [PATCH] daemon: Infer session type from desktop file if user has no
- saved session type
-
-The accountsservice user cache file can specify a session type
-associated with the saved session.  This is optional though. If one
-isn't specified GDM needs to figure out the session type based on the
-list of preferred session types for the system and the session file
-itself.
-
-It was failing to do the latter, though.  This commit fixes that.
----
- daemon/gdm-session.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
-index c1e2be008..4b709731d 100644
---- a/daemon/gdm-session.c
-+++ b/daemon/gdm-session.c
-@@ -1036,6 +1036,8 @@ worker_on_saved_session_name_read (GdmDBusWorker          *worker,
-                 }
-                 if (self->saved_session_type != NULL)
-                         set_session_type (self, self->saved_session_type);
-+                else
-+                        update_session_type (self);
-         }
- 
- }
--- 
-GitLab
-

gdm-disable-wayland-on-mgag200-chipsets.patch

@@ -1,18 +1,21 @@
-Index: gdm-41.alpha/data/61-gdm.rules.in
+Index: gdm-41.3/data/61-gdm.rules.in
 ===================================================================
---- gdm-41.alpha.orig/data/61-gdm.rules.in
+--- gdm-41.3.orig/data/61-gdm.rules.in
-+++ gdm-41.alpha/data/61-gdm.rules.in
++++ gdm-41.3/data/61-gdm.rules.in
-@@ -8,3 +8,13 @@ SUBSYSTEM=="drm", KERNEL=="card[1-9]*",
+@@ -1,6 +1,16 @@
- ACTION=="add", SUBSYSTEM=="module", KERNEL=="nvidia_drm", ATTR{parameters/modeset}=="N", RUN+="@libexecdir@/gdm-runtime-config set daemon WaylandEnable false"
+ # disable Wayland on Hi1710 chipsets
- # disable Wayland if modesetting is disabled
+ ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711", GOTO="gdm_disable_wayland"
- IMPORT{cmdline}="nomodeset", RUN+="@libexecdir@/gdm-runtime-config set daemon WaylandEnable false"
+ 
 +# disable Wayland on Matrox Electronics Systems Ltd. MGA G200 server engines
-+ATTR{vendor}=="0x102b", ATTR{device}=="0x0522", RUN+="@libexecdir@/gdm-runtime-config set daemon WaylandEnable false"
++ATTR{vendor}=="0x102b", ATTR{device}=="0x0522", GOTO="gdm_disable_wayland"
-+ATTR{vendor}=="0x102b", ATTR{device}=="0x0524", RUN+="@libexecdir@/gdm-runtime-config set daemon WaylandEnable false"
++ATTR{vendor}=="0x102b", ATTR{device}=="0x0524", GOTO="gdm_disable_wayland"
-+ATTR{vendor}=="0x102b", ATTR{device}=="0x0530", RUN+="@libexecdir@/gdm-runtime-config set daemon WaylandEnable false"
++ATTR{vendor}=="0x102b", ATTR{device}=="0x0530", GOTO="gdm_disable_wayland"
-+ATTR{vendor}=="0x102b", ATTR{device}=="0x0532", RUN+="@libexecdir@/gdm-runtime-config set daemon WaylandEnable false"
++ATTR{vendor}=="0x102b", ATTR{device}=="0x0532", GOTO="gdm_disable_wayland"
-+ATTR{vendor}=="0x102b", ATTR{device}=="0x0533", RUN+="@libexecdir@/gdm-runtime-config set daemon WaylandEnable false"
++ATTR{vendor}=="0x102b", ATTR{device}=="0x0533", GOTO="gdm_disable_wayland"
-+ATTR{vendor}=="0x102b", ATTR{device}=="0x0534", RUN+="@libexecdir@/gdm-runtime-config set daemon WaylandEnable false"
++ATTR{vendor}=="0x102b", ATTR{device}=="0x0534", GOTO="gdm_disable_wayland"
-+ATTR{vendor}=="0x102b", ATTR{device}=="0x0536", RUN+="@libexecdir@/gdm-runtime-config set daemon WaylandEnable false"
++ATTR{vendor}=="0x102b", ATTR{device}=="0x0536", GOTO="gdm_disable_wayland"
-+ATTR{vendor}=="0x102b", ATTR{device}=="0x0538", RUN+="@libexecdir@/gdm-runtime-config set daemon WaylandEnable false"
++ATTR{vendor}=="0x102b", ATTR{device}=="0x0538", GOTO="gdm_disable_wayland"
 +
+ # disable Wayland if modesetting is disabled
+ KERNEL!="card[0-9]*", GOTO="gdm_nomodeset_end"
+ SUBSYSTEM!="drm", GOTO="gdm_nomodeset_end"

gdm-restart-greeter-session-after-crash.patch

@@ -1,17 +0,0 @@
-Index: gdm-3.34.1/daemon/gdm-local-display-factory.c
-===================================================================
---- gdm-3.34.1.orig/daemon/gdm-local-display-factory.c
-+++ gdm-3.34.1/daemon/gdm-local-display-factory.c
-@@ -366,7 +366,11 @@ on_display_status_changed (GdmDisplay
-                  * ensures we get a new login screen when the user logs out,
-                  * if there isn't one.
-                  */
--                if (is_local && g_strcmp0 (session_class, "greeter") != 0) {
-+                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 ||
-+		     factory->active_vt == 0)) {
-                         /* reset num failures */
-                         factory->num_failures = 0;
- 

gdm.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Wed Jan 12 19:48:02 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Update to version 41.3:
+  + Juggle Xorg's -listen/-nolisten command line change better.
+  + Fix session type selection.
+  + Fix crash.
+  + Drop vestigial gdm-pin service.
+  + XDMCP fixes.
+  + Wayland nvidia udev updates.
+  + Updated translations.
+- Rebase gdm-disable-wayland-on-mgag200-chipsets.patch.
+- Drop gdm-daemon-Infer-session-type-from-desktop-file.patch and
+  gdm-restart-greeter-session-after-crash.patch: fixed upstream.
+
 -------------------------------------------------------------------
 Thu Dec 30 04:28:16 UTC 2021 - Simon Vogl <simon.vogl@gmx.net>
 

gdm.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package gdm
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -21,7 +21,7 @@
 %define enable_split_authentication 0
 
 Name:           gdm
-Version:        41.0
+Version:        41.3
 Release:        0
 Summary:        The GNOME Display Manager
 License:        GPL-2.0-or-later
@@ -63,10 +63,6 @@ Patch13:        gdm-s390-not-require-g-s-d_wacom.patch
 Patch14:        gdm-switch-user-tty7.patch
 # PATCH-FIX-UPSTREAM gdm-disable-wayland-on-mgag200-chipsets.patch bsc#1162888 glgo#GNOME/mutter#57 qkzhu@suse.com -- Disable Wayland on mgag200 chipsets
 Patch15:        gdm-disable-wayland-on-mgag200-chipsets.patch
-# PATCH-FIX-UPSTREAM gdm-daemon-Infer-session-type-from-desktop-file.patch bsc#1191809 glgo#GNOME/gdm#159 rstrode@redhat.com -- daemon: Infer session type from desktop file if user has no saved session type
-Patch16:        gdm-daemon-Infer-session-type-from-desktop-file.patch
-# PATCH-FIX-UPSTREAM gdm-restart-greeter-session-after-crash.patch bsc#1190230 glgo#GNOME/gdm#735 xwang@suse.com -- Restart greeter session when crashed
-Patch17:        gdm-restart-greeter-session-after-crash.patch
 ### NOTE: Keep please SLE-only patches at bottom (starting on 1000).
 # 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.
 Patch1000:      gdm-disable-gnome-initial-setup.patch
@@ -234,8 +230,6 @@ running display manager.
 %endif
 %patch14 -p1
 %patch15 -p1
-%patch16 -p1
-%patch17 -p1
 
 # SLE and Leap only patches start at 1000
 %if 0%{?sle_version}