From e7292ef2583c141c5da4e700ed4ea4bad512297907ffb273bdba500bf6b74c88 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 21 Feb 2024 10:55:35 +0000 Subject: [PATCH] Accepting request 1148625 from home:dimstar:Factory - Drop gdm-disable-wayland-on-mgag200-chipsets.patch: fixed upstream since version 43.0. OBS-URL: https://build.opensuse.org/request/show/1148625 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=539 --- gdm-disable-wayland-on-mgag200-chipsets.patch | 19 ------------------- gdm.changes | 6 ++++++ gdm.spec | 5 +---- 3 files changed, 7 insertions(+), 23 deletions(-) delete mode 100644 gdm-disable-wayland-on-mgag200-chipsets.patch diff --git a/gdm-disable-wayland-on-mgag200-chipsets.patch b/gdm-disable-wayland-on-mgag200-chipsets.patch deleted file mode 100644 index c388839..0000000 --- a/gdm-disable-wayland-on-mgag200-chipsets.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/data/61-gdm.rules.in -+++ b/data/61-gdm.rules.in -@@ -29,6 +29,16 @@ ATTR{vendor}=="0x1a03", ATTR{device}=="0 - - LABEL="gdm_pci_device_end" - -+# disable Wayland on Matrox Electronics Systems Ltd. MGA G200 server engines -+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 if modesetting is disabled - KERNEL!="card[0-9]*", GOTO="gdm_nomodeset_end" - KERNEL=="card[0-9]-*", GOTO="gdm_nomodeset_end" diff --git a/gdm.changes b/gdm.changes index 5a7e165..a856bb6 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 21 10:51:12 UTC 2024 - Alynx Zhou + +- Drop gdm-disable-wayland-on-mgag200-chipsets.patch: fixed + upstream since version 43.0. + ------------------------------------------------------------------- Tue Jan 23 07:58:15 UTC 2024 - Yifan Jiang diff --git a/gdm.spec b/gdm.spec index deda6d6..85b97e2 100644 --- a/gdm.spec +++ b/gdm.spec @@ -72,8 +72,6 @@ Patch4: gdm-xauthlocalhostname.patch Patch5: gdm-switch-to-tty1.patch # PATCH-FIX-OPENSUSE gdm-initial-setup-hardening.patch boo#1140851, glgo#GNOME/gnome-initial-setup#76 fezhang@suse.com -- Prevent gnome-initial-setup running if any regular user has perviously logged into the system Patch6: gdm-initial-setup-hardening.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 -Patch7: gdm-disable-wayland-on-mgag200-chipsets.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. @@ -135,7 +133,7 @@ Requires: xdm Requires(post): dconf Requires(pre): group(video) Requires(post): update-alternatives -Requires(postun):update-alternatives +Requires(postun): update-alternatives Recommends: iso-codes # accessibility Recommends: orca @@ -253,7 +251,6 @@ running display manager. %patch -P 4 -p1 %patch -P 5 -p1 %patch -P 6 -p1 -%patch -P 7 -p1 %endif %ifarch s390 s390x