Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
games-roguelike/dwarf-fortress: fix text mode, use ncurses-6
ncurses-compat doesn't work in DEPEND given it installs no headers, and then it went and built against ncurses-6 then tried to load ncurses-5 which unsurprisingly fails. Seems to work with 6, but haven't tested much (better than entirely broken either way). Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
- Loading branch information
Showing
2 changed files
with
25 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22 changes: 22 additions & 0 deletions
22
games-roguelike/dwarf-fortress/files/dwarf-fortress-0.47.05-ncurses6.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
Gentoo does not have ncurses5 headers anymore, and this fails with 6 | ||
when using wattrset that it currently expects to be a macro. | ||
--- a/g_src/curses.h | ||
+++ b/g_src/curses.h | ||
@@ -9,2 +9,5 @@ | ||
#else | ||
+# ifndef NCURSES_WATTR_MACROS | ||
+# define NCURSES_WATTR_MACROS 1 | ||
+# endif | ||
# include <ncursesw/curses.h> | ||
--- a/g_src/renderer_curses.cpp | ||
+++ b/g_src/renderer_curses.cpp | ||
@@ -296,3 +296,3 @@ | ||
// We prefer libncursesw, but we'll accept libncurses if we have to | ||
- handle = dlopen("libncursesw.so.5", RTLD_LAZY); | ||
+ handle = dlopen("libncursesw.so.6", RTLD_LAZY); | ||
if (handle) goto opened; | ||
@@ -304,3 +304,3 @@ | ||
if (handle) goto opened; | ||
- handle = dlopen("libncurses.so.5", RTLD_LAZY); | ||
+ handle = dlopen("libncurses.so.6", RTLD_LAZY); | ||
if (handle) goto opened; |