1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-18 19:49:40 +00:00

games/freeorion: update to 0.4.10.2

This commit is contained in:
Dmitry Marakasov 2021-08-25 15:05:21 +03:00
parent cda6b1f7b0
commit 3f9b003911
4 changed files with 14 additions and 39 deletions

View File

@ -1,7 +1,6 @@
PORTNAME= freeorion
DISTVERSIONPREFIX= v
DISTVERSION= 0.4.10.1
PORTREVISION= 1
DISTVERSION= 0.4.10.2
CATEGORIES= games
MAINTAINER= amdmi3@FreeBSD.org
@ -15,7 +14,7 @@ LIB_DEPENDS= libboost_thread.so:devel/boost-libs \
USE_GITHUB= yes
USES= cmake compiler:c++14-lang python:3.5+
USES= cmake compiler:c++14-lang python:3.5-3.9 # inherited from boost-python-libs
CMAKE_ARGS= -Wno-dev
LDFLAGS_i386= -Wl,-znotext
@ -40,10 +39,18 @@ HEADLESS_LIB_DEPENDS_OFF= \
libvorbis.so:audio/libvorbis \
libpng.so:graphics/png
.include <bsd.port.pre.mk>
.if ${PYTHON_VER} != ${PYTHON_DEFAULT}
# unable to detect boost_python otherwise since required files are
# not installed by boost-python-libs
CMAKE_ARGS+= -DBoost_NO_BOOST_CMAKE:BOOL=YES
.endif
post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
.for f in ${PORTDOCS}
${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/
.endfor
.include <bsd.port.mk>
.include <bsd.port.post.mk>

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1602008570
SHA256 (freeorion-freeorion-v0.4.10.1_GH0.tar.gz) = ce53307f25c82efaa52b5ea98934648e76b9fa3de5fffbf012bda7cf97bf3168
SIZE (freeorion-freeorion-v0.4.10.1_GH0.tar.gz) = 124693099
TIMESTAMP = 1629828016
SHA256 (freeorion-freeorion-v0.4.10.2_GH0.tar.gz) = 8c3bd4dcae7e2b160361b88f9a97cdb62b5c7413675acc15774054878228e709
SIZE (freeorion-freeorion-v0.4.10.2_GH0.tar.gz) = 124720711

View File

@ -1,21 +0,0 @@
Change similar to upstream commit 9cc1926e8126163d3b8877c0112e11c462a96384:
remove unused code to fix build with boost 1.76
--- UI/CombatReport/GraphicalSummary.cpp.orig 2020-09-25 11:06:39 UTC
+++ UI/CombatReport/GraphicalSummary.cpp
@@ -409,6 +409,7 @@ class SideBar : public GG::Wnd { (public)
m_y_axis_label->MoveTo(GG::Pt(-m_y_axis_label->MinUsableSize().x / 2 - AXIS_WIDTH, Height()/2 - m_y_axis_label->Height()/2));
}
+ /*
void DrawArrow(GG::Pt begin, GG::Pt end) {
double head_width = 5.0;
// A vector (math) of the arrow we wish to draw
@@ -493,6 +494,7 @@ class SideBar : public GG::Wnd { (public)
DrawArrow(begin, x_end);
DrawArrow(begin, y_end);
}
+ */
void SizeMove(const GG::Pt& ul, const GG::Pt& lr) override {
GG::Wnd::SizeMove(ul, lr);

View File

@ -1,11 +0,0 @@
--- universe/Conditions.cpp.orig 2020-09-25 11:06:39 UTC
+++ universe/Conditions.cpp
@@ -32,6 +32,8 @@
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/st_connected.hpp>
+#include <cfloat> // for FLT_MAX
+
using boost::io::str;