1 |
commit: 45eaa6b8e646f975e9efdab763c87142a03a5c34 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Sep 14 07:36:15 2018 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 14 07:36:56 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45eaa6b8 |
7 |
|
8 |
app-editors/nano: Revbump to fix misbinding with upstream patch. |
9 |
|
10 |
Removed old. |
11 |
|
12 |
Package-Manager: Portage-2.3.49, Repoman-2.3.10 |
13 |
|
14 |
app-editors/nano/files/nano-3.0-misbinding.patch | 46 ++++++++++++++++++++++ |
15 |
.../nano/{nano-3.0.ebuild => nano-3.0-r1.ebuild} | 4 ++ |
16 |
2 files changed, 50 insertions(+) |
17 |
|
18 |
diff --git a/app-editors/nano/files/nano-3.0-misbinding.patch b/app-editors/nano/files/nano-3.0-misbinding.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..2312edcff06 |
21 |
--- /dev/null |
22 |
+++ b/app-editors/nano/files/nano-3.0-misbinding.patch |
23 |
@@ -0,0 +1,46 @@ |
24 |
+From 09ab2e3d0eeb33bc4d0702623404ba01b1f8fa9a Mon Sep 17 00:00:00 2001 |
25 |
+From: Benno Schulenberg <bensberg@×××××××.nl> |
26 |
+Date: Wed, 12 Sep 2018 13:18:17 +0200 |
27 |
+Subject: [PATCH] bindings: when Ctrl+Shift+Delete has no keycode, don't |
28 |
+ use KEY_BSP |
29 |
+ |
30 |
+When curses gives no code for Ctrl+Shift+Delete, do not fall back |
31 |
+to KEY_BACKSPACE, because then ^H and/or <Backspace> get bound to |
32 |
+'cutwordleft'. |
33 |
+ |
34 |
+This fixes https://savannah.gnu.org/bugs/?54642. |
35 |
+ |
36 |
+Bug was introduced with version 3.0, commit e6429e78. |
37 |
+--- |
38 |
+ src/nano.c | 2 +- |
39 |
+ src/nano.h | 1 + |
40 |
+ 2 files changed, 2 insertions(+), 1 deletion(-) |
41 |
+ |
42 |
+diff --git a/src/nano.c b/src/nano.c |
43 |
+index c7e0ca2d..74e12439 100644 |
44 |
+--- a/src/nano.c |
45 |
++++ b/src/nano.c |
46 |
+@@ -2580,7 +2580,7 @@ int main(int argc, char **argv) |
47 |
+ controlhome = get_keycode("kHOM5", CONTROL_HOME); |
48 |
+ controlend = get_keycode("kEND5", CONTROL_END); |
49 |
+ controldelete = get_keycode("kDC5", CONTROL_DELETE); |
50 |
+- controlshiftdelete = get_keycode("kDC6", KEY_BACKSPACE); |
51 |
++ controlshiftdelete = get_keycode("kDC6", CONTROL_SHIFT_DELETE); |
52 |
+ #ifndef NANO_TINY |
53 |
+ /* Ask for the codes for Shift+Control+Left/Right/Up/Down. */ |
54 |
+ shiftcontrolleft = get_keycode("kLFT6", SHIFT_CONTROL_LEFT); |
55 |
+diff --git a/src/nano.h b/src/nano.h |
56 |
+index e1042759..7de34bf3 100644 |
57 |
+--- a/src/nano.h |
58 |
++++ b/src/nano.h |
59 |
+@@ -588,6 +588,7 @@ enum |
60 |
+ #define SHIFT_CONTROL_DOWN 0x414 |
61 |
+ #define SHIFT_CONTROL_HOME 0x415 |
62 |
+ #define SHIFT_CONTROL_END 0x416 |
63 |
++#define CONTROL_SHIFT_DELETE 0x417 |
64 |
+ #define ALT_LEFT 0x421 |
65 |
+ #define ALT_RIGHT 0x422 |
66 |
+ #define ALT_UP 0x423 |
67 |
+-- |
68 |
+2.17.1 |
69 |
+ |
70 |
|
71 |
diff --git a/app-editors/nano/nano-3.0.ebuild b/app-editors/nano/nano-3.0-r1.ebuild |
72 |
similarity index 97% |
73 |
rename from app-editors/nano/nano-3.0.ebuild |
74 |
rename to app-editors/nano/nano-3.0-r1.ebuild |
75 |
index 4d2b8d0818e..44b716308be 100644 |
76 |
--- a/app-editors/nano/nano-3.0.ebuild |
77 |
+++ b/app-editors/nano/nano-3.0-r1.ebuild |
78 |
@@ -31,6 +31,10 @@ DEPEND="${RDEPEND} |
79 |
virtual/pkgconfig |
80 |
static? ( ${LIB_DEPEND} )" |
81 |
|
82 |
+PATCHES=( |
83 |
+ "${FILESDIR}"/${P}-misbinding.patch |
84 |
+) |
85 |
+ |
86 |
src_prepare() { |
87 |
default |
88 |
if [[ ${PV} == "9999" ]] ; then |