From 31d517369892de6dc1f4c7bbd3b8bde868d2596b Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Sep 27 2022 12:29:59 +0000
Subject: import gdm-40.1-16.el9


---

diff --git a/SOURCES/0004-daemon-Consolidate-session-type-and-supported-sessio.patch b/SOURCES/0004-daemon-Consolidate-session-type-and-supported-sessio.patch
index 7968261..9a91510 100644
--- a/SOURCES/0004-daemon-Consolidate-session-type-and-supported-sessio.patch
+++ b/SOURCES/0004-daemon-Consolidate-session-type-and-supported-sessio.patch
@@ -260,7 +260,7 @@ index 141d64c6..eba38671 100644
 -                g_object_set (G_OBJECT (display), "session-type", session_type, NULL);
 +                g_object_set (G_OBJECT (display),
 +                              "session-type", session_types[0],
-+                              "supported-session-tyes", session_types,
++                              "supported-session-types", session_types,
 +                              NULL);
                  is_initial = TRUE;
          }
diff --git a/SOURCES/0004-data-Use-latest-upstream-udev-rules.patch b/SOURCES/0004-data-Use-latest-upstream-udev-rules.patch
index 44abca1..fca1f4a 100644
--- a/SOURCES/0004-data-Use-latest-upstream-udev-rules.patch
+++ b/SOURCES/0004-data-Use-latest-upstream-udev-rules.patch
@@ -16,7 +16,7 @@ diff --git a/data/61-gdm.rules.in b/data/61-gdm.rules.in
 index b1da191f..5dae00ea 100644
 --- a/data/61-gdm.rules.in
 +++ b/data/61-gdm.rules.in
-@@ -1,6 +1,137 @@
+@@ -1,6 +1,123 @@
 +# identify virtio graphics cards to find passthrough setups
 +SUBSYSTEM!="virtio", GOTO="gdm_virtio_device_end"
 +ACTION!="add", GOTO="gdm_virtio_device_end"
@@ -24,7 +24,7 @@ index b1da191f..5dae00ea 100644
 +LABEL="gdm_virtio_device_end"
 +
 +SUBSYSTEM!="pci", GOTO="gdm_pci_device_end"
-+ACTION!="bind", GOTO="gdm_pci_device_end"
++ACTION!="bind", ACTION!="add", GOTO="gdm_pci_device_end"
 +
 +# identify virtio graphics cards to find passthrough setups
 +# cirrus
@@ -40,20 +40,6 @@ index b1da191f..5dae00ea 100644
 -DRIVER=="nvidia", RUN+="@libexecdir@/gdm-runtime-config set daemon WaylandEnable false"
 +ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711", GOTO="gdm_disable_wayland"
 +
-+# disable Wayland on Matrox chipsets
-+ATTR{vendor}=="0x102b", ATTR{device}=="0x0522", GOTO="gdm_disable_wayland"
-+ATTR{vendor}=="0x102b", ATTR{device}=="0x0524", GOTO="gdm_disable_wayland"
-+ATTR{vendor}=="0x102b", ATTR{device}=="0x0530", GOTO="gdm_disable_wayland"
-+ATTR{vendor}=="0x102b", ATTR{device}=="0x0532", GOTO="gdm_disable_wayland"
-+ATTR{vendor}=="0x102b", ATTR{device}=="0x0533", GOTO="gdm_disable_wayland"
-+ATTR{vendor}=="0x102b", ATTR{device}=="0x0534", GOTO="gdm_disable_wayland"
-+ATTR{vendor}=="0x102b", ATTR{device}=="0x0536", GOTO="gdm_disable_wayland"
-+ATTR{vendor}=="0x102b", ATTR{device}=="0x0538", GOTO="gdm_disable_wayland"
-+
-+# disable Wayland on aspeed chipsets
-+ATTR{vendor}=="0x1a03", ATTR{device}=="0x2010", GOTO="gdm_disable_wayland"
-+ATTR{vendor}=="0x1a03", ATTR{device}=="0x2000", GOTO="gdm_disable_wayland"
-+
 +LABEL="gdm_pci_device_end"
 +
  # disable Wayland if modesetting is disabled
diff --git a/SPECS/gdm.spec b/SPECS/gdm.spec
index cdf00f1..43bc679 100644
--- a/SPECS/gdm.spec
+++ b/SPECS/gdm.spec
@@ -11,7 +11,7 @@
 Name: gdm
 Epoch: 1
 Version: 40.1
-Release: 13%{?dist}.2
+Release: 16%{?dist}
 Summary: The GNOME Display Manager
 
 License: GPLv2+
@@ -345,18 +345,27 @@ dconf update || :
 %{_libdir}/pkgconfig/gdm-pam-extensions.pc
 
 %changelog
-* Thu Mar 24 2022 Ray Strode <rstrode@redhat.com> - 40.1-13.2
-- Fix erroneous jump back to login screen on udev events after login
-  Resolves: #2065901
+* Tue Apr 12 2022 Ray Strode <rstrode@redhat.com> - 40.1-16
+- Reenable Wayland for matrox and aspeed
+  Resolves: #2097308
 
-* Wed Mar 09 2022 Ray Strode <rstrode@redhat.com> - 40.1-13.1
+* Tue Apr 12 2022 Ray Strode <rstrode@redhat.com> - 40.1-15
 - Fix accountsservice user templates
-  Resolves: #2057483
+  Resolves: #2062827
+- Properly force Xorg on matrox cards
+  Related: #2074013
+- Fix typo that prevents the correct session type from being
+  used when user switching.
+  Resolves: #2074014
+
+* Tue Mar 22 2022 Ray Strode <rstrode@redhat.com> - 40.1-14
+- Fix erroneous jump back to login screen on udev events after login
+  Resolves: #2065901
 
 * Mon Mar 07 2022 Ray Strode <rstrode@redhat.com> - 40.1-13
 - Pull in latest udev rules and race fixes for handling
   udev rules.
-  Related: #2017938
+  Related: #2060793
 
 * Tue Feb 22 2022 Ray Strode <rstrode@redhat.com> - 40.1-12
 - More fixes from RHEL 8: