1.3.0

3 files changed, 7 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1bd93fad3e33..f9dcd393f1eb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = vcmi
 	pkgdesc = Open-source engine for Heroes of Might and Magic III
-	pkgver = 1.2.1
-	pkgrel = 2
+	pkgver = 1.3.0
+	pkgrel = 1
 	url = http://vcmi.eu
 	install = vcmi.install
 	arch = i686
@@ -32,7 +32,7 @@ pkgbase = vcmi
 	optdepends = unzip: required by vcmibuilder
 	provides = vcmi
 	conflicts = vcmi
-	source = https://github.com/vcmi/vcmi/archive/1.2.1.tar.gz
-	sha256sums = 88ffc13da9b7d6ac8ed294b1b7719e5adc0cdc34a9f0d83d55b5b5c8d02e529a
+	source = https://github.com/vcmi/vcmi/archive/1.3.0.tar.gz
+	sha256sums = 358c4ed57af292ce334582a7c0db81892b4bedcea7ab173d18dbb1dcf9c041cc
 
 pkgname = vcmi
diff --git a/PKGBUILD b/PKGBUILD
index c9f2919cfc71..59b0cc35bae8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: Sandy Carter <bwrsandman@gmail.com>
 
 pkgname=vcmi
-pkgver=1.2.1
-pkgrel=2
+pkgver=1.3.0
+pkgrel=1
 pkgdesc="Open-source engine for Heroes of Might and Magic III"
 arch=('i686' 'x86_64' 'arm' 'armv7h' 'armv6h' 'aarch64')
 url="http://vcmi.eu"
@@ -17,13 +17,11 @@ optdepends=('innoextract: required by vcmibuilder' 'unshield: required by vcmibu
 provides=('vcmi')
 conflicts=('vcmi')
 install="${pkgname}.install"
-patch="server.patch"
 source=("https://github.com/vcmi/${pkgname}/archive/${pkgver}.tar.gz")
-sha256sums=('88ffc13da9b7d6ac8ed294b1b7719e5adc0cdc34a9f0d83d55b5b5c8d02e529a')
+sha256sums=('358c4ed57af292ce334582a7c0db81892b4bedcea7ab173d18dbb1dcf9c041cc')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i ../../$patch
 }
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/server.patch b/server.patch
deleted file mode 100644
index f90e543484c6..000000000000
--- a/server.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/server/CVCMIServer.cpp b/server/CVCMIServer.cpp
-index b166167a5..640d8837f 100644
---- a/server/CVCMIServer.cpp
-+++ b/server/CVCMIServer.cpp
-@@ -375,10 +375,10 @@ class CVCMIServerPackVisitor : public VCMI_LIB_WRAP_NAMESPACE(ICPackVisitor)
- {
- private:
- 	CVCMIServer & handler;
--	CGameHandler & gh;
-+	std::shared_ptr<CGameHandler> gh;
- 
- public:
--	CVCMIServerPackVisitor(CVCMIServer & handler, CGameHandler & gh)
-+	CVCMIServerPackVisitor(CVCMIServer & handler, std::shared_ptr<CGameHandler> gh)
- 			:handler(handler), gh(gh)
- 	{
- 	}
-@@ -392,7 +392,9 @@ public:
- 
- 	virtual void visitForServer(CPackForServer & serverPack) override
- 	{
--		gh.handleReceivedPack(&serverPack);
-+		if (!gh)
-+			throw std::runtime_error("Received game handler pack in lobby!");
-+		gh->handleReceivedPack(&serverPack);
- 	}
- 
- 	virtual void visitForClient(CPackForClient & clientPack) override
-@@ -432,7 +434,7 @@ void CVCMIServer::threadHandleClient(std::shared_ptr<CConnection> c)
- 				break;
- 			}
- 
--			CVCMIServerPackVisitor visitor(*this, *this->gh);
-+			CVCMIServerPackVisitor visitor(*this, this->gh);
- 			pack->visit(visitor);
- 		}
- #ifndef _MSC_VER