Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (67c14361020666a8d6c4998436a0164af990168c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (67c14361020666a8d6c4998436a0164af990168c)
  • Date: Wed, 14 Feb 2007 13:44:34 -0600

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

utils/kbd/HISTORY | 6 ++++++
utils/kbd/PRE_BUILD | 7 ++++---
utils/kbd/kbd-1.12-kbd_repeat-v2.patch | 27 +++++++++++++++++++++++++++
3 files changed, 37 insertions(+), 3 deletions(-)

New commits:
commit 67c14361020666a8d6c4998436a0164af990168c
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Fix kbd to compile on my SPARC

diff --git a/utils/kbd/HISTORY b/utils/kbd/HISTORY
index c836bb2..b06c864 100644
--- a/utils/kbd/HISTORY
+++ b/utils/kbd/HISTORY
@@ -1,3 +1,9 @@
+2007-02-14 Eric Sandall <eric AT sandall.us>
+ * PRE_BUILD: Apply kbd_repeat patch
+ * kbd-1.12-kbd_repeat-v2.patch: Patch from Gentoo obtained at
+
http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/kbd/files/kbd-1.12-kbd_repeat-v2.patch?rev=1.2&view=markup
+ This fixes kbd compiling on my SPARC
+
2007-01-08 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* keymap.sh: fixed stop() to not give errors (it worked nonetheless)

diff --git a/utils/kbd/PRE_BUILD b/utils/kbd/PRE_BUILD
index 070ddcb..3bd17e2 100755
--- a/utils/kbd/PRE_BUILD
+++ b/utils/kbd/PRE_BUILD
@@ -1,6 +1,7 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 data/Makefile $SCRIPT_DIRECTORY/keymaps.diff &&
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 data/Makefile $SCRIPT_DIRECTORY/keymaps.diff &&
+patch -p1 < $SCRIPT_DIRECTORY/kbd-1.12-kbd_repeat-v2.patch &&

# Fix for gcc4
if use_gcc ^4; then
diff --git a/utils/kbd/kbd-1.12-kbd_repeat-v2.patch
b/utils/kbd/kbd-1.12-kbd_repeat-v2.patch
new file mode 100644
index 0000000..3e7f11d
--- /dev/null
+++ b/utils/kbd/kbd-1.12-kbd_repeat-v2.patch
@@ -0,0 +1,27 @@
+Linux is nice and changes around core structures :)
+
+--- kbd-1.12/src/kbdrate.c Fri Jan 16 20:45:31 2004
++++ kbd-1.12.kbdrate/src/kbdrate.c Sun Feb 8 14:52:04 2004
+@@ -164,10 +169,10 @@
+ exit( 1 );
+ }
+
+- kbdrate_s.period = (int) (rate + 0.5); /* round up */
++ kbdrate_s.rate = (int) (rate + 0.5); /* round up */
+ kbdrate_s.delay = delay * HZ / 1000; /* convert ms to Hz */
+- if (kbdrate_s.period > 50)
+- kbdrate_s.period = 50;
++ if (kbdrate_s.rate > 50)
++ kbdrate_s.rate = 50;
+
+ if (ioctl( fd, KIOCSRATE, &kbdrate_s )) {
+ perror( "ioctl(KIOCSRATE)" );
+@@ -177,7 +182,7 @@
+
+ if (!silent)
+ printf( "Typematic Rate set to %d cps (delay = %d ms)\n",
+- kbdrate_s.period, kbdrate_s.delay * 1000 / HZ );
++ kbdrate_s.rate, kbdrate_s.delay * 1000 / HZ );
+
+ return 1;
+ #else /* no KIOCSRATE */



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (67c14361020666a8d6c4998436a0164af990168c), Eric Sandall, 02/14/2007

Archive powered by MHonArc 2.6.24.

Top of Page