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 0FE781395E2 for ; Tue, 13 Dec 2016 01:12:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 51F0321C2FD; Mon, 12 Dec 2016 20:09:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1817E21C2FD for ; Mon, 12 Dec 2016 20:09:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AD5F3341293 for ; Mon, 12 Dec 2016 20:09:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4990E300 for ; Mon, 12 Dec 2016 20:09:33 +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: <1481573367.736b2f1955b4852b71ce8891b719cd482878cac7.billie@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/conky/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/conky/files/conky-1.10.1-includewlan.patch app-admin/conky/files/conky-1.10.1-ncurses-tinfo.patch X-VCS-Directories: app-admin/conky/files/ X-VCS-Committer: billie X-VCS-Committer-Name: Daniel Pielmeier X-VCS-Revision: 736b2f1955b4852b71ce8891b719cd482878cac7 X-VCS-Branch: master Date: Mon, 12 Dec 2016 20:09:33 +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: e715b788-d496-48ee-8f6a-87326aee567e X-Archives-Hash: 243ff10abeae8b7a05574cb4db933f33 commit: 736b2f1955b4852b71ce8891b719cd482878cac7 Author: Daniel Pielmeier gentoo org> AuthorDate: Mon Dec 12 20:09:27 2016 +0000 Commit: Daniel Pielmeier gentoo org> CommitDate: Mon Dec 12 20:09:27 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=736b2f19 app-admin/conky: Remove unused patches. Package-Manager: portage-2.3.0 .../conky/files/conky-1.10.1-includewlan.patch | 13 -------- .../conky/files/conky-1.10.1-ncurses-tinfo.patch | 35 ---------------------- 2 files changed, 48 deletions(-) diff --git a/app-admin/conky/files/conky-1.10.1-includewlan.patch b/app-admin/conky/files/conky-1.10.1-includewlan.patch deleted file mode 100644 index 82b09a7..00000000 --- a/app-admin/conky/files/conky-1.10.1-includewlan.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur a/cmake/ConkyPlatformChecks.cmake b/cmake/ConkyPlatformChecks.cmake ---- a/cmake/ConkyPlatformChecks.cmake 2015-11-18 20:47:45.000000000 +0500 -+++ b/cmake/ConkyPlatformChecks.cmake 2016-01-31 20:04:58.036144590 +0500 -@@ -141,7 +141,8 @@ - endif(BUILD_MYSQL) - - if(BUILD_WLAN) -- check_include_file(iwlib.h IWLIB_H -D_GNU_SOURCE) -+ set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE) -+ check_include_files(iwlib.h IWLIB_H -D_GNU_SOURCE) - if(NOT IWLIB_H) - message(FATAL_ERROR "Unable to find iwlib.h") - endif(NOT IWLIB_H) diff --git a/app-admin/conky/files/conky-1.10.1-ncurses-tinfo.patch b/app-admin/conky/files/conky-1.10.1-ncurses-tinfo.patch deleted file mode 100644 index a603959..00000000 --- a/app-admin/conky/files/conky-1.10.1-ncurses-tinfo.patch +++ /dev/null @@ -1,35 +0,0 @@ -From dbf26f0a42a7f46d363abb150192bfcd1ccb204b Mon Sep 17 00:00:00 2001 -From: Laurent Georget -Date: Sat, 14 May 2016 19:38:55 +0200 -Subject: [PATCH] Fix the `symbol stdscr not found` compilation error (#254) - -The compilation fails when the symbols of terminfo are not present in -the libncurses.so. This can happen when the terminfo library libtinfo.so -is compiled separately. Using pkg_config is the correct approach to -handle all cases. ---- - cmake/ConkyPlatformChecks.cmake | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/cmake/ConkyPlatformChecks.cmake b/cmake/ConkyPlatformChecks.cmake -index 05d8bbd..f19ac24 100644 ---- a/cmake/ConkyPlatformChecks.cmake -+++ b/cmake/ConkyPlatformChecks.cmake -@@ -119,12 +119,12 @@ if(BUILD_HTTP) - endif(BUILD_HTTP) - - if(BUILD_NCURSES) -- check_include_files(ncurses.h NCURSES_H) -- find_library(NCURSES_LIB NAMES ncurses) -- if(NOT NCURSES_H OR NOT NCURSES_LIB) -+ pkg_check_modules(NCURSES ncurses) -+ if(NOT NCURSES_FOUND) - message(FATAL_ERROR "Unable to find ncurses library") -- endif(NOT NCURSES_H OR NOT NCURSES_LIB) -- set(conky_libs ${conky_libs} ${NCURSES_LIB}) -+ endif(NOT NCURSES_FOUND) -+ set(conky_libs ${conky_libs} ${NCURSES_LIBRARIES}) -+ set(conky_includes ${conky_includes} ${NCURSES_INCLUDE_DIRS}) - endif(BUILD_NCURSES) - - if(BUILD_MYSQL)