1
0

Accepting request 955929 from X11:XOrg

- 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/request/show/955929
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xkeyboard-config?expand=0&rev=95
This commit is contained in:
Dominique Leuenberger 2022-02-21 16:45:54 +00:00 committed by Git OBS Bridge
commit 78ea9527f8
3 changed files with 8 additions and 17 deletions

View File

@ -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)

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Feb 18 17:36:39 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
- 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 <sndirsch@suse.com> Mon Oct 4 12:56:20 UTC 2021 - Stefan Dirsch <sndirsch@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package xkeyboard-config # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # 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 Group: System/X11/Utilities
URL: https://www.freedesktop.org/Software/XKeyboardConfig URL: https://www.freedesktop.org/Software/XKeyboardConfig
Source: https://xorg.freedesktop.org/archive/individual/data/%{name}/%{name}-%{version}.tar.bz2 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 # 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 Patch109: n_disable-2xalt_2xctrl-toggle.diff
BuildRequires: fdupes BuildRequires: fdupes
@ -49,7 +48,6 @@ make keyboards more accessible to people with physical impairments.
%prep %prep
%setup -q %setup -q
%patch100 -p1
%patch109 -p1 %patch109 -p1
%build %build