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

- xkeyboard-config 1.6

Browse Source 
- Dropping all patches, merged upstream.
This commit is contained in:
Peter Hutterer 2009-05-29 04:59:12 +00:00
parent d31834b040
commit 2d601bf698
9 changed files with 9 additions and 275 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
xkeyboard-config-1.5.tar.bz2 xkeyboard-config-1.6.tar.bz2

2
sources
View File

@ -1 +1 @@
43c74312d303863b1b929554fa9ed9b3 xkeyboard-config-1.5.tar.bz2 5ae575a9073af12cd71773e065b38b3a xkeyboard-config-1.6.tar.bz2

38
usinet.patch
View File

@ -1,38 +0,0 @@
From e0e521d790e050f48c996673820c8be372a9856f Mon Sep 17 00:00:00 2001
From: Fedora X Ninjas <x@fedoraproject.org>
Date: Wed, 28 Jan 2009 12:05:47 +1000
Subject: [PATCH] Add include inet(media_nav_common) by default for pc105
---
rules/base.lists.part | 1 +
symbols/inet | 5 +++++
2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/rules/base.lists.part b/rules/base.lists.part
index e1897b1..1a752eb 100644
--- a/rules/base.lists.part
+++ b/rules/base.lists.part
@@ -54,6 +54,7 @@
microsoftoffice microsoftmult \
mx1998 mx2500 mx2750 \
oretec \
+ pc105 \
presario propeller \
qtronix \
rapidaccess rapidaccess2 thinkpad60 \
diff --git a/symbols/inet b/symbols/inet
index 339b72d..ba55f43 100644
--- a/symbols/inet
+++ b/symbols/inet
@@ -1797,3 +1797,8 @@ xkb_symbols "compalfl90" {
key <II65> { [ XF86MonBrightnessDown ] };
};
+// Generic
+partial alphanumeric_keys
+xkb_symbols "pc105" {
+ include "inet(media_nav_common)"
+};
--
1.6.0.6

30
xkeyboard-config-1.4-battery.patch
View File

