From d4d5fa0f0f6772ee06cfa311128c4a11fb1786dd Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Mon, 30 Dec 2024 07:14:29 +0000
Subject: [PATCH] kbd: 2.6.4 -> 2.7.1

Changes:
- https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git/tag/?h=v2.7
- https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git/tag/?h=v2.7.1
---
 pkgs/by-name/kb/kbd/package.nix        | 12 ++++++------
 pkgs/by-name/kb/kbd/search-paths.patch | 19 ++++++++++---------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/kb/kbd/package.nix b/pkgs/by-name/kb/kbd/package.nix
index 2db418ecc0a79..4bf9cb4325b9c 100644
--- a/pkgs/by-name/kb/kbd/package.nix
+++ b/pkgs/by-name/kb/kbd/package.nix
@@ -18,11 +18,11 @@
 
 stdenv.mkDerivation rec {
   pname = "kbd";
-  version = "2.6.4";
+  version = "2.7.1";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/kbd/${pname}-${version}.tar.xz";
-    sha256 = "sha256-UZ+NCHrsyn4KM80IS++SwGbrGXMWZmU9zHDJ1xqkCSY=";
+    sha256 = "sha256-8WfYmdkrVszxL29JNVFz+ThwqV8V2K7r9f3NKKYhrKg=";
   };
 
   # vlock is moved into its own output, since it depends on pam. This
@@ -58,10 +58,10 @@ stdenv.mkDerivation rec {
 
     # Fix paths to decompressors. Trailing space to avoid replacing `xz` in `".xz"`.
     substituteInPlace src/libkbdfile/kbdfile.c \
-      --replace 'gzip '  '${gzip}/bin/gzip ' \
-      --replace 'bzip2 ' '${bzip2.bin}/bin/bzip2 ' \
-      --replace 'xz '    '${xz.bin}/bin/xz ' \
-      --replace 'zstd '  '${zstd.bin}/bin/zstd '
+      --replace-fail 'gzip '  '${gzip}/bin/gzip ' \
+      --replace-fail 'bzip2 ' '${bzip2.bin}/bin/bzip2 ' \
+      --replace-fail 'xz '    '${xz.bin}/bin/xz ' \
+      --replace-fail 'zstd '  '${zstd.bin}/bin/zstd '
 
     sed -i '
       1i prefix:=$(vlock)
diff --git a/pkgs/by-name/kb/kbd/search-paths.patch b/pkgs/by-name/kb/kbd/search-paths.patch
index 61e8918017c2a..4d51f7d055645 100644
--- a/pkgs/by-name/kb/kbd/search-paths.patch
+++ b/pkgs/by-name/kb/kbd/search-paths.patch
@@ -41,7 +41,7 @@ Without this patch, kbd will only look inside
  };
 @@ -55,5 +58,6 @@ static const char *const unisuffixes[] = {
  /* hide partial fonts a bit - loading a single one is a bad idea */
- const char *const partfontdirpath[]  = {
+ static const char *const partfontdirpath[]  = {
 +	"/etc/kbd/" FONTDIR "/" PARTIALDIR "/",
  	DATADIR "/" FONTDIR "/" PARTIALDIR "/",
  	NULL
@@ -68,13 +68,14 @@ Without this patch, kbd will only look inside
 --- a/src/setfont.c
 +++ b/src/setfont.c
 @@ -48,8 +48,8 @@ usage(void)
- 	                    "    -v         Be verbose.\n"
- 	                    "    -C <cons>  Indicate console device to be used.\n"
- 	                    "    -V         Print version and exit.\n"
--	                    "Files are loaded from the current directory or %s/*/.\n"),
--	        DATADIR);
-+	                    "Files are loaded from the current directory or %s/*/ or %s/*/.\n"),
-+	        DATADIR, "/etc/kbd");
- 	exit(EX_USAGE);
+ 		  "\n"
+-		  "Files are loaded from the %s/*/.\n"),
+-		DATADIR);
++		  "Files are loaded from the %s/*/ or %s/*/.\n"),
++		DATADIR, "/etc/kbd");
+ 
+ 	print_report_bugs();
+ 
+ 	exit(retcode);
  }