[vcmi] 01/01: backport patch build_with_boost_1.58 from upstream to build with boost 1.58 (Closes: #797232)

[Johannes Schauer]

This is an automated email from the git hooks/post-receive script.

josch pushed a commit to branch master
in repository vcmi.

commit 7a212eb6e58a3371acbe662c3f9ba635ba131c6e
Author: Johannes Schauer <josch at debian.org>
Date:   Sat Aug 29 10:46:26 2015 +0200

    backport patch build_with_boost_1.58 from upstream to build with boost 1.58 (Closes: #797232)
---
 debian/changelog                     |  7 +++++++
 debian/patches/build_with_boost_1.58 | 39 ++++++++++++++++++++++++++++++++++++
 debian/patches/series                |  1 +
 3 files changed, 47 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0c30da5..5f75162 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+vcmi (0.98+dfsg-2) unstable; urgency=medium
+
+  * backport patch build_with_boost_1.58 from upstream to build with boost
+    1.58 (Closes: #797232)
+
+ -- Johannes Schauer <josch at debian.org>  Sat, 29 Aug 2015 10:45:14 +0200
+
 vcmi (0.98+dfsg-1) unstable; urgency=medium
 
   * new upstream release 0.98
diff --git a/debian/patches/build_with_boost_1.58 b/debian/patches/build_with_boost_1.58
new file mode 100644
index 0000000..668c9bf
--- /dev/null
+++ b/debian/patches/build_with_boost_1.58
@@ -0,0 +1,39 @@
+commit aa00fdbd0e99b2beec382c7677a64d962b748dcb
+Author: Rohit Nirmal <rohitnirmal9 at gmail.com>
+Date:   Wed May 6 19:16:51 2015 -0500
+
+    Fix building with Boost 1.58.
+
+--- a/CCallback.cpp
++++ b/CCallback.cpp
+@@ -80,7 +80,7 @@ void CCallback::recruitCreatures(const C
+ 
+ bool CCallback::dismissCreature(const CArmedInstance *obj, SlotID stackPos)
+ {
+-	if(((player>=0)  &&  obj->tempOwner != player) || (obj->stacksCount()<2  && obj->needsLastStack()))
++	if((player && obj->tempOwner != player) || (obj->stacksCount()<2  && obj->needsLastStack()))
+ 		return false;
+ 
+ 	DisbandCreature pack(stackPos,obj->id);
+--- a/lib/CArtHandler.cpp
++++ b/lib/CArtHandler.cpp
+@@ -671,7 +671,7 @@ boost::optional<std::vector<CArtifact*>&
+ 	case CArtifact::ART_RELIC:
+ 		return relics;
+ 	default: //special artifacts should not be erased
+-		return nullptr;
++		return boost::optional<std::vector<CArtifact*>&>();
+ 	}
+ }
+ 
+--- a/lib/CGameInfoCallback.cpp
++++ b/lib/CGameInfoCallback.cpp
+@@ -403,7 +403,7 @@ std::vector <const CGObjectInstance * >
+ 
+ 	for(const CGObjectInstance * obj : t->visitableObjects)
+ 	{
+-		if(player < nullptr || obj->ID != Obj::EVENT) //hide events from players
++		if(player || obj->ID != Obj::EVENT) //hide events from players
+ 			ret.push_back(obj);
+ 	}
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 31acd96..7399905 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 disable-privacy-breach
+build_with_boost_1.58

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/vcmi.git