summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Rees <maxcrees@me.com>2019-08-23 01:18:24 -0500
committerMax Rees <maxcrees@me.com>2019-08-23 01:18:24 -0500
commitfc952dce1d292ffbbc434e93077fe2a757d15823 (patch)
treeed74bd8f60bebf6f27b8d3c19fe438b413e74fd6
parenta4e9e939954682c18b16d3ddcf9e79bdbc073e64 (diff)
downloadpackages-fc952dce1d292ffbbc434e93077fe2a757d15823.tar.gz
packages-fc952dce1d292ffbbc434e93077fe2a757d15823.tar.bz2
packages-fc952dce1d292ffbbc434e93077fe2a757d15823.tar.xz
packages-fc952dce1d292ffbbc434e93077fe2a757d15823.zip
system/kbd: fix some regressions in newer releases
Since kbd=2.0.4, three regressions have been discovered: * CFLAGS were being overriden. Fixed by https://github.com/legionus/kbd/commit/15a74479f904f6b15f31854455656710e9aa1942 * loadkeys -d would fail if defkeymap.map.gz was a symlink. Fixed by https://github.com/legionus/kbd/commit/acf93e44f6d036303f95555069031f6fb12ce9d1 * setfont would fail if its argument was a compressed font file. Fixed by https://github.com/legionus/kbd/commit/7e27102b6fc6991a6a4eca422b513781a26b1639 Since the last commit introduced new binary files for the test suite, use a handrolled tarball with the changes instead of patching.
-rw-r--r--system/kbd/APKBUILD11
1 files changed, 8 insertions, 3 deletions
diff --git a/system/kbd/APKBUILD b/system/kbd/APKBUILD
index aa784cf0c..a5a12605a 100644
--- a/system/kbd/APKBUILD
+++ b/system/kbd/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kbd
-pkgver=2.2.0
+pkgver=2.2.0_git20190823
pkgrel=0
pkgdesc="Console keyboard and font management utilities"
url=" "
@@ -13,7 +13,12 @@ makedepends="linux-headers linux-pam-dev"
checkdepends="check-dev"
subpackages="$pkgname-doc $pkgname-fonts::noarch $pkgname-keymaps::noarch
$pkgname-lang"
-source="https://mirrors.kernel.org/pub/linux/utils/kbd/kbd-$pkgver.tar.xz"
+source="https://dev.sick.bike/dist/$pkgname-$pkgver.tar.xz"
+
+prepare() {
+ default_prepare
+ autoreconf -vif
+}
build() {
./configure \
@@ -47,4 +52,4 @@ keymaps() {
mv "$pkgdir"/usr/share/unimaps "$subpkgdir"/usr/share/
}
-sha512sums="5f407c20739487e423e8390e429d30838a1a69a0a50db083803ce56da919e25ce480b63fd1bcfac9eb362095f17e575783b09eaa55e26b442bfa3ed838e04f13 kbd-2.2.0.tar.xz"
+sha512sums="7f6202aeb17d6224095447a92d999478220457e1e7cadb90a7c40ca7f3b0c5b1f672db1995fb69652ca37558a75df582bfb5fea5772f3b1e040fe39f8f54504e kbd-2.2.0_git20190823.tar.xz"