Make pc105 have inet keys, not 100% correct, but better than having the kbd

driver report "us+inet" which confused XKB and higher layers (#441398)
This commit is contained in:
Matthias Clasen 2008-04-09 15:21:04 +00:00
parent b1757e37ca
commit e0c5a88cf6
2 changed files with 32 additions and 1 deletions

24
usinet.patch Normal file
View File

@ -0,0 +1,24 @@
diff -up xkeyboard-config-1.2/rules/base.lists.part.usinet xkeyboard-config-1.2/rules/base.lists.part
--- xkeyboard-config-1.2/rules/base.lists.part.usinet 2008-04-08 14:34:57.000000000 -0400
+++ xkeyboard-config-1.2/rules/base.lists.part 2008-04-08 14:35:26.000000000 -0400
@@ -52,6 +52,7 @@
microsoftoffice microsoftmult \
mx1998 mx2500 mx2750 \
oretec \
+ pc105 \
presario propeller \
qtronix \
rapidaccess rapidaccess2 rapidaccess2a thinkpad thinkpad60 \
diff -up xkeyboard-config-1.2/symbols/inet.usinet xkeyboard-config-1.2/symbols/inet
--- xkeyboard-config-1.2/symbols/inet.usinet 2008-04-09 00:08:22.000000000 -0400
+++ xkeyboard-config-1.2/symbols/inet 2008-04-09 00:09:49.000000000 -0400
@@ -2211,3 +2211,9 @@ xkb_symbols "classmate" {
key <I30> { [ XF86AudioRaiseVolume ] };
};
+
+// Generic
+partial alphanumeric_keys
+xkb_symbols "pc105" {
+ include "inet(media_common)"
+};

View File

@ -4,7 +4,7 @@
Summary: xkeyboard-config alternative xkb data files Summary: xkeyboard-config alternative xkb data files
Name: xkeyboard-config Name: xkeyboard-config
Version: 1.2 Version: 1.2
Release: 1%{?dist} Release: 2%{?dist}
License: MIT License: MIT
Group: User Interface/X Group: User Interface/X
URL: http://www.x.org URL: http://www.x.org
@ -12,6 +12,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: http://xlibs.freedesktop.org/xkbdesc/%{name}-%{version}.tar.bz2 Source0: http://xlibs.freedesktop.org/xkbdesc/%{name}-%{version}.tar.bz2
Patch1: olpc-xkeyboard-config-kz-group.patch Patch1: olpc-xkeyboard-config-kz-group.patch
Patch2: usinet.patch
BuildArch: noarch BuildArch: noarch
@ -41,6 +42,7 @@ xkeyboard-config alternative xkb data files
%prep %prep
%setup -q %setup -q
%patch1 -p1 -b .kzgroup %patch1 -p1 -b .kzgroup
%patch2 -p1 -b .usinet
%build %build
%configure \ %configure \
@ -80,6 +82,11 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/X11/xkb/rules/xorg.xml %{_datadir}/X11/xkb/rules/xorg.xml
%changelog %changelog
* Wed Apr 9 2008 Matthias Clasen <mclasen@redhat.com> - 1.2-2
- Make pc105 have inet keys, not 100% correct, but better than
having the kbd driver report "us+inet" which confused XKB and
higher layers (#441398)
* Thu Feb 7 2008 Matthias Clasen <mclasen@redhat.com> - 1.2-1 * Thu Feb 7 2008 Matthias Clasen <mclasen@redhat.com> - 1.2-1
- Update to 1.2 - Update to 1.2
- Remove upstreamed olpc patches - Remove upstreamed olpc patches