1 |
commit: 08f0d6898403dd54888aac2c573235e90409b9a6 |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 25 16:02:08 2018 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 25 16:03:40 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08f0d689 |
7 |
|
8 |
sys-apps/duc: Fix compiling against sys-libs/ncurses[tinfo] (bug #636958). |
9 |
|
10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
11 |
|
12 |
sys-apps/duc/duc-9999.ebuild | 7 +++++-- |
13 |
sys-apps/duc/files/duc-1.4.1-tinfo.patch | 23 +++++++++++++++++++++++ |
14 |
2 files changed, 28 insertions(+), 2 deletions(-) |
15 |
|
16 |
diff --git a/sys-apps/duc/duc-9999.ebuild b/sys-apps/duc/duc-9999.ebuild |
17 |
index b063305e8b8..55fa313bfe3 100644 |
18 |
--- a/sys-apps/duc/duc-9999.ebuild |
19 |
+++ b/sys-apps/duc/duc-9999.ebuild |
20 |
@@ -1,7 +1,7 @@ |
21 |
-# Copyright 1999-2016 Gentoo Foundation |
22 |
+# Copyright 1999-2018 Gentoo Foundation |
23 |
# Distributed under the terms of the GNU General Public License v2 |
24 |
|
25 |
-EAPI=5 |
26 |
+EAPI=6 |
27 |
|
28 |
inherit autotools |
29 |
|
30 |
@@ -42,6 +42,9 @@ DEPEND=" |
31 |
tokyocabinet? ( dev-db/tokyocabinet ) |
32 |
" |
33 |
RDEPEND="${DEPEND}" |
34 |
+PATCHES=( |
35 |
+ "${FILESDIR}"/${PN}-1.4.1-tinfo.patch |
36 |
+) |
37 |
|
38 |
src_unpack() { |
39 |
if [[ "${PV}" == "9999" ]]; then |
40 |
|
41 |
diff --git a/sys-apps/duc/files/duc-1.4.1-tinfo.patch b/sys-apps/duc/files/duc-1.4.1-tinfo.patch |
42 |
new file mode 100644 |
43 |
index 00000000000..74f0529d674 |
44 |
--- /dev/null |
45 |
+++ b/sys-apps/duc/files/duc-1.4.1-tinfo.patch |
46 |
@@ -0,0 +1,23 @@ |
47 |
+--- a/configure.ac |
48 |
++++ b/configure.ac |
49 |
+@@ -138,8 +138,8 @@ |
50 |
+ if test "${enable_ui}" = "yes"; then |
51 |
+ AC_DEFINE([ENABLE_UI], [1], [Enable ui]) |
52 |
+ |
53 |
+- AC_CHECK_LIB([ncursesw], [tputs],, [ |
54 |
+- AC_CHECK_LIB([ncurses], [tputs],, [ |
55 |
++ AC_CHECK_LIB([ncursesw], [touchwin],, [ |
56 |
++ AC_CHECK_LIB([ncurses], [touchwin],, [ |
57 |
+ AC_MSG_ERROR([ |
58 |
+ The ncurses library was not found, which is needed for ui support. Either install |
59 |
+ the ncurses development libraries, or compile without ui support (--disable-ui) |
60 |
+@@ -148,6 +148,9 @@ |
61 |
+ ]) |
62 |
+ fi |
63 |
+ |
64 |
++AC_SEARCH_LIBS([tputs], [tinfo],, [ |
65 |
++ AC_MSG_ERROR([No library was found providing tputs]) |
66 |
++]) |
67 |
+ |
68 |
+ if test "${enable_x11}" = "yes"; then |
69 |
+ test "${enable_cairo}" != "yes" && AC_MSG_ERROR([cairo must be enabled for x11]) |