diff options
14 files changed, 138 insertions, 0 deletions
diff --git a/games-util/dfhack/dfhack-0.40.24.0.ebuild b/games-util/dfhack/dfhack-0.40.24.0.ebuild new file mode 120000 index 00000000..5a2bf09e --- /dev/null +++ b/games-util/dfhack/dfhack-0.40.24.0.ebuild @@ -0,0 +1 @@ +dfhack-0.40.23.1.ebuild
\ No newline at end of file diff --git a/games-util/dfhack/dfhack-0.40.24.1.ebuild b/games-util/dfhack/dfhack-0.40.24.1.ebuild new file mode 120000 index 00000000..5a2bf09e --- /dev/null +++ b/games-util/dfhack/dfhack-0.40.24.1.ebuild @@ -0,0 +1 @@ +dfhack-0.40.23.1.ebuild
\ No newline at end of file diff --git a/games-util/dfhack/files/dfhack-0.40.24/01-compile-static-libraries-as.patch b/games-util/dfhack/files/dfhack-0.40.24/01-compile-static-libraries-as.patch new file mode 120000 index 00000000..35ba5736 --- /dev/null +++ b/games-util/dfhack/files/dfhack-0.40.24/01-compile-static-libraries-as.patch @@ -0,0 +1 @@ +../dfhack-0.40.23/01-compile-static-libraries-as.patch
\ No newline at end of file diff --git a/games-util/dfhack/files/dfhack-0.40.24/02-drop-strange-build-options.patch b/games-util/dfhack/files/dfhack-0.40.24/02-drop-strange-build-options.patch new file mode 120000 index 00000000..1547ef06 --- /dev/null +++ b/games-util/dfhack/files/dfhack-0.40.24/02-drop-strange-build-options.patch @@ -0,0 +1 @@ +../dfhack-0.40.23/02-drop-strange-build-options.patch
\ No newline at end of file diff --git a/games-util/dfhack/files/dfhack-0.40.24/03-configurable-install-paths.patch b/games-util/dfhack/files/dfhack-0.40.24/03-configurable-install-paths.patch new file mode 120000 index 00000000..924c05ab --- /dev/null +++ b/games-util/dfhack/files/dfhack-0.40.24/03-configurable-install-paths.patch @@ -0,0 +1 @@ +../dfhack-0.40.23/03-configurable-install-paths.patch
\ No newline at end of file diff --git a/games-util/dfhack/files/dfhack-0.40.24/04-compile-time-configurable.patch b/games-util/dfhack/files/dfhack-0.40.24/04-compile-time-configurable.patch new file mode 120000 index 00000000..77fd3d25 --- /dev/null +++ b/games-util/dfhack/files/dfhack-0.40.24/04-compile-time-configurable.patch @@ -0,0 +1 @@ +../dfhack-0.40.23/04-compile-time-configurable.patch
\ No newline at end of file diff --git a/games-util/dfhack/files/dfhack-0.40.24/05-compile-time-configurable-0.patch b/games-util/dfhack/files/dfhack-0.40.24/05-compile-time-configurable-0.patch new file mode 120000 index 00000000..3b6641f5 --- /dev/null +++ b/games-util/dfhack/files/dfhack-0.40.24/05-compile-time-configurable-0.patch @@ -0,0 +1 @@ +../dfhack-0.40.23/05-compile-time-configurable-0.patch
\ No newline at end of file diff --git a/games-util/dfhack/files/dfhack-0.40.24/06-compile-time-configurable-1.patch b/games-util/dfhack/files/dfhack-0.40.24/06-compile-time-configurable-1.patch new file mode 100644 index 00000000..cc1572b9 --- /dev/null +++ b/games-util/dfhack/files/dfhack-0.40.24/06-compile-time-configurable-1.patch @@ -0,0 +1,104 @@ +compile-time configurable state directory + +From: eroen <eroen@occam.eroen.eu> + +It'd be nice to write stuff somewhere writeable. +--- + CMakeLists.txt | 4 ++++ + library/Console-posix.cpp | 4 ++++ + library/Core.cpp | 8 ++++++++ + library/Hooks-egg.cpp | 4 ++++ + library/Hooks-linux.cpp | 4 ++++ + 5 files changed, 24 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9f73481..26a00ec 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -64,6 +64,10 @@ SET(DFHACK_RELEASE "r0" CACHE STRING "Current release revision.") + set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}") + add_definitions(-DDFHACK_VERSION="${DFHACK_VERSION}") + ++## where persistent things are written (and read) at runtime ++SET(DFHACK_STATEDIR "." CACHE PATH "DFHACK_STATEDIR") ++ADD_DEFINITIONS(-DDFHACK_STATEDIR="${DFHACK_STATEDIR}") ++ + ## where to install things (after the build is done, classic 'make install' or package structure) + # the dfhack libraries will be installed here: + IF(UNIX) +diff --git a/library/Console-posix.cpp b/library/Console-posix.cpp +index fcc56b2..afbcd41 100644 +--- a/library/Console-posix.cpp ++++ b/library/Console-posix.cpp +@@ -744,7 +744,11 @@ bool Console::init(bool sharing) + inited = false; + return false; + } ++ #ifdef DFHACK_STATEDIR ++ if (!freopen(DFHACK_STATEDIR "/stdout.log", "w", stdout)) ++ #else + if (!freopen("stdout.log", "w", stdout)) ++ #endif + ; + d = new Private(); + // make our own weird streams so our IO isn't redirected +diff --git a/library/Core.cpp b/library/Core.cpp +index d95854b..3bfaaea 100644 +--- a/library/Core.cpp ++++ b/library/Core.cpp +@@ -883,7 +883,11 @@ void fIOthread(void * iodata) + PluginManager * plug_mgr = ((IODATA*) iodata)->plug_mgr; + + CommandHistory main_history; ++ #ifdef DFHACK_STATEDIR ++ main_history.load(DFHACK_STATEDIR "/dfhack.history"); ++ #else + main_history.load("dfhack.history"); ++ #endif + + Console & con = core->getConsole(); + if (plug_mgr == 0) +@@ -916,7 +920,11 @@ void fIOthread(void * iodata) + { + // a proper, non-empty command was entered + main_history.add(command); ++ #ifdef DFHACK_STATEDIR ++ main_history.save(DFHACK_STATEDIR "/dfhack.history"); ++ #else + main_history.save("dfhack.history"); ++ #endif + } + + auto rv = core->runCommand(con, command); +diff --git a/library/Hooks-egg.cpp b/library/Hooks-egg.cpp +index c98cf5d..90df6af 100644 +--- a/library/Hooks-egg.cpp ++++ b/library/Hooks-egg.cpp +@@ -37,7 +37,11 @@ distribution. + DFhackCExport int egg_init(void) + { + // reroute stderr ++ #ifdef DFHACK_STATEDIR ++ freopen(DFHACK_STATEDIR "/stderr.log", "w", stderr); ++ #else + freopen("stderr.log", "w", stderr); ++ #endif + // we don't reroute stdout until we figure out if this should be done at all + // See: Console-linux.cpp + fprintf(stderr,"dfhack: hooking successful\n"); +diff --git a/library/Hooks-linux.cpp b/library/Hooks-linux.cpp +index 31c0323..42d86f3 100644 +--- a/library/Hooks-linux.cpp ++++ b/library/Hooks-linux.cpp +@@ -114,7 +114,11 @@ static int (*_SDL_Init)(uint32_t flags) = 0; + DFhackCExport int SDL_Init(uint32_t flags) + { + // reroute stderr ++ #ifdef DFHACK_STATEDIR ++ freopen(DFHACK_STATEDIR "/stderr.log", "w", stderr); ++ #else + freopen("stderr.log", "w", stderr); ++ #endif + // we don't reroute stdout until we figure out if this should be done at all + // See: Console-linux.cpp + diff --git a/games-util/dfhack/files/dfhack-0.40.24/07-startup-scripts-configurable.patch b/games-util/dfhack/files/dfhack-0.40.24/07-startup-scripts-configurable.patch new file mode 120000 index 00000000..69b04c50 --- /dev/null +++ b/games-util/dfhack/files/dfhack-0.40.24/07-startup-scripts-configurable.patch @@ -0,0 +1 @@ +../dfhack-0.40.23/07-startup-scripts-configurable.patch
\ No newline at end of file diff --git a/games-util/dfhack/files/dfhack-0.40.24/08-ruby-plugin-configurable-paths.patch b/games-util/dfhack/files/dfhack-0.40.24/08-ruby-plugin-configurable-paths.patch new file mode 120000 index 00000000..40cb6180 --- /dev/null +++ b/games-util/dfhack/files/dfhack-0.40.24/08-ruby-plugin-configurable-paths.patch @@ -0,0 +1 @@ +../dfhack-0.40.23/08-ruby-plugin-configurable-paths.patch
\ No newline at end of file diff --git a/games-util/dfhack/files/dfhack-0.40.24/09-eggy-remove-annoying-banner.patch b/games-util/dfhack/files/dfhack-0.40.24/09-eggy-remove-annoying-banner.patch new file mode 100644 index 00000000..ea4cfe75 --- /dev/null +++ b/games-util/dfhack/files/dfhack-0.40.24/09-eggy-remove-annoying-banner.patch @@ -0,0 +1,22 @@ +eggy - remove annoying banner + +From: eroen <eroen@occam.eroen.eu> + + +--- + library/Core.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/library/Core.cpp b/library/Core.cpp +index 3bfaaea..4c6cded 100644 +--- a/library/Core.cpp ++++ b/library/Core.cpp +@@ -1113,7 +1113,7 @@ bool Core::Init() + // set up hotkey capture + thread * HK = new thread(fHKthread, (void *) temp); + screen_window = new Windows::top_level_window(); +- screen_window->addChild(new Windows::dfhack_dummy(5,10)); ++ //screen_window->addChild(new Windows::dfhack_dummy(5,10)); + started = true; + modstate = 0; + diff --git a/games-util/dfhack/files/dfhack-0.40.24/10-unbreak-egg.patch b/games-util/dfhack/files/dfhack-0.40.24/10-unbreak-egg.patch new file mode 120000 index 00000000..e30ed55c --- /dev/null +++ b/games-util/dfhack/files/dfhack-0.40.24/10-unbreak-egg.patch @@ -0,0 +1 @@ +../dfhack-0.40.23/10-unbreak-egg.patch
\ No newline at end of file diff --git a/games-util/dfhack/files/dfhack-0.40.24/11-dfhack-init-example.patch b/games-util/dfhack/files/dfhack-0.40.24/11-dfhack-init-example.patch new file mode 120000 index 00000000..03f03225 --- /dev/null +++ b/games-util/dfhack/files/dfhack-0.40.24/11-dfhack-init-example.patch @@ -0,0 +1 @@ +../dfhack-0.40.23/11-dfhack-init-example.patch
\ No newline at end of file diff --git a/games-util/dfhack/files/dfhack-0.40.24/series b/games-util/dfhack/files/dfhack-0.40.24/series new file mode 120000 index 00000000..0ca6dcb8 --- /dev/null +++ b/games-util/dfhack/files/dfhack-0.40.24/series @@ -0,0 +1 @@ +../dfhack-0.40.23/series
\ No newline at end of file |
