From 0ca95370adbbc3413040ccbc379536e6f97c277d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= Date: Tue, 5 Dec 2023 00:43:50 +0100 Subject: [PATCH] community/gdm: also fix /bin/rm path --- ...1-DOWNSTREAM-use-bin-touch-instead-of-usr-bin-touch.patch | 5 +++-- community/gdm/APKBUILD | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/community/gdm/0001-DOWNSTREAM-use-bin-touch-instead-of-usr-bin-touch.patch b/community/gdm/0001-DOWNSTREAM-use-bin-touch-instead-of-usr-bin-touch.patch index 4f7ad6fbd6b..3959f48083b 100644 --- a/community/gdm/0001-DOWNSTREAM-use-bin-touch-instead-of-usr-bin-touch.patch +++ b/community/gdm/0001-DOWNSTREAM-use-bin-touch-instead-of-usr-bin-touch.patch @@ -1,7 +1,7 @@ From a12b01f4f71d7ca1ed528ea11f99520c10b0d93c Mon Sep 17 00:00:00 2001 From: Newbyte Date: Tue, 14 Mar 2023 19:37:17 +0100 -Subject: [PATCH 1/2] DOWNSTREAM: use /bin/touch instead of /usr/bin/touch +Subject: [PATCH 1/2] DOWNSTREAM: use /bin/touch and /bin/rm instead of /usr/bin/touch and /ust/bin/rm as that's the path here in Alpine. --- @@ -60,8 +60,9 @@ index a4f841bdf..481c5b4dd 100644 @@ -79,7 +79,7 @@ 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/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" diff --git a/community/gdm/APKBUILD b/community/gdm/APKBUILD index 7753a17aa44..d7c5b46bcb1 100644 --- a/community/gdm/APKBUILD +++ b/community/gdm/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: team/gnome pkgname=gdm pkgver=45.0.1 -pkgrel=0 +pkgrel=1 pkgdesc="GNOME display manager" url="https://wiki.gnome.org/Projects/GDM" # blocked by gnome-shell @@ -74,7 +74,7 @@ package() { sha512sums=" f0c667dd5df034087e284c2ec1131b55a85cd9e832c15c2aff1637e1e36d4d62a7d86528a2e524bb2782ca7d7cc7cb9c34a9ce9bba688ad222af409e2eb69abe gdm-45.0.1.tar.xz -f91ad0ccae448649e4a7c707b83c796988968a698718db0aedbf2b7c2b9aec0d0cfb12fb4bb7f5de99d3cf337bf4528608625d701872bad8bdc98f8020f0ea95 0001-DOWNSTREAM-use-bin-touch-instead-of-usr-bin-touch.patch +70b2bb6d6711c17a14c6e6a48b7b29f1b22cf858953f16723ba3e00570dce0416bcb72e4b3d3d4ef608eed32e1f7efa617f94f0a3327c7f5ceeb6b7232e4be84 0001-DOWNSTREAM-use-bin-touch-instead-of-usr-bin-touch.patch 66611d49fc4c9578415a7e554834edcb9de99396bd0ca511dcfd4fb256e8a1cd1fd5f10464f4668ffe04799d919bc22ddb58e8bf272017edba69a7951522e63d 0003-DOWNSTREAM-pam-rename-common-to-base.patch cd4c8f80e37dc362727bd535cbe1d3917f2bc47d52af717595e19709051ab5f27c0f650195152ccd1a7e5e2f886e4e8bc60287f05dcd81e84237c7f78c89223f gdm.initd f836cf0acdf148f2ae09ac28251b5126ce597f08254c43b1ec77596f75e1a3229926116c13f98554625be763e8d28415b27bd679b0a5de9f86bdca7857054c82 Xsession