diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2010-05-19 08:58:23 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-05-31 22:43:05 +0200 |
commit | b76270bf9e6dd375e495fec92140a79a79415d27 (patch) | |
tree | 3dbed78b2279bf9f14207a16dc634b90995cbd40 /source/a/kbd/sources | |
parent | 5a12e7c134274dba706667107d10d231517d3e05 (diff) | |
download | current-b76270bf9e6dd375e495fec92140a79a79415d27.tar.gz current-b76270bf9e6dd375e495fec92140a79a79415d27.tar.xz |
Slackware 13.1slackware-13.1
Wed May 19 08:58:23 UTC 2010
Slackware 13.1 x86_64 stable is released!
Lots of thanks are due -- see the RELEASE_NOTES and the rest of the
ChangeLog for credits. The ISOs are on their way to replication,
a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD.
We are taking pre-orders now at store.slackware.com, and offering
a discount if you sign up for a subscription. Consider picking up
a copy to help support the project. Thanks again to the Slackware
community for testing, contributing, and generally holding us to a
high level of quality. :-)
Enjoy!
Diffstat (limited to 'source/a/kbd/sources')
-rw-r--r-- | source/a/kbd/sources/kbd-1.15-po.patch | 31 | ||||
-rw-r--r-- | source/a/kbd/sources/kbd-1.15-quiet_doc.patch | 34 | ||||
-rw-r--r-- | source/a/kbd/sources/kbd-1.15-sparc.patch | 97 | ||||
-rw-r--r-- | source/a/kbd/sources/kbd-1.15.2-po.patch | 14 | ||||
-rw-r--r-- | source/a/kbd/sources/kbd-1.15.2.tar.bz2.sign (renamed from source/a/kbd/sources/kbd-1.15.tar.bz2.sign) | 6 |
5 files changed, 17 insertions, 165 deletions
diff --git a/source/a/kbd/sources/kbd-1.15-po.patch b/source/a/kbd/sources/kbd-1.15-po.patch deleted file mode 100644 index 0221f60c9..000000000 --- a/source/a/kbd/sources/kbd-1.15-po.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -up kbd-1.15/po/Makefile.in_old kbd-1.15/po/Makefile.in ---- kbd-1.15/po/Makefile.in_old 2008-10-23 21:03:59.000000000 +0200 -+++ kbd-1.15/po/Makefile.in 2008-12-09 15:35:58.000000000 +0100 -@@ -4,10 +4,10 @@ srcdir = @srcdir@ - - prefix = @prefix@ - datarootdir = @datarootdir@ --datadir = @datadir@ --localedir = $(DESTDIR)$(datadir)/locale --gnulocaledir = $(DESTDIR)$(datadir)/locale --gettextsrcdir = $(DESTDIR)$(datadir)/gettext/po -+datadir = $(DESTDIR)@datadir@ -+localedir = $(DESTDIR)@localedir@ -+gnulocaledir = $(DESTDIR)@localedir@ -+gettextsrcdir = $(datadir)/gettext/po - - FOREIGN = @FOREIGN@ - HAVE_XGETTEXT = @HAVE_XGETTEXT@ -@@ -36,10 +36,10 @@ INCLUDES = -I.. -I$(INTL) - COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) - - # Enter here all .po files --POFILES = cs.po da.po de.po el.po es.po fr.po gr.po nl.po pl.po \ -+POFILES = cs.po da.po de.po el.po es.po fr.po nl.po pl.po \ - ro.po ru.po sv.po tr.po - # the same but with .gmo --GMOFILES = cs.gmo da.gmo de.gmo el.gmo es.gmo fr.gmo gr.gmo nl.gmo \ -+GMOFILES = cs.gmo da.gmo de.gmo el.gmo es.gmo fr.gmo nl.gmo \ - pl.gmo ro.gmo ru.gmo sv.gmo tr.gmo - - CATALOGS = $(GMOFILES) diff --git a/source/a/kbd/sources/kbd-1.15-quiet_doc.patch b/source/a/kbd/sources/kbd-1.15-quiet_doc.patch deleted file mode 100644 index eca867b85..000000000 --- a/source/a/kbd/sources/kbd-1.15-quiet_doc.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -up kbd-1.15/man/man1/loadkeys.1.in_old kbd-1.15/man/man1/loadkeys.1.in ---- kbd-1.15/man/man1/loadkeys.1.in_old 2008-10-23 21:03:59.000000000 +0200 -+++ kbd-1.15/man/man1/loadkeys.1.in 2009-03-05 13:11:08.000000000 +0100 -@@ -19,6 +19,8 @@ loadkeys \- load keyboard translation ta - ] [ - .I -m --mktable - ] [ -+.I -q --quiet -+] [ - .I -s --clearstrings - ] [ - .I -v --verbose -@@ -148,6 +150,10 @@ command (and does not modify the current - .B loadkeys - prints its version number and a short usage message to the programs - standard error output and exits. -+.TP -+.B \-q \-\-quiet -+.B loadkeys -+suppresses all normal output. - .SH WARNING - Note that anyone having read access to - .B /dev/console -diff -up kbd-1.15/src/loadkeys.c_old kbd-1.15/src/loadkeys.c ---- kbd-1.15/src/loadkeys.c_old 2008-10-23 21:03:59.000000000 +0200 -+++ kbd-1.15/src/loadkeys.c 2009-03-05 13:09:00.000000000 +0100 -@@ -1966,6 +1966,7 @@ usage(void) { - " -d --default load \"%s\"\n" - " -h --help display this help text\n" - " -m --mktable output a \"defkeymap.c\" to stdout\n" -+" -q --quiet suppress all normal output\n" - " -s --clearstrings clear kernel string table\n" - " -u --unicode implicit conversion to Unicode\n" - " -v --verbose report the changes\n"), PACKAGE_VERSION, DEFMAP); diff --git a/source/a/kbd/sources/kbd-1.15-sparc.patch b/source/a/kbd/sources/kbd-1.15-sparc.patch deleted file mode 100644 index a858a253a..000000000 --- a/source/a/kbd/sources/kbd-1.15-sparc.patch +++ /dev/null @@ -1,97 +0,0 @@ -diff -up kbd-1.15/man/man8/kbdrate.8_old kbd-1.15/man/man8/kbdrate.8 ---- kbd-1.15/man/man8/kbdrate.8_old 2008-12-10 14:20:33.000000000 +0100 -+++ kbd-1.15/man/man8/kbdrate.8 2008-12-10 14:41:10.000000000 +0100 -@@ -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. - These are the IBM defaults. On SPARC-based systems it will reset the repeat rate --to 5 cps and the delay to 200 ms. -+to 20 cps and the delay to 200 ms. - - .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/src/kbdrate.c_old kbd-1.15/src/kbdrate.c ---- kbd-1.15/src/kbdrate.c_old 2008-12-10 14:00:25.000000000 +0100 -+++ kbd-1.15/src/kbdrate.c 2008-12-10 14:20:11.000000000 +0100 -@@ -77,7 +77,6 @@ beats rebuilding the kernel! - - #ifdef __sparc__ - #include <asm/param.h> --#include <asm/kbio.h> - #endif - - #ifndef KDKBDREP -@@ -109,11 +108,15 @@ static int valid_delays[] = { 250, 500, - - static int - KDKBDREP_ioctl_ok(double rate, int delay, int silent) { -+#if defined(KDKBDREP) && !defined(__sparc__) - /* - * This ioctl is defined in <linux/kd.h> but is not - * implemented anywhere - must be in some m68k patches. -+ * We cannot blindly try unimplemented ioctls on sparc64 - -+ * the 32<->64bit transition layer does not like it. - * Since 2.4.9 also on i386. -- */ -+ */ -+ - struct my_kbd_repeat kbdrep_s; - - /* don't change, just test */ -@@ -177,6 +180,9 @@ KDKBDREP_ioctl_ok(double rate, int delay - rate, kbdrep_s.delay ); - - return 1; /* success! */ -+#else /* no KDKBDREP or __sparc__ */ -+ return 0; -+#endif /* KDKBDREP */ - } - - static int -@@ -221,7 +227,7 @@ sigalrmhandler( int sig ) { - int - main( int argc, char **argv ) { - #ifdef __sparc__ -- double rate = 5.0; /* Default rate */ -+ double rate = 20.0; /* Default rate */ - int delay = 200; /* Default delay */ - #else - double rate = 10.9; /* Default rate */ -@@ -272,7 +278,9 @@ main( int argc, char **argv ) { - - - /* 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; -@@ -335,5 +343,7 @@ main( int argc, char **argv ) { - valid_rates[value & 0x1f] / 10.0, - valid_delays[ (value & 0x60) >> 5 ] ); - -+#endif -+ - return 0; - } -diff -up kbd-1.15/src/setleds.c_old kbd-1.15/src/setleds.c ---- kbd-1.15/src/setleds.c_old 2008-12-10 14:00:02.000000000 +0100 -+++ kbd-1.15/src/setleds.c 2008-12-10 14:00:16.000000000 +0100 -@@ -14,10 +14,6 @@ - #include "nls.h" - #include "version.h" - --#ifdef __sparc__ --#include <asm/kbio.h> --#endif -- - static void - usage(void) - { diff --git a/source/a/kbd/sources/kbd-1.15.2-po.patch b/source/a/kbd/sources/kbd-1.15.2-po.patch new file mode 100644 index 000000000..a32a793f4 --- /dev/null +++ b/source/a/kbd/sources/kbd-1.15.2-po.patch @@ -0,0 +1,14 @@ +--- ./po/Makefile.in.in.orig 2010-04-10 16:34:12.000000000 -0500 ++++ ./po/Makefile.in.in 2010-04-29 00:19:10.000000000 -0500 +@@ -22,8 +22,9 @@ + + prefix = @prefix@ + exec_prefix = @exec_prefix@ +-datadir = @datadir@ +-localedir = $(datadir)/locale ++datadir = @datadir@ ++localedir = @localedir@ ++gnulocaledir = @localedir@ + gettextsrcdir = $(datadir)/gettext/po + + INSTALL = @INSTALL@ diff --git a/source/a/kbd/sources/kbd-1.15.tar.bz2.sign b/source/a/kbd/sources/kbd-1.15.2.tar.bz2.sign index 39388b383..39f3c0228 100644 --- a/source/a/kbd/sources/kbd-1.15.tar.bz2.sign +++ b/source/a/kbd/sources/kbd-1.15.2.tar.bz2.sign @@ -2,7 +2,7 @@ Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info -iD8DBQBJj684yGugalF9Dw4RAqQuAJ9fBsk3RWp6BT4UWHjceFn5YuEBygCff3dW -qo/ACrIhyBx/eiZEpao8N4o= -=0zxS +iD8DBQBLwPHZyGugalF9Dw4RAhiyAJ9DdLbizzsoJi87OjQ8VzyNsRnr2QCeJ9zg +MOKY0UbkCZyUALLyzxF2bKE= +=Ou46 -----END PGP SIGNATURE----- |