1 |
commit: 5d2dae218ed7436bdd1114c80a4917f3634f0224 |
2 |
Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat May 4 16:13:40 2019 +0000 |
4 |
Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat May 4 16:17:27 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d2dae21 |
7 |
|
8 |
games-roguelike/zangband: fix build with separate tinfo |
9 |
|
10 |
Closes: https://bugs.gentoo.org/678866 |
11 |
Package-Manager: Portage-2.3.66, Repoman-2.3.12 |
12 |
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org> |
13 |
|
14 |
games-roguelike/zangband/files/zangband-2.7.4c-tinfo.patch | 12 ++++++++++++ |
15 |
games-roguelike/zangband/metadata.xml | 12 ++++++++---- |
16 |
games-roguelike/zangband/zangband-2.7.4c.ebuild | 3 ++- |
17 |
3 files changed, 22 insertions(+), 5 deletions(-) |
18 |
|
19 |
diff --git a/games-roguelike/zangband/files/zangband-2.7.4c-tinfo.patch b/games-roguelike/zangband/files/zangband-2.7.4c-tinfo.patch |
20 |
new file mode 100644 |
21 |
index 00000000000..e9b491e070c |
22 |
--- /dev/null |
23 |
+++ b/games-roguelike/zangband/files/zangband-2.7.4c-tinfo.patch |
24 |
@@ -0,0 +1,12 @@ |
25 |
+diff '--color=auto' -Naurd zangband.orig/configure.in zangband/configure.in |
26 |
+--- zangband.orig/configure.in 2004-08-01 13:23:14.000000000 +0400 |
27 |
++++ zangband/configure.in 2019-05-04 19:01:09.287753294 +0300 |
28 |
+@@ -117,6 +117,8 @@ |
29 |
+ # Only check termcap if we don't have GCU |
30 |
+ AC_SEARCH_LIBS([tgetent], [termcap], |
31 |
+ AC_DEFINE(USE_CAP, 1, [Use termcap port]))) |
32 |
++# tinfo may be in a separate lib |
33 |
++AC_SEARCH_LIBS([keypad], [tinfow tinfo]) |
34 |
+ |
35 |
+ if test "x$with_gtk" != "xno" ; then |
36 |
+ AC_SEARCH_LIBS([gtk_init_check], [gtk], |
37 |
|
38 |
diff --git a/games-roguelike/zangband/metadata.xml b/games-roguelike/zangband/metadata.xml |
39 |
index 78274e0fa55..aff073dd197 100644 |
40 |
--- a/games-roguelike/zangband/metadata.xml |
41 |
+++ b/games-roguelike/zangband/metadata.xml |
42 |
@@ -1,8 +1,12 @@ |
43 |
<?xml version="1.0" encoding="UTF-8"?> |
44 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
45 |
<pkgmetadata> |
46 |
-<maintainer type="project"> |
47 |
- <email>games@g.o</email> |
48 |
- <name>Gentoo Games Project</name> |
49 |
-</maintainer> |
50 |
+ <maintainer type="person"> |
51 |
+ <email>bircoph@g.o</email> |
52 |
+ <name>Andrew Savchenko</name> |
53 |
+ </maintainer> |
54 |
+ <maintainer type="project"> |
55 |
+ <email>games@g.o</email> |
56 |
+ <name>Gentoo Games Project</name> |
57 |
+ </maintainer> |
58 |
</pkgmetadata> |
59 |
|
60 |
diff --git a/games-roguelike/zangband/zangband-2.7.4c.ebuild b/games-roguelike/zangband/zangband-2.7.4c.ebuild |
61 |
index 90b697ebbc8..e04a2836fb7 100644 |
62 |
--- a/games-roguelike/zangband/zangband-2.7.4c.ebuild |
63 |
+++ b/games-roguelike/zangband/zangband-2.7.4c.ebuild |
64 |
@@ -1,4 +1,4 @@ |
65 |
-# Copyright 1999-2015 Gentoo Foundation |
66 |
+# Copyright 1999-2019 Gentoo Authors |
67 |
# Distributed under the terms of the GNU General Public License v2 |
68 |
|
69 |
EAPI=5 |
70 |
@@ -28,6 +28,7 @@ S=${WORKDIR}/${PN} |
71 |
src_prepare() { |
72 |
epatch "${FILESDIR}"/${P}-tk85.patch \ |
73 |
"${FILESDIR}"/${P}-rng.patch \ |
74 |
+ "${FILESDIR}"/${P}-tinfo.patch \ |
75 |
"${FILESDIR}"/${P}-configure.patch \ |
76 |
"${FILESDIR}"/${P}-makefile.patch |
77 |
mv configure.in configure.ac || die |