@ -1,30 +0,0 @@
From ca3dcd5cf50ccb0ffadd8308a7132a14993b16bc Mon Sep 17 00:00:00 2001
From: Fedora X Ninjas <x@fedoraproject.org>
Date: Mon, 24 Nov 2008 13:01:22 +1000
Subject: [PATCH] Map KEY_BATTERY, WLAN, BLUETOOTH, UWB to their XF86<...> keycodes.
---
symbols/inet | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/symbols/inet b/symbols/inet
index 54ec241..50b559b 100644
--- a/symbols/inet
+++ b/symbols/inet
@@ -158,9 +158,10 @@ xkb_symbols "evdev" {
key <I241> { [ XF86MailForward ] };
key <I242> { [ XF86Save ] };
key <I243> { [ XF86Documents ] };
-// key <I244> { [ ] }; // KEY_BATTERY
-// key <I245> { [ ] }; // KEY_BLUETOOTH
-// key <I246> { [ ] }; // KEY_WLAN
+ key <I244> { [ XF86Battery ] }; // KEY_BATTERY
+ key <I245> { [ XF86Bluetooth ] }; // KEY_BLUETOOTH
+ key <I246> { [ XF86WLAN ] }; // KEY_WLAN
+ key <I247> { [ XF86UWB ] }; // KEY_UWB
// key <I249> { [ ] }; // KEY_VIDEO_NEXT -- drive next video source
// key <I250> { [ ] }; // KEY_VIDEO_PREV -- drive previous video source
// key <I251> { [ ] }; // KEY_BRIGHTNESS_CYCLE -- bright up, max++ == min
--
1.6.0.3

31
xkeyboard-config-1.4-jp-tilde.patch
View File

@ -1,31 +0,0 @@
From 824ce3a400a452929f90a038033c83055c01a2d7 Mon Sep 17 00:00:00 2001
From: Fedora X Ninjas <x@fedoraproject.org>
Date: Mon, 24 Nov 2008 12:59:09 +1000
Subject: [PATCH] Map TLDE to Zenkaku/Hankaku in jp, and BKSL to bracket/brace right (#469537).
This patch is only needed for jp on a non-jp106 keyboard model.
---
symbols/jp | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/symbols/jp b/symbols/jp
index 694090c..ef0b0f7 100644
--- a/symbols/jp
+++ b/symbols/jp
@@ -24,6 +24,13 @@ xkb_symbols "common" {
symbols[Group1]= [ Zenkaku_Hankaku, Kanji ]
};
+ key <TLDE> {
+ type[Group1]="PC_ALT_LEVEL2",
+ symbols[Group1]= [ Zenkaku_Hankaku, Kanji ]
+ };
+
+ key <BKSL> { [ bracketright, braceright ] };
+
key <AE01> { [ 1, exclam ] };
key <AE02> { [ 2, quotedbl ] };
key <AE03> { [ 3, numbersign ] };
--
1.6.0.3

31
xkeyboard-config-1.5-evdevkbds.patch
View File

@ -1,31 +0,0 @@
From e8b234d2566c1a5dcb5d41706f14a66e426c7d30 Mon Sep 17 00:00:00 2001
From: Sergey V. Udaltsov <svu@gnome.org>
Date: Sun, 1 Feb 2009 15:54:12 +0000
Subject: [PATCH] introducing $evdevkbds
---
ChangeLog | 4 +++-
rules/base.lists.part | 1 +
rules/evdev.m_s.part | 3 ++-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/rules/base.lists.part b/rules/base.lists.part
index e1897b1..7cbd874 100644
--- a/rules/base.lists.part
+++ b/rules/base.lists.part
@@ -87,3 +87,4 @@
vn \
za
+! $evdevkbds = ibm_spacesaver
diff --git a/rules/evdev.m_s.part b/rules/evdev.m_s.part
index fd6590d..516c976 100644
--- a/rules/evdev.m_s.part
+++ b/rules/evdev.m_s.part
@@ -1 +1,2 @@
- * = +inet(evdev)
+ $evdevkbds = +inet(evdev)+inet(%m)
+ * = +inet(evdev)
--
1.6.0.6

35
xkeyboard-config-1.5-suspend-hibernate.patch
View File

@ -1,35 +0,0 @@
From 3b0326435e6f02c0d1c92b1c7f9902d81f1245aa Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu, 5 Mar 2009 13:01:20 +1000
Subject: [PATCH] Map I213 to XF86Suspend, and I255 to XF86Hibernate.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
---
symbols/inet | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/symbols/inet b/symbols/inet
index ba55f43..dafb406 100644
--- a/symbols/inet
+++ b/symbols/inet
@@ -165,7 +165,7 @@ xkb_symbols "evdev" {
key <I209> { [ XF86AudioPause ] };
key <I210> { [ XF86Launch3 ] };
key <I211> { [ XF86Launch4 ] };
- key <I213> { [ XF86Standby ] };
+ key <I213> { [ XF86Suspend ] };
key <I214> { [ XF86Close ] };
key <I215> { [ XF86AudioPlay ] };
key <I216> { [ XF86Forward ] };
@@ -205,6 +205,8 @@ xkb_symbols "evdev" {
// key <I251> { [ ] }; // KEY_BRIGHTNESS_CYCLE -- bright up, max++ == min
// key <I252> { [ ] }; // KEY_BRIGHTNESS_ZERO -- brightness off
// key <I253> { [ ] }; // KEY_DISPLAY_OFF -- turn off display
+// key <I254> { [ ] }; // KEY_WIMAX
+ key <I255> { [ XF86Hibernate ] }; // KEY_HIBERNATE
};
--
1.6.0.6

96
xkeyboard-config-1.5-terminate.patch
View File

@ -1,96 +0,0 @@
From ff416cce47e29c113c706684a05ebb112c9116b3 Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau@debian.org>
Date: Tue, 7 Apr 2009 04:18:32 +0200
Subject: [PATCH] Make Terminate_Server on ctrl+alt+bksp an option
This disables zapping by default, it can be reenabled with
'setxkbmap -option terminate:ctrl_alt_bksp'.
---
rules/base.o_s.part | 1 +
rules/base.xml.in | 12 ++++++++++++
symbols/pc | 5 +----
symbols/srvr_ctrl | 13 +++++++++----
4 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/rules/base.o_s.part b/rules/base.o_s.part
index c401790..9843c61 100644
--- a/rules/base.o_s.part
+++ b/rules/base.o_s.part
@@ -97,4 +97,5 @@
shift:breaks_caps = +shift(breaks_caps)
esperanto:qwerty = +epo(qwerty)
esperanto:dvorak = +epo(dvorak)
+ terminate:ctrl_alt_bksp = +srvr_ctrl(terminate_ctrl_alt_bksp)
diff --git a/rules/base.xml.in b/rules/base.xml.in
index a7616c5..fe7a26f 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -4914,5 +4914,17 @@
</configItem>
</option>
</group>
+ <group allowMultipleSelection="true">
+ <configItem>
+ <name>terminate</name>
+ <_description>Key sequence to kill the X server</_description>
+ </configItem>
+ <option>
+ <configItem>
+ <name>terminate:ctrl_alt_bksp</name>
+ <_description>Control + Alt + Backspace</_description>
+ </configItem>
+ </option>
+ </group>
</optionList>
</xkbConfigRegistry>
diff --git a/symbols/pc b/symbols/pc
index 07472b8..9474df5 100644
--- a/symbols/pc
+++ b/symbols/pc
@@ -19,10 +19,7 @@ xkb_symbols "pc105" {
include "pc(editing)"
include "keypad(x11)"
- key <BKSP> {
- type="CTRL+ALT",
- symbols[Group1]= [ BackSpace, Terminate_Server ]
- };
+ key <BKSP> { [ BackSpace ] };
key <TAB> { [ Tab, ISO_Left_Tab ] };
key <RTRN> { [ Return ] };
diff --git a/symbols/srvr_ctrl b/symbols/srvr_ctrl
index 712f763..9b333e3 100644
--- a/symbols/srvr_ctrl
+++ b/symbols/srvr_ctrl
@@ -13,10 +13,7 @@ xkb_symbols "xfree86" {
partial keypad_keys
xkb_symbols "stdkeypad" {
- key <BKSP> {
- type="CTRL+ALT",
- symbols[Group1]= [ BackSpace, Terminate_Server ]
- };
+ include "srvr_ctrl(terminate_ctrl_alt_bksp)"
// Ungrab cancels server/keyboard/pointer grabs
key <KPDV> {
@@ -44,6 +41,14 @@ xkb_symbols "stdkeypad" {
};
+partial modifier_keys
+xkb_symbols "terminate_ctrl_alt_bksp" {
+ key <BKSP> {
+ type="CTRL+ALT",
+ symbols[Group1]= [ NoSymbol, Terminate_Server ]
+ };
+};
+
partial function_keys
xkb_symbols "fkey2vt" {
--
1.5.6.3

19
xkeyboard-config.spec
View File

@ -3,23 +3,14 @@
Summary: X Keyboard Extension configuration data Summary: X Keyboard Extension configuration data
Name: xkeyboard-config Name: xkeyboard-config
Version: 1.5 Version: 1.6
Release: 5%{?dist} Release: 1%{?dist}
License: MIT License: MIT
Group: User Interface/X Group: User Interface/X
URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 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
Patch2: usinet.patch
# Sent to svu, partially committed as d0ff2e0d4ac, expect for 1.6
Patch4: xkeyboard-config-1.4-battery.patch
# Sent to svu
Patch5: xkeyboard-config-1.4-jp-tilde.patch
# Taken from upstream, remove with 1.6
Patch6: xkeyboard-config-1.5-evdevkbds.patch
Patch7: xkeyboard-config-1.5-suspend-hibernate.patch
Patch8: xkeyboard-config-1.5-terminate.patch
BuildArch: noarch BuildArch: noarch
@ -61,7 +52,7 @@ fi
git add . git add .
git commit -a -q -m "%{version} baseline." git commit -a -q -m "%{version} baseline."
git am -p1 $(awk '/^Patch.*:/ { print "%{_sourcedir}/"$2 }' %{_specdir}/%{name}.spec) #git am -p1 $(awk '/^Patch.*:/ { print "%{_sourcedir}/"$2 }' %{_specdir}/%{name}.spec)
%build %build
%configure \ %configure \
@ -101,6 +92,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/X11/xkb/rules/xorg.xml %{_datadir}/X11/xkb/rules/xorg.xml
%changelog %changelog
* Fri May 29 2009 Peter Hutterer <peter.hutterer@redhat.com> - 1.6-1
- xkeyboard-config 1.6
- Dropping all patches, merged upstream.
* Tue Apr 07 2009 Peter Hutterer <peter.hutterer@redhat.com> - 1.5-5 * Tue Apr 07 2009 Peter Hutterer <peter.hutterer@redhat.com> - 1.5-5
- xkeyboard-config-1.5-terminate.patch: remove Terminate_Server from default - xkeyboard-config-1.5-terminate.patch: remove Terminate_Server from default
pc symbols, add terminate:ctrl_alt_bksp. pc symbols, add terminate:ctrl_alt_bksp.