1 |
commit: d1fd0846fa55f34ed1ed4825ec2a1a70fe159f04 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jun 3 15:44:01 2019 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jun 3 15:44:38 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1fd0846 |
7 |
|
8 |
games-board/ccgo: Fixed build with sys-libs/ncurses[tinfo] |
9 |
|
10 |
Closes: https://bugs.gentoo.org/687278 |
11 |
Package-Manager: Portage-2.3.67, Repoman-2.3.13 |
12 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
13 |
|
14 |
games-board/ccgo/ccgo-0.3.6.5-r1.ebuild | 3 ++- |
15 |
games-board/ccgo/files/ccgo-0.3.6.5-tinfo.patch | 35 +++++++++++++++++++++++++ |
16 |
2 files changed, 37 insertions(+), 1 deletion(-) |
17 |
|
18 |
diff --git a/games-board/ccgo/ccgo-0.3.6.5-r1.ebuild b/games-board/ccgo/ccgo-0.3.6.5-r1.ebuild |
19 |
index 9f19d9aa9e4..fd69f9b4f47 100644 |
20 |
--- a/games-board/ccgo/ccgo-0.3.6.5-r1.ebuild |
21 |
+++ b/games-board/ccgo/ccgo-0.3.6.5-r1.ebuild |
22 |
@@ -1,4 +1,4 @@ |
23 |
-# Copyright 1999-2018 Gentoo Foundation |
24 |
+# Copyright 1999-2019 Gentoo Authors |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
|
27 |
EAPI=6 |
28 |
@@ -24,6 +24,7 @@ DEPEND="${RDEPEND} |
29 |
|
30 |
PATCHES=( |
31 |
"${FILESDIR}"/${P}-gcc4.patch |
32 |
+ "${FILESDIR}"/${P}-tinfo.patch |
33 |
) |
34 |
|
35 |
src_prepare() { |
36 |
|
37 |
diff --git a/games-board/ccgo/files/ccgo-0.3.6.5-tinfo.patch b/games-board/ccgo/files/ccgo-0.3.6.5-tinfo.patch |
38 |
new file mode 100644 |
39 |
index 00000000000..aaa8b5ae0f9 |
40 |
--- /dev/null |
41 |
+++ b/games-board/ccgo/files/ccgo-0.3.6.5-tinfo.patch |
42 |
@@ -0,0 +1,35 @@ |
43 |
+https://bugs.gentoo.org/687278 |
44 |
+ |
45 |
+--- ccgo-0.3.6.5/configure.ac |
46 |
++++ ccgo-0.3.6.5/configure.ac |
47 |
+@@ -30,7 +30,7 @@ |
48 |
+ PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 gconfmm-2.6) |
49 |
+ AC_SUBST(GTKMM_CFLAGS) |
50 |
+ AC_SUBST(GTKMM_LIBS) |
51 |
+-AC_CHECK_HEADERS(ncurses.h, [have_ncurses=true], [have_ncurses=false]) |
52 |
++PKG_CHECK_MODULES(NCURSES, ncurses, [have_ncurses=true], [have_ncurses=false]) |
53 |
+ AM_CONDITIONAL([HAVE_NCURSES], [test x$have_ncurses = xtrue]) |
54 |
+ |
55 |
+ AM_GNU_GETTEXT([external]) |
56 |
+--- ccgo-0.3.6.5/Makefile.am |
57 |
++++ ccgo-0.3.6.5/Makefile.am |
58 |
+@@ -53,7 +53,7 @@ |
59 |
+ nctest_SOURCES = \ |
60 |
+ nctest.cc \ |
61 |
+ nc.cc nc.hh |
62 |
+-nctest_LDADD = arg.o debug.o ui/libui.a go/libgo.a -lncurses |
63 |
++nctest_LDADD = arg.o debug.o ui/libui.a go/libgo.a $(NCURSES_LIBS) |
64 |
+ endif |
65 |
+ |
66 |
+ gtktest_SOURCES = gtktest.cc |
67 |
+--- ccgo-0.3.6.5/nc/Makefile.am |
68 |
++++ ccgo-0.3.6.5/nc/Makefile.am |
69 |
+@@ -8,7 +8,7 @@ |
70 |
+ misc.cc misc.hh \ |
71 |
+ editor.cc editor.hh |
72 |
+ |
73 |
+-LDADD = libnc.a -lncurses |
74 |
++LDADD = libnc.a $(NCURSES_LIBS) |
75 |
+ noinst_PROGRAMS = |
76 |
+ |
77 |
+ noinst_PROGRAMS += test-entry |