reinit the tree, so we can have metadata

6 files changed, 203 insertions, 0 deletions

diff --git a/games-strategy/galaxyhack/files/galaxyhack-1.74-boost-1.50.patch b/games-strategy/galaxyhack/files/galaxyhack-1.74-boost-1.50.patch
new file mode 100644
index 000000000000..1b630c66fb20
--- /dev/null
+++ b/games-strategy/galaxyhack/files/galaxyhack-1.74-boost-1.50.patch
@@ -0,0 +1,77 @@
+--- ForceSelectWin.cpp.orig	2012-08-20 17:35:01.000000000 +0200
++++ ForceSelectWin.cpp	2012-08-20 17:47:19.000000000 +0200
+@@ -1596,15 +1596,15 @@
+ 	fs::directory_iterator directoryEnd; // default construction yields past-the-end

+ 	for (fs::directory_iterator iter(sourcePath); iter != directoryEnd; ++iter) {

+ 		if (is_directory(*iter)) {

+-			fs::create_directory(destPath.string() + "/" + iter->leaf());

+-			DoCopy(sourcePath.string() + "/" + iter->leaf(), destPath.string() + "/" + iter->leaf());

++			fs::create_directory(destPath.string() + "/" + iter->path().filename().string());

++			DoCopy(sourcePath.string() + "/" + iter->path().filename().string(), destPath.string() + "/" + iter->path().filename().string());

+ 			continue;

+ 		}

+ 		string destFile;

+-		if (iter->leaf() == sideName + ".dat")

++		if (iter->path().filename() == sideName + ".dat")

+ 			destFile = theInput + ".dat";

+ 		else	

+-			destFile = iter->leaf();

++			destFile = iter->path().filename().string();

+ 		

+ 		fs::copy_file(*iter, destPath.string() + "/" + destFile);

+ 	}

+--- Main.cpp.orig	2012-08-20 17:48:13.000000000 +0200
++++ Main.cpp	2012-08-20 17:50:51.000000000 +0200
+@@ -339,12 +339,6 @@
+ 

