Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=60181dd1946b820a3837fc079fc0b7eed9e2faea
commit 60181dd1946b820a3837fc079fc0b7eed9e2faea Author: Miklos Vajna <[EMAIL PROTECTED]> Date: Wed Mar 26 01:33:10 2008 +0100 kbd-1.14.1-1-i686 - version bump - all patch now in upstream :) - url/up2date/source fix diff --git a/source/base/kbd/FrugalBuild b/source/base/kbd/FrugalBuild index 5df822f..a407643 100644 --- a/source/base/kbd/FrugalBuild +++ b/source/base/kbd/FrugalBuild @@ -2,30 +2,25 @@ # Maintainer: VMiklos <[EMAIL PROTECTED]> pkgname=kbd -pkgver=1.12 -pkgrel=26 +pkgver=1.14.1 +pkgrel=1 pkgdesc="Keyboard maps and console fonts" -url="http://www.ibiblio.org/pub/Linux/system/keyboards/" -up2date="lynx -dump 'http://www.ibiblio.org/pub/Linux/system/keyboards/?C=M;O=D'|grep kbd.*tar.gz$ | grep -v 'GR' |sed -n 's/.*d-\(.*\)\.t.*/\1/;1 p'" +url="ftp://ftp.altlinux.org/pub/people/legion/kbd/" +up2date="Flasttar $url" depends=('sed>=4.1.5-2' 'bash') groups=('base') archs=('i686' 'x86_64' 'ppc') backup=(etc/sysconfig/font) -source=(ftp://ftp.win.tue.nl/pub/linux-local/utils/$pkgname/$pkgname-$pkgver.tar.gz \ - $pkgname-$pkgver-{alias,find_map_fix}.patch rc.font \ - rc.font-{de,hu}.po rc.keymap rc.keymap-{de,hu}.po font \ - kbd_mode.diff) -sha1sums=('d4917da308e01e74d67d7b814bf527063b3919fc' \ - '2a266a3fc520371bba9050ea8fa13f4592892e83' \ - '420fd29fc06e3518dac3fac8003c8ac71ae3b28e' \ +source=($url/$pkgname-$pkgver.tar.gz \ + rc.font rc.font-{de,hu}.po rc.keymap rc.keymap-{de,hu}.po font) +sha1sums=('12d91613096d1a724fc780e2d7974a0a1b308dce' \ '72aee792be75d38defbde653c2ff06e8c56586dc' \ '7b1e17e399608f54ff70ac22cf8e697e01ea6b23' \ 'd385735e880bea9f8444dfbc5144007eaaffee32' \ - '3962c97102902dbd0524c33b3b7364cfefd2b994' \ + 'a1e7614b06bf5c597d6d03bc29b41d6b8392baf2' \ 'beceda61cdf168e4063873a9ea6312dbc8284613' \ 'b9c50c54c7f3b1efce7858a39b0dd7490cc742a3' \ - '84e361527f415ef4d560b3e6affea0d463d544de' \ - 'dde0580490e0b7c62bacaadc5c3a3e2ece7fa1ff') + '84e361527f415ef4d560b3e6affea0d463d544de') build() { diff --git a/source/base/kbd/kbd-1.12-alias.patch b/source/base/kbd/kbd-1.12-alias.patch deleted file mode 100644 index 30be4fa..0000000 --- a/source/base/kbd/kbd-1.12-alias.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -u kbd-1.12/src/psffontop.c kbd-1.12/src/psffontop.c ---- kbd-1.12/src/psffontop.c 2005-03-12 00:48:30.075310872 +0100 -+++ kbd-1.12/src/psffontop.c 2005-05-14 10:49:59.000000000 +0900 -@@ -59,7 +59,6 @@ - - static unsigned int - assemble_ucs2(char **inptr, int cnt) { -- unsigned char **in = (unsigned char **) inptr; - unsigned int u1, u2; - - if (cnt < 2) { -@@ -68,8 +67,8 @@ - exit(EX_DATAERR); - } - -- u1 = *(*in)++; -- u2 = *(*in)++; -+ u1 = (unsigned char)*(*inptr)++; -+ u2 = (unsigned char)*(*inptr)++; - return (u1 | (u2 << 8)); - } - -@@ -110,7 +109,6 @@ - */ - static void - get_uni_entry(char **inptr, char **endptr, struct unicode_list *up, int utf8) { -- unsigned char **in = (unsigned char **) inptr; - unsigned char uc; - unicode unichar; - int inseq = 0; -@@ -126,14 +124,14 @@ - exit(EX_DATAERR); - } - if (utf8) { -- uc = *(*in)++; -+ uc = *(*inptr)++; - if (uc == PSF2_SEPARATOR) - break; - if (uc == PSF2_STARTSEQ) { - inseq = 1; - continue; - } -- --(*in); -+ --(*inptr); - unichar = assemble_utf8(inptr, *endptr - *inptr); - } else { - unichar = assemble_ucs2(inptr, *endptr - *inptr); diff --git a/source/base/kbd/kbd-1.12-find_map_fix.patch b/source/base/kbd/kbd-1.12-find_map_fix.patch deleted file mode 100644 index ca24703..0000000 --- a/source/base/kbd/kbd-1.12-find_map_fix.patch +++ /dev/null @@ -1,37 +0,0 @@ -Oh, but I fixed it already. Patch below. - -Andries - ---- kbd-1.12.orig/src/findfile.c Fri Jan 16 20:45:31 2004 -+++ kbd-1.12/src/findfile.c Wed Jan 28 23:29:35 2004 -@@ -70,6 +70,7 @@ - FILE *fp = NULL; - DIR *d; - struct dirent *de; -+ struct stat statbuf; - char *ff, *fdir, *p, *q, **sp; - struct decompressor *dc; - int secondpass = 0; -@@ -104,7 +105,6 @@ - okdir = (ff && strcmp(de->d_name, fdir) == 0); - - if ((secondpass && recdepth) || okdir) { -- struct stat statbuf; - char *a; - - a = xmalloc(strlen(dir) + strlen(de->d_name) + 2); -@@ -137,6 +137,11 @@ - - sprintf(pathname, "%s/%s", dir, de->d_name); - -+ /* Is this a regular file? */ -+ if (stat(pathname, &statbuf) != 0 || -+ !S_ISREG(statbuf.st_mode)) -+ continue; -+ - /* Does tail consist of a known suffix and possibly - a compression suffix? */ - for(sp = suf; *sp; sp++) { - - -[pasted and cut from another window, so with whitespace damage] diff --git a/source/base/kbd/kbd_mode.diff b/source/base/kbd/kbd_mode.diff deleted file mode 100644 index 5629a5a..0000000 --- a/source/base/kbd/kbd_mode.diff +++ /dev/null @@ -1,34 +0,0 @@ -diff -Naur kbd-1.12.orig/src/kbd_mode.c kbd-1.12/src/kbd_mode.c ---- kbd-1.12.orig/src/kbd_mode.c 2004-01-16 20:45:31.000000000 +0100 -+++ kbd-1.12/src/kbd_mode.c 2008-01-26 02:57:35.000000000 +0100 -@@ -15,7 +15,7 @@ - - static void - usage(void){ -- fprintf(stderr, _("usage: kbd_mode [-a|-u|-k|-s]\n")); -+ fprintf(stderr, _("usage: kbd_mode [-a|-u|-k|-s] [device]\n")); - exit(1); - } - -@@ -32,7 +32,11 @@ - if (argc == 2 && !strcmp(argv[1], "-V")) - print_version_and_exit(); - -- fd = getfd(NULL); -+ if(argc == 3) { -+ fd = getfd(argv[2]); -+ } else { -+ fd = getfd(NULL); -+ } - - if (argc == 1) { - /* report mode */ -@@ -59,7 +63,7 @@ - } - exit(1); - } -- if (argc != 2) -+ if (argc < 2) - usage(); - if (!strcmp(argv[1], "-a")) - mode = K_XLATE; diff --git a/source/base/kbd/rc.keymap b/source/base/kbd/rc.keymap index f9f0cc8..cc64483 100644 --- a/source/base/kbd/rc.keymap +++ b/source/base/kbd/rc.keymap @@ -32,7 +32,7 @@ rc_start() if ! echo $LANG |grep -qi utf; then for i in `seq 1 12` do - kbd_mode -a /dev/tty$i + kbd_mode -a -C /dev/tty$i echo -n -e '\033%@' > /dev/tty$i done fi _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
