diff --git a/games-strategy/openxcom/openxcom-1.0.recipe b/games-strategy/openxcom/openxcom-1.0.recipe index 682839374..846d87a2b 100644 --- a/games-strategy/openxcom/openxcom-1.0.recipe +++ b/games-strategy/openxcom/openxcom-1.0.recipe @@ -15,7 +15,7 @@ SOURCE_DIR="OpenXcom-$portVersion" PATCHES="openxcom-$portVersion.patchset" ADDITIONAL_FILES="openxcom.rdef" -ARCHITECTURES="!x86_gcc2 ?x86_64 ?x86" +ARCHITECTURES="!x86_gcc2 x86_64 ?x86" SECONDARY_ARCHITECTURES="x86" GLOBAL_WRITABLE_FILES=" diff --git a/games-strategy/openxcom/patches/openxcom-1.0.patchset b/games-strategy/openxcom/patches/openxcom-1.0.patchset index 801444dbb..46fa2b679 100644 --- a/games-strategy/openxcom/patches/openxcom-1.0.patchset +++ b/games-strategy/openxcom/patches/openxcom-1.0.patchset @@ -1,4 +1,4 @@ -From c965aec6b307f3b6bc614a1ee3733ef23fd8e17a Mon Sep 17 00:00:00 2001 +From b334f8dcdf3982f87dabdc47f4ca2b240167786a Mon Sep 17 00:00:00 2001 From: Mikolaj 'lich' Halber Date: Sun, 3 Jan 2016 21:31:07 +0000 Subject: Added Haiku support @@ -27,7 +27,7 @@ index b407bef..7764974 100644 ~/Library/Frameworks /Library/Frameworks diff --git a/cmake/modules/FindSDL_gfx.cmake b/cmake/modules/FindSDL_gfx.cmake -index 2e09b9b..c4c0633 100644 +index 2e09b9b..3a5c89e 100644 --- a/cmake/modules/FindSDL_gfx.cmake +++ b/cmake/modules/FindSDL_gfx.cmake @@ -28,7 +28,7 @@ FIND_PATH(SDLGFX_INCLUDE_DIR SDL_gfx.h @@ -48,22 +48,8 @@ index 2e09b9b..c4c0633 100644 PATHS ~/Library/Frameworks /Library/Frameworks - -diff --git a/cmake/modules/FindYaml_cpp.cmake b/cmake/modules/FindYaml_cpp.cmake -index 64ccc2f..27a0f4b 100644 ---- a/cmake/modules/FindYaml_cpp.cmake -+++ b/cmake/modules/FindYaml_cpp.cmake -@@ -29,7 +29,7 @@ FIND_PATH(YAMLCPP_INCLUDE_DIR yaml.h - ${PC_YAMLCPP_INCLUDEDIR} - ${PC_YAMLCPP_INCLUDE_DIRS} - $ENV{YAMLCPPDIR} -- PATH_SUFFIXES include/yaml-cpp include -+ PATH_SUFFIXES include/yaml-cpp include yaml-cpp - PATHS - ~/Library/Frameworks - /Library/Frameworks diff --git a/src/Engine/CrossPlatform.cpp b/src/Engine/CrossPlatform.cpp -index a5704f4..53823e6 100644 +index a5704f4..d5768e9 100644 --- a/src/Engine/CrossPlatform.cpp +++ b/src/Engine/CrossPlatform.cpp @@ -59,6 +59,10 @@ @@ -114,5 +100,100 @@ index a5704f4..53823e6 100644 char const *home = getHome(); char path[MAXPATHLEN]; -- -2.2.2 +2.24.0 + + +From 249301dc0c28cf27c37d56626e423ffcc0e33352 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Sat, 25 Jan 2020 21:46:40 +0100 +Subject: fix build. + + +diff --git a/cmake/modules/FindYaml_cpp.cmake b/cmake/modules/FindYaml_cpp.cmake +index 64ccc2f..4f1d60f 100644 +--- a/cmake/modules/FindYaml_cpp.cmake ++++ b/cmake/modules/FindYaml_cpp.cmake +@@ -24,7 +24,7 @@ FIND_PACKAGE(PkgConfig) + PKG_CHECK_MODULES(PC_YAMLCPP QUIET yaml-cpp) + + +-FIND_PATH(YAMLCPP_INCLUDE_DIR yaml.h ++FIND_PATH(YAMLCPP_INCLUDE_DIR yaml-cpp/yaml.h + HINTS + ${PC_YAMLCPP_INCLUDEDIR} + ${PC_YAMLCPP_INCLUDE_DIRS} +diff --git a/src/Engine/Language.cpp b/src/Engine/Language.cpp +index b14bca4..ca26e08 100644 +--- a/src/Engine/Language.cpp ++++ b/src/Engine/Language.cpp +@@ -17,6 +17,7 @@ + * along with OpenXcom. If not, see . + */ + #include "Language.h" ++#include + #include + #include + #include +diff --git a/src/Engine/OptionInfo.cpp b/src/Engine/OptionInfo.cpp +index 31df3b5..57c229c 100644 +--- a/src/Engine/OptionInfo.cpp ++++ b/src/Engine/OptionInfo.cpp +@@ -17,6 +17,7 @@ + * along with OpenXcom. If not, see . + */ + #include "OptionInfo.h" ++#include + #include "Exception.h" + + namespace OpenXcom +diff --git a/src/Engine/Sound.cpp b/src/Engine/Sound.cpp +index f45f092..5d534d4 100644 +--- a/src/Engine/Sound.cpp ++++ b/src/Engine/Sound.cpp +@@ -17,6 +17,7 @@ + * along with OpenXcom. If not, see . + */ + #include "Sound.h" ++#include + #include + #include "Exception.h" + #include "Options.h" +diff --git a/src/Menu/ListGamesState.cpp b/src/Menu/ListGamesState.cpp +index 9361da8..0f37915 100644 +--- a/src/Menu/ListGamesState.cpp ++++ b/src/Menu/ListGamesState.cpp +@@ -17,6 +17,7 @@ + * along with OpenXcom. If not, see . + */ + #include "ListGamesState.h" ++#include + #include + #include "../Engine/Logger.h" + #include "../Savegame/SavedGame.h" +diff --git a/src/Menu/ListLoadState.cpp b/src/Menu/ListLoadState.cpp +index f805c57..9b21523 100644 +--- a/src/Menu/ListLoadState.cpp ++++ b/src/Menu/ListLoadState.cpp +@@ -17,6 +17,7 @@ + * along with OpenXcom. If not, see . + */ + #include "ListLoadState.h" ++#include + #include "../Engine/Game.h" + #include "../Engine/Language.h" + #include "../Engine/Action.h" +diff --git a/src/Savegame/Craft.cpp b/src/Savegame/Craft.cpp +index f0c0ee8..ad99385 100644 +--- a/src/Savegame/Craft.cpp ++++ b/src/Savegame/Craft.cpp +@@ -18,6 +18,7 @@ + */ + #define _USE_MATH_DEFINES + #include "Craft.h" ++#include + #include + #include + #include "../Engine/Language.h" +-- +2.24.0