haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-03 13:38:52 +02:00
Code Issues Packages Projects Releases Wiki Activity
Files
dc14a8f67656b80828aa211b6fd4930c3bf9825a
haikuports/games-strategy/freeciv/patches/freeciv-2.5.10.patchset
Schrijvers Luc f2698d55f8 freeciv, bump version (#2161)
2018-02-13 19:33:56 -05:00

232 lines
6.9 KiB
Plaintext
Raw Blame History

From f682f43e7f5c0e770033d1ef0b57bebf870349b1 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sun, 5 Mar 2017 09:18:33 +0100
Subject: move ~/.freeciv to ~/config/settings/freeciv on Haiku.
diff --git a/configure.ac b/configure.ac
index b65af70..294c4ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -154,6 +154,7 @@ AM_CONDITIONAL(SERVER, test x$server = xyes)
dnl Host type variable defaults
MINGW32=no
AMIGA=no
+HAIKU=no
dnl Settings specific to host OS
case "$host_os" in
@@ -161,6 +162,9 @@ case "$host_os" in
*mingw32*)
dnl Windows-specific settings
MINGW32=yes ;;
+ *haiku*)
+ dnl Haiku-specific settings
+ HAIKU=yes ;;
esac
dnl Networking headers
@@ -1252,9 +1256,15 @@ if test x"$MINGW32" = xyes; then
fi
else
FC_CONF_PATH="$sysconfdir/freeciv"
- DEFAULT_DATA_PATH=".:data:~/.freeciv/$DATASUBDIR:$datadir/freeciv"
- DEFAULT_SAVE_PATH=".:~/.freeciv/saves"
- DEFAULT_SCENARIO_PATH=".:data/scenarios:~/.freeciv/$DATASUBDIR/scenarios:~/.freeciv/scenarios:$datadir/freeciv/scenarios"
+ if test x"$HAIKU" = xyes; then
+ DEFAULT_DATA_PATH=".:data:~/config/settings/freeciv/$DATASUBDIR:$datadir/freeciv"
+ DEFAULT_SAVE_PATH=".:~/config/settings/freeciv/saves"
+ DEFAULT_SCENARIO_PATH=".:data/scenarios:~/config/settings/freeciv/$DATASUBDIR/scenarios:~/config/settings/freeciv/scenarios:$datadir/freeciv/scenarios"
+ else
+ DEFAULT_DATA_PATH=".:data:~/.freeciv/$DATASUBDIR:$datadir/freeciv"
+ DEFAULT_SAVE_PATH=".:~/.freeciv/saves"
+ DEFAULT_SCENARIO_PATH=".:data/scenarios:~/.freeciv/$DATASUBDIR/scenarios:~/.freeciv/scenarios:$datadir/freeciv/scenarios"
+ fi
fi
CPPFLAGS="$CPPFLAGS -DFC_CONF_PATH=\"\\\"$FC_CONF_PATH\\\"\""
CPPFLAGS="$CPPFLAGS -DDEFAULT_DATA_PATH=\"\\\"$DEFAULT_DATA_PATH\\\"\""
--
2.16.1
From a0fc0b5f2b7ae56cc7ad2e9d8e6ba337f72e16f4 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sun, 5 Mar 2017 10:19:43 +0100
Subject: .freeciv => config/settings/freeciv
diff --git a/client/connectdlg_common.c b/client/connectdlg_common.c
index 0cb630b..95c1152 100644
--- a/client/connectdlg_common.c
+++ b/client/connectdlg_common.c
@@ -298,9 +298,17 @@ bool client_start_server(void)
argv[argc++] = "1";
argv[argc++] = "-e";
argv[argc++] = "--saves";
+#ifdef __HAIKU__
+ argv[argc++] = "~/config/settings/freeciv/saves";
+#else
argv[argc++] = "~/.freeciv/saves";
+#endif
argv[argc++] = "--scenarios";
+#ifdef __HAIKU__
+ argv[argc++] = "~/config/settings/freeciv/scenarios";
+#else
argv[argc++] = "~/.freeciv/scenarios";
+#endif
argv[argc++] = "-A";
argv[argc++] = "none";
if (logfile) {
@@ -435,10 +443,18 @@ bool client_start_server(void)
free(savefile_in_local_encoding);
}
+#ifdef __HAIKU__
+ interpret_tilde(savesdir, sizeof(savesdir), "~/config/settings/freeciv/saves");
+#else
interpret_tilde(savesdir, sizeof(savesdir), "~/.freeciv/saves");
+#endif
internal_to_local_string_buffer(savesdir, savescmdline, sizeof(savescmdline));
+#ifdef __HAIKU__
interpret_tilde(scensdir, sizeof(scensdir), "~/.freeciv/scenarios");
+#else
+ interpret_tilde(scensdir, sizeof(scensdir), "~/.freeciv/scenarios");
+#endif
internal_to_local_string_buffer(scensdir, scenscmdline, sizeof(scenscmdline));
fc_snprintf(options, sizeof(options),
@@ -596,7 +612,11 @@ void send_client_wants_hack(const char *filename)
/* get the full filename path */
interpret_tilde(challenge_fullname, sizeof(challenge_fullname),
+#ifdef __HAIKU__
+ "~/config/settings/freeciv/");
+#else
"~/.freeciv/");
+#endif
make_dir(challenge_fullname);
sz_strlcat(challenge_fullname, filename);
diff --git a/client/options.c b/client/options.c
index 8f0a1d5..6ad8626 100644
--- a/client/options.c
+++ b/client/options.c
@@ -19,6 +19,9 @@
#include <string.h>
#include <sys/stat.h>
#include <sys/types.h>
+#ifdef __HAIKU__
+ #include <libgen.h>
+#endif
/* utility */
#include "fcintl.h"
@@ -4617,7 +4620,11 @@ static void save_cma_presets(struct section_file *file)
/* Old rc file name. */
#define OLD_OPTION_FILE_NAME ".civclientrc"
/* New rc file name. */
-#define NEW_OPTION_FILE_NAME ".freeciv-client-rc-%d.%d"
+#ifdef __HAIKU__
+# define NEW_OPTION_FILE_NAME "config/settings/freeciv/freeciv-client-rc-%d.%d"
+#else
+# define NEW_OPTION_FILE_NAME ".freeciv-client-rc-%d.%d"
+#endif
#define MAJOR_NEW_OPTION_FILE_NAME MAJOR_VERSION
#if IS_DEVEL_VERSION && ! IS_FREEZE_VERSION
#define MINOR_NEW_OPTION_FILE_NAME (MINOR_VERSION + 1)
@@ -5337,6 +5344,13 @@ void options_save(option_save_log_callback log_cb)
/* insert global worklists */
global_worklists_save(sf);
+#ifdef __HAIKU__
+{
+ char path[PATH_MAX];
+ strcpy(path, name);
+ make_dir(dirname(path));
+}
+#endif
/* save to disk */
if (!secfile_save(sf, name, 0, FZ_PLAIN)) {
log_cb(LOG_ERROR, _("Save failed, cannot write to file %s"), name);
diff --git a/server/gamehand.c b/server/gamehand.c
index 35dcca5..9671dc6 100644
--- a/server/gamehand.c
+++ b/server/gamehand.c
@@ -1010,7 +1010,7 @@ static const char *get_challenge_fullname(struct connection *pc)
{
static char fullname[MAX_LEN_PATH];
- interpret_tilde(fullname, sizeof(fullname), "~/.freeciv/");
+ interpret_tilde(fullname, sizeof(fullname), "~/config/settings/freeciv/");
sz_strlcat(fullname, get_challenge_filename(pc));
return fullname;
diff --git a/server/sernet.c b/server/sernet.c
index 5bfbe3f..e17c8b4 100644
--- a/server/sernet.c
+++ b/server/sernet.c
@@ -42,6 +42,9 @@
#ifdef HAVE_LIBREADLINE
#include <readline/history.h>
#include <readline/readline.h>
+#ifdef __HAIKU__
+#include <libgen.h>
+#endif
#endif
#ifdef HAVE_SYS_SELECT_H
#include <sys/select.h>
@@ -163,7 +166,11 @@ static void handle_stdin_close(void)
#ifdef HAVE_LIBREADLINE
/****************************************************************************/
-#define HISTORY_FILENAME ".freeciv-server_history"
+#ifdef __HAIKU__
+# define HISTORY_FILENAME "config/settings/freeciv/server_history"
+#else
+# define HISTORY_FILENAME ".freeciv-server_history"
+#endif
#define HISTORY_LENGTH 100
static char *history_file = NULL;
@@ -517,6 +524,13 @@ enum server_events server_sniff_all_input(void)
strcpy(history_file, home_dir);
strcat(history_file, "/");
strcat(history_file, HISTORY_FILENAME);
+#ifdef __HAIKU__
+ {
+ char path[PATH_MAX];
+ strcpy(path, history_file);
+ make_dir(dirname(path));
+ }
+#endif
using_history();
read_history(history_file);
}
--
2.16.1
From 6e6f7b0388b559a91b35ff126973822ff6825b36 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Sat, 10 Feb 2018 20:01:43 +0100
Subject: Fix header path to MagickWand.h
diff --git a/common/mapimg.c b/common/mapimg.c
index ad57fd0..9128e38 100644
--- a/common/mapimg.c
+++ b/common/mapimg.c
@@ -18,7 +18,7 @@
#include <stdarg.h>
#ifdef HAVE_MAPIMG_MAGICKWAND
- #include <wand/MagickWand.h>
+ #include <MagickWand/MagickWand.h>
#endif /* HAVE_MAPIMG_MAGICKWAND */
/* utility */
--
2.16.1
Reference in New Issue View Git Blame Copy Permalink