From b330359e01a914d68c04e1bd721cb3743c78be12175140bdbf59dd5caf18d8a1 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Fri, 18 Feb 2022 17:44:30 +0000 Subject: [PATCH] - removed n_suse-ctrl-alt-bksp-terminate.patch * no longer needed; made it impossible to disable Ctrl-Alt-BS on Wayland (boo#1195871) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xkeyboard-config?expand=0&rev=162 --- n_suse-ctrl-alt-bksp-terminate.patch | 14 -------------- xkeyboard-config.changes | 7 +++++++ xkeyboard-config.spec | 4 +--- 3 files changed, 8 insertions(+), 17 deletions(-) delete mode 100644 n_suse-ctrl-alt-bksp-terminate.patch diff --git a/n_suse-ctrl-alt-bksp-terminate.patch b/n_suse-ctrl-alt-bksp-terminate.patch deleted file mode 100644 index a6faa2a..0000000 --- a/n_suse-ctrl-alt-bksp-terminate.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: xkeyboard-config-2.31/rules/0026-evdev.m_s.part -=================================================================== ---- xkeyboard-config-2.31.orig/rules/0026-evdev.m_s.part -+++ xkeyboard-config-2.31/rules/0026-evdev.m_s.part -@@ -1,5 +1,5 @@ - ! model = symbols -- $evdevkbds = +inet(evdev)+inet(%m) -- chromebook = +inet(evdev)+inet(chromebook) -- applealu_jis = +inet(evdev)+macintosh_vndr/jp(alujiskeys) -- * = +inet(evdev) -+ $evdevkbds = +inet(evdev)+inet(%m)+terminate(ctrl_alt_bksp) -+ chromebook = +inet(evdev)+inet(chromebook)+terminate(ctrl_alt_bksp) -+ applealu_jis = +inet(evdev)+macintosh_vndr/jp(alujiskeys)+terminate(ctrl_alt_bksp) -+ * = +inet(evdev)+terminate(ctrl_alt_bksp) diff --git a/xkeyboard-config.changes b/xkeyboard-config.changes index 031989e..e9582bc 100644 --- a/xkeyboard-config.changes +++ b/xkeyboard-config.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Feb 18 17:36:39 UTC 2022 - Stefan Dirsch + +- removed n_suse-ctrl-alt-bksp-terminate.patch + * no longer needed; made it impossible to disable Ctrl-Alt-BS + on Wayland (boo#1195871) + ------------------------------------------------------------------- Mon Oct 4 12:56:20 UTC 2021 - Stefan Dirsch diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec index 506327f..e357c53 100644 --- a/xkeyboard-config.spec +++ b/xkeyboard-config.spec @@ -1,7 +1,7 @@ # # spec file for package xkeyboard-config # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,6 @@ License: CDDL-1.0 AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT Group: System/X11/Utilities URL: https://www.freedesktop.org/Software/XKeyboardConfig Source: https://xorg.freedesktop.org/archive/individual/data/%{name}/%{name}-%{version}.tar.bz2 -Patch100: n_suse-ctrl-alt-bksp-terminate.patch # PATCH-FIX-OPENSUSE disable-2xalt_2xctrl-toggle.diff fdo#4927 -- This is just a workaround until fdo#4927 is fixed Patch109: n_disable-2xalt_2xctrl-toggle.diff BuildRequires: fdupes @@ -49,7 +48,6 @@ make keyboards more accessible to people with physical impairments. %prep %setup -q -%patch100 -p1 %patch109 -p1 %build