[packages/vcmi] - updated to 0.98 - fixed building qith boost 1.58
baggins
baggins at pld-linux.org
Wed Jun 24 08:16:18 CEST 2015
commit 0b8124b14318531ada92b8be54dbc9faf2c0a108
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Wed Jun 24 08:15:56 2015 +0200
- updated to 0.98
- fixed building qith boost 1.58
boost-1.58.patch | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
vcmi.spec | 10 ++++++----
2 files changed, 56 insertions(+), 4 deletions(-)
---
diff --git a/vcmi.spec b/vcmi.spec
index 1b939fd..604641c 100644
--- a/vcmi.spec
+++ b/vcmi.spec
@@ -1,13 +1,14 @@
Summary: Heroes 3: WoG recreated
Name: vcmi
-Version: 0.97
-Release: 2
+Version: 0.98
+Release: 1
License: GPL v2+
Group: X11/Applications/Games
-Source0: https://github.com/vcmi/vcmi/archive/%{version}.tar.gz
-# Source0-md5: 11f2000244622706773ce37ca2366ebb
+Source0: https://github.com/vcmi/vcmi/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 6a69e52a3380358220eba67332b097c6
Source1: http://download.vcmi.eu/core.zip
# Source1-md5: 5cf75d588cc53b93aceb809a6068ae37
+Patch0: boost-1.58.patch
URL: http://www.vcmi.eu/
BuildRequires: Qt5Network-devel
BuildRequires: qt5-build
@@ -34,6 +35,7 @@ H3 engine rewrie (not another mod) with new possibilities.
%prep
%setup -q
+%patch0 -p1
%build
install -d build
diff --git a/boost-1.58.patch b/boost-1.58.patch
new file mode 100644
index 0000000..854e505
--- /dev/null
+++ b/boost-1.58.patch
@@ -0,0 +1,50 @@
+From aa00fdbd0e99b2beec382c7677a64d962b748dcb Mon Sep 17 00:00:00 2001
+From: Rohit Nirmal <rohitnirmal9 at gmail.com>
+Date: Wed, 6 May 2015 19:16:51 -0500
+Subject: [PATCH] Fix building with Boost 1.58.
+
+---
+ CCallback.cpp | 2 +-
+ lib/CArtHandler.cpp | 2 +-
+ lib/CGameInfoCallback.cpp | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CCallback.cpp b/CCallback.cpp
+index 8009bc7..da280db 100644
+--- a/CCallback.cpp
++++ b/CCallback.cpp
+@@ -80,7 +80,7 @@ void CCallback::recruitCreatures(const CGDwelling *obj, const CArmedInstance * d
+
+ 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);
+diff --git a/lib/CArtHandler.cpp b/lib/CArtHandler.cpp
+index 2d9dd01..0026a66 100644
+--- a/lib/CArtHandler.cpp
++++ b/lib/CArtHandler.cpp
+@@ -671,7 +671,7 @@ boost::optional<std::vector<CArtifact*>&> CArtHandler::listFromClass( CArtifact:
+ case CArtifact::ART_RELIC:
+ return relics;
+ default: //special artifacts should not be erased
+- return nullptr;
++ return boost::optional<std::vector<CArtifact*>&>();
+ }
+ }
+
+diff --git a/lib/CGameInfoCallback.cpp b/lib/CGameInfoCallback.cpp
+index 051bb9c..2a59b96 100644
+--- a/lib/CGameInfoCallback.cpp
++++ b/lib/CGameInfoCallback.cpp
+@@ -403,7 +403,7 @@ std::vector <const CGObjectInstance * > CGameInfoCallback::getVisitableObjs(int3
+
+ 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);
+ }
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vcmi.git/commitdiff/0b8124b14318531ada92b8be54dbc9faf2c0a108
More information about the pld-cvs-commit
mailing list