From 4be1562ce279ca7a50cbbad19e16f5adf8cc914f Mon Sep 17 00:00:00 2001 From: eroen Date: Mon, 11 Aug 2014 22:21:39 +0200 Subject: dfhack - drop accidental debugging patch --- .../dfhack-0.40.06_pre20140808/11-debugging.patch | 22 -------------------- .../11-unbreak-egg.patch | 24 ++++++++++++++++++++++ .../12-unbreak-egg.patch | 24 ---------------------- 3 files changed, 24 insertions(+), 46 deletions(-) delete mode 100644 games-util/dfhack/files/dfhack-0.40.06_pre20140808/11-debugging.patch create mode 100644 games-util/dfhack/files/dfhack-0.40.06_pre20140808/11-unbreak-egg.patch delete mode 100644 games-util/dfhack/files/dfhack-0.40.06_pre20140808/12-unbreak-egg.patch (limited to 'games-util') diff --git a/games-util/dfhack/files/dfhack-0.40.06_pre20140808/11-debugging.patch b/games-util/dfhack/files/dfhack-0.40.06_pre20140808/11-debugging.patch deleted file mode 100644 index 80848422..00000000 --- a/games-util/dfhack/files/dfhack-0.40.06_pre20140808/11-debugging.patch +++ /dev/null @@ -1,22 +0,0 @@ -debugging - -From: eroen - - ---- - library/Core.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/library/Core.cpp b/library/Core.cpp -index 8906f85..dd5725d 100644 ---- a/library/Core.cpp -+++ b/library/Core.cpp -@@ -400,6 +400,8 @@ static bool try_autocomplete(color_ostream &con, const std::string &first, std:: - } - - string findScript(string path, string name) { -+ cerr << "findScript(" << path << ", " << name << std::endl; -+ - if (df::global::world) { - //first try the save folder if it exists - string save = World::ReadWorldFolder(); diff --git a/games-util/dfhack/files/dfhack-0.40.06_pre20140808/11-unbreak-egg.patch b/games-util/dfhack/files/dfhack-0.40.06_pre20140808/11-unbreak-egg.patch new file mode 100644 index 00000000..0d23872b --- /dev/null +++ b/games-util/dfhack/files/dfhack-0.40.06_pre20140808/11-unbreak-egg.patch @@ -0,0 +1,24 @@ +Unbreak egg + +From: eroen + +See: + commit fc24d24ccc2147fff61e309bcb2167b9709249b6 + Merge Console-linux and Console-darwin into Console-posix +--- + library/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt +index 24149ec..50ac9f2 100644 +--- a/library/CMakeLists.txt ++++ b/library/CMakeLists.txt +@@ -99,7 +99,7 @@ Hooks-darwin.cpp + ) + + SET(MAIN_SOURCES_LINUX_EGGY +-Console-linux.cpp ++Console-posix.cpp + Hooks-egg.cpp + PlugLoad-linux.cpp + Process-linux.cpp diff --git a/games-util/dfhack/files/dfhack-0.40.06_pre20140808/12-unbreak-egg.patch b/games-util/dfhack/files/dfhack-0.40.06_pre20140808/12-unbreak-egg.patch deleted file mode 100644 index 0d23872b..00000000 --- a/games-util/dfhack/files/dfhack-0.40.06_pre20140808/12-unbreak-egg.patch +++ /dev/null @@ -1,24 +0,0 @@ -Unbreak egg - -From: eroen - -See: - commit fc24d24ccc2147fff61e309bcb2167b9709249b6 - Merge Console-linux and Console-darwin into Console-posix ---- - library/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt -index 24149ec..50ac9f2 100644 ---- a/library/CMakeLists.txt -+++ b/library/CMakeLists.txt -@@ -99,7 +99,7 @@ Hooks-darwin.cpp - ) - - SET(MAIN_SOURCES_LINUX_EGGY --Console-linux.cpp -+Console-posix.cpp - Hooks-egg.cpp - PlugLoad-linux.cpp - Process-linux.cpp -- cgit v1.2.1