1 |
commit: 468fac8b3ce93a2f486b68401189a80c137c5d16 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Aug 14 06:19:50 2019 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Aug 14 06:21:05 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=468fac8b |
7 |
|
8 |
sys-apps/kbd: Revbump to make "loadkeys -d" not stop on first error |
9 |
|
10 |
Package-Manager: Portage-2.3.71, Repoman-2.3.17 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
...bd-2.2.0-kbdfile-dont_stop_on_first_error.patch | 31 ++++++++++++++++++++++ |
14 |
.../{kbd-2.2.0-r1.ebuild => kbd-2.2.0-r2.ebuild} | 3 ++- |
15 |
2 files changed, 33 insertions(+), 1 deletion(-) |
16 |
|
17 |
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 |
18 |
new file mode 100644 |
19 |
index 00000000000..4b545f5bc2a |
20 |
--- /dev/null |
21 |
+++ b/sys-apps/kbd/files/kbd-2.2.0-kbdfile-dont_stop_on_first_error.patch |
22 |
@@ -0,0 +1,31 @@ |
23 |
+From acf93e44f6d036303f95555069031f6fb12ce9d1 Mon Sep 17 00:00:00 2001 |
24 |
+From: Alexey Gladkov <gladkov.alexey@×××××.com> |
25 |
+Date: Tue, 6 Aug 2019 13:59:34 +0200 |
26 |
+Subject: [PATCH] libkbdfile: Do not stop on the first error |
27 |
+ |
28 |
+The kbdfile_find() gets a list of directories in which the filename. If |
29 |
+we could not find the filename in the first directory, you do not need |
30 |
+to return an error. |
31 |
+ |
32 |
+Link: https://github.com/legionus/kbd/issues/31 |
33 |
+ |
34 |
+Signed-off-by: Alexey Gladkov <gladkov.alexey@×××××.com> |
35 |
+--- |
36 |
+ src/libkbdfile/kbdfile.c | 4 ++-- |
37 |
+ 1 file changed, 2 insertions(+), 2 deletions(-) |
38 |
+ |
39 |
+diff --git a/src/libkbdfile/kbdfile.c b/src/libkbdfile/kbdfile.c |
40 |
+index 804f04a..fb8e035 100644 |
41 |
+--- a/src/libkbdfile/kbdfile.c |
42 |
++++ b/src/libkbdfile/kbdfile.c |
43 |
+@@ -433,8 +433,8 @@ kbdfile_find(char *fnam, char **dirpath, char **suffixes, struct kbdfile *fp) |
44 |
+ rc = findfile_in_dir(fnam, dir, recdepth, suffixes, fp); |
45 |
+ free(dir); |
46 |
+ |
47 |
+- if (rc <= 0) |
48 |
+- return rc; |
49 |
++ if (!rc) |
50 |
++ return 0; |
51 |
+ } |
52 |
+ |
53 |
+ return 1; |
54 |
|
55 |
diff --git a/sys-apps/kbd/kbd-2.2.0-r1.ebuild b/sys-apps/kbd/kbd-2.2.0-r2.ebuild |
56 |
similarity index 93% |
57 |
rename from sys-apps/kbd/kbd-2.2.0-r1.ebuild |
58 |
rename to sys-apps/kbd/kbd-2.2.0-r2.ebuild |
59 |
index 895a4995c52..3675430c7a9 100644 |
60 |
--- a/sys-apps/kbd/kbd-2.2.0-r1.ebuild |
61 |
+++ b/sys-apps/kbd/kbd-2.2.0-r2.ebuild |
62 |
@@ -36,7 +36,8 @@ BDEPEND=" |
63 |
" |
64 |
|
65 |
PATCHES=( |
66 |
- "${FILESDIR}/${PN}-2.2.0-cflags.patch" #691142 |
67 |
+ "${FILESDIR}/${P}-cflags.patch" #691142 |
68 |
+ "${FILESDIR}/${P}-kbdfile-dont_stop_on_first_error.patch" |
69 |
) |
70 |
|
71 |
src_unpack() { |