diff options
| author |   Daniel Pielmeier <billie@gentoo.org> | 2016-12-12 21:09:27 +0100 |
|---|---|---|
| committer | Daniel Pielmeier <billie@gentoo.org> | 2016-12-12 21:09:27 +0100 |
| commit | 736b2f1955b4852b71ce8891b719cd482878cac7 (patch) | |
| tree | c25138e0facb6754aa6ec5f3c0f7487f3c170551 /app-admin/conky | |
| parent | app-admin/conky: Version bump. (diff) | |
| download | gentoo-736b2f1955b4852b71ce8891b719cd482878cac7.tar.gz gentoo-736b2f1955b4852b71ce8891b719cd482878cac7.tar.bz2 gentoo-736b2f1955b4852b71ce8891b719cd482878cac7.zip | |
app-admin/conky: Remove unused patches.
Package-Manager: portage-2.3.0
Diffstat (limited to 'app-admin/conky')
| -rw-r--r-- | app-admin/conky/files/conky-1.10.1-includewlan.patch | 13 | ||||
| -rw-r--r-- | app-admin/conky/files/conky-1.10.1-ncurses-tinfo.patch | 35 |
2 files changed, 0 insertions, 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 82b09a749b9a..000000000000 --- 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 a603959af6da..000000000000 --- 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 <laurent@lgeorget.eu> -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) |