diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-03-13 16:55:35 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-03-13 16:55:35 +0000 |
| commit | 1dde4e5c4b92d849bf1abf0a48135b2a0644f7e1 (patch) | |
| tree | c99a472cce74148d499f42ada873454b0e32a42d /app-admin/conky/files | |
| parent | da6a52f691ef980bab92d003d5df8f463c623af8 (diff) | |
gentoo resync : 13.03.2018
Diffstat (limited to 'app-admin/conky/files')
| -rw-r--r-- | app-admin/conky/files/conky-1.10.8-use-pkgconfig.patch | 34 |
1 files changed, 34 insertions, 0 deletions
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 000000000000..97e6bd02323f --- /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 <brenden@diddyinc.com> +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) |