[arch-commits] Commit in kbd/trunk (PKGBUILD kbd-fix-loadkmap-compat.patch)

[Antonio Rojas]

    Date: Wednesday, August 28, 2019 @ 20:28:11
  Author: arojas
Revision: 361344

Restore compatibility with loadkmap (FS#63565), run test suite

Added:
  kbd/trunk/kbd-fix-loadkmap-compat.patch
Modified:
  kbd/trunk/PKGBUILD

-------------------------------+
 PKGBUILD                      |   20 ++++++++++++++++----
 kbd-fix-loadkmap-compat.patch |   14 ++++++++++++++
 2 files changed, 30 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-08-28 19:40:36 UTC (rev 361343)
+++ PKGBUILD	2019-08-28 20:28:11 UTC (rev 361344)
@@ -2,7 +2,7 @@
 
 pkgname=kbd
 pkgver=2.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Keytable files and keyboard utilities"
 arch=('x86_64')
 url="http://www.kbd-project.org"
@@ -12,12 +12,14 @@
 #source=(https://www.kernel.org/pub/linux/utils/${pkgname}/${pkgname}-${pkgver}.tar.gz
 #        https://www.kernel.org/pub/linux/utils/kbd/${pkgname}-${pkgver}.tar.sign
 source=(git+https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git#tag=v$pkgver
-        'fix-euro2.patch')
+        'fix-euro2.patch'
+        'kbd-fix-loadkmap-compat.patch')
 provides=('vlock')
 conflicts=('vlock')
 replaces=('vlock')
 md5sums=('SKIP'
-         'd869200acbc0aab6a9cafa43cb140d4e')
+         'd869200acbc0aab6a9cafa43cb140d4e'
+         '730b1054fbd88b87c27c5565bd7d4fc6')
 validpgpkeys=(
               '7F2A3D07298149A0793C9A4EA45ABA544CFFD434' #Alexey Gladkov 
              )
@@ -38,6 +40,7 @@
   git cherry-pick -n 15a74479 # Don't override CFLAGS
   git cherry-pick -n acf93e44 # https://github.com/legionus/kbd/issues/31
   git cherry-pick -n 7e27102b # https://github.com/legionus/kbd/issues/32
+  patch -p1 -i ../kbd-fix-loadkmap-compat.patch # Restore compatibility with busybox loadkmap
   autoreconf -if
 }
 
@@ -47,7 +50,16 @@
   make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes
 }
 
+check() {
+  cd ${pkgname}
+
+# This test is expected to fail since kbd-fix-loadkmap-compat.patch modifies the binary format
+  sed -e 's|dumpkeys-bkeymap ||' -i tests/Makefile
+
+  make check
+}
+
 package() {
   cd ${pkgname}
-  make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes DESTDIR=${pkgdir} install
+  make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes DESTDIR="${pkgdir}" install
 }

Added: kbd-fix-loadkmap-compat.patch
===================================================================
--- kbd-fix-loadkmap-compat.patch	                        (rev 0)
+++ kbd-fix-loadkmap-compat.patch	2019-08-28 20:28:11 UTC (rev 361344)
@@ -0,0 +1,14 @@
+diff --git a/src/libkeymap/dump.c b/src/libkeymap/dump.c
+index 83ac351..a7ba1e5 100644
+--- a/src/libkeymap/dump.c
++++ b/src/libkeymap/dump.c
+@@ -72,7 +72,7 @@ int lk_dump_bkeymap(struct lk_ctx *ctx, FILE *fd)
+ 			continue;
+ 
+ 		for (j = 0; j < NR_KEYS / 2; j++) {
+-			int v = lk_get_key(ctx, i, j);
++			short v = (short)lk_get_key(ctx, i, j);
+ 
+ 			if (fwrite(&v, sizeof(v), 1, fd) != 1)
+ 				goto fail;
+