teldra
/
vp-build
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

OpenXcom: rebuild against yaml-cpp-0.6.2_1

This commit is contained in:
John Zimmermann 2018-09-30 22:22:38 +02:00 committed by Helmut Pozimski
parent 605d6f56ee
commit 49d797dcd0
3 changed files with 57 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/shlibs
View File

@ -2013,7 +2013,7 @@ libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
libOpenImageIO_Util.so.1.8 openimageio-1.8.12_1
libOpenImageIO.so.1.8 openimageio-1.8.12_1
libOpenColorIO.so.1 opencolorio-1.0.8_1
libyaml-cpp.so.0.5 yaml-cpp-0.5.2_1
libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1
libpaper.so.1 libpaper-1.1.24_1
libhtsjava.so.2 httrack-3.48.21_1
libhttrack.so.2 httrack-3.48.21_1

55
srcpkgs/OpenXcom/patches/openxcom-cmath-algorithm-fixes.patch Normal file
View File

@ -0,0 +1,55 @@
diff -aur src/Basescape/BaseInfoState.h src/Basescape/BaseInfoState.h
--- src/Basescape/BaseInfoState.h 2018-03-14 15:06:59.665628271 +0000
+++ src/Basescape/BaseInfoState.h 2018-03-14 15:43:22.067605905 +0000
@@ -19,6 +19,7 @@
#ifndef OPENXCOM_BASEINFOSTATE_H
#define OPENXCOM_BASEINFOSTATE_H
+#include <cmath>
#include "../Engine/State.h"
namespace OpenXcom
diff -aur src/Basescape/CraftInfoState.h src/Basescape/CraftInfoState.h
--- src/Basescape/CraftInfoState.h 2018-03-14 15:02:09.783729176 +0000
+++ src/Basescape/CraftInfoState.h 2018-03-14 15:43:16.476703036 +0000
@@ -19,6 +19,7 @@
#ifndef OPENXCOM_CRAFTINFOSTATE_H
#define OPENXCOM_CRAFTINFOSTATE_H
+#include <cmath>
#include "../Engine/State.h"
namespace OpenXcom
diff -aur src/Engine/Language.h src/Engine/Language.h
--- src/Engine/Language.h 2018-03-14 15:11:37.236763021 +0000
+++ src/Engine/Language.h 2018-03-14 15:42:14.751775215 +0000
@@ -23,6 +23,7 @@
#include <vector>
#include <string>
#include <yaml-cpp/yaml.h>
+#include <algorithm>
#include "LocalizedText.h"
#include "../Savegame/Soldier.h"
diff -aur src/Engine/OptionInfo.h src/Engine/OptionInfo.h
--- src/Engine/OptionInfo.h 2018-03-14 15:14:50.346384845 +0000
+++ src/Engine/OptionInfo.h 2018-03-14 15:42:14.750775233 +0000
@@ -23,6 +23,7 @@
#include <string>
#include <map>
#include <SDL.h>
+#include <algorithm>
namespace OpenXcom
{
diff -aur src/Savegame/CraftWeapon.h src/Savegame/CraftWeapon.h
--- src/Savegame/CraftWeapon.h 2018-03-14 15:27:14.695387913 +0000
+++ src/Savegame/CraftWeapon.h 2018-03-14 15:42:14.748775267 +0000
@@ -21,6 +21,7 @@
#include <string>
#include <yaml-cpp/yaml.h>
+#include <cmath>
namespace OpenXcom
{

2
srcpkgs/OpenXcom/template
View File

@ -1,7 +1,7 @@
# Template file for 'OpenXcom'
pkgname=OpenXcom
version=1.0
revision=1
revision=2
build_style=gnu-configure
configure_args="--disable-silent-rules --disable-werror"
hostmakedepends="automake pkg-config xmlto"