[gentoo-commits] repo/gentoo:master commit in: dev-games/simgear/files/, dev-games/simgear/

[Andreas Sturmlechner]

commit:     15251ba9c43dbb9661083f2c65000c9219006d3f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 25 17:56:04 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 25 20:54:37 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15251ba9

dev-games/simgear: Fix build with >=boost-1.69

Closes: https://bugs.gentoo.org/684026
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/simgear-2018.3.2-boost-1.69.patch        | 24 ++++++++++++++++++++++
 dev-games/simgear/simgear-2018.3.2.ebuild          |  2 ++
 2 files changed, 26 insertions(+)

diff --git a/dev-games/simgear/files/simgear-2018.3.2-boost-1.69.patch b/dev-games/simgear/files/simgear-2018.3.2-boost-1.69.patch
new file mode 100644
index 00000000000..2372c8c58ad
--- /dev/null
+++ b/dev-games/simgear/files/simgear-2018.3.2-boost-1.69.patch
@@ -0,0 +1,24 @@
+From c1ac1fb93dace81b2a60f9d1f5d6d20298c8b9bb Mon Sep 17 00:00:00 2001
+From: Fabrice Bellet <fabrice@××××××.info>
+Date: Fri, 1 Feb 2019 09:29:40 +0100
+Subject: [PATCH] fix for boost 1.69
+
+---
+ simgear/nasal/cppbind/NasalHash.hxx | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/simgear/nasal/cppbind/NasalHash.hxx b/simgear/nasal/cppbind/NasalHash.hxx
+index aac672fd..2ee7d044 100644
+--- a/simgear/nasal/cppbind/NasalHash.hxx
++++ b/simgear/nasal/cppbind/NasalHash.hxx
+@@ -23,6 +23,7 @@
+ #include "to_nasal.hxx"
+ 
+ #include <simgear/structure/map.hxx>
++#include <boost/core/enable_if.hpp>
+ #include <boost/iterator/iterator_facade.hpp>
+ 
+ namespace nasal
+-- 
+2.20.1
+

diff --git a/dev-games/simgear/simgear-2018.3.2.ebuild b/dev-games/simgear/simgear-2018.3.2.ebuild
index a65b51665aa..ead30a3c496 100644
--- a/dev-games/simgear/simgear-2018.3.2.ebuild
+++ b/dev-games/simgear/simgear-2018.3.2.ebuild
@@ -31,6 +31,8 @@ RDEPEND="${COMMON_DEPEND}
 	subversion? ( dev-vcs/subversion )
 "
 
+PATCHES=( "${FILESDIR}/${P}-boost-1.69.patch" )
+
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }