fix boost compilation

2 files changed, 90 insertions, 3 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 8c01738daef9..64497e234072 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,13 +17,16 @@ optdepends=('innoextract: required by vcmibuilder'
 conflicts=('fuzzylite')
 install="${pkgname}.install"
 source=(https://github.com/vcmi/${pkgname}/archive/${pkgver}.tar.gz
-        0001-Launcher-add-sanity-checks-for-QDir-removeRecursivel.patch)
+        0001-Launcher-add-sanity-checks-for-QDir-removeRecursivel.patch
+        boostasiofix.patch)
 sha256sums=('b7f2459d7e054c8bdcf419cbb80040e751d3dbb06dc1113ac28f7365930f902e'
-            'fefca8818a11bc753a9dfd828fc1e3f6f64d104713e64fa76088c3ce05f60143')
+            'fefca8818a11bc753a9dfd828fc1e3f6f64d104713e64fa76088c3ce05f60143'
+            'e270050db24c2cd717c490d9d121b43d19574fd92345105374f3bc1c8386ea35')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p0 "${srcdir}/0001-Launcher-add-sanity-checks-for-QDir-removeRecursivel.patch"
+  patch -p1 -i "${srcdir}/0001-Launcher-add-sanity-checks-for-QDir-removeRecursivel.patch"
+  patch -p1 -l -i "${srcdir}/boostasiofix.patch"
 }
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/boostasiofix.patch b/boostasiofix.patch
new file mode 100644
index 000000000000..f7c0f7db3099
--- /dev/null
+++ b/boostasiofix.patch
@@ -0,0 +1,84 @@
+diff --git a/lib/serializer/Connection.h b/lib/serializer/Connection.h
+index 5eaf286a..b1923bfd 100644
+--- a/lib/serializer/Connection.h
++++ b/lib/serializer/Connection.h
+@@ -14,31 +14,12 @@
+ #include "BinaryDeserializer.h"
+ #include "BinarySerializer.h"
+ 
+-struct CPack;
++#include <boost/asio.hpp>
+ 
+-namespace boost
+-{
+-	namespace asio
+-	{
+-		namespace ip
+-		{
+-			class tcp;
+-		}
+-		class io_service;
+-
+-		template <typename Protocol> class stream_socket_service;
+-		template <typename Protocol,typename StreamSocketService>
+-		class basic_stream_socket;
+-
+-		template <typename Protocol> class socket_acceptor_service;
+-		template <typename Protocol,typename SocketAcceptorService>
+-		class basic_socket_acceptor;
+-	}
+-	class mutex;
+-}
++struct CPack;
+ 
+-typedef boost::asio::basic_stream_socket < boost::asio::ip::tcp , boost::asio::stream_socket_service<boost::asio::ip::tcp>  > TSocket;
+-typedef boost::asio::basic_socket_acceptor<boost::asio::ip::tcp, boost::asio::socket_acceptor_service<boost::asio::ip::tcp> > TAcceptor;
++typedef boost::asio::basic_stream_socket < boost::asio::ip::tcp > TSocket;
++typedef boost::asio::basic_socket_acceptor<boost::asio::ip::tcp> TAcceptor;
+ 
+ /// Main class for network communication
+ /// Allows establishing connection and bidirectional read-write
+diff --git a/server/CVCMIServer.h b/server/CVCMIServer.h
+index 5443d355..4614006b 100644
+--- a/server/CVCMIServer.h
++++ b/server/CVCMIServer.h
+@@ -11,6 +11,8 @@
+  * Full text of license available in license.txt file, in main folder

+  *

+  */

++
++#include <boost/asio.hpp>
+ 

+ class CMapInfo;

+ 

+@@ -18,28 +20,8 @@ class CConnection;
+ struct CPackForSelectionScreen;

+ class CGameHandler;

+ 

+-namespace boost

+-{

+-	namespace asio

+-	{

+-		namespace ip

+-		{

+-			class tcp;

+-		}

+-		class io_service;

+-

+-		template <typename Protocol> class stream_socket_service;

+-		template <typename Protocol,typename StreamSocketService>

+-		class basic_stream_socket;

+-

+-		template <typename Protocol> class socket_acceptor_service;

+-		template <typename Protocol,typename SocketAcceptorService>

+-		class basic_socket_acceptor;

+-	}

+-};

+-

+-typedef boost::asio::basic_socket_acceptor<boost::asio::ip::tcp, boost::asio::socket_acceptor_service<boost::asio::ip::tcp> > TAcceptor;

+-typedef boost::asio::basic_stream_socket < boost::asio::ip::tcp , boost::asio::stream_socket_service<boost::asio::ip::tcp>  > TSocket;

++typedef boost::asio::basic_socket_acceptor<boost::asio::ip::tcp> TAcceptor;
++typedef boost::asio::basic_stream_socket < boost::asio::ip::tcp > TSocket;
+ 

+ class CVCMIServer

+ {