From c4458228de9692634b7021d6a2c123fd7985906cff402262cab548f8a2df629c Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 10 Oct 2017 12:29:19 +0000 Subject: [PATCH] - n_suse-ctrl-alt-bksp-terminate.patch * removed the hunk, which made Shift-RCTL and Shift-RALT the default Compose key (bsc#1059438) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xkeyboard-config?expand=0&rev=136 --- n_suse-ctrl-alt-bksp-terminate.patch | 16 ---------------- xkeyboard-config.changes | 7 +++++++ 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/n_suse-ctrl-alt-bksp-terminate.patch b/n_suse-ctrl-alt-bksp-terminate.patch index feefe3c..933259e 100644 --- a/n_suse-ctrl-alt-bksp-terminate.patch +++ b/n_suse-ctrl-alt-bksp-terminate.patch @@ -1,5 +1,3 @@ --- Add Multi_key to Control_R to get compose.Index: xkeyboard-config-2.1/rules/evdev.m_s.part - diff -u -r xkeyboard-config-2.16.orig/rules/evdev.m_s.part xkeyboard-config-2.16/rules/evdev.m_s.part --- xkeyboard-config-2.16.orig/rules/evdev.m_s.part 2015-10-20 16:46:14.666938000 +0200 +++ xkeyboard-config-2.16/rules/evdev.m_s.part 2015-10-20 16:47:50.094095000 +0200 @@ -12,17 +10,3 @@ diff -u -r xkeyboard-config-2.16.orig/rules/evdev.m_s.part xkeyboard-config-2.16 + 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 -u -r xkeyboard-config-2.16.orig/symbols/pc xkeyboard-config-2.16/symbols/pc ---- xkeyboard-config-2.16.orig/symbols/pc 2015-10-20 16:46:13.091936000 +0200 -+++ xkeyboard-config-2.16/symbols/pc 2015-10-20 16:46:28.915956000 +0200 -@@ -27,8 +27,8 @@ - key { [ Super_L ] }; - - key { [ Shift_R ] }; -- key { [ Control_R ] }; -- key { [ Super_R ] }; -+ key { [ Control_R, Multi_key ] }; -+ key { [ Super_R, Multi_key ] }; - key { [ Menu ] }; - - // Beginning of modifier mappings. diff --git a/xkeyboard-config.changes b/xkeyboard-config.changes index 487e2c7..82c3e83 100644 --- a/xkeyboard-config.changes +++ b/xkeyboard-config.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Oct 10 12:06:17 UTC 2017 - sndirsch@suse.com + +- n_suse-ctrl-alt-bksp-terminate.patch + * removed the hunk, which made Shift-RCTL and Shift-RALT the + default Compose key (bsc#1059438) + ------------------------------------------------------------------- Thu Oct 5 12:15:30 UTC 2017 - tobias.johannes.klausmann@mni.thm.de