From 835960416eb2c82b98794e5ac89de1e7f41fc37b Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Mon, 22 Jul 2024 10:27:28 -0400
Subject: [PATCH] Update to 47.alpha
Resolves: RHEL-50078
---
.gitignore | 1 +
...wayland-on-hybrid-nvidia-with-vendor.patch | 38 -------------------
gdm.spec | 8 ++--
sources | 2 +-
4 files changed, 6 insertions(+), 43 deletions(-)
delete mode 100644 0001-udev-Stick-with-wayland-on-hybrid-nvidia-with-vendor.patch
diff --git a/.gitignore b/.gitignore
index cab8bd2..bc5d650 100644
--- a/.gitignore
+++ b/.gitignore
@@ -149,3 +149,4 @@ gdm-2.30.2.tar.bz2
/gdm-45.0.1.tar.xz
/gdm-46.alpha.tar.xz
/gdm-46.0.tar.xz
+/gdm-47.alpha.tar.xz
diff --git a/0001-udev-Stick-with-wayland-on-hybrid-nvidia-with-vendor.patch b/0001-udev-Stick-with-wayland-on-hybrid-nvidia-with-vendor.patch
deleted file mode 100644
index 3ea7d79..0000000
--- a/0001-udev-Stick-with-wayland-on-hybrid-nvidia-with-vendor.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 32cabdadde5e272a8f045208fe4af1d47e4c3854 Mon Sep 17 00:00:00 2001
-From: rpm-build <rpm-build>
-Date: Tue, 27 Sep 2022 10:00:11 -0400
-Subject: [PATCH] udev: Stick with wayland on hybrid nvidia with vendor driver
-
-F36 defaulted to wayland for users with hybrid graphics that
-use the vendor nvidia driver.
-
-We shouldn't change behavior so close to f37 release, so this
-commit brings that behavior back.
----
- data/61-gdm.rules.in | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/data/61-gdm.rules.in b/data/61-gdm.rules.in
-index a4f841bdf..addfc3119 100644
---- a/data/61-gdm.rules.in
-+++ b/data/61-gdm.rules.in
-@@ -82,12 +82,14 @@ ENV{GDM_NUMBER_OF_GRAPHICS_CARDS}=="1", RUN+="/usr/bin/rm -f /run/udev/gdm-machi
- ENV{GDM_NUMBER_OF_GRAPHICS_CARDS}!="1", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-hybrid-graphics"
- LABEL="gdm_hybrid_graphics_check_end"
-
--# If this is a hybrid graphics laptop with vendor nvidia driver, disable wayland
-+# If this is a hybrid graphics laptop with vendor nvidia driver default to wayland
-+# It gives poor performance for multi-monitor, but Xorg fails some multi-monitor
-+# setups too, and this is what we did in F36.
- LABEL="gdm_hybrid_nvidia_laptop_check"
- TEST!="/run/udev/gdm-machine-is-laptop", GOTO="gdm_hybrid_nvidia_laptop_check_end"
- TEST!="/run/udev/gdm-machine-has-hybrid-graphics", GOTO="gdm_hybrid_nvidia_laptop_check_end"
- TEST!="/run/udev/gdm-machine-has-vendor-nvidia-driver", GOTO="gdm_hybrid_nvidia_laptop_check_end"
--GOTO="gdm_disable_wayland"
-+GOTO="gdm_end"
- LABEL="gdm_hybrid_nvidia_laptop_check_end"
-
- # Disable wayland in situation where we're in a guest with a virtual gpu and host passthrough gpu
---
-2.40.0
-
diff --git a/gdm.spec b/gdm.spec
index fb93361..b9c9108 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -6,13 +6,13 @@
Name: gdm
Epoch: 1
-Version: 46.0
+Version: 47~alpha
Release: %autorelease
Summary: The GNOME Display Manager
License: GPL-2.0-or-later
URL: https://wiki.gnome.org/Projects/GDM
-Source0: https://download.gnome.org/sources/gdm/46/gdm-%{tarball_version}.tar.xz
+Source0: https://download.gnome.org/sources/gdm/47/gdm-%{tarball_version}.tar.xz
Source1: org.gnome.login-screen.gschema.override
# moved here from pulseaudio-gdm-hooks-11.1-16
@@ -21,7 +21,6 @@ Source5: default.pa-for-gdm
Source6: gdm.sysusers
# Downstream patches
-Patch: 0001-udev-Stick-with-wayland-on-hybrid-nvidia-with-vendor.patch
Patch: 0001-Honor-initial-setup-being-disabled-by-distro-install.patch
Patch: 0001-data-add-system-dconf-databases-to-gdm-profile.patch
Patch: 0001-xorg-detect.patch
@@ -151,6 +150,8 @@ mkdir -p %{buildroot}/run/gdm
mkdir -p %{buildroot}%{_sysconfdir}/dconf/db/gdm.d/locks
+rm -f %{buildroot}%{_udevrulesdir}/61-gdm.rules
+
%find_lang gdm --with-gnome
%pre
@@ -270,7 +271,6 @@ fi
%config %{_sysconfdir}/pam.d/gdm-smartcard
%config %{_sysconfdir}/pam.d/gdm-fingerprint
%{_sysconfdir}/pam.d/gdm-launch-environment
-%{_udevrulesdir}/61-gdm.rules
%{_unitdir}/gdm.service
%dir %{_userunitdir}/gnome-session@gnome-login.target.d/
%{_userunitdir}/gnome-session@gnome-login.target.d/session.conf
diff --git a/sources b/sources
index 67a04cd..5d2ad50 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gdm-46.0.tar.xz) = baca2635a4f99f7a13123bc65c38d7c6f6ec58b0311f289a42e8455b612929f1711d108eeb9b0b64ff93da2bc7d759fcb3aba8a2a356cf0351c1da637b44b396
+SHA512 (gdm-47.alpha.tar.xz) = 768931fc80b09754135ea0f8014bd3ba24ab2f74428efcfafb09720915264644186fbbcfd59004ca76df8ff29c8f41a224afb1d3ccaead47fae1e77ab4e7ae2e