Update to kbd-2.0.3
This commit is contained in:
parent
5de5185191
commit
f6d95db93a
1
.gitignore
vendored
1
.gitignore
vendored
@ -20,3 +20,4 @@ kbd-1.15.tar.gz
|
||||
/kbd-2.0.1.tar.gz
|
||||
/kbdinfo.1
|
||||
/kbd-2.0.2.tar.xz
|
||||
/kbd-2.0.3.tar.xz
|
||||
|
@ -1,6 +1,6 @@
|
||||
diff -up kbd-1.15.2/man/man8/kbdrate.8.orig kbd-1.15.2/man/man8/kbdrate.8
|
||||
--- kbd-1.15.2/docs/man/man8/kbdrate.8.orig 2009-06-07 21:48:42.000000000 +0200
|
||||
+++ kbd-1.15.2/docs/man/man8/kbdrate.8 2011-01-05 12:58:34.579706016 +0100
|
||||
diff -up kbd-2.0.3/docs/man/man8/kbdrate.8.orig kbd-2.0.3/docs/man/man8/kbdrate.8
|
||||
--- kbd-2.0.3/docs/man/man8/kbdrate.8.orig 2015-07-14 13:42:43.799261110 +0200
|
||||
+++ kbd-2.0.3/docs/man/man8/kbdrate.8 2015-07-14 13:43:30.213459824 +0200
|
||||
@@ -22,7 +22,7 @@ Using
|
||||
without any options will reset the repeat rate to 10.9 characters per second (cps)
|
||||
and the delay to 250 milliseconds (ms) for Intel- and M68K-based systems.
|
||||
@ -10,16 +10,10 @@ diff -up kbd-1.15.2/man/man8/kbdrate.8.orig kbd-1.15.2/man/man8/kbdrate.8
|
||||
|
||||
.SH OPTIONS
|
||||
.TP
|
||||
@@ -69,3 +69,5 @@ When these ioctls fail an ioport interfa
|
||||
.I /etc/rc.local
|
||||
.br
|
||||
.I /dev/port
|
||||
+.br
|
||||
+.I /dev/kbd
|
||||
diff -up kbd-1.15.2/src/kbdrate.c.orig kbd-1.15.2/src/kbdrate.c
|
||||
--- kbd-1.15.2/src/kbdrate.c.orig 2011-01-05 12:53:45.186575833 +0100
|
||||
+++ kbd-1.15.2/src/kbdrate.c 2011-01-05 12:57:37.746753646 +0100
|
||||
@@ -108,9 +108,12 @@ static int valid_delays[] = { 250, 500,
|
||||
diff -up kbd-2.0.3/src/kbdrate.c.orig kbd-2.0.3/src/kbdrate.c
|
||||
--- kbd-2.0.3/src/kbdrate.c.orig 2015-07-14 13:43:49.463542240 +0200
|
||||
+++ kbd-2.0.3/src/kbdrate.c 2015-07-14 13:46:55.797330678 +0200
|
||||
@@ -109,9 +109,12 @@ static int valid_delays[] = { 250, 500,
|
||||
|
||||
static int
|
||||
KDKBDREP_ioctl_ok(double rate, int delay, int silent) {
|
||||
@ -32,7 +26,7 @@ diff -up kbd-1.15.2/src/kbdrate.c.orig kbd-1.15.2/src/kbdrate.c
|
||||
* Since 2.4.9 also on i386.
|
||||
*/
|
||||
struct my_kbd_repeat kbdrep_s;
|
||||
@@ -176,6 +179,9 @@ KDKBDREP_ioctl_ok(double rate, int delay
|
||||
@@ -174,6 +177,9 @@ KDKBDREP_ioctl_ok(double rate, int delay
|
||||
rate, kbdrep_s.delay );
|
||||
|
||||
return 1; /* success! */
|
||||
@ -42,7 +36,7 @@ diff -up kbd-1.15.2/src/kbdrate.c.orig kbd-1.15.2/src/kbdrate.c
|
||||
}
|
||||
|
||||
#ifndef KIOCSRATE
|
||||
@@ -226,7 +232,7 @@ sigalrmhandler( attr_unused int sig ) {
|
||||
@@ -222,7 +228,7 @@ sigalrmhandler(int sig __attribute__ ((u
|
||||
int
|
||||
main( int argc, char **argv ) {
|
||||
#ifdef __sparc__
|
||||
@ -51,21 +45,22 @@ diff -up kbd-1.15.2/src/kbdrate.c.orig kbd-1.15.2/src/kbdrate.c
|
||||
int delay = 200; /* Default delay */
|
||||
#else
|
||||
double rate = 10.9; /* Default rate */
|
||||
@@ -277,7 +283,9 @@ main( int argc, char **argv ) {
|
||||
@@ -272,8 +278,9 @@ main( int argc, char **argv ) {
|
||||
return 0;
|
||||
|
||||
|
||||
/* The ioport way */
|
||||
- /* The ioport way */
|
||||
+ /* The ioport way - will crash on sparc */
|
||||
|
||||
+#ifndef __sparc__
|
||||
for (i = 0; i < RATE_COUNT; i++)
|
||||
if (rate * 10 >= valid_rates[i]) {
|
||||
value &= 0x60;
|
||||
@@ -340,5 +348,7 @@ main( int argc, char **argv ) {
|
||||
@@ -331,5 +338,7 @@ main( int argc, char **argv ) {
|
||||
valid_rates[value & 0x1f] / 10.0,
|
||||
valid_delays[ (value & 0x60) >> 5 ] );
|
||||
|
||||
+#endif
|
||||
+
|
||||
return 0;
|
||||
return EXIT_SUCCESS;
|
||||
}
|
||||
|
8
kbd.spec
8
kbd.spec
@ -1,6 +1,6 @@
|
||||
Name: kbd
|
||||
Version: 2.0.2
|
||||
Release: 7%{?dist}
|
||||
Version: 2.0.3
|
||||
Release: 1%{?dist}
|
||||
Summary: Tools for configuring the console (keyboard, virtual terminals, etc.)
|
||||
|
||||
Group: System Environment/Base
|
||||
@ -184,6 +184,10 @@ gzip $RPM_BUILD_ROOT/lib/kbd/keymaps/xkb/fi-kotoistus.map
|
||||
/lib/kbd/keymaps/legacy
|
||||
|
||||
%changelog
|
||||
* Wed Jul 15 2015 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.0.3-1
|
||||
- Update to kbd-2.0.3
|
||||
Resolves: #1242684
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.2-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user