From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sat, 28 May 2016 18:12:29 +0000 (+0000)
Subject: - rebuild with boost 1.61
X-Git-Tag: auto/th/vcmi-0.98-4
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fvcmi.git;a=commitdiff_plain;h=e2eeb10

- rebuild with boost 1.61
- fix building with modern libstdc++
- rel 4
---

diff --git a/cxx.patch b/cxx.patch
new file mode 100644
index 0000000..aeed7b6
--- /dev/null
+++ b/cxx.patch
@@ -0,0 +1,67 @@
+--- vcmi-0.98/lib/Connection.cpp~	2015-04-01 07:34:22.000000000 +0000
++++ vcmi-0.98/lib/Connection.cpp	2016-05-28 17:54:42.579831336 +0000
+@@ -440,7 +440,7 @@
+ 		return typeDescr;  //type found, return ptr to structure
+ 
+ 	//type not found - add it to the list and return given ID
+-	auto newType = make_shared<TypeDescriptor>();
++	auto newType = std::make_shared<TypeDescriptor>();
+ 	newType->typeID = typeInfos.size() + 1;
+ 	newType->name = type->name();
+ 	typeInfos[type] = newType;
+--- vcmi-0.98/client/Client.cpp~	2015-04-01 07:34:22.000000000 +0000
++++ vcmi-0.98/client/Client.cpp	2016-05-28 18:01:35.421105201 +0000
+@@ -451,7 +451,7 @@
+ 			}
+ 			else 
+ 			{
+-				installNewPlayerInterface(make_shared<CPlayerInterface>(color), color);
++				installNewPlayerInterface(std::make_shared<CPlayerInterface>(color), color);
+ 				humanPlayers++;
+ 			}
+ 		}
+@@ -467,7 +467,7 @@
+ 		if(!gNoGUI)
+ 		{
+ 			boost::unique_lock<boost::recursive_mutex> un(*LOCPLINT->pim);
+-			auto p = make_shared<CPlayerInterface>(PlayerColor::NEUTRAL);
++			auto p = std::make_shared<CPlayerInterface>(PlayerColor::NEUTRAL);
+ 			p->observerInDuelMode = true;
+ 			installNewPlayerInterface(p, boost::none);
+ 			GH.curInt = p.get();
+@@ -550,7 +550,7 @@
+ 			else
+ 			{
+ 				assert(isHuman);
+-				nInt = make_shared<CPlayerInterface>(pid);
++				nInt = std::make_shared<CPlayerInterface>(pid);
+ 			}
+ 
+ 			nInt->dllName = dllname;
+@@ -620,7 +620,7 @@
+ 			else
+ 			{
+ 				assert(isHuman);
+-				nInt = make_shared<CPlayerInterface>(pid);
++				nInt = std::make_shared<CPlayerInterface>(pid);
+ 			}
+ 
+ 			nInt->dllName = dllname;
+@@ -866,7 +866,7 @@
+ 	playerint[colorUsed] = gameInterface;
+ 
+ 	logGlobal->traceStream() << boost::format("\tInitializing the interface for player %s") % colorUsed;
+-	auto cb = make_shared<CCallback>(gs, color, this);
++	auto cb = std::make_shared<CCallback>(gs, color, this);
+ 	callbacks[colorUsed] = cb;
+ 	battleCallbacks[colorUsed] = cb;
+ 	gameInterface->init(cb);
+@@ -887,7 +887,7 @@
+ 	if(needCallback)
+ 	{
+ 		logGlobal->traceStream() << boost::format("\tInitializing the battle interface for player %s") % *color;
+-		auto cbc = make_shared<CBattleCallback>(gs, color, this);
++		auto cbc = std::make_shared<CBattleCallback>(gs, color, this);
+ 		battleCallbacks[colorUsed] = cbc;
+ 		battleInterface->init(cbc);
+ 	}
diff --git a/vcmi.spec b/vcmi.spec
index 5f8640b..afc3a3c 100644
--- a/vcmi.spec
+++ b/vcmi.spec
@@ -1,7 +1,7 @@
 Summary:	Heroes 3: WoG recreated
 Name:		vcmi
 Version:	0.98
-Release:	3
+Release:	4
 License:	GPL v2+
 Group:		X11/Applications/Games
 Source0:	https://github.com/vcmi/vcmi/archive/%{version}/%{name}-%{version}.tar.gz
@@ -10,6 +10,7 @@ Source1:	http://download.vcmi.eu/core.zip
 # Source1-md5:	5cf75d588cc53b93aceb809a6068ae37
 Patch0:		boost-1.58.patch
 Patch1:		ffmpeg3.patch
+Patch2:		cxx.patch
 URL:		http://www.vcmi.eu/
 BuildRequires:	Qt5Network-devel
 BuildRequires:	qt5-build
@@ -38,6 +39,7 @@ H3 engine rewrie (not another mod) with new possibilities.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 install -d build