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 D32AD138334 for ; Thu, 27 Sep 2018 11:28:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9D0C9E0878; Thu, 27 Sep 2018 11:28:47 +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 77498E0878 for ; Thu, 27 Sep 2018 11:28:46 +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 CE2EB335C95 for ; Thu, 27 Sep 2018 11:28:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D79853DE for ; Thu, 27 Sep 2018 11:28:42 +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: <1538047713.d150c22c354afa61f9777c65f075e58e8d6780b4.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/nano/files/, app-editors/nano/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/nano/files/nano-3.1-enable_tiny_build_fix.patch app-editors/nano/nano-3.1.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: d150c22c354afa61f9777c65f075e58e8d6780b4 X-VCS-Branch: master Date: Thu, 27 Sep 2018 11:28:42 +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: cb843a97-434d-4cb1-ad03-be45c22d01c9 X-Archives-Hash: 5b2778d68fc8d87122f7749d96ba3dca commit: d150c22c354afa61f9777c65f075e58e8d6780b4 Author: Lars Wendler gentoo org> AuthorDate: Thu Sep 27 11:28:33 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Thu Sep 27 11:28:33 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d150c22c app-editors/nano: Added USE="minimal" build fix. Closes: https://bugs.gentoo.org/667052 Package-Manager: Portage-2.3.50, Repoman-2.3.11 .../files/nano-3.1-enable_tiny_build_fix.patch | 29 ++++++++++++++++++++++ app-editors/nano/nano-3.1.ebuild | 6 ++++- 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/app-editors/nano/files/nano-3.1-enable_tiny_build_fix.patch b/app-editors/nano/files/nano-3.1-enable_tiny_build_fix.patch new file mode 100644 index 00000000000..58fe1982be9 --- /dev/null +++ b/app-editors/nano/files/nano-3.1-enable_tiny_build_fix.patch @@ -0,0 +1,29 @@ +From 368ec04870a366b19f1c5801a6868786547968b0 Mon Sep 17 00:00:00 2001 +From: Benno Schulenberg +Date: Wed, 19 Sep 2018 20:36:39 +0200 +Subject: build: fix compilation again when configured with --enable-tiny + +Reported-by: Jordi Mallach +--- + src/nano.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/nano.c b/src/nano.c +index ebb1f11..01f92a1 100644 +--- a/src/nano.c ++++ b/src/nano.c +@@ -1756,7 +1756,10 @@ int do_input(bool allow_funcs) + if (shortcut == NULL) + pletion_line = NULL; + else { +- if (ISSET(VIEW_MODE) && shortcut->func != do_toggle_void && ++ if (ISSET(VIEW_MODE) && ++#ifndef NANO_TINY ++ shortcut->func != do_toggle_void && ++#endif + !okay_for_view(shortcut)) { + print_view_warning(); + return ERR; +-- +cgit v1.0-41-gc330 + diff --git a/app-editors/nano/nano-3.1.ebuild b/app-editors/nano/nano-3.1.ebuild index 7f0d1d7bfbd..a9712a1c464 100644 --- a/app-editors/nano/nano-3.1.ebuild +++ b/app-editors/nano/nano-3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -31,6 +31,10 @@ DEPEND="${RDEPEND} virtual/pkgconfig static? ( ${LIB_DEPEND} )" +PATCHES=( + "${FILESDIR}/${P}-enable_tiny_build_fix.patch" +) + src_prepare() { default if [[ ${PV} == "9999" ]] ; then