Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/files/, sys-apps/kbd/
Date: Wed, 14 Aug 2019 06:21:14
Message-Id: 1565763665.468fac8b3ce93a2f486b68401189a80c137c5d16.polynomial-c@gentoo
commit:     468fac8b3ce93a2f486b68401189a80c137c5d16
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 14 06:19:50 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Aug 14 06:21:05 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=468fac8b

sys-apps/kbd: Revbump to make "loadkeys -d" not stop on first error

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 ...bd-2.2.0-kbdfile-dont_stop_on_first_error.patch | 31 ++++++++++++++++++++++
 .../{kbd-2.2.0-r1.ebuild => kbd-2.2.0-r2.ebuild}   |  3 ++-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/sys-apps/kbd/files/kbd-2.2.0-kbdfile-dont_stop_on_first_error.patch b/sys-apps/kbd/files/kbd-2.2.0-kbdfile-dont_stop_on_first_error.patch
new file mode 100644
index 00000000000..4b545f5bc2a
--- /dev/null
+++ b/sys-apps/kbd/files/kbd-2.2.0-kbdfile-dont_stop_on_first_error.patch
@@ -0,0 +1,31 @@
+From acf93e44f6d036303f95555069031f6fb12ce9d1 Mon Sep 17 00:00:00 2001
+From: Alexey Gladkov <gladkov.alexey@×××××.com>
+Date: Tue, 6 Aug 2019 13:59:34 +0200
+Subject: [PATCH] libkbdfile: Do not stop on the first error
+
+The kbdfile_find() gets a list of directories in which the filename. If
+we could not find the filename in the first directory, you do not need
+to return an error.
+
+Link: https://github.com/legionus/kbd/issues/31
+
+Signed-off-by: Alexey Gladkov <gladkov.alexey@×××××.com>
+---
+ src/libkbdfile/kbdfile.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/libkbdfile/kbdfile.c b/src/libkbdfile/kbdfile.c
+index 804f04a..fb8e035 100644
+--- a/src/libkbdfile/kbdfile.c
++++ b/src/libkbdfile/kbdfile.c
+@@ -433,8 +433,8 @@ kbdfile_find(char *fnam, char **dirpath, char **suffixes, struct kbdfile *fp)
+ 		rc = findfile_in_dir(fnam, dir, recdepth, suffixes, fp);
+ 		free(dir);
+ 
+-		if (rc <= 0)
+-			return rc;
++		if (!rc)
++			return 0;
+ 	}
+ 
+ 	return 1;

diff --git a/sys-apps/kbd/kbd-2.2.0-r1.ebuild b/sys-apps/kbd/kbd-2.2.0-r2.ebuild
similarity index 93%
rename from sys-apps/kbd/kbd-2.2.0-r1.ebuild
rename to sys-apps/kbd/kbd-2.2.0-r2.ebuild
index 895a4995c52..3675430c7a9 100644
--- a/sys-apps/kbd/kbd-2.2.0-r1.ebuild
+++ b/sys-apps/kbd/kbd-2.2.0-r2.ebuild
@@ -36,7 +36,8 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-2.2.0-cflags.patch" #691142
+	"${FILESDIR}/${P}-cflags.patch" #691142
+	"${FILESDIR}/${P}-kbdfile-dont_stop_on_first_error.patch"
 )
 
 src_unpack() {