diff options
| author | B. Watson <yalhcru@gmail.com> | 2021-02-17 16:37:37 -0500 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2021-02-21 00:05:07 +0700 |
| commit | 9752325add790d3b2e308c485b5559e0dc76ae51 (patch) | |
| tree | ce755cae94b1f6b160f811cce1aa68d869f693a1 | |
| parent | a89d7445920d7adb48df2b6daec1fcbaf986c095 (diff) | |
| download | slackbuilds-9752325add790d3b2e308c485b5559e0dc76ae51.tar.gz | |
games/freeorion: Fix build.
Signed-off-by: B. Watson <yalhcru@gmail.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | games/freeorion/compilefix.diff | 36 | ||||
| -rw-r--r-- | games/freeorion/freeorion.SlackBuild | 8 |
2 files changed, 43 insertions, 1 deletions
diff --git a/games/freeorion/compilefix.diff b/games/freeorion/compilefix.diff new file mode 100644 index 0000000000..c4c207a520 --- /dev/null +++ b/games/freeorion/compilefix.diff @@ -0,0 +1,36 @@ +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 2277787124..550b76c64c 100644 --- a/games/freeorion/freeorion.SlackBuild +++ b/games/freeorion/freeorion.SlackBuild @@ -22,9 +22,13 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20210217 bkw: modified by SlackBuilds.org: add compilefix.diff. I +# have no idea how this build passed QA, since it was broken all +# along. + PRGNAM=freeorion VERSION=${VERSION:-0.4.8} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -73,6 +77,8 @@ find -L . \ export CC=/usr/bin/clang export CXX=/usr/bin/clang++ +patch -p1 < $CWD/compilefix.diff + mkdir -p build cd build cmake \ |