From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EAE5E138334 for ; Fri, 14 Sep 2018 07:37:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 714C4E0DA0; Fri, 14 Sep 2018 07:37:06 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2DEDAE0DA0 for ; Fri, 14 Sep 2018 07:37:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E4561335CA6 for ; Fri, 14 Sep 2018 07:37:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1C3953D5 for ; Fri, 14 Sep 2018 07:37:02 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1536910616.45eaa6b8e646f975e9efdab763c87142a03a5c34.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/nano/, app-editors/nano/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/nano/files/nano-3.0-misbinding.patch app-editors/nano/nano-3.0-r1.ebuild app-editors/nano/nano-3.0.ebuild X-VCS-Directories: app-editors/nano/ app-editors/nano/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 45eaa6b8e646f975e9efdab763c87142a03a5c34 X-VCS-Branch: master Date: Fri, 14 Sep 2018 07:37:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9e8f0784-7fc7-49bd-b73f-fc0a9353bcac X-Archives-Hash: 3de71471123cb56a9068cf971915653b commit: 45eaa6b8e646f975e9efdab763c87142a03a5c34 Author: Lars Wendler gentoo org> AuthorDate: Fri Sep 14 07:36:15 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Fri Sep 14 07:36:56 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45eaa6b8 app-editors/nano: Revbump to fix misbinding with upstream patch. Removed old. Package-Manager: Portage-2.3.49, Repoman-2.3.10 app-editors/nano/files/nano-3.0-misbinding.patch | 46 ++++++++++++++++++++++ .../nano/{nano-3.0.ebuild => nano-3.0-r1.ebuild} | 4 ++ 2 files changed, 50 insertions(+) diff --git a/app-editors/nano/files/nano-3.0-misbinding.patch b/app-editors/nano/files/nano-3.0-misbinding.patch new file mode 100644 index 00000000000..2312edcff06 --- /dev/null +++ b/app-editors/nano/files/nano-3.0-misbinding.patch @@ -0,0 +1,46 @@ +From 09ab2e3d0eeb33bc4d0702623404ba01b1f8fa9a Mon Sep 17 00:00:00 2001 +From: Benno Schulenberg +Date: Wed, 12 Sep 2018 13:18:17 +0200 +Subject: [PATCH] bindings: when Ctrl+Shift+Delete has no keycode, don't + use KEY_BSP + +When curses gives no code for Ctrl+Shift+Delete, do not fall back +to KEY_BACKSPACE, because then ^H and/or get bound to +'cutwordleft'. + +This fixes https://savannah.gnu.org/bugs/?54642. + +Bug was introduced with version 3.0, commit e6429e78. +--- + src/nano.c | 2 +- + src/nano.h | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/nano.c b/src/nano.c +index c7e0ca2d..74e12439 100644 +--- a/src/nano.c ++++ b/src/nano.c +@@ -2580,7 +2580,7 @@ int main(int argc, char **argv) + controlhome = get_keycode("kHOM5", CONTROL_HOME); + controlend = get_keycode("kEND5", CONTROL_END); + controldelete = get_keycode("kDC5", CONTROL_DELETE); +- controlshiftdelete = get_keycode("kDC6", KEY_BACKSPACE); ++ controlshiftdelete = get_keycode("kDC6", CONTROL_SHIFT_DELETE); + #ifndef NANO_TINY + /* Ask for the codes for Shift+Control+Left/Right/Up/Down. */ + shiftcontrolleft = get_keycode("kLFT6", SHIFT_CONTROL_LEFT); +diff --git a/src/nano.h b/src/nano.h +index e1042759..7de34bf3 100644 +--- a/src/nano.h ++++ b/src/nano.h +@@ -588,6 +588,7 @@ enum + #define SHIFT_CONTROL_DOWN 0x414 + #define SHIFT_CONTROL_HOME 0x415 + #define SHIFT_CONTROL_END 0x416 ++#define CONTROL_SHIFT_DELETE 0x417 + #define ALT_LEFT 0x421 + #define ALT_RIGHT 0x422 + #define ALT_UP 0x423 +-- +2.17.1 + diff --git a/app-editors/nano/nano-3.0.ebuild b/app-editors/nano/nano-3.0-r1.ebuild similarity index 97% rename from app-editors/nano/nano-3.0.ebuild rename to app-editors/nano/nano-3.0-r1.ebuild index 4d2b8d0818e..44b716308be 100644 --- a/app-editors/nano/nano-3.0.ebuild +++ b/app-editors/nano/nano-3.0-r1.ebuild @@ -31,6 +31,10 @@ DEPEND="${RDEPEND} virtual/pkgconfig static? ( ${LIB_DEPEND} )" +PATCHES=( + "${FILESDIR}"/${P}-misbinding.patch +) + src_prepare() { default if [[ ${PV} == "9999" ]] ; then