diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-01-15 09:29:50 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-01-15 09:32:11 +0000 |
| commit | 191f720fd52f1b0e6f8d54663f70d890811b85c6 (patch) | |
| tree | fb475336e6e054cb4cb9fac4a39d51363b59973b /main/kbd | |
| parent | 8c370fbacea0bd4dc7042708e9187a5ecadc2a2f (diff) | |
| download | aports-191f720fd52f1b0e6f8d54663f70d890811b85c6.tar.bz2 aports-191f720fd52f1b0e6f8d54663f70d890811b85c6.tar.xz | |
main/kbd: upgrade to 1.15.5
Diffstat (limited to 'main/kbd')
| -rw-r--r-- | main/kbd/APKBUILD | 10 | ||||
| -rw-r--r-- | main/kbd/kbd-1.15-resizecon-x86_64.patch | 11 | ||||
| -rw-r--r-- | main/kbd/kbd-1.15.3-loadkeys-d.patch | 20 |
3 files changed, 3 insertions, 38 deletions
diff --git a/main/kbd/APKBUILD b/main/kbd/APKBUILD index 3a02a1e6c4..d185b16122 100644 --- a/main/kbd/APKBUILD +++ b/main/kbd/APKBUILD @@ -1,19 +1,17 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=kbd -pkgver=1.15.3 +pkgver=1.15.5 pkgrel=0 pkgdesc="Tools for configuring the console (keyboard, virtual terminals, etc.)" url="http://ftp.altlinux.org/pub/people/legion/kbd" arch="all" license="GPLv2+" depends="kbd-misc" -makedepends="bison flex autoconf automake" +makedepends="bison flex autoconf automake linux-pam-dev" install="" subpackages="$pkgname-misc $pkgname-doc" source="ftp://ftp.altlinux.org/pub/people/legion/kbd/kbd-$pkgver.tar.gz - kbd-1.15-resizecon-x86_64.patch - kbd-1.15.3-loadkeys-d.patch " _builddir="$srcdir"/kbd-$pkgver @@ -92,6 +90,4 @@ misc() { mv "$pkgdir"/lib/kbd "$subpkgdir"/lib/ } -md5sums="8143e179a0f3c25646ce5085e8777200 kbd-1.15.3.tar.gz -435755fb51017b17558f38a2a2c5074c kbd-1.15-resizecon-x86_64.patch -d7bb334afc00f7794774762a07dacaa7 kbd-1.15.3-loadkeys-d.patch" +md5sums="34c71feead8ab9c01ec638acea8cd877 kbd-1.15.5.tar.gz" diff --git a/main/kbd/kbd-1.15-resizecon-x86_64.patch b/main/kbd/kbd-1.15-resizecon-x86_64.patch deleted file mode 100644 index 3ce5a68688..0000000000 --- a/main/kbd/kbd-1.15-resizecon-x86_64.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up kbd-1.15.3/configure.ac.orig kbd-1.15.3/configure.ac ---- kbd-1.15.3/configure.ac.orig 2011-08-22 16:01:11.456165128 +0200 -+++ kbd-1.15.3/configure.ac 2011-08-22 16:01:38.878163675 +0200 -@@ -60,6 +60,7 @@ AM_CONDITIONAL(KEYCODES_PROGS, test "$KE - - case $host_cpu in - i?86*) RESIZECONS_PROGS=yes ;; -+ x86_64*) RESIZECONS_PROGS=yes ;; - *) RESIZECONS_PROGS=no ;; - esac - AM_CONDITIONAL(RESIZECONS_PROGS, test "$RESIZECONS_PROGS" = "yes") diff --git a/main/kbd/kbd-1.15.3-loadkeys-d.patch b/main/kbd/kbd-1.15.3-loadkeys-d.patch deleted file mode 100644 index 73bb7c47fe..0000000000 --- a/main/kbd/kbd-1.15.3-loadkeys-d.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up kbd-1.15.3/src/loadkeys.c.orig kbd-1.15.3/src/loadkeys.c ---- kbd-1.15.3/src/loadkeys.c.orig 2011-10-24 13:44:52.222401546 +0200 -+++ kbd-1.15.3/src/loadkeys.c 2011-10-24 13:47:52.413389029 +0200 -@@ -2958,7 +2958,7 @@ int main(int argc, char *argv[]) - close(fd); - } - -- for (i = optind; argv[i]; i++) { -+ for (i = optind; argv[i] || optd; i++) { - FILE *f; - char *ev; - -@@ -2974,6 +2974,7 @@ int main(int argc, char *argv[]) - if (optd) { - /* first read default map - search starts in . */ - optd = 0; -+ i--; - if ((f = findfile(DEFMAP, dirpath, suffixes)) == NULL) { - fprintf(stderr, _("Cannot find %s\n"), DEFMAP); - exit(EXIT_FAILURE); |