From 745d1157e0225f8dc6397921341a1b48539fe81b Mon Sep 17 00:00:00 2001 From: eroen Date: Wed, 13 Aug 2014 23:14:30 +0200 Subject: dfhack - move patches around a bit --- games-util/dfhack/dfhack-0.40.08_pre9999.ebuild | 2 +- .../01-compile-static-libraries-as.patch | 1 + .../02-drop-strange-build-options.patch | 1 + .../03-configurable-install-paths.patch | 1 + .../04-compile-time-configurable.patch | 1 + .../05-compile-time-configurable-0.patch | 1 + .../06-compile-time-configurable-1.patch | 1 + .../07-startup-scripts-configurable.patch | 1 + .../08-ruby-plugin-configurable-paths.patch | 1 + .../09-eggy-remove-annoying-banner.patch | 1 + .../files/dfhack-0.40.08/10-unbreak-egg.patch | 1 + .../dfhack-0.40.08/11-dfhack-init-example.patch | 39 ++++++++++++++++++++++ .../01-compile-static-libraries-as.patch | 1 - .../02-drop-strange-build-options.patch | 1 - .../03-configurable-install-paths.patch | 1 - .../04-compile-time-configurable.patch | 1 - .../05-compile-time-configurable-0.patch | 1 - .../06-compile-time-configurable-1.patch | 1 - .../07-startup-scripts-configurable.patch | 1 - .../08-ruby-plugin-configurable-paths.patch | 1 - .../09-eggy-remove-annoying-banner.patch | 1 - .../dfhack-0.40.08_pre9999/10-unbreak-egg.patch | 1 - .../11-dfhack-init-example.patch | 39 ---------------------- 23 files changed, 50 insertions(+), 50 deletions(-) create mode 120000 games-util/dfhack/files/dfhack-0.40.08/01-compile-static-libraries-as.patch create mode 120000 games-util/dfhack/files/dfhack-0.40.08/02-drop-strange-build-options.patch create mode 120000 games-util/dfhack/files/dfhack-0.40.08/03-configurable-install-paths.patch create mode 120000 games-util/dfhack/files/dfhack-0.40.08/04-compile-time-configurable.patch create mode 120000 games-util/dfhack/files/dfhack-0.40.08/05-compile-time-configurable-0.patch create mode 120000 games-util/dfhack/files/dfhack-0.40.08/06-compile-time-configurable-1.patch create mode 120000 games-util/dfhack/files/dfhack-0.40.08/07-startup-scripts-configurable.patch create mode 120000 games-util/dfhack/files/dfhack-0.40.08/08-ruby-plugin-configurable-paths.patch create mode 120000 games-util/dfhack/files/dfhack-0.40.08/09-eggy-remove-annoying-banner.patch create mode 120000 games-util/dfhack/files/dfhack-0.40.08/10-unbreak-egg.patch create mode 100644 games-util/dfhack/files/dfhack-0.40.08/11-dfhack-init-example.patch delete mode 120000 games-util/dfhack/files/dfhack-0.40.08_pre9999/01-compile-static-libraries-as.patch delete mode 120000 games-util/dfhack/files/dfhack-0.40.08_pre9999/02-drop-strange-build-options.patch delete mode 120000 games-util/dfhack/files/dfhack-0.40.08_pre9999/03-configurable-install-paths.patch delete mode 120000 games-util/dfhack/files/dfhack-0.40.08_pre9999/04-compile-time-configurable.patch delete mode 120000 games-util/dfhack/files/dfhack-0.40.08_pre9999/05-compile-time-configurable-0.patch delete mode 120000 games-util/dfhack/files/dfhack-0.40.08_pre9999/06-compile-time-configurable-1.patch delete mode 120000 games-util/dfhack/files/dfhack-0.40.08_pre9999/07-startup-scripts-configurable.patch delete mode 120000 games-util/dfhack/files/dfhack-0.40.08_pre9999/08-ruby-plugin-configurable-paths.patch delete mode 120000 games-util/dfhack/files/dfhack-0.40.08_pre9999/09-eggy-remove-annoying-banner.patch delete mode 120000 games-util/dfhack/files/dfhack-0.40.08_pre9999/10-unbreak-egg.patch delete mode 100644 games-util/dfhack/files/dfhack-0.40.08_pre9999/11-dfhack-init-example.patch (limited to 'games-util') diff --git a/games-util/dfhack/dfhack-0.40.08_pre9999.ebuild b/games-util/dfhack/dfhack-0.40.08_pre9999.ebuild index e15247e6..3d3c7204 100644 --- a/games-util/dfhack/dfhack-0.40.08_pre9999.ebuild +++ b/games-util/dfhack/dfhack-0.40.08_pre9999.ebuild @@ -111,7 +111,7 @@ src_prepare() { # stg export -n -d patches-master-$(date -I) -e patch # rm /usr/local/portage/games-util/dfhack/files/dfhack-0.40.06.9999/* # cp patches-master-$(date -I)/* /usr/local/portage/games-util/dfhack/files/dfhack-0.40.06.9999/ - epatch "${FILESDIR}"/${P}/*.patch + epatch "${FILESDIR}"/${PN}-0.${df_PV}/*.patch pushd "${S}"/depends/clsocket epatch "${FILESDIR}"/clsocket/0001-Compile-static-library-as-PIC.patch diff --git a/games-util/dfhack/files/dfhack-0.40.08/01-compile-static-libraries-as.patch b/games-util/dfhack/files/dfhack-0.40.08/01-compile-static-libraries-as.patch new file mode 120000 index 00000000..a1129d08 --- /dev/null +++ b/games-util/dfhack/files/dfhack-0.40.08/01-compile-static-libraries-as.patch @@ -0,0 +1 @@ +../dfhack-0.40.07_pre20140811/01-compile-static-libraries-as.patch \ No newline at end of file diff --git a/games-util/dfhack/files/dfhack-0.40.08/02-drop-strange-build-options.patch b/games-util/dfhack/files/dfhack-0.40.08/02-drop-strange-build-options.patch new file mode 120000 index 00000000..8eeff26e --- /dev/null +++ b/games-util/dfhack/files/dfhack-0.40.08/02-drop-strange-build-options.patch @@ -0,0 +1 @@ +../dfhack-0.40.07_pre20140811/02-drop-strange-build-options.patch \ No newline at end of file diff --git a/games-util/dfhack/files/dfhack-0.40.08/03-configurable-install-paths.patch b/games-util/dfhack/files/dfhack-0.40.08/03-configurable-install-paths.patch new file mode 120000 index 00000000..61b8314e --- /dev/null +++ b/games-util/dfhack/files/dfhack-0.40.08/03-configurable-install-paths.patch @@ -0,0 +1 @@ +../dfhack-0.40.07_pre20140811/03-configurable-install-paths.patch \ No newline at end of file diff --git a/games-util/dfhack/files/dfhack-0.40.08/04-compile-time-configurable.patch b/games-util/dfhack/files/dfhack-0.40.08/04-compile-time-configurable.patch new file mode 120000 index 00000000..6e27d7ce --- /dev/null +++ b/games-util/dfhack/files/dfhack-0.40.08/04-compile-time-configurable.patch @@ -0,0 +1 @@ +../dfhack-0.40.07_pre20140811/04-compile-time-configurable.patch \ No newline at end of file diff --git a/games-util/dfhack/files/dfhack-0.40.08/05-compile-time-configurable-0.patch b/games-util/dfhack/files/dfhack-0.40.08/05-compile-time-configurable-0.patch new file mode 120000 index 00000000..4f1fdc7b --- /dev/null +++ b/games-util/dfhack/files/dfhack-0.40.08/05-compile-time-configurable-0.patch @@ -0,0 +1 @@ +../dfhack-0.40.07_pre20140811/05-compile-time-configurable-0.patch \ No newline at end of file diff --git a/games-util/dfhack/files/dfhack-0.40.08/06-compile-time-configurable-1.patch b/games-util/dfhack/files/dfhack-0.40.08/06-compile-time-configurable-1.patch new file mode 120000 index 00000000..54c06b45 --- /dev/null +++ b/games-util/dfhack/files/dfhack-0.40.08/06-compile-time-configurable-1.patch @@ -0,0 +1 @@ +../dfhack-0.40.07_pre20140811/06-compile-time-configurable-1.patch \ No newline at end of file diff --git a/games-util/dfhack/files/dfhack-0.40.08/07-startup-scripts-configurable.patch b/games-util/dfhack/files/dfhack-0.40.08/07-startup-scripts-configurable.patch new file mode 120000 index 00000000..404c4709 --- /dev/null +++ b/games-util/dfhack/files/dfhack-0.40.08/07-startup-scripts-configurable.patch @@ -0,0 +1 @@ +../dfhack-0.40.07_pre20140811/07-startup-scripts-configurable.patch \ No newline at end of file diff --git a/games-util/dfhack/files/dfhack-0.40.08/08-ruby-plugin-configurable-paths.patch b/games-util/dfhack/files/dfhack-0.40.08/08-ruby-plugin-configurable-paths.patch new file mode 120000 index 00000000..8c8c25f3 --- /dev/null +++ b/games-util/dfhack/files/dfhack-0.40.08/08-ruby-plugin-configurable-paths.patch @@ -0,0 +1 @@ +../dfhack-0.40.07_pre20140811/08-ruby-plugin-configurable-paths.patch \ No newline at end of file diff --git a/games-util/dfhack/files/dfhack-0.40.08/09-eggy-remove-annoying-banner.patch b/games-util/dfhack/files/dfhack-0.40.08/09-eggy-remove-annoying-banner.patch new file mode 120000 index 00000000..54a100cb --- /dev/null +++ b/games-util/dfhack/files/dfhack-0.40.08/09-eggy-remove-annoying-banner.patch @@ -0,0 +1 @@ +../dfhack-0.40.07_pre20140811/09-eggy-remove-annoying-banner.patch \ No newline at end of file diff --git a/games-util/dfhack/files/dfhack-0.40.08/10-unbreak-egg.patch b/games-util/dfhack/files/dfhack-0.40.08/10-unbreak-egg.patch new file mode 120000 index 00000000..53667329 --- /dev/null +++ b/games-util/dfhack/files/dfhack-0.40.08/10-unbreak-egg.patch @@ -0,0 +1 @@ +../dfhack-0.40.07_pre20140811/10-unbreak-egg.patch \ No newline at end of file diff --git a/games-util/dfhack/files/dfhack-0.40.08/11-dfhack-init-example.patch b/games-util/dfhack/files/dfhack-0.40.08/11-dfhack-init-example.patch new file mode 100644 index 00000000..55ef5778 --- /dev/null +++ b/games-util/dfhack/files/dfhack-0.40.08/11-dfhack-init-example.patch @@ -0,0 +1,39 @@ +dfhack.init.example + +From: eroen + + +--- + library/CMakeLists.txt | 2 +- + library/Core.cpp | 4 ++++ + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt +index 50ac9f2..eac23db 100644 +--- a/library/CMakeLists.txt ++++ b/library/CMakeLists.txt +@@ -350,7 +350,7 @@ install(FILES xml/symbols.xml + DESTINATION ${DFHACK_DATA_DESTINATION}) #linux: share/dfhack + #install the example autoexec file + install(FILES ../dfhack.init-example +- DESTINATION ${DFHACK_USERDOC_DESTINATION}) ++ DESTINATION ${DFHACK_DATA_DESTINATION}) + + install(TARGETS dfhack-run dfhack-client binpatch + LIBRARY DESTINATION ${DFHACK_LIBRARY_DESTINATION} +diff --git a/library/Core.cpp b/library/Core.cpp +index 8906f85..8ef600c 100644 +--- a/library/Core.cpp ++++ b/library/Core.cpp +@@ -864,7 +864,11 @@ static void run_dfhack_init(color_ostream &out, Core *core) + if (!core->loadScriptFile(out, "dfhack.init", true)) + { + core->runCommand(out, "gui/no-dfhack-init"); ++#ifdef DFHACK_DATA_DESTINATION ++ core->loadScriptFile(out, DFHACK_DATA_DESTINATION "/dfhack.init-example", true); ++#else + core->loadScriptFile(out, "dfhack.init-example", true); ++#endif + } + } + diff --git a/games-util/dfhack/files/dfhack-0.40.08_pre9999/01-compile-static-libraries-as.patch b/games-util/dfhack/files/dfhack-0.40.08_pre9999/01-compile-static-libraries-as.patch deleted file mode 120000 index a1129d08..00000000 --- a/games-util/dfhack/files/dfhack-0.40.08_pre9999/01-compile-static-libraries-as.patch +++ /dev/null @@ -1 +0,0 @@ -../dfhack-0.40.07_pre20140811/01-compile-static-libraries-as.patch \ No newline at end of file diff --git a/games-util/dfhack/files/dfhack-0.40.08_pre9999/02-drop-strange-build-options.patch b/games-util/dfhack/files/dfhack-0.40.08_pre9999/02-drop-strange-build-options.patch deleted file mode 120000 index 8eeff26e..00000000 --- a/games-util/dfhack/files/dfhack-0.40.08_pre9999/02-drop-strange-build-options.patch +++ /dev/null @@ -1 +0,0 @@ -../dfhack-0.40.07_pre20140811/02-drop-strange-build-options.patch \ No newline at end of file diff --git a/games-util/dfhack/files/dfhack-0.40.08_pre9999/03-configurable-install-paths.patch b/games-util/dfhack/files/dfhack-0.40.08_pre9999/03-configurable-install-paths.patch deleted file mode 120000 index 61b8314e..00000000 --- a/games-util/dfhack/files/dfhack-0.40.08_pre9999/03-configurable-install-paths.patch +++ /dev/null @@ -1 +0,0 @@ -../dfhack-0.40.07_pre20140811/03-configurable-install-paths.patch \ No newline at end of file diff --git a/games-util/dfhack/files/dfhack-0.40.08_pre9999/04-compile-time-configurable.patch b/games-util/dfhack/files/dfhack-0.40.08_pre9999/04-compile-time-configurable.patch deleted file mode 120000 index 6e27d7ce..00000000 --- a/games-util/dfhack/files/dfhack-0.40.08_pre9999/04-compile-time-configurable.patch +++ /dev/null @@ -1 +0,0 @@ -../dfhack-0.40.07_pre20140811/04-compile-time-configurable.patch \ No newline at end of file diff --git a/games-util/dfhack/files/dfhack-0.40.08_pre9999/05-compile-time-configurable-0.patch b/games-util/dfhack/files/dfhack-0.40.08_pre9999/05-compile-time-configurable-0.patch deleted file mode 120000 index 4f1fdc7b..00000000 --- a/games-util/dfhack/files/dfhack-0.40.08_pre9999/05-compile-time-configurable-0.patch +++ /dev/null @@ -1 +0,0 @@ -../dfhack-0.40.07_pre20140811/05-compile-time-configurable-0.patch \ No newline at end of file diff --git a/games-util/dfhack/files/dfhack-0.40.08_pre9999/06-compile-time-configurable-1.patch b/games-util/dfhack/files/dfhack-0.40.08_pre9999/06-compile-time-configurable-1.patch deleted file mode 120000 index 54c06b45..00000000 --- a/games-util/dfhack/files/dfhack-0.40.08_pre9999/06-compile-time-configurable-1.patch +++ /dev/null @@ -1 +0,0 @@ -../dfhack-0.40.07_pre20140811/06-compile-time-configurable-1.patch \ No newline at end of file diff --git a/games-util/dfhack/files/dfhack-0.40.08_pre9999/07-startup-scripts-configurable.patch b/games-util/dfhack/files/dfhack-0.40.08_pre9999/07-startup-scripts-configurable.patch deleted file mode 120000 index 404c4709..00000000 --- a/games-util/dfhack/files/dfhack-0.40.08_pre9999/07-startup-scripts-configurable.patch +++ /dev/null @@ -1 +0,0 @@ -../dfhack-0.40.07_pre20140811/07-startup-scripts-configurable.patch \ No newline at end of file diff --git a/games-util/dfhack/files/dfhack-0.40.08_pre9999/08-ruby-plugin-configurable-paths.patch b/games-util/dfhack/files/dfhack-0.40.08_pre9999/08-ruby-plugin-configurable-paths.patch deleted file mode 120000 index 8c8c25f3..00000000 --- a/games-util/dfhack/files/dfhack-0.40.08_pre9999/08-ruby-plugin-configurable-paths.patch +++ /dev/null @@ -1 +0,0 @@ -../dfhack-0.40.07_pre20140811/08-ruby-plugin-configurable-paths.patch \ No newline at end of file diff --git a/games-util/dfhack/files/dfhack-0.40.08_pre9999/09-eggy-remove-annoying-banner.patch b/games-util/dfhack/files/dfhack-0.40.08_pre9999/09-eggy-remove-annoying-banner.patch deleted file mode 120000 index 54a100cb..00000000 --- a/games-util/dfhack/files/dfhack-0.40.08_pre9999/09-eggy-remove-annoying-banner.patch +++ /dev/null @@ -1 +0,0 @@ -../dfhack-0.40.07_pre20140811/09-eggy-remove-annoying-banner.patch \ No newline at end of file diff --git a/games-util/dfhack/files/dfhack-0.40.08_pre9999/10-unbreak-egg.patch b/games-util/dfhack/files/dfhack-0.40.08_pre9999/10-unbreak-egg.patch deleted file mode 120000 index 53667329..00000000 --- a/games-util/dfhack/files/dfhack-0.40.08_pre9999/10-unbreak-egg.patch +++ /dev/null @@ -1 +0,0 @@ -../dfhack-0.40.07_pre20140811/10-unbreak-egg.patch \ No newline at end of file diff --git a/games-util/dfhack/files/dfhack-0.40.08_pre9999/11-dfhack-init-example.patch b/games-util/dfhack/files/dfhack-0.40.08_pre9999/11-dfhack-init-example.patch deleted file mode 100644 index 55ef5778..00000000 --- a/games-util/dfhack/files/dfhack-0.40.08_pre9999/11-dfhack-init-example.patch +++ /dev/null @@ -1,39 +0,0 @@ -dfhack.init.example - -From: eroen - - ---- - library/CMakeLists.txt | 2 +- - library/Core.cpp | 4 ++++ - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt -index 50ac9f2..eac23db 100644 ---- a/library/CMakeLists.txt -+++ b/library/CMakeLists.txt -@@ -350,7 +350,7 @@ install(FILES xml/symbols.xml - DESTINATION ${DFHACK_DATA_DESTINATION}) #linux: share/dfhack - #install the example autoexec file - install(FILES ../dfhack.init-example -- DESTINATION ${DFHACK_USERDOC_DESTINATION}) -+ DESTINATION ${DFHACK_DATA_DESTINATION}) - - install(TARGETS dfhack-run dfhack-client binpatch - LIBRARY DESTINATION ${DFHACK_LIBRARY_DESTINATION} -diff --git a/library/Core.cpp b/library/Core.cpp -index 8906f85..8ef600c 100644 ---- a/library/Core.cpp -+++ b/library/Core.cpp -@@ -864,7 +864,11 @@ static void run_dfhack_init(color_ostream &out, Core *core) - if (!core->loadScriptFile(out, "dfhack.init", true)) - { - core->runCommand(out, "gui/no-dfhack-init"); -+#ifdef DFHACK_DATA_DESTINATION -+ core->loadScriptFile(out, DFHACK_DATA_DESTINATION "/dfhack.init-example", true); -+#else - core->loadScriptFile(out, "dfhack.init-example", true); -+#endif - } - } - -- cgit v1.2.1