From 65c86481476a62ba25ce45968fc6af85b1fad649 Mon Sep 17 00:00:00 2001 From: Nicolo Date: Tue, 16 Mar 2021 18:43:01 +0100 Subject: [PATCH 1/2] kbd: update to 2.4.0 --- srcpkgs/kbd/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/kbd/template b/srcpkgs/kbd/template index e88ebf5d7fb1..55a4a7b5436d 100644 --- a/srcpkgs/kbd/template +++ b/srcpkgs/kbd/template @@ -1,7 +1,7 @@ # 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" @@ -12,7 +12,7 @@ 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 post_patch() { # Rename keymap files with the same names From c32bfade1b127ec3933dc422a3b5264de77b21ea Mon Sep 17 00:00:00 2001 From: Nicolo Date: Tue, 16 Mar 2021 20:54:42 +0100 Subject: [PATCH 2/2] kbd: update to 2.4.0 and remove -data --- srcpkgs/kbd/template | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/srcpkgs/kbd/template b/srcpkgs/kbd/template index 55a4a7b5436d..4e31589e8149 100644 --- a/srcpkgs/kbd/template +++ b/srcpkgs/kbd/template @@ -6,7 +6,6 @@ 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" @@ -42,14 +41,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 - } -}