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 7595C1382C5 for ; Sun, 11 Mar 2018 12:45:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7CF55E07EE; Sun, 11 Mar 2018 12:45:53 +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 4D21AE07EE for ; Sun, 11 Mar 2018 12:45:52 +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 14926335C6E for ; Sun, 11 Mar 2018 12:45:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5959E232 for ; Sun, 11 Mar 2018 12:45:49 +0000 (UTC) From: "Daniel Pielmeier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Daniel Pielmeier" Message-ID: <1520772330.90fd8959023db84ccf85a639c45a2b03b67c5d6e.billie@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/conky/files/, app-admin/conky/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/conky/conky-1.10.8.ebuild app-admin/conky/files/conky-1.10.8-use-pkgconfig.patch X-VCS-Directories: app-admin/conky/files/ app-admin/conky/ X-VCS-Committer: billie X-VCS-Committer-Name: Daniel Pielmeier X-VCS-Revision: 90fd8959023db84ccf85a639c45a2b03b67c5d6e X-VCS-Branch: master Date: Sun, 11 Mar 2018 12:45:49 +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: dd17f1ef-5fd9-48e9-9c44-71057c94f139 X-Archives-Hash: d2cae2ef2c9a6027a8a664b66a3e8db8 commit: 90fd8959023db84ccf85a639c45a2b03b67c5d6e Author: Daniel Pielmeier gentoo org> AuthorDate: Sun Mar 11 12:45:00 2018 +0000 Commit: Daniel Pielmeier gentoo org> CommitDate: Sun Mar 11 12:45:30 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90fd8959 app-admin/conky: Fix bug #648090. This adds a patch to switch back to using pkg-config for the detection of ncurses instead of FindCurses provided by cmake as it does not handle cases with separate tinfo. Package-Manager: Portage-2.3.24, Repoman-2.3.6 app-admin/conky/conky-1.10.8.ebuild | 2 ++ .../conky/files/conky-1.10.8-use-pkgconfig.patch | 34 ++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/app-admin/conky/conky-1.10.8.ebuild b/app-admin/conky/conky-1.10.8.ebuild index 2679d661162..e46eaaa3096 100644 --- a/app-admin/conky/conky-1.10.8.ebuild +++ b/app-admin/conky/conky-1.10.8.ebuild @@ -73,6 +73,8 @@ CONFIG_CHECK=~IPV6 DOCS=( README.md TODO ChangeLog NEWS AUTHORS ) +PATCHES=( "${FILESDIR}"/${P}-use-pkgconfig.patch ) + DISABLE_AUTOFORMATTING="yes" DOC_CONTENTS="You can find sample configurations at ${ROOT%/}/usr/share/doc/${PF}. To customize, copy to ${XDG_CONFIG_HOME}/conky/conky.conf diff --git a/app-admin/conky/files/conky-1.10.8-use-pkgconfig.patch b/app-admin/conky/files/conky-1.10.8-use-pkgconfig.patch new file mode 100644 index 00000000000..97e6bd02323 --- /dev/null +++ b/app-admin/conky/files/conky-1.10.8-use-pkgconfig.patch @@ -0,0 +1,34 @@ +Reversed patch + +From abd0be51a00444d3be6b213e0926675e5a4e5ed3 Mon Sep 17 00:00:00 2001 +From: Brenden Matthews +Date: Tue, 23 Jan 2018 12:56:06 -0500 +Subject: [PATCH] Use FindCurses instead of pkg_check_modules. + +This should resolve #217. +--- + cmake/ConkyPlatformChecks.cmake | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/cmake/ConkyPlatformChecks.cmake b/cmake/ConkyPlatformChecks.cmake +index c5b39b2f..19ec7b9b 100644 +--- a/cmake/ConkyPlatformChecks.cmake ++++ b/cmake/ConkyPlatformChecks.cmake +@@ -129,12 +129,12 @@ if(BUILD_HTTP) + endif(BUILD_HTTP) + + if(BUILD_NCURSES) ++ pkg_check_modules(NCURSES ncurses) ++ if(NOT NCURSES_FOUND) +- include(FindCurses) +- if(NOT CURSES_FOUND) + message(FATAL_ERROR "Unable to find ncurses library") ++ endif(NOT NCURSES_FOUND) ++ set(conky_libs ${conky_libs} ${NCURSES_LIBRARIES}) ++ set(conky_includes ${conky_includes} ${NCURSES_INCLUDE_DIRS}) +- endif(NOT CURSES_FOUND) +- set(conky_libs ${conky_libs} ${CURSES_LIBRARIES}) +- set(conky_includes ${conky_includes} ${CURSES_INCLUDE_DIR}) + endif(BUILD_NCURSES) + + if(BUILD_MYSQL)