| 1 |
commit: 335b399e38f34ed16dd59d40f1345dce03a04f54 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Apr 8 16:01:14 2019 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Apr 8 16:15:35 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=335b399e |
| 7 |
|
| 8 |
dev-util/min-cscope: Fixed build with sys-libs/ncurses[tinfo] |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/678886 |
| 11 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
| 12 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 13 |
|
| 14 |
.../min-cscope/files/min-cscope-16.1.0-tinfo.patch | 33 ++++++++++++++++++++++ |
| 15 |
dev-util/min-cscope/min-cscope-16.1.0.ebuild | 6 +++- |
| 16 |
2 files changed, 38 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/dev-util/min-cscope/files/min-cscope-16.1.0-tinfo.patch b/dev-util/min-cscope/files/min-cscope-16.1.0-tinfo.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..4b7f86f9f2f |
| 21 |
--- /dev/null |
| 22 |
+++ b/dev-util/min-cscope/files/min-cscope-16.1.0-tinfo.patch |
| 23 |
@@ -0,0 +1,33 @@ |
| 24 |
+https://bugs.gentoo.org/678886 |
| 25 |
+ |
| 26 |
+--- min-cscope/src/CMakeLists.txt |
| 27 |
++++ min-cscope/src/CMakeLists.txt |
| 28 |
+@@ -15,7 +15,11 @@ |
| 29 |
+ # Curses interface |
| 30 |
+ IF(NOT NO_CURSES) |
| 31 |
+ CHECK_INCLUDE_FILES(ncurses.h HAVE_NCURSES) |
| 32 |
++ if(HAVE_NCURSES) |
| 33 |
++ set(CURSES_NEED_NCURSES TRUE) |
| 34 |
++ endif(HAVE_NCURSES) |
| 35 |
+ CHECK_INCLUDE_FILES(curses.h HAVE_CURSES) |
| 36 |
++ find_package(Curses REQUIRED) |
| 37 |
+ IF(HAVE_NCURSES OR HAVE_CURSES) |
| 38 |
+ MESSAGE("Building with curses-based interface") |
| 39 |
+ SET(MIN_CSCOPE_SRCS ${MIN_CSCOPE_SRCS} command.c edit.c help.c mouse.c) |
| 40 |
+@@ -137,13 +141,9 @@ |
| 41 |
+ IF(WIN32) |
| 42 |
+ SET(MIN_CSCOPE_LIBS ${MIN_CSCOPE_LIBS} regex) |
| 43 |
+ ENDIF(WIN32) |
| 44 |
+-IF(HAVE_NCURSES) |
| 45 |
+- SET(MIN_CSCOPE_LIBS ${MIN_CSCOPE_LIBS} ncurses) |
| 46 |
+-ELSE(HAVE_NCURSES) |
| 47 |
+- IF(HAVE_CURSES) |
| 48 |
+- SET(MIN_CSCOPE_LIBS ${MIN_CSCOPE_LIBS} ncurses) |
| 49 |
+- ENDIF(HAVE_CURSES) |
| 50 |
+-ENDIF(HAVE_NCURSES) |
| 51 |
++IF(HAVE_NCURSES OR HAVE_CURSES) |
| 52 |
++ SET(MIN_CSCOPE_LIBS ${MIN_CSCOPE_LIBS} ${CURSES_LIBRARIES}) |
| 53 |
++ENDIF(HAVE_NCURSES OR HAVE_CURSES) |
| 54 |
+ |
| 55 |
+ ADD_EXECUTABLE(min-cscope ${MIN_CSCOPE_SRCS}) |
| 56 |
+ TARGET_LINK_LIBRARIES(min-cscope ${MIN_CSCOPE_LIBS}) |
| 57 |
|
| 58 |
diff --git a/dev-util/min-cscope/min-cscope-16.1.0.ebuild b/dev-util/min-cscope/min-cscope-16.1.0.ebuild |
| 59 |
index 9ae7cbca401..2648a185f32 100644 |
| 60 |
--- a/dev-util/min-cscope/min-cscope-16.1.0.ebuild |
| 61 |
+++ b/dev-util/min-cscope/min-cscope-16.1.0.ebuild |
| 62 |
@@ -1,4 +1,4 @@ |
| 63 |
-# Copyright 1999-2018 Gentoo Foundation |
| 64 |
+# Copyright 1999-2019 Gentoo Authors |
| 65 |
# Distributed under the terms of the GNU General Public License v2 |
| 66 |
|
| 67 |
EAPI=6 |
| 68 |
@@ -18,6 +18,10 @@ S=${WORKDIR}/${PN} |
| 69 |
|
| 70 |
DOCS=( AUTHORS README{,.cscope} TODO ) |
| 71 |
|
| 72 |
+PATCHES=( |
| 73 |
+ "${FILESDIR}/${P}-tinfo.patch" #678886 |
| 74 |
+) |
| 75 |
+ |
| 76 |
src_prepare() { |
| 77 |
cmake-utils_src_prepare |
Archives