+ void GameInit(char* argv[]) {

+ 	namespace fs = boost::filesystem;

+-	//boost is really quite stupid

+-	#ifndef WIN32

+-		fs::path::default_name_check(fs::windows_name);

+-	#else

+-		fs::path::default_name_check(fs::native);

+-	#endif

+ 	

+ 	FindHomePath();

+ 	LoadSettings(argv);

+--- Menu_Base.cpp.orig	2012-08-20 17:51:05.000000000 +0200
++++ Menu_Base.cpp	2012-08-20 17:52:15.000000000 +0200
+@@ -206,7 +206,7 @@
+ 

+ 	fs::directory_iterator directoryEnd; // default construction yields past-the-end

+ 	for (fs::directory_iterator iter(directory); iter != directoryEnd; ++iter) {

+-		string filename = iter->leaf();

++		string filename = iter->path().filename().string();

+ 

+ 		if (filename.find('.') == filename.npos)

+ 			continue;

+@@ -237,7 +237,7 @@
+ 	fs::directory_iterator directoryEnd; // default construction yields past-the-end

+ 	for (fs::directory_iterator iter(globalSettings.bdp + "fleets/"); iter != directoryEnd; ++iter) {

+ 		if (fs::is_directory(*iter)) {

+-			string fleetName = iter->leaf();

++			string fleetName = iter->path().filename().string();

+ 

+ 			if (CheckFleetExists(fleetName)) {

+ 				tempItem.desc = fleetName;

+@@ -261,7 +261,7 @@
+ 	fs::path iterPath(GetFleetDir(whichSide));

+ 	fs::directory_iterator directoryEnd; // default construction yields past-the-end

+ 	for (fs::directory_iterator iter(iterPath); iter != directoryEnd; ++iter) {

+-		string filename = iter->leaf();

++		string filename = iter->path().filename().string();

+ 

+ 		if (filename.find('.') == filename.npos)

+ 			continue;

+--- Stuff.cpp.orig	2012-08-20 17:52:36.000000000 +0200
++++ Stuff.cpp	2012-08-20 17:53:11.000000000 +0200
+@@ -657,7 +657,7 @@
+ 	fs::directory_iterator directoryEnd; // default construction yields past-the-end

+ 	for (fs::directory_iterator iter(tempPath); iter != directoryEnd; ++iter) {

+ 		if (fs::is_directory(*iter) && !fs::is_empty(*iter))

+-			RemoveDirectory(iter->string());

++			RemoveDirectory(iter->path().string());

+ 		else

+ 			fs::remove(*iter);

+ 	}

diff --git a/games-strategy/galaxyhack/files/galaxyhack-1.74-boost.patch b/games-strategy/galaxyhack/files/galaxyhack-1.74-boost.patch
new file mode 100644
index 000000000000..c7fd49135dee
--- /dev/null
+++ b/games-strategy/galaxyhack/files/galaxyhack-1.74-boost.patch
@@ -0,0 +1,11 @@
+--- src/SetupBattle.cpp
++++ src/SetupBattle.cpp
+@@ -18,7 +18,7 @@
+ #include "PreBattle.h"

+ 

+ #include <sstream>

+-#include <boost/filesystem/exception.hpp>

++#include <boost/filesystem.hpp>

+ 

+ using std::stringstream;

+ using std::getline;

diff --git a/games-strategy/galaxyhack/files/galaxyhack-1.74-destdirs.patch b/games-strategy/galaxyhack/files/galaxyhack-1.74-destdirs.patch
new file mode 100644
index 000000000000..4b5beef56ac7
--- /dev/null
+++ b/games-strategy/galaxyhack/files/galaxyhack-1.74-destdirs.patch
@@ -0,0 +1,11 @@
+--- Main.cpp.old	2006-07-28 00:04:46.000000000 +0200
++++ Main.cpp	2006-07-28 00:08:28.000000000 +0200
+@@ -184,7 +184,7 @@
+ #ifndef WIN32

+ 	string settingsPath = userHomePath + "settings.dat";

+ 	if (!DoesFileExist(settingsPath))

+-		settingsPath = "settings.dat";

++		settingsPath = "@GAMES_DATADIR@/galaxyhack/settings.dat";

+ #else

+ 	string settingsPath = "settings.dat";

+ #endif

diff --git a/games-strategy/galaxyhack/files/galaxyhack-1.74-format.patch b/games-strategy/galaxyhack/files/galaxyhack-1.74-format.patch
new file mode 100644
index 000000000000..4bd9e8fc6f83
--- /dev/null
+++ b/games-strategy/galaxyhack/files/galaxyhack-1.74-format.patch
@@ -0,0 +1,64 @@
+--- JSDL.cpp.old	2016-01-04 10:42:56.404316856 +0100
++++ JSDL.cpp	2016-01-04 10:51:16.744255312 +0100
+@@ -47,14 +47,14 @@
+ 	if (!globalSettings.batch) {

+ 		if (SDL_Init(SDL_INIT_TIMER | SDL_INIT_VIDEO) == -1) {

+ 			char output[120];

+-			sprintf(output, SDL_GetError());

++			strcpy(output, SDL_GetError());

+ 			throw runtime_error(output);

+ 		}

+ 		

+ 		if (!globalSettings.disableSound) {

+ 			if (SDL_InitSubSystem(SDL_INIT_AUDIO) == -1) {

+ 				char error[120];

+-				sprintf(error, SDL_GetError());

++				strcpy(error, SDL_GetError());

+ 				string errorStr = error;

+ 				errorStr += ", continuing without initialising sound.";

+ 				WriteLog(errorStr);

+@@ -81,7 +81,7 @@
+ 		//4096 is rather a large chunksize, should be smaller if I add sound effects

+ 		if (Mix_OpenAudio(MIX_DEFAULT_FREQUENCY, MIX_DEFAULT_FORMAT, 2, 4096) == -1) {

+ 			char output[100];

+-			sprintf(output, Mix_GetError());

++			strcpy(output, Mix_GetError());

+ 			throw runtime_error(output);

+ 		}

+ 	}

+@@ -101,7 +101,7 @@
+ 	if (screen == NULL) {

+ 		SDL_Quit();

+ 		char output[120];

+-		sprintf(output, SDL_GetError());

++		strcpy(output, SDL_GetError());

+ 		throw runtime_error(output);

+ 	}

+ }

+@@ -114,7 +114,7 @@
+ 

+ 	if (loadingSurface == NULL) {

+ 		char output[100];

+-		sprintf(output, IMG_GetError());

++		strcpy(output, IMG_GetError());

+ 		throw runtime_error(output);

+ 	}

+ 

+@@ -308,7 +308,7 @@
+ 

+ 	if (!theMusic) {

+ 		char output[100];

+-		sprintf(output, Mix_GetError());

++		strcpy(output, Mix_GetError());

+ 		throw runtime_error(output);

+ 	}

+ }

+@@ -319,7 +319,7 @@
+ 

+ 	if (Mix_PlayMusic(theMusic, -1) == -1) {

+ 		char output[100];

+-		sprintf(output, Mix_GetError());

++		strcpy(output, Mix_GetError());

+ 		throw runtime_error(output);

+ 	}

+ }

diff --git a/games-strategy/galaxyhack/files/galaxyhack-1.74-gcc43.patch b/games-strategy/galaxyhack/files/galaxyhack-1.74-gcc43.patch
new file mode 100644
index 000000000000..eeb64d12e587
--- /dev/null
+++ b/games-strategy/galaxyhack/files/galaxyhack-1.74-gcc43.patch
@@ -0,0 +1,12 @@
+diff -aur src.old/JSDL.cpp src/JSDL.cpp
+--- src.old/JSDL.cpp	2008-07-17 18:31:38.000000000 +0200
++++ src/JSDL.cpp	2008-07-17 19:19:39.000000000 +0200
+@@ -20,7 +20,7 @@
+ #include <cstdlib>

+ #include <fstream>

+ #include <stdexcept>

+-

++#include <cstring>

+ using std::runtime_error;

+ using std::memcpy;

+ 

diff --git a/games-strategy/galaxyhack/files/galaxyhack-1.74-gentoo.patch b/games-strategy/galaxyhack/files/galaxyhack-1.74-gentoo.patch
new file mode 100644
index 000000000000..a609a473fe7f
--- /dev/null
+++ b/games-strategy/galaxyhack/files/galaxyhack-1.74-gentoo.patch
@@ -0,0 +1,28 @@
+--- Makefile.old	2009-02-11 22:21:26.000000000 +0100
++++ Makefile	2009-02-11 22:20:58.000000000 +0100
+@@ -6,12 +6,11 @@
+ # James Gregory and Everton da Silva Marques <evertonsm@yahoo.com.br>
+ #
+ 
+-INSTALL_DIR=/usr/local/share
+-INSTALL_BIN_DIR=/usr/local/bin
++INSTALL_DIR="${GAMES_DATADIR}"
++INSTALL_BIN_DIR="${GAMES_BINDIR}"
+ 
+-CXX = g++
+-CXXFLAGS = $(shell sdl-config --cflags) -O3
+-LDFLAGS = $(shell sdl-config --libs) -lSDL_image -lSDL_mixer -lboost_filesystem
++CXXFLAGS += $(shell sdl-config --cflags)
++LDLIBS = $(shell sdl-config --libs) -lSDL_image -lSDL_mixer -lboost_filesystem -lboost_system -lm
+ 
+ OBJS = AIInterpreter.o AutoFireUnit.o BCCompiler.o DerivedGroups.o DragWindow.o \
+ 	ForceSelect.o ForceSelectWin.o GenWindow.o GenWindow_Base.o GFX.o Globals.o \
+@@ -40,7 +39,7 @@
+ 	install $(TARGET) $(INSTALL_BIN_DIR)
+ 
+ $(TARGET): $(OBJS)
+-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS)
+ 
+ %.o: %.cpp
+ 	$(CXX) $(CXXFLAGS) -c $< -o $@