rpms/xkeyboard-config
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Revert broken fix for is keyboard (#826220)

Browse Source
This commit is contained in:
Peter Hutterer 2012-06-26 13:16:08 +10:00
parent 45e92a9f7c
commit 35a54fb780
2 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
0001-Reverting-broken-fix-for-is-keyboard.patch Normal file
View File

@ -0,0 +1,34 @@
From cd657ccb4223f34feffd635c3299206f96a5e216 Mon Sep 17 00:00:00 2001
From: "Sergey V. Udaltsov" <svu@gnome.org>
Date: Fri, 1 Jun 2012 22:20:01 +0100
Subject: [PATCH] Reverting broken fix for is keyboard
https://bugs.freedesktop.org/show_bug.cgi?id=43173
---
symbols/is | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/symbols/is b/symbols/is
index f8e0ce1..e5f5d82 100644
--- a/symbols/is
+++ b/symbols/is
@@ -21,14 +21,14 @@ xkb_symbols "basic" {
key <AE12> { [ minus, underscore, dead_cedilla, dead_ogonek ] };
key <AD11> { [ eth, ETH, dead_diaeresis, dead_abovering ] };
- key <AD12> { [apostrophe, question, dead_tilde, dead_macron ] };
+ key <AD12> { [apostrophe, question, asciitilde, dead_macron ] };
key <AC10> { [ ae, AE, asciicircum, dead_doubleacute ] };
key <AC11> { [dead_acute, dead_acute, dead_circumflex, dead_caron ] };
key <TLDE> { [dead_abovering, dead_diaeresis, notsign, hyphen ] };
// <AC12> = <BKSL>
- key <BKSL> { [ plus, asterisk, dead_grave, dead_breve ] };
+ key <BKSL> { [ plus, asterisk, grave, dead_breve ] };
// <AB00> = <LSGT>, is in file "pc": pc105
key <AB10> { [ thorn, THORN, dead_belowdot, dead_abovedot ] };
--
1.7.10.2

10
xkeyboard-config.spec
View File

@ -7,7 +7,7 @@
Summary: X Keyboard Extension configuration data
Name: xkeyboard-config
Version: 2.6
Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{dist}
Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{dist}
License: MIT
Group: User Interface/X
URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig
@ -19,6 +19,9 @@ Source2: commitid
Source0: http://xorg.freedesktop.org/archive/individual/data/xkeyboard-config/%{name}-%{version}.tar.bz2
%endif
# Bug 826220 - Tilda is now a dead key (for accented chars)
Patch01: 0001-Reverting-broken-fix-for-is-keyboard.patch
BuildArch: noarch
BuildRequires: pkgconfig
@ -68,7 +71,7 @@ git add .
git commit -a -q -m "%{name} %{version} baseline."
%endif
#git am -p1 $(awk '/^Patch.*:/ { print "%{_sourcedir}/"$2 }' %{_specdir}/%{name}.spec)
git am -p1 %{patches} < /dev/null
%build
AUTOPOINT="intltoolize --automake --copy" autoreconf -v --force --install || exit 1
@ -109,6 +112,9 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
%{_datadir}/pkgconfig/xkeyboard-config.pc
%changelog
* Tue Jun 26 2012 Peter Hutterer <peter.hutterer@redhat.com> 2.6-2
- Revert broken fix for is keyboard (#826220)
* Thu May 31 2012 Peter Hutterer <peter.hutterer@redhat.com> 2.6-1
- xkeyboard-config 2.6
- change source URL, 2.6 is in a different directory