From 584bc2206a0fba3d7461916792d6938fca5ec453 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 18 Nov 2013 09:24:08 +0100 Subject: [PATCH] kbd: update to 2.0.1. --- srcpkgs/kbd-data | 1 + .../patches/fix-keymap-loading-1.15.5.patch | 47 ------------------- srcpkgs/kbd/template | 40 ++++++++++------ 3 files changed, 27 insertions(+), 61 deletions(-) create mode 120000 srcpkgs/kbd-data delete mode 100644 srcpkgs/kbd/patches/fix-keymap-loading-1.15.5.patch diff --git a/srcpkgs/kbd-data b/srcpkgs/kbd-data new file mode 120000 index 0000000000..04e5d3b5d7 --- /dev/null +++ b/srcpkgs/kbd-data @@ -0,0 +1 @@ +kbd \ No newline at end of file diff --git a/srcpkgs/kbd/patches/fix-keymap-loading-1.15.5.patch b/srcpkgs/kbd/patches/fix-keymap-loading-1.15.5.patch deleted file mode 100644 index f8f7b6f33b..0000000000 --- a/srcpkgs/kbd/patches/fix-keymap-loading-1.15.5.patch +++ /dev/null @@ -1,47 +0,0 @@ -commit 7e06e56157e8431d02e1377cdc44230944203d88 -Author: Alexey Gladkov -Date: Tue Dec 11 14:24:44 2012 +0400 - - Fix regression in 16117ce6ab - - Signed-off-by: Alexey Gladkov - -diff --git a/src/loadkeys.analyze.l b/src/loadkeys.analyze.l -index c18dcea..f817c78 100644 ---- src/loadkeys.analyze.l -+++ src/loadkeys.analyze.l -@@ -307,8 +307,10 @@ To to|To|TO - char *s = xstrndup(yytext+1, strlen(yytext)-2); - /* use static pathname to store *s ? */ - open_include(s); -- yy_pop_state(); -- state_ptr--; -+ while (state_ptr > 0) { -+ yy_pop_state(); -+ state_ptr--; -+ } - } - [^"]|\"\"|\"[^"\n]*{Eol} { - yyerror(_("expected filename between quotes")); -@@ -323,7 +325,7 @@ To to|To|TO - } - {Eol} { - line_nr++; -- if (state_ptr > 0) { -+ while (state_ptr > 0) { - yy_pop_state(); - state_ptr--; - } -@@ -428,8 +430,10 @@ To to|To|TO - } - \" { - *p = '\0'; -- yy_pop_state(); -- state_ptr--; -+ while (state_ptr > 0) { -+ yy_pop_state(); -+ state_ptr--; -+ } - return(STRLITERAL); - } - . { diff --git a/srcpkgs/kbd/template b/srcpkgs/kbd/template index 5a57f80df1..59704f9521 100644 --- a/srcpkgs/kbd/template +++ b/srcpkgs/kbd/template @@ -1,21 +1,17 @@ # Template file for 'kbd' pkgname=kbd -version=1.15.5 -revision=3 +version=2.0.1 +revision=1 build_style=gnu-configure configure_args="--datadir=/usr/share/kbd --localedir=/usr/share/kbd/locale" -hostmakedepends="flex" -makedepends="pam-devel" +hostmakedepends="automake libtool gettext-devel flex pkg-config" +makedepends="pam-devel libfl-devel" short_desc="Linux keyboard utilities" maintainer="Juan RP " license="GPL-2" -homepage="ftp://ftp.altlinux.org/pub/people/legion/kbd/" -distfiles="${homepage}/kbd-${version}.tar.gz" -checksum=e35fa29f690dbbfb721706b2c8edc760c697640904fec65e81194ae8840c5c62 - -if [ "$CROSS_BUILD" ]; then - makedepends+=" libfl-devel" -fi +homepage="http://www.kbd-project.org/" +distfiles="http://www.kbd-project.org/download/kbd-${version}.tar.xz" +checksum=55407b79e90ee65cdbaff7d3dafd2b53c4fee3a645788ffb582091074a2254af pre_configure() { # Rename keymap files with the same names @@ -28,6 +24,10 @@ pre_configure() { mv data/keymaps/i386/dvorak/no{,-dvorak}.map mv data/keymaps/i386/fgGIod/trf{,-fgGIod}.map mv data/keymaps/i386/colemak/{en-latin9,colemak}.map + + sed -e '/^PKG_CHECK_MODULES.*/d' -i configure.ac + sed -e 's,tests ,,g' -i Makefile.am + autoreconf -fi } post_install() { @@ -37,9 +37,21 @@ post_install() { done } -kbd_package() { - replaces="kbd-common<1.15.5" +kbd-data_package() { + short_desc+=" - keymaps, console fonts and unicode maps" + replaces="kbd<2.0.1_1" + noarch=yes pkg_install() { - vmove usr + vmove usr/share/kbd/consolefonts + vmove usr/share/kbd/consoletrans + vmove usr/share/kbd/keymaps + vmove usr/share/kbd/unimaps + } +} + +kbd_package() { + depends="kbd-data" + pkg_install() { + vmove all } }