diff options
Diffstat (limited to 'main/kbd')
| -rw-r--r-- | main/kbd/APKBUILD | 39 | ||||
| -rw-r--r-- | main/kbd/error.h | 20 |
2 files changed, 21 insertions, 38 deletions
diff --git a/main/kbd/APKBUILD b/main/kbd/APKBUILD index 99a8a1c5a4e..c619bb68eec 100644 --- a/main/kbd/APKBUILD +++ b/main/kbd/APKBUILD @@ -1,22 +1,28 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=kbd -pkgver=2.4.0 -pkgrel=1 +pkgver=2.6.4 +pkgrel=0 pkgdesc="Tools for configuring the console (keyboard, virtual terminals, etc.)" -url="http://kbd-project.org/" +url="https://kbd-project.org/" arch="all" license="GPL-2.0-or-later" depends="kbd-misc" -makedepends="linux-headers linux-pam-dev check-dev ckbcomp xkeyboard-config - autoconf automake" +makedepends=" + autoconf + automake + check-dev + ckbcomp + linux-headers + linux-pam-dev + musl-legacy-error + xkeyboard-config-dev + " subpackages="$pkgname-bkeymaps::noarch $pkgname-legacy::noarch $pkgname-misc::noarch $pkgname-doc $pkgname-openrc $pkgname-vlock" source="https://www.kernel.org/pub/linux/utils/kbd/kbd-$pkgver.tar.gz loadkeys.initd loadkeys.confd - - error.h " _datadir=/usr/share @@ -24,18 +30,13 @@ _xmapdir="$_datadir"/keymaps/xkb _bmapdir="$_datadir"/bkeymaps _badmaps="pk-ara" -prepare() { - default_prepare - - cp "$srcdir"/error.h "$builddir" -} - build() { ./configure \ --build=$CBUILD \ --host=$CHOST \ --disable-nls \ --prefix=/usr \ + --sysconfdir=/etc \ --datadir="$_datadir" \ --htmldir=/usr/share/html/$pkgname \ --disable-static @@ -50,7 +51,7 @@ check() { _listxmaps() { local invariant line; invariant=false - grep -v '^$' /usr/share/X11/xkb/rules/base.lst | while read line; do + grep -v '^$' /usr/share/X11/xkb/rules/base.lst | while read -r line; do case "$line" in '! variant') invariant=true ;; '!'*) invariant=false ;; @@ -102,10 +103,10 @@ package() { _listxmaps | while read -r variant layout; do if ! test -f "$pkgdir$_xmapdir"/"$layout".map.gz; then echo "Generating keymap $layout..." - ckbcomp "$layout" | gzip > "$pkgdir$_xmapdir"/"$layout".map.gz || exit 1 + ckbcomp "$layout" | gzip > "$pkgdir$_xmapdir"/"$layout".map.gz fi echo "Generating keymap $layout-$variant..." - ckbcomp "$layout" "$variant" | gzip > "$pkgdir$_xmapdir"/"$layout"-"$variant".map.gz || exit 1 + ckbcomp "$layout" "$variant" | gzip > "$pkgdir$_xmapdir"/"$layout"-"$variant".map.gz done # Do some fix-ups on X.org keymaps @@ -143,6 +144,7 @@ bkeymaps() { mkdir -p "$subpkgdir$_bmapdir" local map variant layout; for map in "$pkgdir$_xmapdir"/*.map.gz; do variant="$(basename "$map" | cut -d. -f1)" + # shellcheck disable=2254 case "$variant" in $_badmaps) continue ;; esac layout="${variant%%-*}" @@ -170,7 +172,8 @@ misc() { done } -sha512sums="7d63003d5d51c65863417f2f48f5298b6ab29715d477e04948973013809f42e89ce94bfc2ebf9590869e0fcde9fe47b45888f37ab0bbd7e9255d9721d91285b1 kbd-2.4.0.tar.gz +sha512sums=" +2bde7a271392f0ac81966af46c4b3568c9e777550fd0b0d1627db158f0b24b8a67f3c0cca84de9b33d43ac8cbb730c1610212c3da071add3559abe6c4397272f kbd-2.6.4.tar.gz 64b5ab4c362350521da8f507d22c0b77784da99bbe1b32f0c001cd826f63c607e3f9cd6af01f06a61af8bd709760bbf2bb3cfe2010c33925f2987a1af6ef4998 loadkeys.initd 12028796552a5ffed1d5cb19d37fc6a73fb4f2e2bf34d837a81171c7ebee98d6c3f557715bf79706d79ce053b9b2450cd8cf1c4ea045428fb7d8a5915ae3ed78 loadkeys.confd -c66f6b0d8c8b8d285c740bdbe7130dee272ac01cd5e73b35a58cedf1a77fe8d9e062631b804fb58014d8eb9861c8f28aed07bc022ef31662bcc61b5c85a21752 error.h" +" diff --git a/main/kbd/error.h b/main/kbd/error.h deleted file mode 100644 index 5eb8ed5115f..00000000000 --- a/main/kbd/error.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef ERROR_H -#define ERROR_H - -#include <stdio.h> -#include <stdarg.h> -#include <err.h> - -static inline void error(int status, int errnum, const char *fmt, ...) -{ - va_list ap; - void (*errfunc[2])(int, const char *, va_list) = { &verr, &verrx }; - void (*warnfunc[2])(const char *, va_list) = { &vwarn, &vwarnx }; - fflush(stdout); - va_start(ap, fmt); - if (status != 0) - errfunc[errnum==0](status, fmt, ap); /* does not return */ - warnfunc[errnum==0](fmt, ap); - va_end(ap); -} -#endif |