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 5D3C11382C5 for ; Mon, 7 Dec 2020 14:47:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8FA6EE0B51; Mon, 7 Dec 2020 14:47:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 6276AE0B51 for ; Mon, 7 Dec 2020 14:47:03 +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 46B6D340E2B for ; Mon, 7 Dec 2020 14:47:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ACEDE38A for ; Mon, 7 Dec 2020 14:47:00 +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: <1607352417.fcb9a9dd103f542b2382497615c72817ab61ad73.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-process/htop/files/, sys-process/htop/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-process/htop/files/htop-3.0.3-tinfo.patch sys-process/htop/htop-3.0.2.ebuild sys-process/htop/htop-3.0.3.ebuild X-VCS-Directories: sys-process/htop/files/ sys-process/htop/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: fcb9a9dd103f542b2382497615c72817ab61ad73 X-VCS-Branch: master Date: Mon, 7 Dec 2020 14:47:00 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: cd837df2-61a2-483d-963d-0ada450b6b24 X-Archives-Hash: f47d58df1b1e1e5fae6d43f4f245f9cb commit: fcb9a9dd103f542b2382497615c72817ab61ad73 Author: Lars Wendler gentoo org> AuthorDate: Mon Dec 7 14:46:37 2020 +0000 Commit: Lars Wendler gentoo org> CommitDate: Mon Dec 7 14:46:57 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcb9a9dd sys-process/htop: Fixed build with USE="-unicode" Closes: https://bugs.gentoo.org/690840 Package-Manager: Portage-3.0.11, Repoman-3.0.2 Signed-off-by: Lars Wendler gentoo.org> sys-process/htop/files/htop-3.0.3-tinfo.patch | 38 +++++++++++++++++++++++++++ sys-process/htop/htop-3.0.2.ebuild | 4 ++- sys-process/htop/htop-3.0.3.ebuild | 4 +++ 3 files changed, 45 insertions(+), 1 deletion(-) diff --git a/sys-process/htop/files/htop-3.0.3-tinfo.patch b/sys-process/htop/files/htop-3.0.3-tinfo.patch new file mode 100644 index 00000000000..ea65a799ed7 --- /dev/null +++ b/sys-process/htop/files/htop-3.0.3-tinfo.patch @@ -0,0 +1,38 @@ +From ead978bce6236a55d75b72e059686766fa708db4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= +Date: Mon, 7 Dec 2020 15:30:56 +0100 +Subject: [PATCH] configure: check for additional linker flags for keypad(3) + +Gentoo requires an explicit addition of -ltinfo + +Resolves: https://bugs.gentoo.org/show_bug.cgi?id=690840 +--- + configure.ac | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 460b16aa..f91d8e92 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -217,6 +217,10 @@ if test "x$enable_unicode" = xyes; then + [AC_CHECK_HEADERS([ncurses/ncurses.h],[:], + [AC_CHECK_HEADERS([ncurses/curses.h],[:], + [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])]) ++ ++ # check if additional linker flags are needed for keypad(3) ++ # (at this point we already link against a working ncurses library with wide character support) ++ AC_SEARCH_LIBS([keypad], [tinfow tinfo]) + else + HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "ncurses6-config", + HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses5-config", +@@ -229,6 +233,10 @@ else + [AC_CHECK_HEADERS([ncurses/curses.h],[:], + [AC_CHECK_HEADERS([ncurses/ncurses.h],[:], + [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])]) ++ ++ # check if additional linker flags are needed for keypad(3) ++ # (at this point we already link against a working ncurses library) ++ AC_SEARCH_LIBS([keypad], [tinfo]) + fi + + if test "$my_htop_platform" = "freebsd"; then diff --git a/sys-process/htop/htop-3.0.2.ebuild b/sys-process/htop/htop-3.0.2.ebuild index a9fd130d98b..9a0da288eaf 100644 --- a/sys-process/htop/htop-3.0.2.ebuild +++ b/sys-process/htop/htop-3.0.2.ebuild @@ -25,7 +25,9 @@ DOCS=( ChangeLog README ) CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS" -PATCHES=() +PATCHES=( + "${FILESDIR}/${PN}-3.0.3-tinfo.patch" #690840 +) pkg_setup() { if ! has_version sys-process/lsof; then diff --git a/sys-process/htop/htop-3.0.3.ebuild b/sys-process/htop/htop-3.0.3.ebuild index 3e1ec19ce2e..32795d9586e 100644 --- a/sys-process/htop/htop-3.0.3.ebuild +++ b/sys-process/htop/htop-3.0.3.ebuild @@ -29,6 +29,10 @@ CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS" S="${WORKDIR}/${P/_}" +PATCHES=( + "${FILESDIR}/${PN}-3.0.3-tinfo.patch" #690840 +) + pkg_setup() { if ! has_version sys-process/lsof; then ewarn "To use lsof features in htop (what processes are accessing"