Compare commits
1 Commits
Author | SHA256 | Date | |
---|---|---|---|
9322048d7f |
33
kbd-1.15.2-docu-X11R6-xorg.patch
Normal file
33
kbd-1.15.2-docu-X11R6-xorg.patch
Normal file
@@ -0,0 +1,33 @@
|
||||
--- a/docs/doc/kbd.FAQ-15.html.orig 2012-02-27 13:27:11.000000000 +0300
|
||||
+++ b/docs/doc/kbd.FAQ-15.html 2013-07-30 18:56:43.697000005 +0300
|
||||
@@ -188,7 +188,7 @@
|
||||
<P>XFree86 also supports Slow Keys, Repeat Keys, Bounce Keys and an
|
||||
audible bell. <CODE>xkbcomp</CODE> can be used to generate a <CODE>.xkm</CODE> file
|
||||
to enable these. The appropriate <CODE>xkbcomp</CODE> commands are listed in
|
||||
-<CODE>/usr/X11R6/lib/X11/xkb/compat/accessx</CODE>.
|
||||
+<CODE>/usr/{X11R6/lib,share}/X11/xkb/compat/accessx</CODE>.
|
||||
Unfortunately, the exact process is still undocumented.
|
||||
<P>
|
||||
<HR>
|
||||
--- a/docs/doc/kbd.FAQ.txt.orig 2012-02-27 13:27:11.000000000 +0300
|
||||
+++ b/docs/doc/kbd.FAQ.txt 2013-07-30 18:57:41.150000005 +0300
|
||||
@@ -1253,7 +1253,7 @@
|
||||
1. The Linux keyboard driver mechanism, used in conjunction with
|
||||
loadkeys.
|
||||
2. The X mechanism - see X386keybd(1), later XFree86kbd(1). Under
|
||||
- X11R6: edit /usr/X11R6/lib/X11/locale/iso8859-1/Compose.
|
||||
+ X11R6: edit /usr/{X11R6/lib,/usr/share}/X11/locale/iso8859-1/Compose.
|
||||
|
||||
See also Andrew D. Balsa's comments at
|
||||
http://wauug.erols.com/~balsa/linux/deadkeys/index.html.
|
||||
--- a/docs/doc/kbd.FAQ-8.html.orig 2012-02-27 13:27:11.000000000 +0300
|
||||
+++ b/docs/doc/kbd.FAQ-8.html 2013-07-30 18:58:23.978000004 +0300
|
||||
@@ -154,7 +154,7 @@
|
||||
<OL>
|
||||
<LI>The Linux keyboard driver mechanism, used in conjunction with loadkeys.</LI>
|
||||
<LI>The X mechanism - see X386keybd(1), later XFree86kbd(1).
|
||||
-Under X11R6: edit <CODE>/usr/X11R6/lib/X11/locale/iso8859-1/Compose</CODE>.<P>See also Andrew D. Balsa's comments at
|
||||
+Under X11R6: edit <CODE>/usr/{X11R6/lib,share}/X11/locale/iso8859-1/Compose</CODE>.<P>See also Andrew D. Balsa's comments at
|
||||
<A HREF="http://wauug.erols.com/~balsa/linux/deadkeys/index.html">http://wauug.erols.com/~balsa/linux/deadkeys/index.html</A>.
|
||||
</LI>
|
||||
<LI>The emacs mechanism obtained by loading "iso-insert.el" or
|
326
kbd-1.15.2-prtscr_no_sigquit.patch
Normal file
326
kbd-1.15.2-prtscr_no_sigquit.patch
Normal file
@@ -0,0 +1,326 @@
|
||||
XXX: reverted upstream
|
||||
---
|
||||
data/keymaps/i386/azerty/fr-latin9.map | 1 +
|
||||
data/keymaps/i386/fgGIod/tr_f-latin5.map | 1 +
|
||||
data/keymaps/i386/qwerty/bg-cp1251.map | 1 +
|
||||
data/keymaps/i386/qwerty/bg_bds-cp1251.map | 1 +
|
||||
data/keymaps/i386/qwerty/br-abnt.map | 1 +
|
||||
data/keymaps/i386/qwerty/by.map | 1 +
|
||||
data/keymaps/i386/qwerty/cz-cp1250.map | 1 +
|
||||
data/keymaps/i386/qwerty/cz-lat2-prog.map | 1 +
|
||||
data/keymaps/i386/qwerty/cz-lat2.map | 1 +
|
||||
data/keymaps/i386/qwerty/cz.map | 8 ++++----
|
||||
data/keymaps/i386/qwerty/defkeymap.map | 1 +
|
||||
data/keymaps/i386/qwerty/defkeymap_V1.0.map | 1 +
|
||||
data/keymaps/i386/qwerty/lt.baltic.map | 1 +
|
||||
data/keymaps/i386/qwerty/lt.l4.map | 1 +
|
||||
data/keymaps/i386/qwerty/lt.map | 1 +
|
||||
data/keymaps/i386/qwerty/pl2.map | 1 +
|
||||
data/keymaps/i386/qwerty/sk-prog-qwerty.map | 1 +
|
||||
data/keymaps/i386/qwerty/ua-utf-ws.map | 1 +
|
||||
data/keymaps/i386/qwerty/ua-utf.map | 1 +
|
||||
data/keymaps/i386/qwerty/ua-ws.map | 1 +
|
||||
data/keymaps/i386/qwerty/ua.map | 1 +
|
||||
data/keymaps/i386/qwerty/us-acentos.map | 1 +
|
||||
data/keymaps/i386/qwertz/cz-us-qwertz.map | 1 +
|
||||
data/keymaps/i386/qwertz/sk-prog-qwertz.map | 1 +
|
||||
24 files changed, 27 insertions(+), 4 deletions(-)
|
||||
|
||||
Index: kbd-1.15.2/data/keymaps/i386/azerty/fr-latin9.map
|
||||
===================================================================
|
||||
--- kbd-1.15.2.orig/data/keymaps/i386/azerty/fr-latin9.map
|
||||
+++ kbd-1.15.2/data/keymaps/i386/azerty/fr-latin9.map
|
||||
@@ -418,6 +418,7 @@ keycode 100 = AltGr
|
||||
# La touche Ctrl+Pause = Attn = 101 a un code pour elle-m<>me
|
||||
#
|
||||
keycode 101 = Break
|
||||
+ control keycode 101 = Control_c
|
||||
|
||||
keycode 102 = Home
|
||||
|
||||
Index: kbd-1.15.2/data/keymaps/i386/fgGIod/tr_f-latin5.map
|
||||
===================================================================
|
||||
--- kbd-1.15.2.orig/data/keymaps/i386/fgGIod/tr_f-latin5.map
|
||||
+++ kbd-1.15.2/data/keymaps/i386/fgGIod/tr_f-latin5.map
|
||||
@@ -217,6 +217,7 @@ keycode 99 = VoidSymbol
|
||||
alt keycode 99 = Control_backslash
|
||||
keycode 100 = AltGr
|
||||
keycode 101 = Break
|
||||
+ control keycode 101 = Control_c
|
||||
keycode 102 = Find
|
||||
keycode 103 = Up
|
||||
keycode 104 = Prior
|
||||
Index: kbd-1.15.2/data/keymaps/i386/qwerty/bg-cp1251.map
|
||||
===================================================================
|
||||
--- kbd-1.15.2.orig/data/keymaps/i386/qwerty/bg-cp1251.map
|
||||
+++ kbd-1.15.2/data/keymaps/i386/qwerty/bg-cp1251.map
|
||||
@@ -312,6 +312,7 @@ keycode 99 = Control_backslash
|
||||
altgr alt keycode 99 = Control_backslash
|
||||
keycode 100 = AltGr
|
||||
keycode 101 = Break
|
||||
+ control keycode 101 = Control_c
|
||||
keycode 102 = Find
|
||||
keycode 103 = Up
|
||||
keycode 104 = Prior
|
||||
Index: kbd-1.15.2/data/keymaps/i386/qwerty/bg_bds-cp1251.map
|
||||
===================================================================
|
||||
--- kbd-1.15.2.orig/data/keymaps/i386/qwerty/bg_bds-cp1251.map
|
||||
+++ kbd-1.15.2/data/keymaps/i386/qwerty/bg_bds-cp1251.map
|
||||
@@ -638,6 +638,7 @@ keycode 98 = KP_Divide
|
||||
keycode 99 = Control_backslash
|
||||
keycode 100 = AltGr
|
||||
keycode 101 = Break
|
||||
+ control keycode 101 = Control_c
|
||||
keycode 102 = Find
|
||||
keycode 103 = Up
|
||||
keycode 104 = Prior
|
||||
Index: kbd-1.15.2/data/keymaps/i386/qwerty/br-abnt.map
|
||||
===================================================================
|
||||
--- kbd-1.15.2.orig/data/keymaps/i386/qwerty/br-abnt.map
|
||||
+++ kbd-1.15.2/data/keymaps/i386/qwerty/br-abnt.map
|
||||
@@ -197,6 +197,7 @@ keycode 99 = VoidSymbol
|
||||
alt keycode 99 = Control_backslash
|
||||
keycode 100 = AltGr
|
||||
keycode 101 = Break
|
||||
+ control keycode 101 = Control_c
|
||||
keycode 102 = Find
|
||||
keycode 103 = Up
|
||||
keycode 104 = Prior
|
||||
Index: kbd-1.15.2/data/keymaps/i386/qwerty/by.map
|
||||
===================================================================
|
||||
--- kbd-1.15.2.orig/data/keymaps/i386/qwerty/by.map
|
||||
+++ kbd-1.15.2/data/keymaps/i386/qwerty/by.map
|
||||
@@ -529,6 +529,7 @@ keycode 99 = VoidSymbol Control_backsl
|
||||
Meta_Control_backslash Meta_Control_backslash Meta_Control_backslash
|
||||
keycode 100 = Alt
|
||||
keycode 101 = Break
|
||||
+ control keycode 101 = Control_c
|
||||
keycode 102 = Find
|
||||
keycode 103 = Up Up Up \
|
||||
KeyboardSignal Up Up \
|
||||
Index: kbd-1.15.2/data/keymaps/i386/qwerty/cz-cp1250.map
|
||||
===================================================================
|
||||
--- kbd-1.15.2.orig/data/keymaps/i386/qwerty/cz-cp1250.map
|
||||
+++ kbd-1.15.2/data/keymaps/i386/qwerty/cz-cp1250.map
|
||||
@@ -138,6 +138,7 @@ keycode 99 = VoidSymbol
|
||||
alt keycode 99 = Control_backslash
|
||||
keycode 100 = AltGr
|
||||
keycode 101 = Break
|
||||
+ control keycode 101 = Control_c
|
||||
keycode 102 = Find
|
||||
keycode 103 = Up
|
||||
keycode 104 = Prior
|
||||
Index: kbd-1.15.2/data/keymaps/i386/qwerty/cz-lat2-prog.map
|
||||
===================================================================
|
||||
--- kbd-1.15.2.orig/data/keymaps/i386/qwerty/cz-lat2-prog.map
|
||||
+++ kbd-1.15.2/data/keymaps/i386/qwerty/cz-lat2-prog.map
|
||||
@@ -141,6 +141,7 @@ keycode 99 = VoidSymbol
|
||||
alt keycode 99 = Control_backslash
|
||||
keycode 100 = AltGr
|
||||
keycode 101 = Break
|
||||
+ control keycode 101 = Control_c
|
||||
keycode 102 = Find
|
||||
keycode 103 = Up
|
||||
keycode 104 = Prior Scroll_Backward Prior Scroll_Backward VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
|
||||
Index: kbd-1.15.2/data/keymaps/i386/qwerty/cz-lat2.map
|
||||
===================================================================
|
||||
--- kbd-1.15.2.orig/data/keymaps/i386/qwerty/cz-lat2.map
|
||||
+++ kbd-1.15.2/data/keymaps/i386/qwerty/cz-lat2.map
|
||||
@@ -138,6 +138,7 @@ keycode 99 = VoidSymbol
|
||||
alt keycode 99 = Control_backslash
|
||||
keycode 100 = AltGr
|
||||
keycode 101 = Break
|
||||
+ control keycode 101 = Control_c
|
||||
keycode 102 = Find
|
||||
keycode 103 = Up
|
||||
keycode 104 = Prior Scroll_Backward Prior Scroll_Backward VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
|
||||
Index: kbd-1.15.2/data/keymaps/i386/qwerty/cz.map
|
||||
===================================================================
|
||||
--- kbd-1.15.2.orig/data/keymaps/i386/qwerty/cz.map
|
||||
+++ kbd-1.15.2/data/keymaps/i386/qwerty/cz.map
|
||||
@@ -1086,13 +1086,13 @@ keycode 99 = dead_acute dead_acute
|
||||
keycode 100 = AltGr
|
||||
#
|
||||
#keycode 101 = Break
|
||||
-keycode 101 = Break Break VoidSymbol VoidSymbol VoidSymbol \
|
||||
- VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \
|
||||
+keycode 101 = Break Break VoidSymbol VoidSymbol Control_c \
|
||||
+ Control_c VoidSymbol VoidSymbol VoidSymbol VoidSymbol \
|
||||
VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \
|
||||
VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \
|
||||
VoidSymbol \
|
||||
- Break Break VoidSymbol VoidSymbol VoidSymbol \
|
||||
- VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \
|
||||
+ Break Break VoidSymbol VoidSymbol Control_c \
|
||||
+ Control_c VoidSymbol VoidSymbol VoidSymbol VoidSymbol \
|
||||
VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \
|
||||
VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol \
|
||||
VoidSymbol
|
||||
Index: kbd-1.15.2/data/keymaps/i386/qwerty/defkeymap.map
|
||||
===================================================================
|
||||
--- kbd-1.15.2.orig/data/keymaps/i386/qwerty/defkeymap.map
|
||||
+++ kbd-1.15.2/data/keymaps/i386/qwerty/defkeymap.map
|
||||
@@ -222,6 +222,7 @@ keycode 99 = VoidSymbol
|
||||
alt keycode 99 = Control_backslash
|
||||
keycode 100 = AltGr
|
||||
keycode 101 = Break
|
||||
+ control keycode 101 = Control_c
|
||||
keycode 102 = Find
|
||||
keycode 103 = Up
|
||||
keycode 104 = Prior
|
||||
Index: kbd-1.15.2/data/keymaps/i386/qwerty/defkeymap_V1.0.map
|
||||
===================================================================
|
||||
--- kbd-1.15.2.orig/data/keymaps/i386/qwerty/defkeymap_V1.0.map
|
||||
+++ kbd-1.15.2/data/keymaps/i386/qwerty/defkeymap_V1.0.map
|
||||
@@ -185,6 +185,7 @@ keycode 99 = VoidSymbol
|
||||
alt keycode 99 = Control_backslash
|
||||
keycode 100 = AltGr
|
||||
keycode 101 = Break
|
||||
+ control keycode 101 = Control_c
|
||||
keycode 102 = Find
|
||||
keycode 103 = Up
|
||||
keycode 104 = Prior
|
||||
Index: kbd-1.15.2/data/keymaps/i386/qwerty/lt.baltic.map
|
||||
===================================================================
|
||||
--- kbd-1.15.2.orig/data/keymaps/i386/qwerty/lt.baltic.map
|
||||
+++ kbd-1.15.2/data/keymaps/i386/qwerty/lt.baltic.map
|
||||
@@ -171,6 +171,7 @@ keycode 99 = VoidSymbol
|
||||
alt keycode 99 = Control_backslash
|
||||
keycode 100 = AltGr
|
||||
keycode 101 = Break
|
||||
+ control keycode 101 = Control_c
|
||||
keycode 102 = Find
|
||||
keycode 103 = Up
|
||||
keycode 104 = Prior
|
||||
Index: kbd-1.15.2/data/keymaps/i386/qwerty/lt.l4.map
|
||||
===================================================================
|
||||
--- kbd-1.15.2.orig/data/keymaps/i386/qwerty/lt.l4.map
|
||||
+++ kbd-1.15.2/data/keymaps/i386/qwerty/lt.l4.map
|
||||
@@ -463,6 +463,7 @@ keycode 99 = VoidSymbol # 99=Print-Scr
|
||||
alt keycode 99 = Control_backslash
|
||||
keycode 100 = AltGr
|
||||
keycode 101 = Break # 101=Control-Pause
|
||||
+ control keycode 101 = Control_c
|
||||
string F102 = "\033[7$"
|
||||
keycode 102 = Find # =Home
|
||||
shift keycode 102 = F102
|
||||
Index: kbd-1.15.2/data/keymaps/i386/qwerty/lt.map
|
||||
===================================================================
|
||||
--- kbd-1.15.2.orig/data/keymaps/i386/qwerty/lt.map
|
||||
+++ kbd-1.15.2/data/keymaps/i386/qwerty/lt.map
|
||||
@@ -462,6 +462,7 @@ keycode 99 = VoidSymbol # 99=Print-Scr
|
||||
alt keycode 99 = Control_backslash
|
||||
keycode 100 = AltGr
|
||||
keycode 101 = Break # 101=Control-Pause
|
||||
+ control keycode 101 = Control_c
|
||||
string F102 = "\033[7$"
|
||||
keycode 102 = Find # =Home
|
||||
shift keycode 102 = F102
|
||||
Index: kbd-1.15.2/data/keymaps/i386/qwerty/pl2.map
|
||||
===================================================================
|
||||
--- kbd-1.15.2.orig/data/keymaps/i386/qwerty/pl2.map
|
||||
+++ kbd-1.15.2/data/keymaps/i386/qwerty/pl2.map
|
||||
@@ -242,6 +242,7 @@ keycode 99 = VoidSymbol
|
||||
alt keycode 99 = Control_backslash
|
||||
keycode 100 = AltGr
|
||||
keycode 101 = Break
|
||||
+ control keycode 101 = Control_c
|
||||
keycode 102 = Find
|
||||
keycode 103 = Up
|
||||
keycode 104 = Prior
|
||||
Index: kbd-1.15.2/data/keymaps/i386/qwerty/sk-prog-qwerty.map
|
||||
===================================================================
|
||||
--- kbd-1.15.2.orig/data/keymaps/i386/qwerty/sk-prog-qwerty.map
|
||||
+++ kbd-1.15.2/data/keymaps/i386/qwerty/sk-prog-qwerty.map
|
||||
@@ -122,6 +122,7 @@ keycode 99 = VoidSymbol
|
||||
alt keycode 99 = Control_backslash
|
||||
keycode 100 = AltGr
|
||||
keycode 101 = Break
|
||||
+ control keycode 101 = Control_c
|
||||
keycode 102 = Find
|
||||
keycode 103 = Up
|
||||
keycode 104 = Prior
|
||||
Index: kbd-1.15.2/data/keymaps/i386/qwerty/ua-utf-ws.map
|
||||
===================================================================
|
||||
--- kbd-1.15.2.orig/data/keymaps/i386/qwerty/ua-utf-ws.map
|
||||
+++ kbd-1.15.2/data/keymaps/i386/qwerty/ua-utf-ws.map
|
||||
@@ -1526,6 +1526,7 @@ ctrll keycode 100 = CtrlR_Lock
|
||||
ctrlr keycode 100 = CtrlR_Lock
|
||||
ctrll ctrlr keycode 100 = CtrlR_Lock
|
||||
keycode 101 = Break
|
||||
+ control keycode 101 = Control_c
|
||||
keycode 102 = Find
|
||||
keycode 103 = Up
|
||||
keycode 104 = Prior
|
||||
Index: kbd-1.15.2/data/keymaps/i386/qwerty/ua-utf.map
|
||||
===================================================================
|
||||
--- kbd-1.15.2.orig/data/keymaps/i386/qwerty/ua-utf.map
|
||||
+++ kbd-1.15.2/data/keymaps/i386/qwerty/ua-utf.map
|
||||
@@ -1516,6 +1516,7 @@ ctrll keycode 100 = CtrlR_Lock
|
||||
ctrlr keycode 100 = CtrlR_Lock
|
||||
ctrll ctrlr keycode 100 = CtrlR_Lock
|
||||
keycode 101 = Break
|
||||
+ control keycode 101 = Control_c
|
||||
keycode 102 = Find
|
||||
keycode 103 = Up
|
||||
keycode 104 = Prior
|
||||
Index: kbd-1.15.2/data/keymaps/i386/qwerty/ua-ws.map
|
||||
===================================================================
|
||||
--- kbd-1.15.2.orig/data/keymaps/i386/qwerty/ua-ws.map
|
||||
+++ kbd-1.15.2/data/keymaps/i386/qwerty/ua-ws.map
|
||||
@@ -1521,6 +1521,7 @@ keycode 99 = VoidSymbol
|
||||
alt keycode 99 = Control_backslash
|
||||
keycode 100 = Alt
|
||||
keycode 101 = Break
|
||||
+ control keycode 101 = Control_c
|
||||
keycode 102 = Find
|
||||
keycode 103 = Up
|
||||
keycode 104 = Prior
|
||||
Index: kbd-1.15.2/data/keymaps/i386/qwerty/ua.map
|
||||
===================================================================
|
||||
--- kbd-1.15.2.orig/data/keymaps/i386/qwerty/ua.map
|
||||
+++ kbd-1.15.2/data/keymaps/i386/qwerty/ua.map
|
||||
@@ -1515,6 +1515,7 @@ ctrll keycode 100 = CtrlR_Lock
|
||||
ctrlr keycode 100 = CtrlR_Lock
|
||||
ctrll ctrlr keycode 100 = CtrlR_Lock
|
||||
keycode 101 = Break
|
||||
+ control keycode 101 = Control_c
|
||||
keycode 102 = Find
|
||||
keycode 103 = Up
|
||||
keycode 104 = Prior
|
||||
Index: kbd-1.15.2/data/keymaps/i386/qwerty/us-acentos.map
|
||||
===================================================================
|
||||
--- kbd-1.15.2.orig/data/keymaps/i386/qwerty/us-acentos.map
|
||||
+++ kbd-1.15.2/data/keymaps/i386/qwerty/us-acentos.map
|
||||
@@ -194,6 +194,7 @@ keycode 99 = VoidSymbol
|
||||
alt keycode 99 = Control_backslash
|
||||
keycode 100 = AltGr
|
||||
keycode 101 = Break
|
||||
+ control keycode 101 = Control_c
|
||||
keycode 102 = Find
|
||||
keycode 103 = Up
|
||||
keycode 104 = Prior
|
||||
Index: kbd-1.15.2/data/keymaps/i386/qwertz/cz-us-qwertz.map
|
||||
===================================================================
|
||||
--- kbd-1.15.2.orig/data/keymaps/i386/qwertz/cz-us-qwertz.map
|
||||
+++ kbd-1.15.2/data/keymaps/i386/qwertz/cz-us-qwertz.map
|
||||
@@ -135,6 +135,7 @@ control keycode 99 = Control_backslash
|
||||
alt keycode 99 = Control_backslash
|
||||
keycode 100 = AltGr
|
||||
keycode 101 = Break
|
||||
+control keycode 101 = Control_c
|
||||
keycode 102 = Find
|
||||
keycode 103 = Up
|
||||
keycode 104 = Prior Scroll_Backward Prior Scroll_Backward VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol
|
||||
Index: kbd-1.15.2/data/keymaps/i386/qwertz/sk-prog-qwertz.map
|
||||
===================================================================
|
||||
--- kbd-1.15.2.orig/data/keymaps/i386/qwertz/sk-prog-qwertz.map
|
||||
+++ kbd-1.15.2/data/keymaps/i386/qwertz/sk-prog-qwertz.map
|
||||
@@ -122,6 +122,7 @@ keycode 99 = VoidSymbol
|
||||
alt keycode 99 = Control_backslash
|
||||
keycode 100 = AltGr
|
||||
keycode 101 = Break
|
||||
+ control keycode 101 = Control_c
|
||||
keycode 102 = Find
|
||||
keycode 103 = Up
|
||||
keycode 104 = Prior
|
10
kbd-1.15.2-sv-latin1-keycode10.patch
Normal file
10
kbd-1.15.2-sv-latin1-keycode10.patch
Normal file
@@ -0,0 +1,10 @@
|
||||
--- kbd-1.12/data/keymaps/i386/qwerty/sv-latin1.map.orig 2007-07-17 12:33:52.000000000 +0200
|
||||
+++ kbd-1.12/data/keymaps/i386/qwerty/sv-latin1.map 2007-07-17 12:36:34.855389000 +0200
|
||||
@@ -42,6 +42,7 @@
|
||||
alt keycode 9 = Meta_eight
|
||||
keycode 10 = nine parenright bracketright
|
||||
alt keycode 10 = Meta_nine
|
||||
+ control altgr keycode 10 = Control_bracketright
|
||||
keycode 11 = zero equal braceright
|
||||
alt keycode 11 = Meta_zero
|
||||
keycode 12 = plus question backslash
|
@@ -1,17 +1,26 @@
|
||||
Index: kbd-2.7.1/src/loadkeys.c
|
||||
Index: b/src/loadkeys.c
|
||||
===================================================================
|
||||
--- kbd-2.7.1.orig/src/loadkeys.c
|
||||
+++ kbd-2.7.1/src/loadkeys.c
|
||||
@@ -24,7 +24,12 @@
|
||||
--- a/src/loadkeys.c
|
||||
+++ b/src/loadkeys.c
|
||||
@@ -26,6 +26,8 @@
|
||||
#include "keymap.h"
|
||||
|
||||
#include "libcommon.h"
|
||||
|
||||
+#define XKBKEYMAPDIR KEYMAPDIR "/xkb"
|
||||
+#define LEGACYKEYMAPDIR KEYMAPDIR "/legacy"
|
||||
+
|
||||
static const char *const dirpath1[] = {
|
||||
+ DATADIR "/" XKBKEYMAPDIR "/",
|
||||
+ DATADIR "/" LEGACYKEYMAPDIR "/**",
|
||||
DATADIR "/" KEYMAPDIR "/**",
|
||||
KERNDIR "/",
|
||||
NULL
|
||||
Index: b/src/paths.h
|
||||
===================================================================
|
||||
--- a/src/paths.h
|
||||
+++ b/src/paths.h
|
||||
@@ -5,6 +5,8 @@
|
||||
* The following five subdirectories are defined:
|
||||
*/
|
||||
#define KEYMAPDIR "keymaps"
|
||||
+#define XKBKEYMAPDIR "keymaps/xkb"
|
||||
+#define LEGACYKEYMAPDIR "keymaps/legacy"
|
||||
#define UNIMAPDIR "unimaps"
|
||||
#define TRANSDIR "consoletrans"
|
||||
#define VIDEOMODEDIR "videomodes"
|
||||
|
10
kbd-2.0.2-doshell-reference.patch
Normal file
10
kbd-2.0.2-doshell-reference.patch
Normal file
@@ -0,0 +1,10 @@
|
||||
Index: docs/man/man1/openvt.1
|
||||
===================================================================
|
||||
--- a/docs/man/man1/openvt.1.orig 2013-08-27 22:45:33.000000000 +0200
|
||||
+++ b/docs/man/man1/openvt.1 2014-09-12 11:48:08.465988937 +0200
|
||||
@@ -92,5 +92,4 @@
|
||||
|
||||
.SH "SEE ALSO"
|
||||
.BR chvt (1),
|
||||
-.BR doshell (8),
|
||||
.BR login (1)
|
@@ -91,3 +91,15 @@ diff -Ndurp kbd-2.0.2/contrib/showconsolefont kbd-2.0.2-fix-bashisms/contrib/sho
|
||||
done
|
||||
-echo -ne "\033%@"
|
||||
+printf "\033%%@"
|
||||
diff -Ndurp kbd-2.0.2/rc/suse-kbd.rc kbd-2.0.2-fix-bashisms/rc/suse-kbd.rc
|
||||
--- kbd-2.0.2/rc/suse-kbd.rc 2012-02-27 12:27:11.000000000 +0200
|
||||
+++ kbd-2.0.2-fix-bashisms/rc/suse-kbd.rc 2014-10-19 23:00:34.475266064 +0300
|
||||
@@ -76,7 +76,7 @@ case "$1" in
|
||||
else
|
||||
return=$rc_failed
|
||||
fi
|
||||
- echo -e "Loading keymap ${retmsg#Loading*/usr/lib/kbd/keymaps/*/}${return}"
|
||||
+ printf "Loading keymap ${retmsg#Loading*/usr/lib/kbd/keymaps/*/}${return}\n"
|
||||
;;
|
||||
stop)
|
||||
;;
|
||||
|
BIN
kbd-2.6.4-repack.tar.xz
(Stored with Git LFS)
Normal file
BIN
kbd-2.6.4-repack.tar.xz
(Stored with Git LFS)
Normal file
Binary file not shown.
@@ -1,42 +0,0 @@
|
||||
From eebaa3b69efd9e3d218f3436dc43ff3340020ef5 Mon Sep 17 00:00:00 2001
|
||||
From: Alexey Gladkov <legion@kernel.org>
|
||||
Date: Fri, 3 Jan 2025 12:54:18 +0100
|
||||
Subject: [PATCH] Restore the old behavior when using gzip
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Commit b2f454b ("Add option to control keymaps compression") removed -n
|
||||
option from gzip invocation, the absence of which makes gzip write file
|
||||
timestamps into compressed .gz files. These timestamps vary from one
|
||||
build to another, and so the resulting installed .gz files are
|
||||
non-reproducible.
|
||||
|
||||
Since not all archivers understand this option it is impossible to add
|
||||
it for all archivers by default.
|
||||
|
||||
But we can bring back the default behavior (the case where no configure
|
||||
options were specified) by using “gzip -n” as the archiver.
|
||||
|
||||
Link: https://github.com/legionus/kbd/issues/124
|
||||
Fixes: b2f454bd ("Add option to control keymaps compression")
|
||||
Signed-off-by: Alexey Gladkov <legion@kernel.org>
|
||||
---
|
||||
configure.ac | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 5e951815..33a9afad 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -188,8 +188,8 @@ AC_ARG_ENABLE(compress,
|
||||
[enable_compress=$enableval], [enable_compress=auto])
|
||||
|
||||
AS_IF([test "x$enable_compress" = xno], [],
|
||||
- [test "x$enable_compress" = xyes], [AC_CHECK_PROGS([COMPRESS_PROG], [zstd xz bzip2 gzip])],
|
||||
- [test "x$enable_compress" = xauto], [AC_CHECK_PROGS([COMPRESS_PROG], [gzip])],
|
||||
+ [test "x$enable_compress" = xyes], [AC_CHECK_PROGS([COMPRESS_PROG], [zstd xz bzip2 "gzip -n"])],
|
||||
+ [test "x$enable_compress" = xauto], [AC_CHECK_PROGS([COMPRESS_PROG], ["gzip -n"])],
|
||||
[AC_CHECK_PROGS([COMPRESS_PROG], ["$enable_compress"])])
|
||||
AM_CONDITIONAL(ENABLE_COMPRESS, test "x$COMPRESS_PROG" != "x")
|
||||
|
@@ -1,17 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQJGBAABCAAwFiEEfyo9BymBSaB5PJpOpFq6VEz/1DQFAmdgZGYSHGxlZ2lvbkBr
|
||||
ZXJuZWwub3JnAAoJEKRaulRM/9Q0MJkP/3FJyt9vSh7HkBqQNXA4KBXnskRPwzES
|
||||
pQbAlMKOoecaIyOZcVFzS09HqZkqEDtJfJuCR9bZG56g0tN1yZbrhDhDPXxOZ0sI
|
||||
uAoM9IGpA4kLjRyqQsAwMpp6ZihTquVToz5FMqQMDxFiCGvxLMsl8phF39EcAYGs
|
||||
98B8J1+OQ1hmRrtreAq6G1mQrxMYOk67rWJaj5pAhzrk1Fg9aLc0facjgYJ3cb42
|
||||
c3YvphmLveTHXJEKVoOmZ913eMKF22IBK4rptJkOZbWnO4C7Fn8ZXTaAvRlwXtIZ
|
||||
PnnFO0TSsewyqex2P9/FQ1EoHF987wk0UuwmZ47uZsnXlHAfgGUz8K1TMUVzNYyL
|
||||
upKy5L1xfdsCP5+AVo3zzHpIZ38zkqy8TV1PoYAdBrml2DT8OWo9gCMFbjDAOYNB
|
||||
B37E6DjWhICDPVMp7nlQTa42Qmft+l6O6JhmOAAjThKwxh5lnU3RunrAebJx6tgO
|
||||
LWnnJVjhuHVrrAsYclORSkCSriy4m/mgVYThNatjyj2DYJohB4k1vgcelYpRRdaU
|
||||
Ou0ATM8+gabN0O2nmV7rWrFYVncbiyxWDRGnKtCTHA3UOsmFZC+0OY4ATNphw+M+
|
||||
+jAqHvyjMlmt9gsemP2cbQcShYEm8Q0wDbKU40+aFgc6ZK/HW4+4Tdli9HPptEtz
|
||||
6LX7z/xld8/j
|
||||
=zRnN
|
||||
-----END PGP SIGNATURE-----
|
BIN
kbd-2.7.1.tar.xz
(Stored with Git LFS)
BIN
kbd-2.7.1.tar.xz
(Stored with Git LFS)
Binary file not shown.
109
kbd.changes
109
kbd.changes
@@ -1,115 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Mar 29 07:20:48 UTC 2025 - Bernhard Wiedemann <bwiedemann@suse.com>
|
||||
|
||||
- Add kbd-2.7.1-reproducible-gzip.patch (bsc#1240348)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 6 14:12:33 UTC 2025 - Stanislav Brabec <sbrabec@suse.com>
|
||||
|
||||
- Update to version 2.7.1:
|
||||
* setfont: Fixed regression in argument parsing.
|
||||
* dumpkeys: Fixed dumpkeys on pc and non-pc architectures.
|
||||
* libkeymap: Add API to get/set keymap keywords.
|
||||
Export functions to convert the value to kernel code.
|
||||
Fix double kbdfile open.
|
||||
Dump action codes for keycode 0.
|
||||
* libkfont: Fix buffer allocation for doubled font.
|
||||
Check console mode.
|
||||
* keymaps:
|
||||
Add hcesar layout, for portuguese speaking countries.
|
||||
Update Colemak-DH keymaps with upstream changes.
|
||||
sv-latin1.map: make Ctrl+AltGr+9 act as Ctrl+].
|
||||
* fonts:
|
||||
Remove non-free Agafari fonts. (bnc#95915,
|
||||
remove repack_kbd.sh)
|
||||
* other:
|
||||
Update man pages.
|
||||
Remove deprecated startup scripts.
|
||||
(Refresh kbd-2.0.2-fix-bashisms.patch.)
|
||||
Remove outdated docs.
|
||||
(Drop kbd-1.15.2-docu-X11R6-xorg.patch.)
|
||||
Update translations.
|
||||
- Drop upstreamed patches: kbd-1.15.2-sv-latin1-keycode10.patch,
|
||||
kbd-2.0.2-doshell-reference.patch.
|
||||
- Refresh kbd-1.15.5-loadkeys-search-path.patch.
|
||||
- Releases are signed, add kbd.keyring and the signature.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 6 10:56:56 UTC 2025 - Stanislav Brabec <sbrabec@suse.com>
|
||||
|
||||
- sysconfig.keyboard: KBD_NUMLOCK="bios" works only on systems
|
||||
without Secure Boot. Document that. Change the default to
|
||||
KBD_NUMLOCK="no". (boo#1212141)
|
||||
- kbdsettings-nox86.patch: Update and return missing chunk.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 2 23:12:19 UTC 2025 - Stanislav Brabec <sbrabec@suse.com>
|
||||
|
||||
- Remove obsolete parts of suse-add.tar.bz2 (jsc#PED-7977),
|
||||
possible BREAKING CHANGES for obscure configurations:
|
||||
* Replace consolefonts/Cyr_a8x*.psf with upstream instances.
|
||||
* Replace consolefonts/cp850-full-8x*.psfu with upstream
|
||||
instances.
|
||||
* Drop consolefonts/lat5--*.psfu in favor of upstream
|
||||
lat5-*.psfu, exactly the same fonts with a better unimap.
|
||||
* Drop consolefonts/lat7.psf as it is lat7a-16.psf in the
|
||||
upstream.
|
||||
* Drop consolefonts/lt-brim-8x14.psfu in favor of upstream
|
||||
lat7a-14.psfu, exactly the same fonts with a better unimap.
|
||||
* Drop keymaps/i386/qwerty/Pl02.map in favor of nearly equal
|
||||
upstream pl2.map.
|
||||
* Drop keymaps/i386/qwerty/br-abnt-alt.map in favor of nearly
|
||||
equal upstream br-abnt.map.
|
||||
* Drop keymaps/i386/qwerty/tj_alt-UTF8.map that is already
|
||||
upstreamed.
|
||||
* Drop unimaps/iso07*.uni that is already upstreamed.
|
||||
- Remove broken KBD_DISABLE_CAPS_LOCK feature (sysconfig.keyboard,
|
||||
kbdsettings, boo#1179897, jsc#PED-7814).
|
||||
Can be replaced by KEYMAP="{my map} disable.capslock" in
|
||||
/etc/vconsole.conf.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 22 08:34:18 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Enable libkfont
|
||||
- Rename libkeymap-devel to just kbd-devel (the recommendation is
|
||||
to reuse the SRPM base name)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 17 10:06:59 UTC 2024 - Stanislav Brabec <sbrabec@suse.com>
|
||||
|
||||
- Fix subpackage names and their dependencies.
|
||||
- Add missing ldconfig scriptlets.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 3 09:46:00 UTC 2024 - Tobias Görgens <tobi.goergens@gmail.com>
|
||||
|
||||
- Build libkeymap and create additional subpackages.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 8 18:22:42 UTC 2024 - Stanislav Brabec <sbrabec@suse.com>
|
||||
Wed Apr 17 15:35:26 UTC 2024 - Stanislav Brabec <sbrabec@suse.com>
|
||||
|
||||
- Move legacy keymaps that have no acceptable xkb counterpart and
|
||||
its includes back to kbd. (bsc#1194609)
|
||||
- Stop requiring kbd-legacy. All YaST supported languages should
|
||||
now have its keymaps in kbd.
|
||||
- Remove kbd-1.15.2-prtscr_no_sigquit.patch rejected by the
|
||||
upstream. The problem is fixed for a long time, this is an
|
||||
additional modification. (PED-7977,
|
||||
https://github.com/legionus/kbd/pull/111):
|
||||
- Drop kbd_fonts.tar.bz2 containing just several 30 years old
|
||||
inferior fonts with an unknown author and uncertain license.
|
||||
- Add structured comments to patches.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 1 11:42:56 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
|
||||
|
||||
- fix conversion of lowercase f in de-e1 keymap (boo#1207841)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 22 12:40:21 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Use %patch -P N instead of deprecated %patchN.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 22 18:26:49 UTC 2023 - Antonio Teixeira <antonio.teixeira@suse.com>
|
||||
|
84
kbd.keyring
84
kbd.keyring
@@ -1,84 +0,0 @@
|
||||
pub rsa4096 2012-01-04 [SC]
|
||||
7F2A3D07298149A0793C9A4EA45ABA544CFFD434
|
||||
uid [ unknown] Alexey Gladkov <legion@kernel.org>
|
||||
uid [ unknown] Alexey Gladkov <agladkov@redhat.com>
|
||||
uid [ unknown] Alexey Gladkov <gladkov.alexey@gmail.com>
|
||||
sub rsa4096 2012-01-04 [E]
|
||||
9C065A307CEF8A5A718339BFE4BEDE5BAEC8BACC
|
||||
|
||||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
|
||||
mQINBE8E1rgBEACS11V2AGKefqobEq1jvurx8yek7mdHA7Wf7XNCGq1C+uA+/5ou
|
||||
wOG4C6G26jv/OHBYdK093ULR0QUCrsAdaN9HEKRfBbYUnthZ02wTE/Z+9QtIZI4H
|
||||
2ok4uooKM5F0esR1f4DuUkNIRcCOPZFODzycxDNgS3rea1n1i6sKvu631iqzi+ZW
|
||||
A/fGwJR121ofbMyolJpVu8grKmSseQ0KDPJSc98AWvD81N2xoRVxf94pKALJmODP
|
||||
AGUb1vQPcphzjucByAVaqXbnkEDB9iid+OHwfTKi/YAwJIsl1Lpkb9Amc+4ywgIk
|
||||
WDHoyvtxWz6sMbdSI+KzvThNVKGrZH7BU/aAUkk1zrMsvWAh2WjACnlNR5rKodY4
|
||||
nu9zId/XHDx1X4ViEgRgix1lRW2HOJm9/EUEz9AB0lAMG0ooZctS/eGM20UwIC8d
|
||||
Zt1KvbVtEKbtU2+J7VXN59MBciqanwUzQwJwxZD5ywPmBIrkrVUdWRCeG+tGMtm0
|
||||
/D7I1rSwyMPL2b5EEqtDlRW04vXuqbkufBYUELtfLsbYu5N/ot1wrK6D4BNMgmv3
|
||||
d2/Z6R3wxIoiVDd7pkSLvV30TfpWz6NpyKLbEiSs0fLQNEkQqNRpxcEhNIhrvxC5
|
||||
WfTL0rvj0uTZaRBpZ2u6zWCZLR09c4Y33R869wWF4ODW2dX8ApcQhhHOEQARAQAB
|
||||
tCRBbGV4ZXkgR2xhZGtvdiA8YWdsYWRrb3ZAcmVkaGF0LmNvbT6JAjgEEwECACIF
|
||||
AlmOF9oCGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEKRaulRM/9Q0sRwP
|
||||
/0EMbTvbEH62WyKExFaECPtaIfAZxZymJzH8hePREGGV8m+Z1auOvE7FTPKzBkPh
|
||||
X7mILC+QFzryNuPvT85WToyxdlLg8QRh0FI6Ocx8ydcnQI82jnwB9oejHO7c936M
|
||||
xiQSCo7Que0T8EE2yglNTry5MQlSCVAwNxZG8Zdkb4MHDn66bLhlKqhZCriya2ww
|
||||
QdHvAFsoDdnWHBSA9Vb7prP1bh1BItzxiuRbQWmtLCS0bDIzQLPDukyLSZiHbI4L
|
||||
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
|
||||
=I9A/
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
118
kbd.spec
118
kbd.spec
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package kbd
|
||||
#
|
||||
# Copyright (c) 2025 SUSE LLC
|
||||
# Copyright (c) 2023 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -24,19 +24,19 @@
|
||||
%define legacy_folders amiga,atari,include,mac,pine,ppc,sun
|
||||
|
||||
Name: kbd
|
||||
Version: 2.7.1
|
||||
Version: 2.6.4
|
||||
Release: 0
|
||||
Summary: Keyboard and Font Utilities
|
||||
# git: git://git.altlinux.org/people/legion/packages/kbd.git
|
||||
License: GPL-2.0-or-later AND GPL-3.0-or-later
|
||||
Group: System/Console
|
||||
URL: http://kbd-project.org/
|
||||
Source: https://www.kernel.org/pub/linux/utils/kbd/%{name}-%{version}.tar.xz
|
||||
Source1: https://www.kernel.org/pub/linux/utils/kbd/%{name}-%{version}.tar.sign
|
||||
# repack_kbd.sh on https://www.kernel.org/pub/linux/utils/kbd/kbd-%%{version}.tar.xz
|
||||
Source: %{name}-%{version}-repack.tar.xz
|
||||
Source1: kbd_fonts.tar.bz2
|
||||
Source2: suse-add.tar.bz2
|
||||
Source3: README.SUSE
|
||||
Source4: vlock.pamd
|
||||
Source5: kbd.keyring
|
||||
Source8: sysconfig.console
|
||||
Source9: sysconfig.keyboard
|
||||
Source10: autogen.sh
|
||||
@@ -47,29 +47,29 @@ Source20: kbdsettings
|
||||
Source21: kbdsettings.service
|
||||
Source22: numlockbios.c
|
||||
Source42: convert-kbd-mac.sed
|
||||
Source43: repack_kbd.sh
|
||||
Source44: xml2lst.pl
|
||||
Source45: genmap4systemd.sh
|
||||
# PATCH-FEATURE-SUSE kbd-1.15.2-unicode_scripts.patch -- To be able to use bold, only fonts with 256 glyphs can be used. Therefore we prefer the font specified in /etc/sysconfig/console.
|
||||
Patch0: kbd-1.15.2-prtscr_no_sigquit.patch
|
||||
# PATCH-FIX-UPSTREAM
|
||||
Patch2: kbd-1.15.2-unicode_scripts.patch
|
||||
# PATCH-FIX-OPENSUSE kbd-2.0.2-euro-unicode.patch pgajdos@suse.cz joehtg@joehtg.co.at boo360993 -- Use Unicode Euro symbol instead of the currency symbol. Not upstreamable as it breaks 8-bit environment using false ISO-8859-1 and ISO-8859-9 naps mapping currency to euro.
|
||||
Patch3: kbd-1.15.2-docu-X11R6-xorg.patch
|
||||
Patch4: kbd-1.15.2-sv-latin1-keycode10.patch
|
||||
Patch10: kbd-2.0.2-doshell-reference.patch
|
||||
Patch11: kbd-2.0.2-euro-unicode.patch
|
||||
# PATCH-FIX-OPENSUSE kbd-2.0.2-fix-bashisms.patch ledest@gmail.com -- Fix bash specific code.
|
||||
Patch12: kbd-2.0.2-fix-bashisms.patch
|
||||
# PATCH-FEATURE-SUSE kbd-1.15.5-loadkeys-search-path.patch openSUSE FATE#318355 sle FATE#318426 sndirsch@suse.com -- Add xkb and legacy keymaps subdirs to loadkyes search path.
|
||||
# Patch13: adds xkb and legacy keymaps subdirs to loadkyes search path
|
||||
# (openSUSE FATE#318355, sle FATE#318426)
|
||||
Patch13: kbd-1.15.5-loadkeys-search-path.patch
|
||||
# PATCH-FEATURE-OPENSUSE kbdsettings-nox86.patch sbrabec@suse.cz -- Disable "bios" option for NumLock settings on non x86 platforms.
|
||||
Patch14: kbdsettings-nox86.patch
|
||||
# PATCH-FIX-SLE kbd-unicode-fxxx.patch sbrabec@suse.com bsc1085432 -- Do not cause error on UNICODE characters >= 0xF000 (e. g. ligature fi)
|
||||
Patch15: kbd-unicode-fxxx.patch
|
||||
# PATCH-FIX-UPSTREAM bsc#1240348 -- for reproducible builds
|
||||
Patch16: https://github.com/legionus/kbd/commit/eebaa3b69efd9e3d218f3436dc43ff3340020ef5.patch#/kbd-2.7.1-reproducible-gzip.patch
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: bison
|
||||
BuildRequires: check-devel
|
||||
BuildRequires: console-setup
|
||||
# TODO: The documentation generated by doxygen does not contain any valuable data
|
||||
#BuildRequires: doxygen
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: flex
|
||||
BuildRequires: gcc >= 4.6
|
||||
@@ -80,7 +80,7 @@ BuildRequires: suse-module-tools
|
||||
BuildRequires: xkeyboard-config
|
||||
BuildRequires: xz
|
||||
Requires(post): coreutils
|
||||
Requires(postun): coreutils
|
||||
Requires(postun):coreutils
|
||||
Requires(pre): %fillup_prereq
|
||||
Provides: vlock = 2.2.3
|
||||
Obsoletes: vlock <= 2.2.3
|
||||
@@ -104,45 +104,10 @@ BuildArch: noarch
|
||||
The %{name}-legacy package contains original keymaps for kbd package.
|
||||
Please note that %{name}-legacy is not helpful without kbd.
|
||||
|
||||
%package -n libkbdfile1
|
||||
Summary: File I/O library for kbd utilities
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n libkbdfile1
|
||||
libkbdfile contains file access routines for kbd.
|
||||
|
||||
%package -n libkeymap1
|
||||
Summary: Keymap library for kbd utilities
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n libkeymap1
|
||||
libkeymap contains routines for exchanging keyboard mappings
|
||||
with the Linux kernel for the Linux virtual console (vtcon).
|
||||
|
||||
%package -n libkfont0
|
||||
Summary: Font I/O library for kbd utilities
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n libkfont0
|
||||
libkfont contains routines for reading/writing PSF fonts, screen maps
|
||||
and Unicode maps/tables for kbd.
|
||||
|
||||
%package devel
|
||||
Summary: Header files for kbd libraries
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libkbdfile1 = %{version}
|
||||
Requires: libkeymap1 = %{version}
|
||||
Requires: libkfont0 = %{version}
|
||||
|
||||
%description devel
|
||||
This subpackage contains header files and toolchain metadata for
|
||||
building programs utilizing the kbd component libraries libkbdfile,
|
||||
libkfont and libkeymap.
|
||||
|
||||
%define kbd %{_datadir}/kbd
|
||||
|
||||
%prep
|
||||
%setup -q -a 2 -n kbd-%{version}
|
||||
%setup -q -a 1 -a 2 -n kbd-%{version}
|
||||
|
||||
cp -fp %{SOURCE8} .
|
||||
cp -fp %{SOURCE9} .
|
||||
@@ -154,7 +119,7 @@ cp -fp %{SOURCE21} .
|
||||
cp -fp %{SOURCE22} .
|
||||
%autopatch -p1
|
||||
%ifarch %{ix86} x86_64
|
||||
%patch -P 14 -p1 -R
|
||||
%patch14 -p1 -R
|
||||
%endif
|
||||
|
||||
%build
|
||||
@@ -178,13 +143,11 @@ chmod 755 autogen.sh
|
||||
%configure \
|
||||
--disable-silent-rules \
|
||||
--datadir=%{kbd} \
|
||||
--docdir=%{_defaultdocdir}/kbd \
|
||||
--enable-nls \
|
||||
--localedir=%{_datadir}/locale \
|
||||
--enable-optional-progs \
|
||||
--disable-static \
|
||||
--enable-libkeymap --enable-libkfont
|
||||
%make_build
|
||||
--disable-static
|
||||
make %{?_smp_mflags}
|
||||
gcc %{optflags} -o fbtest $RPM_SOURCE_DIR/fbtest.c
|
||||
%ifarch %{ix86} x86_64
|
||||
gcc %{optflags} -o numlockbios $RPM_SOURCE_DIR/numlockbios.c
|
||||
@@ -194,25 +157,30 @@ font=data/consolefonts/lat2a-16.psfu
|
||||
./src/psfxtable -i $font -it data/unimaps/lat2u.uni \
|
||||
-o t.psfu
|
||||
mv t.psfu $font
|
||||
%make_build
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
mkdir -p %{buildroot}%{_sbindir}
|
||||
DOC=%{buildroot}%{_defaultdocdir}/kbd
|
||||
KBD=%{kbd}
|
||||
K=%{buildroot}$KBD
|
||||
mkdir -p $K/consolefonts
|
||||
# First install the fonts from the kbd_fonts directory
|
||||
# (allowing kbd to overwrite some of them)
|
||||
mkdir -p $DOC/fonts
|
||||
install -m 644 fonts/README $DOC/fonts/README.fonts
|
||||
install -m 644 fonts/*/* $K/consolefonts/
|
||||
# Now call kbd install
|
||||
echo "# Now call kbd install DESTDIR=%{buildroot} DATA_DIR=%{kbd} MAN_DIR=%{_mandir}"
|
||||
make DESTDIR=%{buildroot} DATA_DIR=%{kbd} MAN_DIR=%{_mandir} install
|
||||
rm %{buildroot}%{_libdir}/*.la
|
||||
# ln -s iso01-12x22.psfu $K/consolefonts/suse12x22.psfu
|
||||
cp -a data/consolefonts/README* $DOC/fonts/
|
||||
install -m 644 data/consolefonts/README* $DOC/fonts/
|
||||
mkdir -p $DOC/doc/
|
||||
cp -a docs/doc/{A20,dvorak,font-formats,pine,iso8859.info,keysyms.h.info} $DOC/doc/
|
||||
install -m 644 docs/doc/keysyms.h.info docs/doc/kbd.FAQ.txt docs/doc/kbd.FAQ*.html docs/doc/README* docs/doc/TODO $DOC/doc/
|
||||
install -m 644 docs/doc/as400.kbd docs/doc/console.docs docs/doc/repeat/set_kbd_repeat-2 $DOC/doc/
|
||||
echo "See %{_datadir}/i18/charmaps for a description of char maps" >$DOC/doc/README.charmaps
|
||||
cp -a CREDITS README $DOC/
|
||||
cp -a %{SOURCE3} $DOC/
|
||||
install -m 644 CREDITS README $DOC/
|
||||
install -m 644 %{SOURCE3} $DOC/
|
||||
rm -f $K/consolefonts/README* $K/consolefonts/ERRORS.gz
|
||||
if ls $K/consolefonts/Agafari-* > /dev/null 2>&1; then
|
||||
echo "";
|
||||
@@ -358,10 +326,6 @@ while read line; do
|
||||
echo "$XKBLAYOUT" >> layouts-list.lst
|
||||
XKBVARIANT=`echo "$line" | cut -d " " -f 2`
|
||||
ckbcomp "$XKBLAYOUT" "$XKBVARIANT" > /tmp/"$XKBLAYOUT"-"$XKBVARIANT".map
|
||||
# fix conversion of lowercase f in de-e1 keymap (boo#1207841)
|
||||
if [ "$XKBLAYOUT-$XKBVARIANT" == "de-e1" ]; then
|
||||
sed -i 's/^plain keycode 33 = AltGr/plain keycode 33 = +U+0066/' /tmp/"$XKBLAYOUT"-"$XKBVARIANT".map
|
||||
fi
|
||||
# skip converted layouts which cannot input ASCII (rh#1031848)
|
||||
grep -q "U+0041" /tmp/"$XKBLAYOUT"-"$XKBVARIANT".map && \
|
||||
gzip -cn9 /tmp/"$XKBLAYOUT"-"$XKBVARIANT".map > %{buildroot}%{kbd}/keymaps/xkb/"$XKBLAYOUT"-"$XKBVARIANT".map.gz
|
||||
@@ -428,15 +392,11 @@ sed -i 's/^KBD_NUMLOCK="bios"/KBD_NUMLOCK="no"/' /etc/sysconfig/keyboard
|
||||
# Migration to /usr/etc.
|
||||
test -f /etc/pam.d/vlock.rpmsave && mv -v /etc/pam.d/vlock.rpmsave /etc/pam.d/vlock ||:
|
||||
|
||||
%ldconfig_scriptlets -n libkbdfile1
|
||||
%ldconfig_scriptlets -n libkeymap1
|
||||
%ldconfig_scriptlets -n libkfont0
|
||||
|
||||
%files -f %{name}.lang
|
||||
#config(noreplace) /etc/sysconfig/console
|
||||
%license COPYING
|
||||
%doc %{_defaultdocdir}/kbd
|
||||
#%%exclude %%{_defaultdocdir}/kbd/html
|
||||
#doc CREDITS README
|
||||
%{_fillupdir}/sysconfig.console
|
||||
%{_fillupdir}/sysconfig.keyboard
|
||||
%dir %{kbd}
|
||||
@@ -591,22 +551,4 @@ test -f /etc/pam.d/vlock.rpmsave && mv -v /etc/pam.d/vlock.rpmsave /etc/pam.d/vl
|
||||
%exclude %{kbd}/keymaps/i386/include/compose.inc
|
||||
%exclude %{kbd}/keymaps/i386/include/qwerty-layout.inc
|
||||
|
||||
%files -n libkbdfile1
|
||||
%{_libdir}/libkbdfile.so.*
|
||||
|
||||
%files -n libkeymap1
|
||||
%{_libdir}/libkeymap.so.*
|
||||
|
||||
%files -n libkfont0
|
||||
%{_libdir}/libkfont.so.*
|
||||
|
||||
%files devel
|
||||
#%%doc %%{_defaultdocdir}/kbd/html
|
||||
%{_includedir}/kbd
|
||||
%{_includedir}/kbdfile.h
|
||||
%{_includedir}/keymap.h
|
||||
%{_includedir}/kfont.h
|
||||
%{_libdir}/pkgconfig/*.pc
|
||||
%{_libdir}/libk*.so
|
||||
|
||||
%changelog
|
||||
|
BIN
kbd_fonts.tar.bz2
(Stored with Git LFS)
Normal file
BIN
kbd_fonts.tar.bz2
(Stored with Git LFS)
Normal file
Binary file not shown.
@@ -49,3 +49,7 @@ for i in NUM SCR CAPS; do
|
||||
esac
|
||||
done
|
||||
done
|
||||
|
||||
if [ "$KBD_DISABLE_CAPS_LOCK" = "yes" ]; then
|
||||
/usr/bin/dumpkeys | sed 's/ *58 *= *Caps_Lock/ 58 = Control/' | /usr/bin/loadkeys -q -
|
||||
fi
|
||||
|
@@ -1,33 +1,6 @@
|
||||
--- a/kbdsettings
|
||||
+++ b/kbdsettings
|
||||
@@ -25,24 +25,6 @@
|
||||
fi
|
||||
/usr/bin/setleds -D -$param < /dev/$tty
|
||||
;;
|
||||
- bios)
|
||||
- if [ -x /usr/libexec/kbd/numlockbios ]; then
|
||||
- bios=$(/usr/libexec/kbd/numlockbios 2>/dev/null)
|
||||
- else
|
||||
- bios=$(/usr/lib/kbd/numlockbios 2>/dev/null)
|
||||
- fi
|
||||
- if [ $param = "num" ]; then
|
||||
- if [ "$bios" = "on" ]; then
|
||||
- touch /run/numlock-on
|
||||
- /usr/bin/setleds -D +$param < /dev/$tty
|
||||
- elif [ "$bios" = "off" -o "$bios" = "unknown" ]; then
|
||||
- rm -f /run/numlock-on
|
||||
- /usr/bin/setleds -D -$param < /dev/$tty
|
||||
- fi
|
||||
- else
|
||||
- echo "Value $confval invalid for $conf"
|
||||
- fi
|
||||
- ;;
|
||||
*)
|
||||
echo "error: unknown value $confval in $conf"
|
||||
;;
|
||||
--- a/sysconfig.keyboard
|
||||
+++ b/sysconfig.keyboard
|
||||
@@ -15,11 +15,10 @@
|
||||
@@ -15,12 +15,12 @@
|
||||
# Keyboard repeat rate (2.0 - 30.0)
|
||||
KBD_RATE=""
|
||||
|
||||
@@ -37,8 +10,10 @@
|
||||
+## Default: no
|
||||
#
|
||||
-# NumLock on? ("yes" or "no" or "bios" for BIOS setting)
|
||||
-# "bios" requires access to BIOS settings. Does not work with Secure Boot and falls back to "no" there.
|
||||
+# NumLock on? ("yes" or "no")
|
||||
# This setting may interfere with GNOME /org/gnome/settings-daemon/peripherals/keyboard/remember-numlock-state DConf key.
|
||||
KBD_NUMLOCK="no"
|
||||
-KBD_NUMLOCK="bios"
|
||||
+KBD_NUMLOCK="no"
|
||||
|
||||
## Type: yesno
|
||||
## Default: no
|
||||
|
26
repack_kbd.sh
Normal file
26
repack_kbd.sh
Normal file
@@ -0,0 +1,26 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# repackage kbd source tar ball,
|
||||
# to remove fonts that forbid commercial distribution.
|
||||
#
|
||||
# 2005-07-11, jw@suse.de
|
||||
|
||||
tmpdir=`mktemp -d`
|
||||
in="$1"
|
||||
if [ -z $in ]; then
|
||||
echo "usage: $0 <tarball>"
|
||||
exit 1
|
||||
fi
|
||||
name="${in%.tar.*}"
|
||||
|
||||
# recent gnu tar can autodetect gzip / bzip2
|
||||
if ! tar xf "$in" -C $tmpdir; then
|
||||
rm -rf $tmpdir
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo removing files...
|
||||
find $tmpdir -iname \*agafari\* | tee /dev/tty | xargs rm
|
||||
tar Jcf $name-repack.tar.xz -C $tmpdir $name
|
||||
|
||||
rm -rf $tmpdir
|
BIN
suse-add.tar.bz2
(Stored with Git LFS)
BIN
suse-add.tar.bz2
(Stored with Git LFS)
Binary file not shown.
@@ -19,9 +19,8 @@ KBD_RATE=""
|
||||
## Default: bios
|
||||
#
|
||||
# NumLock on? ("yes" or "no" or "bios" for BIOS setting)
|
||||
# "bios" requires access to BIOS settings. Does not work with Secure Boot and falls back to "no" there.
|
||||
# This setting may interfere with GNOME /org/gnome/settings-daemon/peripherals/keyboard/remember-numlock-state DConf key.
|
||||
KBD_NUMLOCK="no"
|
||||
KBD_NUMLOCK="bios"
|
||||
|
||||
## Type: yesno
|
||||
## Default: no
|
||||
@@ -35,6 +34,17 @@ KBD_SCRLOCK="no"
|
||||
# CapsLock on? ("yes" or "no")
|
||||
KBD_CAPSLOCK="no"
|
||||
|
||||
## Type: yesno
|
||||
## Default: no
|
||||
#
|
||||
# Disable CAPS LOCK and make it a normal Shift key?
|
||||
# (Ctrl Caps Lock will still toggle Caps Lock functionality)
|
||||
# Note that you need to tweak the xkb maps or use xmodmap
|
||||
# if you want to do the same under X-Windows. In ~/.Xmodmap:
|
||||
# keycode 0x42 = Shift_L Shift_L
|
||||
#
|
||||
KBD_DISABLE_CAPS_LOCK="no"
|
||||
|
||||
## Type: string
|
||||
## Default:
|
||||
#
|
||||
|
Reference in New Issue
Block a user