rpm/xkeyboard-config
SHA256
1
0
Fork 0
forked from pool/xkeyboard-config
Code Pull Requests Activity

Accepting request 197404 from X11:XOrg

Browse Source 
- renamed u_zhe-dze.patch to 
  U_rs-cyralpha-The-key-z-on-US-keyboard-should-give-dze.patch
  after having it upstreamed (#fdo#68754)

- renamed p_suse.diff to n_suse.patch (never to be upstreamed)
  according to X11:XOrg patch guidelines

OBS-URL: https://build.opensuse.org/request/show/197404
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xkeyboard-config?expand=0&rev=64
This commit is contained in:
Stephan Kulow 2013-09-05 21:28:19 +00:00 committed by Git OBS Bridge
commit 53910ef885
4 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
u_zhe-dze.patch → U_rs-cyralpha-The-key-z-on-US-keyboard-should-give-dze.patch
View File

@ -1,10 +1,22 @@
Author: Oliver Neukum <oneukum@suse.de>
Subject: The key (z on US keyboard) should give dze (&#1029; [capital] / &#1109;) but it gives zhe (&#1046; [capital] / &#1078;)
References: bnc#780230
Signed-off-by: Stefan Dirsch <sndirsch@suse.de>
From 8f49c92c54c53eab6d40d8be90ce06773d20d196 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.de>
Date: Mon, 2 Sep 2013 11:07:38 +0200
Subject: [PATCH] rs(cyralpha): The key (z on US keyboard) should give dze, but
it gives zhe
--- /usr/share/X11/xkb/symbols/rs.alt 2012-09-13 15:39:18.039949695 +0200
+++ /usr/share/X11/xkb/symbols/rs 2012-09-13 16:19:37.007170631 +0200
The key (z on US keyboard) should give dze (&#1029; [capital] / &#1109;),
but it gives zhe (&#1046; [capital] / &#1078;). (fdo#68754, patch by
Oliver Neukum <oneukum@suse.de>)
Signed-off-by: Stefan Dirsch <sndirsch@suse.de>
---
symbols/rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/symbols/rs b/symbols/rs
index 1b88d01..baa7a34 100644
--- a/symbols/rs
+++ b/symbols/rs
@@ -108,7 +108,7 @@ xkb_symbols "cyralpha" {
key <AC11> { [ Serbian_tshe, Serbian_TSHE, any,any ] }; // ' "
key <BKSL> { [ Cyrillic_zhe, Cyrillic_ZHE, any,any ] }; // \ |
@ -14,3 +26,6 @@ Signed-off-by: Stefan Dirsch <sndirsch@suse.de>
key <AB02> { [ Cyrillic_dzhe, Cyrillic_DZHE, any,any ] }; // x
key <AB03> { [ Cyrillic_tse, Cyrillic_TSE, any,any ] }; // c
key <AB04> { [ Cyrillic_ve, Cyrillic_VE, any,any ] }; // v
--
1.8.1.4

0
p_suse.diff → n_suse.patch
View File

13
xkeyboard-config.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Wed Sep 4 13:41:51 UTC 2013 - sndirsch@suse.com
- renamed u_zhe-dze.patch to
U_rs-cyralpha-The-key-z-on-US-keyboard-should-give-dze.patch
after having it upstreamed (#fdo#68754)
-------------------------------------------------------------------
Fri Aug 30 13:50:55 UTC 2013 - sndirsch@suse.com
- renamed p_suse.diff to n_suse.patch (never to be upstreamed)
according to X11:XOrg patch guidelines
-------------------------------------------------------------------
Fri Aug 30 08:11:24 UTC 2013 - sndirsch@suse.com

6
xkeyboard-config.spec
View File

@ -34,10 +34,10 @@ Summary: The X Keyboard Extension
License: GPL-2.0+ and LGPL-2.1+ and MIT and CDDL-1.0
Group: System/X11/Utilities
Source: http://xorg.freedesktop.org/releases/individual/data/%{name}-%{version}.tar.bz2
Patch0: u_zhe-dze.patch
Patch0: U_rs-cyralpha-The-key-z-on-US-keyboard-should-give-dze.patch
Patch11: U_Add-missing-backslash-bar-mapping-on-us-internationa.patch
Patch12: U_ara-digits-Generate-arabic-script-digits-also-on-key.patch
Patch100: p_suse.diff
Patch100: n_suse.patch
# PATCH-FIX-OPENSUSE disable-2xalt_2xctrl-toggle.diff fdo#4927 -- This is just a workaround until fdo#4927 is fixed
Patch109: disable-2xalt_2xctrl-toggle.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -56,7 +56,7 @@ make keyboards more accessible to people with physical impairments.
%prep
%setup -q
translation-update-upstream
%patch0 -p5
%patch0 -p1
%patch11 -p1
%patch12 -p1
%patch100