Stanislav Brabec
8004b168a1
* 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.
- Build documentation with doxygen.
kbdsettings, boo#1179897, jsc#PED-7814).
OBS-URL: https://build.opensuse.org/package/show/Base:System/kbd?expand=0&rev=182
94 lines
3.1 KiB
Diff
94 lines
3.1 KiB
Diff
diff -Ndurp kbd-2.0.2/contrib/font2psf kbd-2.0.2-fix-bashisms/contrib/font2psf
|
|
--- kbd-2.0.2/contrib/font2psf 2012-02-27 12:27:10.000000000 +0200
|
|
+++ kbd-2.0.2-fix-bashisms/contrib/font2psf 2014-10-19 23:07:11.719239190 +0300
|
|
@@ -1,4 +1,4 @@
|
|
-#!/bin/bash
|
|
+#!/bin/sh
|
|
#written by Martin Lohner, SuSE GmbH, Dec 1998
|
|
echo "This script converts 256 character font to psf-fonts"
|
|
echo "It simply assumes that all files in the current directory"
|
|
@@ -15,24 +15,21 @@ read a
|
|
random=hfdsvnpoh97k
|
|
if [ $a = y -o $a = Y ] ; then
|
|
echo "Creating psf-headers..."
|
|
- echo -ne "\066" > $random
|
|
- echo -ne "\004" >> $random
|
|
- echo -ne "\000" >> $random
|
|
+ printf "\066\004\000" > $random
|
|
|
|
-
|
|
- echo -ne "\006" > $random.6.tmp
|
|
+ printf "\006" > $random.6.tmp
|
|
cat $random $random.6.tmp > $random.6
|
|
- echo -ne "\010" > $random.8.tmp
|
|
+ printf "\010" > $random.8.tmp
|
|
cat $random $random.8.tmp > $random.8
|
|
- echo -ne "\012" > $random.10.tmp
|
|
+ printf "\012" > $random.10.tmp
|
|
cat $random $random.10.tmp > $random.10
|
|
- echo -ne "\014" > $random.12.tmp
|
|
+ printf "\014" > $random.12.tmp
|
|
cat $random $random.12.tmp > $random.12
|
|
- echo -ne "\016" > $random.14.tmp
|
|
+ printf "\016" > $random.14.tmp
|
|
cat $random $random.14.tmp > $random.14
|
|
- echo -ne "\020" > $random.16.tmp
|
|
+ printf "\020" > $random.16.tmp
|
|
cat $random $random.16.tmp > $random.16
|
|
- echo -ne "\023" > $random.19.tmp
|
|
+ printf "\023" > $random.19.tmp
|
|
cat $random $random.19.tmp > $random.19
|
|
|
|
for i in 6 8 10 12 14 16 19; do
|
|
diff -Ndurp kbd-2.0.2/contrib/psfsplit kbd-2.0.2-fix-bashisms/contrib/psfsplit
|
|
--- kbd-2.0.2/contrib/psfsplit 2012-02-27 12:27:10.000000000 +0200
|
|
+++ kbd-2.0.2-fix-bashisms/contrib/psfsplit 2014-10-19 22:53:02.271296655 +0300
|
|
@@ -11,17 +11,17 @@ then echo $1 -- non .psf file
|
|
exit
|
|
fi
|
|
size=`hexdump -e '/1 "%i" ' -n1 -s2 $1 `
|
|
-size=$[ ($size % 2 + 1) * 256 ]
|
|
+size=$((($size % 2 + 1) * 256))
|
|
height=`hexdump -e '/1 "%i" ' -n1 -s3 $1 `
|
|
echo $size chars, height=$height
|
|
mkdir $1_
|
|
-dd bs=4 count=1 if=$1 of=$1_/#psf_header &>/dev/null
|
|
+dd bs=4 count=1 if=$1 of=$1_/#psf_header >/dev/null 2>&1
|
|
i=0
|
|
-while let $[ i < $size ]
|
|
+while [ $i -lt $size ]
|
|
do
|
|
- dd bs=1 count=$height skip=$[ $i * $height + 4 ] if=$1 \
|
|
- of=$1_/`printf "%.3x" $i` &>/dev/null
|
|
- let i+=1
|
|
+ dd bs=1 count=$height skip=$(($i * $height + 4)) if=$1 \
|
|
+ of=$1_/`printf "%.3x" $i` >/dev/null 2>&1
|
|
+ i=$((i + 1))
|
|
done
|
|
-dd bs=1 skip=$[ $i * $height + 4 ] if=$1 of=$1_/map_tables &>/dev/null
|
|
+dd bs=1 skip=$(($i * $height + 4)) if=$1 of=$1_/map_tables >/dev/null 2>&1
|
|
|
|
diff -Ndurp kbd-2.0.2/contrib/showconsolefont kbd-2.0.2-fix-bashisms/contrib/showconsolefont
|
|
--- kbd-2.0.2/contrib/showconsolefont 2012-02-27 12:27:10.000000000 +0200
|
|
+++ kbd-2.0.2-fix-bashisms/contrib/showconsolefont 2014-10-19 22:58:03.106276304 +0300
|
|
@@ -5,16 +5,16 @@
|
|
# A small shell script version of the `showconsolefont' C program
|
|
#
|
|
|
|
-echo -e "\033%G"
|
|
+printf "\033%%G\n"
|
|
for L in "0 2 4 6" "1 3 5 7"; do
|
|
for P in 0 1 2 3 4 5 6 7; do
|
|
for U in 0 1 2 3; do
|
|
for K in $L; do
|
|
- echo -ne " \357\20$U\2$K$P"
|
|
+ printf " \357\20$U\2$K$P"
|
|
done
|
|
done
|
|
echo
|
|
done
|
|
echo
|
|
done
|
|
-echo -ne "\033%@"
|
|
+printf "\033%%@"
|