summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Matteo Bernardini2021-02-20 19:50:38 +0100
committer Matteo Bernardini2021-03-06 09:51:28 +0100
commit8dfe726c0c8a047c7c4fca7527455d575508354e (patch)
tree0e9b9693cc250d23cd008f1ee298c8d19dfde373
parent3c59cb22425adf5d8a0d1a79baf00e6d9334c620 (diff)
downloadslackbuilds-freeorion.tar.gz
games/freeorion: Updated for version 0.4.10.1.freeorion
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
-rw-r--r--games/freeorion/compilefix.diff36
-rw-r--r--games/freeorion/freeorion.SlackBuild6
-rw-r--r--games/freeorion/freeorion.info6
3 files changed, 5 insertions, 43 deletions
diff --git a/games/freeorion/compilefix.diff b/games/freeorion/compilefix.diff
deleted file mode 100644
index c4c207a520..0000000000
--- a/games/freeorion/compilefix.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur freeorion-0.4.8/parse/ConditionParser.h freeorion-0.4.8.patched/parse/ConditionParser.h
---- freeorion-0.4.8/parse/ConditionParser.h 2018-08-23 05:41:14.000000000 -0400
-+++ freeorion-0.4.8.patched/parse/ConditionParser.h 2021-02-17 04:34:17.063751926 -0500
-@@ -1,6 +1,7 @@
- #ifndef _ConditionParser_h_
- #define _ConditionParser_h_
-
-+#include "../universe/ValueRef.h"
- #include "Lexer.h"
- #include "ParseImpl.h"
- #include "ValueRefParser.h"
-diff -Naur freeorion-0.4.8/server/ServerApp.cpp freeorion-0.4.8.patched/server/ServerApp.cpp
---- freeorion-0.4.8/server/ServerApp.cpp 2018-08-23 05:41:14.000000000 -0400
-+++ freeorion-0.4.8.patched/server/ServerApp.cpp 2021-02-17 16:33:47.472827568 -0500
-@@ -1715,7 +1715,7 @@
- // make a link to new connection
- m_player_empire_ids[player_connection->PlayerID()] = empire.first;
-
-- const OrderSet dummy;
-+ OrderSet dummy;
- const OrderSet& orders = orders_it->second ? *orders_it->second : dummy;
-
- auto player_info_map = GetPlayerInfoMap();
-diff -Naur freeorion-0.4.8/universe/Universe.h freeorion-0.4.8.patched/universe/Universe.h
---- freeorion-0.4.8/universe/Universe.h 2018-08-23 05:41:14.000000000 -0400
-+++ freeorion-0.4.8.patched/universe/Universe.h 2021-02-17 04:03:51.908917840 -0500
-@@ -3,7 +3,8 @@
-
-
- #include "EnumsFwd.h"
--#include "ValueRefFwd.h"
-+#include "ValueRef.h"
-+#include "Condition.h"
- #include "ObjectMap.h"
- #include "UniverseObject.h"
- #include "../util/Pending.h"
diff --git a/games/freeorion/freeorion.SlackBuild b/games/freeorion/freeorion.SlackBuild
index 550b76c64c..114e98bdc8 100644
--- a/games/freeorion/freeorion.SlackBuild
+++ b/games/freeorion/freeorion.SlackBuild
@@ -27,8 +27,8 @@
# along.
PRGNAM=freeorion
-VERSION=${VERSION:-0.4.8}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.4.10.1}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -77,8 +77,6 @@ find -L . \
export CC=/usr/bin/clang
export CXX=/usr/bin/clang++
-patch -p1 < $CWD/compilefix.diff
-
mkdir -p build
cd build
cmake \
diff --git a/games/freeorion/freeorion.info b/games/freeorion/freeorion.info
index 6796385b79..304d107f60 100644
--- a/games/freeorion/freeorion.info
+++ b/games/freeorion/freeorion.info
@@ -1,8 +1,8 @@
PRGNAM="freeorion"
-VERSION="0.4.8"
+VERSION="0.4.10.1"
HOMEPAGE="http://www.freeorion.org"
-DOWNLOAD="https://github.com/freeorion/freeorion/archive/v0.4.8/freeorion-0.4.8.tar.gz"
-MD5SUM="df605a8b6c4de264f2319610dea99dbe"
+DOWNLOAD="https://github.com/freeorion/freeorion/archive/v0.4.10.1/freeorion-0.4.10.1.tar.gz"
+MD5SUM="6c1f5a2508bb60a6503709b355246488"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="SDL2 OpenAL"