[PR PATCH] kbd: update to 2.4.0

[PR PATCH] kbd: update to 2.4.0

[dkwo]

[-- Attachment #1: Type: text/plain, Size: 1546 bytes --]

There is a new pull request by dkwo against master on the void-packages repository

https://github.com/dkwo/void-packages kbd
https://github.com/void-linux/void-packages/pull/29512

kbd: update to 2.4.0
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29512.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-kbd-29512.patch --]
[-- Type: text/x-diff, Size: 1129 bytes --]

From 65c86481476a62ba25ce45968fc6af85b1fad649 Mon Sep 17 00:00:00 2001
From: Nicolo <nicolopiazzalunga@gmail.com>
Date: Tue, 16 Mar 2021 18:43:01 +0100
Subject: [PATCH] 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 <gottox@voidlinux.org>"
 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

Re: kbd: update to 2.4.0

[Chocimier]

[-- Attachment #1: Type: text/plain, Size: 172 bytes --]

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/29512#issuecomment-800505013

Comment:
Apply change asked in #28158.

Re: [PR PATCH] [Updated] kbd: update to 2.4.0

[dkwo]

[-- Attachment #1: Type: text/plain, Size: 380 bytes --]

There is an updated pull request by dkwo against master on the void-packages repository

https://github.com/dkwo/void-packages kbd
https://github.com/void-linux/void-packages/pull/29512

kbd: update to 2.4.0
I built and used it on my `x86_64-musl`.
Incidentally, the update fixes #29478 

A patch file from https://github.com/void-linux/void-packages/pull/29512.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-kbd-29512.patch --]
[-- Type: text/x-diff, Size: 2282 bytes --]

From 65c86481476a62ba25ce45968fc6af85b1fad649 Mon Sep 17 00:00:00 2001
From: Nicolo <nicolopiazzalunga@gmail.com>
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 <gottox@voidlinux.org>"
 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 <nicolopiazzalunga@gmail.com>
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 <gottox@voidlinux.org>"
 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
-	}
-}

Re: kbd: update to 2.4.0

[dkwo]

[-- Attachment #1: Type: text/plain, Size: 250 bytes --]

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/29512#issuecomment-800562545

Comment:
Thanks, I missed that.
Is it enough to just delete that part? or, could you suggest how to proceed?
@ahesford 

Re: kbd: update to 2.4.0

[Chocimier]

[-- Attachment #1: Type: text/plain, Size: 180 bytes --]

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/29512#issuecomment-800566405

Comment:
Do it like in commit 000010772d9fd4.

Re: [PR PATCH] [Updated] kbd: update to 2.4.0

[dkwo]

[-- Attachment #1: Type: text/plain, Size: 380 bytes --]

There is an updated pull request by dkwo against master on the void-packages repository

https://github.com/dkwo/void-packages kbd
https://github.com/void-linux/void-packages/pull/29512

kbd: update to 2.4.0
I built and used it on my `x86_64-musl`.
Incidentally, the update fixes #29478 

A patch file from https://github.com/void-linux/void-packages/pull/29512.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-kbd-29512.patch --]
[-- Type: text/x-diff, Size: 1617 bytes --]

From aede25759fea4e9560095ec2396109ae5b504350 Mon Sep 17 00:00:00 2001
From: Nicolo <nicolopiazzalunga@gmail.com>
Date: Wed, 17 Mar 2021 10:21:16 +0100
Subject: [PATCH] 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 <gottox@voidlinux.org>"
 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
-	}
-}

Re: kbd: update to 2.4.0

[dkwo]

[-- Attachment #1: Type: text/plain, Size: 166 bytes --]

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/29512#issuecomment-801073475

Comment:
@Chocimier How does it look?

Re: kbd: update to 2.4.0

[Chocimier]

[-- Attachment #1: Type: text/plain, Size: 187 bytes --]

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/29512#issuecomment-801438090

Comment:
please also remove srcpkgs/kbd-data symlink.

Re: [PR PATCH] [Updated] kbd: update to 2.4.0

[dkwo]

[-- Attachment #1: Type: text/plain, Size: 380 bytes --]

There is an updated pull request by dkwo against master on the void-packages repository

https://github.com/dkwo/void-packages kbd
https://github.com/void-linux/void-packages/pull/29512

kbd: update to 2.4.0
I built and used it on my `x86_64-musl`.
Incidentally, the update fixes #29478 

A patch file from https://github.com/void-linux/void-packages/pull/29512.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-kbd-29512.patch --]
[-- Type: text/x-diff, Size: 2109 bytes --]

From aede25759fea4e9560095ec2396109ae5b504350 Mon Sep 17 00:00:00 2001
From: Nicolo <nicolopiazzalunga@gmail.com>
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 <gottox@voidlinux.org>"
 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 <nicolopiazzalunga@gmail.com>
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

Re: [PR PATCH] [Updated] kbd: update to 2.4.0

[Chocimier]

[-- Attachment #1: Type: text/plain, Size: 385 bytes --]

There is an updated pull request by Chocimier against master on the void-packages repository

https://github.com/dkwo/void-packages kbd
https://github.com/void-linux/void-packages/pull/29512

kbd: update to 2.4.0
I built and used it on my `x86_64-musl`.
Incidentally, the update fixes #29478 

A patch file from https://github.com/void-linux/void-packages/pull/29512.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-kbd-29512.patch --]
[-- Type: text/x-diff, Size: 1875 bytes --]

From 8a5ac5894e9703f902239644ba64ec5f9ef0ac32 Mon Sep 17 00:00:00 2001
From: Nicolo <nicolopiazzalunga@gmail.com>
Date: Wed, 17 Mar 2021 10:21:16 +0100
Subject: [PATCH] kbd: update to 2.4.0 and merge kbd-data

---
 srcpkgs/kbd-data     |  1 -
 srcpkgs/kbd/template | 19 ++++---------------
 2 files changed, 4 insertions(+), 16 deletions(-)
 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
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 <gottox@voidlinux.org>"
 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
-	}
-}

Re: [PR PATCH] [Merged]: kbd: update to 2.4.0

[Chocimier]

[-- Attachment #1: Type: text/plain, Size: 234 bytes --]

There's a merged pull request on the void-packages repository

kbd: update to 2.4.0
https://github.com/void-linux/void-packages/pull/29512

Description:
I built and used it on my `x86_64-musl`.
Incidentally, the update fixes #29478 

Re: kbd: update to 2.4.0.

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 162 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/28158#issuecomment-801089984

Comment:
Superseded by #29512

Re: kbd: update to 2.4.0.

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 315 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/28158#issuecomment-776809016

Comment:
`kbd-data` should probably be merged with `kbd`, as `kbd` pulls in `-data` and nothing depends on `-data` independently. The drop of `noarch` makes the separation pointless.