Add br(thinkpad) to the xml file (#1292881)

This commit is contained in:
Peter Hutterer 2015-12-22 12:42:41 +10:00
parent 9ec827a281
commit 3c8955dbf8
2 changed files with 51 additions and 1 deletions

View File

@ -0,0 +1,45 @@
From 6ae3f980f479044c9dd2846054ffb94b08100ec4 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 22 Dec 2015 12:18:32 +1000
Subject: [PATCH] Add the br(thinkpad) model to the xml files
https://bugzilla.redhat.com/show_bug.cgi?id=1292881
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
rules/base.xml.in | 6 ++++++
symbols/br | 1 +
2 files changed, 7 insertions(+)
diff --git a/rules/base.xml.in b/rules/base.xml.in
index bae2b56..daf8322 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -2279,6 +2279,12 @@
</languageList>
</configItem>
</variant>
+ <variant>
+ <configItem>
+ <name>thinkpad</name>
+ <_description>Portuguese (Brazil, IBM/Lenovo ThinkPad)</_description>
+ </configItem>
+ </variant>
</variantList>
</layout>
<layout>
diff --git a/symbols/br b/symbols/br
index f65d13a..b7a76d5 100644
--- a/symbols/br
+++ b/symbols/br
@@ -64,6 +64,7 @@ partial alphanumeric_keys
xkb_symbols "thinkpad" {
include "br(abnt2)"
+ name[Group1]="Portuguese (Brazil, IBM/Lenovo ThinkPad)";
key <RCTL> { [ slash, question, degree, questiondown ] };
};
--
2.5.0

View File

@ -7,7 +7,7 @@
Summary: X Keyboard Extension configuration data
Name: xkeyboard-config
Version: 2.16
Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
License: MIT
URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig
@ -19,6 +19,8 @@ Source2: commitid
Source0: http://xorg.freedesktop.org/archive/individual/data/%{name}/%{name}-%{version}.tar.bz2
%endif
Patch01: 0001-Add-the-br-thinkpad-model-to-the-xml-files.patch
BuildArch: noarch
BuildRequires: gettext
@ -107,6 +109,9 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
%{_datadir}/pkgconfig/xkeyboard-config.pc
%changelog
* Tue Dec 22 2015 Peter Hutterer <peter.hutterer@redhat.com> 2.16-2
- Add br(thinkpad) to the xml file (#1292881)
* Thu Oct 15 2015 Peter Hutterer <peter.hutterer@redhat.com> 2.16-1
- xkeyboard-config 2.16