[packages/gdm] - rel 3, fix path to tools in udev rules

[baggins]

commit 44c79175f90895ca31447066f1e01aade48ef10b
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Jan 4 17:31:09 2026 +0100

    - rel 3, fix path to tools in udev rules

 gdm.spec            |  4 +++-
 no-merged-usr.patch | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 1 deletion(-)
---
diff --git a/gdm.spec b/gdm.spec
index 149bfe1..0d3c586 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -17,7 +17,7 @@ Summary(ru.UTF-8):	Дисплейный менеджер GNOME
 Summary(uk.UTF-8):	Дисплейний менеджер GNOME
 Name:		gdm
 Version:	48.0
-Release:	2
+Release:	3
 Epoch:		2
 License:	GPL v2+
 Group:		X11/Applications
@@ -37,6 +37,7 @@ Patch1:		%{name}-xsession.patch
 Patch2:		%{name}-defaults.patch
 Patch3:		%{name}-both-libraries.patch
 Patch4:		display-fallback.patch
+Patch5:		no-merged-usr.patch
 URL:		https://wiki.gnome.org/Projects/GDM
 BuildRequires:	accountsservice-devel >= 0.6.35
 BuildRequires:	audit-libs-devel
@@ -218,6 +219,7 @@ Pakiet zawiera statyczne biblioteki GDM.
 %patch -P2 -p1
 %patch -P3 -p1
 %patch -P4 -p1
+%patch -P5 -p1
 
 %build
 %meson \
diff --git a/no-merged-usr.patch b/no-merged-usr.patch
new file mode 100644
index 0000000..29d24de
--- /dev/null
+++ b/no-merged-usr.patch
@@ -0,0 +1,60 @@
+--- gdm-48.0/data/61-gdm.rules.in~	2025-03-17 17:07:15.000000000 +0100
++++ gdm-48.0/data/61-gdm.rules.in	2026-01-04 17:29:24.763333505 +0100
+@@ -2,13 +2,13 @@
+ ACTION!="bind", ACTION!="add", GOTO="gdm_pci_device_end"
+ 
+ # cirrus
+-ATTR{vendor}=="0x1013", ATTR{device}=="0x00b8", ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
++ATTR{vendor}=="0x1013", ATTR{device}=="0x00b8", ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100", RUN+="/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
+ # virtio
+-ATTR{vendor}=="0x1af4", ATTR{device}=="0x1050", ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
++ATTR{vendor}=="0x1af4", ATTR{device}=="0x1050", ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100", RUN+="/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
+ # qxl
+-ATTR{vendor}=="0x1b36", ATTR{device}=="0x0100", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
++ATTR{vendor}=="0x1b36", ATTR{device}=="0x0100", RUN+="/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
+ # vga
+-ATTR{vendor}=="0x1234", ATTR{device}=="0x1111", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
++ATTR{vendor}=="0x1234", ATTR{device}=="0x1111", RUN+="/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
+ 
+ # disable Wayland on Hi1710 chipsets
+ ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711", GOTO="gdm_disable_wayland"
+@@ -21,7 +21,7 @@
+ SUBSYSTEM!="drm", GOTO="gdm_hardware_gpu_end"
+ DRIVERS=="simple-framebuffer", GOTO="gdm_hardware_gpu_end"
+ IMPORT{parent}="GDM_MACHINE_HAS_VIRTUAL_GPU"
+-ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}!="1", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-hardware-gpu"
++ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}!="1", RUN+="/bin/touch /run/udev/gdm-machine-has-hardware-gpu"
+ LABEL="gdm_hardware_gpu_end"
+ 
+ # The vendor nvidia driver has multiple modules that need to be loaded before GDM can make an
+@@ -30,7 +30,7 @@
+ KERNEL!="nvidia", GOTO="gdm_nvidia_end"
+ SUBSYSTEM!="module", GOTO="gdm_nvidia_end"
+ ACTION!="add", GOTO="gdm_nvidia_end"
+-RUN+="/usr/bin/touch /run/udev/gdm-machine-has-vendor-nvidia-driver"
++RUN+="/bin/touch /run/udev/gdm-machine-has-vendor-nvidia-driver"
+ 
+ # Import nvidia kernel parameters
+ IMPORT{program}="/bin/sh -c \"sed -e 's/: /=/g' -e 's/\([^[:upper:]]\)\([[:upper:]]\)/\1_\2/g' -e 's/[[:lower:]]/\U&/g' -e 's/^/NVIDIA_/' /proc/driver/nvidia/params\""
+@@ -40,8 +40,8 @@
+ ENV{NVIDIA_ENABLE_S0IX_POWER_MANAGEMENT}=="1", GOTO="gdm_nvidia_suspend_end"
+ 
+ # Check if suspend/resume services necessary for working wayland support is available
+-TEST{0711}!="/usr/bin/nvidia-sleep.sh", GOTO="gdm_disable_wayland"
+-TEST{0711}!="/usr/lib/systemd/system-sleep/nvidia", GOTO="gdm_disable_wayland"
++TEST{0711}!="/bin/nvidia-sleep.sh", GOTO="gdm_disable_wayland"
++TEST{0711}!="/lib/systemd/system-sleep/nvidia", GOTO="gdm_disable_wayland"
+ 
+ ENV{NVIDIA_PRESERVE_VIDEO_MEMORY_ALLOCATIONS}!="1", GOTO="gdm_disable_wayland"
+ IMPORT{program}="/bin/sh -c 'echo NVIDIA_HIBERNATE=`systemctl is-enabled nvidia-hibernate`'"
+@@ -59,8 +59,8 @@
+ SUBSYSTEM!="drm", GOTO="gdm_hybrid_graphics_check_end"
+ ACTION!="add", GOTO="gdm_hybrid_graphics_check_end"
+ IMPORT{program}="/bin/sh -c \"echo GDM_NUMBER_OF_GRAPHICS_CARDS=`ls -1d /sys/class/drm/card[0-9] | wc -l`\""
+-ENV{GDM_NUMBER_OF_GRAPHICS_CARDS}=="1", RUN+="/usr/bin/rm -f /run/udev/gdm-machine-has-hybrid-graphics"
+-ENV{GDM_NUMBER_OF_GRAPHICS_CARDS}!="1", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-hybrid-graphics"
++ENV{GDM_NUMBER_OF_GRAPHICS_CARDS}=="1", RUN+="/bin/rm -f /run/udev/gdm-machine-has-hybrid-graphics"
++ENV{GDM_NUMBER_OF_GRAPHICS_CARDS}!="1", RUN+="/bin/touch /run/udev/gdm-machine-has-hybrid-graphics"
+ LABEL="gdm_hybrid_graphics_check_end"
+ 
+ # Disable wayland in situation where we're in a guest with a virtual gpu and host passthrough gpu
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gdm.git/commitdiff/44c79175f90895ca31447066f1e01aade48ef10b