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 EEF841396D0 for ; Sat, 2 Sep 2017 00:23:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4DD52E0831; Sat, 2 Sep 2017 00:23:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 20661E0831 for ; Sat, 2 Sep 2017 00:23:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 2AD3133BEC7 for ; Sat, 2 Sep 2017 00:23:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 942118AC1 for ; Sat, 2 Sep 2017 00:23:25 +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: <1504311801.a85bdb42ac21f9adb2ed7b71c6257fbf8a2f60e6.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-2.8.7-minimal_compile_fix.patch app-editors/nano/nano-2.8.7.ebuild X-VCS-Directories: app-editors/nano/files/ app-editors/nano/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: a85bdb42ac21f9adb2ed7b71c6257fbf8a2f60e6 X-VCS-Branch: master Date: Sat, 2 Sep 2017 00:23:25 +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: 18422ebd-7752-4cac-af07-947cc8505590 X-Archives-Hash: 54ed76dd8498c0e50bbd937b46dc5d9f commit: a85bdb42ac21f9adb2ed7b71c6257fbf8a2f60e6 Author: Lars Wendler gentoo org> AuthorDate: Sat Sep 2 00:23:06 2017 +0000 Commit: Lars Wendler gentoo org> CommitDate: Sat Sep 2 00:23:21 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a85bdb42 app-editors/nano: Fixed build with USE="minimal" (bug #629510). Package-Manager: Portage-2.3.8, Repoman-2.3.3 .../files/nano-2.8.7-minimal_compile_fix.patch | 38 ++++++++++++++++++++++ app-editors/nano/nano-2.8.7.ebuild | 6 +++- 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/app-editors/nano/files/nano-2.8.7-minimal_compile_fix.patch b/app-editors/nano/files/nano-2.8.7-minimal_compile_fix.patch new file mode 100644 index 00000000000..ef8d7491016 --- /dev/null +++ b/app-editors/nano/files/nano-2.8.7-minimal_compile_fix.patch @@ -0,0 +1,38 @@ +From 28cfab7580c42a6d6c9c5d787ce736094fd51a0c Mon Sep 17 00:00:00 2001 +From: Benno Schulenberg +Date: Tue, 29 Aug 2017 19:28:44 +0200 +Subject: tweaks: fix compilation when configured with --enable-tiny + +When moving the cursor to the top-left corner, it is not necessary +to compute leftedge because firstcolumn IS the relevant leftedge. + +Reported-by: Jordi Mallach +--- + src/move.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/move.c b/src/move.c +index d138356..ce276e4 100644 +--- a/src/move.c ++++ b/src/move.c +@@ -121,7 +121,7 @@ void do_page_up(void) + openfile->current = openfile->edittop; + openfile->current_y = 0; + +- leftedge = leftedge_for(openfile->firstcolumn, openfile->edittop); ++ leftedge = openfile->firstcolumn; + target_column = 0; + } else + get_edge_and_target(&leftedge, &target_column); +@@ -152,7 +152,7 @@ void do_page_down(void) + openfile->current = openfile->edittop; + openfile->current_y = 0; + +- leftedge = leftedge_for(openfile->firstcolumn, openfile->edittop); ++ leftedge = openfile->firstcolumn; + target_column = 0; + } else + get_edge_and_target(&leftedge, &target_column); +-- +cgit v1.0-41-gc330 + diff --git a/app-editors/nano/nano-2.8.7.ebuild b/app-editors/nano/nano-2.8.7.ebuild index 4463df57a3e..49a313cd193 100644 --- a/app-editors/nano/nano-2.8.7.ebuild +++ b/app-editors/nano/nano-2.8.7.ebuild @@ -31,11 +31,15 @@ DEPEND="${RDEPEND} virtual/pkgconfig static? ( ${LIB_DEPEND} )" +PATCHES=( + "${FILESDIR}/${P}-minimal_compile_fix.patch" #629510 +) + src_prepare() { + default if [[ ${PV} == "9999" ]] ; then eautoreconf fi - default } src_configure() {