Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 14 Aug 2019 17:14:24 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r508940 - in head/games/openxcom: . files
Message-ID:  <201908141714.x7EHEOTp058698@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Wed Aug 14 17:14:23 2019
New Revision: 508940
URL: https://svnweb.freebsd.org/changeset/ports/508940

Log:
  - Fix build with GCC-based architectures
  
  PR:		239633
  Submitted by:	pkubaj@FreeBSD.org

Added:
  head/games/openxcom/files/patch-src_Engine_Language.cpp   (contents, props changed)
  head/games/openxcom/files/patch-src_Engine_OptionInfo.cpp   (contents, props changed)
  head/games/openxcom/files/patch-src_Menu_ListGamesState.cpp   (contents, props changed)
  head/games/openxcom/files/patch-src_Menu_ListLoadState.cpp   (contents, props changed)
  head/games/openxcom/files/patch-src_Savegame_Craft.cpp   (contents, props changed)
Modified:
  head/games/openxcom/Makefile

Modified: head/games/openxcom/Makefile
==============================================================================
--- head/games/openxcom/Makefile	Wed Aug 14 17:12:49 2019	(r508939)
+++ head/games/openxcom/Makefile	Wed Aug 14 17:14:23 2019	(r508940)
@@ -15,13 +15,11 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS=	libyaml-cpp.so:devel/yaml-cpp
 
-BROKEN_powerpc64=	fails to compile: XcomResourcePack.cpp: undefined reference to YAML::LoadFile
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	SupSuper
 GH_PROJECT=	OpenXcom
 
-USES=		compiler:c++11-lang gmake pkgconfig
+USES=		compiler:c++11-lang gl gmake pkgconfig sdl
 USE_CXXSTD=	c++11
 USE_SDL=	sdl mixer image gfx
 USE_GL=		gl

Added: head/games/openxcom/files/patch-src_Engine_Language.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/openxcom/files/patch-src_Engine_Language.cpp	Wed Aug 14 17:14:23 2019	(r508940)
@@ -0,0 +1,10 @@
+--- src/Engine/Language.cpp.orig	2019-08-03 22:25:23 UTC
++++ src/Engine/Language.cpp
+@@ -17,6 +17,7 @@
+  * along with OpenXcom.  If not, see <http://www.gnu.org/licenses/>.
+  */
+ #include "Language.h"
++#include <algorithm>
+ #include <assert.h>
+ #include <locale>
+ #include <fstream>

Added: head/games/openxcom/files/patch-src_Engine_OptionInfo.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/openxcom/files/patch-src_Engine_OptionInfo.cpp	Wed Aug 14 17:14:23 2019	(r508940)
@@ -0,0 +1,10 @@
+--- src/Engine/OptionInfo.cpp.orig	2019-08-03 22:24:06 UTC
++++ src/Engine/OptionInfo.cpp
+@@ -16,6 +16,7 @@
+  * You should have received a copy of the GNU General Public License
+  * along with OpenXcom.  If not, see <http://www.gnu.org/licenses/>.
+  */
++#include <algorithm>
+ #include "OptionInfo.h"
+ #include "Exception.h"
+ 

Added: head/games/openxcom/files/patch-src_Menu_ListGamesState.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/openxcom/files/patch-src_Menu_ListGamesState.cpp	Wed Aug 14 17:14:23 2019	(r508940)
@@ -0,0 +1,10 @@
+--- src/Menu/ListGamesState.cpp.orig	2019-08-03 22:29:28 UTC
++++ src/Menu/ListGamesState.cpp
+@@ -17,6 +17,7 @@
+  * along with OpenXcom.  If not, see <http://www.gnu.org/licenses/>.
+  */
+ #include "ListGamesState.h"
++#include <algorithm>
+ #include <utility>
+ #include "../Engine/Logger.h"
+ #include "../Savegame/SavedGame.h"

Added: head/games/openxcom/files/patch-src_Menu_ListLoadState.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/openxcom/files/patch-src_Menu_ListLoadState.cpp	Wed Aug 14 17:14:23 2019	(r508940)
@@ -0,0 +1,10 @@
+--- src/Menu/ListLoadState.cpp.orig	2019-08-03 22:27:50 UTC
++++ src/Menu/ListLoadState.cpp
+@@ -16,6 +16,7 @@
+  * You should have received a copy of the GNU General Public License
+  * along with OpenXcom.  If not, see <http://www.gnu.org/licenses/>.
+  */
++#include <algorithm>
+ #include "ListLoadState.h"
+ #include "../Engine/Game.h"
+ #include "../Engine/Language.h"

Added: head/games/openxcom/files/patch-src_Savegame_Craft.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/openxcom/files/patch-src_Savegame_Craft.cpp	Wed Aug 14 17:14:23 2019	(r508940)
@@ -0,0 +1,10 @@
+--- src/Savegame/Craft.cpp.orig	2019-08-03 22:32:11 UTC
++++ src/Savegame/Craft.cpp
+@@ -18,6 +18,7 @@
+  */
+ #define _USE_MATH_DEFINES
+ #include "Craft.h"
++#include <algorithm>
+ #include <cmath>
+ #include <sstream>
+ #include "../Engine/Language.h"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908141714.x7EHEOTp058698>