From aede25759fea4e9560095ec2396109ae5b504350 Mon Sep 17 00:00:00 2001 From: Nicolo Date: Wed, 17 Mar 2021 10:21:16 +0100 Subject: [PATCH 1/2] kbd: update to 2.4.0 and merge kbd-data --- srcpkgs/kbd/template | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/srcpkgs/kbd/template b/srcpkgs/kbd/template index e88ebf5d7fb1..10b5c5dba294 100644 --- a/srcpkgs/kbd/template +++ b/srcpkgs/kbd/template @@ -1,18 +1,18 @@ # Template file for 'kbd' pkgname=kbd -version=2.3.0 -revision=2 +version=2.4.0 +revision=1 build_style=gnu-configure configure_args="--datadir=/usr/share/kbd --localedir=/usr/share/kbd/locale" hostmakedepends="automake libtool gettext-devel flex pkg-config" makedepends="pam-devel" -depends="kbd-data" short_desc="Linux keyboard utilities" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="http://www.kbd-project.org/" distfiles="${KERNEL_SITE}/utils/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=685056143cb8effd0a1d44b5c391eb50d80dcfd014b1a4d6e2650a28d61cb82a +checksum=55f0740458cfd3a84e775e50d7e8b92dc01846db1edad8e2411ccc293ece9b9f +replaces="kbd-data>=0" post_patch() { # Rename keymap files with the same names @@ -42,14 +42,3 @@ post_install() { rm -rf ${DESTDIR}/usr/share/kbd/keymaps/${f} done } - -kbd-data_package() { - short_desc+=" - keymaps, console fonts and unicode maps" - replaces="kbd<2.0.1_1" - pkg_install() { - vmove usr/share/kbd/consolefonts - vmove usr/share/kbd/consoletrans - vmove usr/share/kbd/keymaps - vmove usr/share/kbd/unimaps - } -} From 69a3d76f4b7223f3c56bc45e3b09b57582f88729 Mon Sep 17 00:00:00 2001 From: Nicolo Date: Thu, 18 Mar 2021 16:33:12 +0100 Subject: [PATCH 2/2] kbd-data: remove symlink --- srcpkgs/kbd-data | 1 - 1 file changed, 1 deletion(-) delete mode 120000 srcpkgs/kbd-data diff --git a/srcpkgs/kbd-data b/srcpkgs/kbd-data deleted file mode 120000 index 04e5d3b5d7ec..000000000000 --- a/srcpkgs/kbd-data +++ /dev/null @@ -1 +0,0 @@ -kbd \ No newline at end of file