rm outdated patches

2 files changed, 0 insertions, 156 deletions

diff --git a/0001-Launcher-add-sanity-checks-for-QDir-removeRecursivel.patch b/0001-Launcher-add-sanity-checks-for-QDir-removeRecursivel.patch
deleted file mode 100644
index a23586d94f9a..000000000000
--- a/0001-Launcher-add-sanity-checks-for-QDir-removeRecursivel.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 5d8e943787666543df6b858c001ab4e59b09fe2d Mon Sep 17 00:00:00 2001
-From: Arseniy Shestakov <me@arseniyshestakov.com>
-Date: Thu, 25 May 2017 03:03:02 +0300
-Subject: [PATCH] Launcher: add sanity checks for QDir::removeRecursively.
- Issue 2673
-
-I'm not always fail to uninstall mod, but when I do I remove $HOME
-Bumblebee developers should be proud of us...
----
- launcher/modManager/cmodmanager.cpp | 22 ++++++++++++++++++++--
- launcher/modManager/cmodmanager.h   |  1 +
- 2 files changed, 21 insertions(+), 2 deletions(-)
-
-diff --git a/launcher/modManager/cmodmanager.cpp b/launcher/modManager/cmodmanager.cpp
-index 59fd7faf..99a3df32 100644
---- a/launcher/modManager/cmodmanager.cpp
-+++ b/launcher/modManager/cmodmanager.cpp
-@@ -245,7 +245,7 @@ bool CModManager::doInstallMod(QString modname, QString archivePath)
- 
- 	if (!ZipArchive::extract(qstringToPath(archivePath), qstringToPath(destDir)))
- 	{
--		QDir(destDir + modDirName).removeRecursively();
-+		removeModDir(destDir + modDirName);
- 		return addError(modname, "Failed to extract mod data");
- 	}
- 
-@@ -270,7 +270,7 @@ bool CModManager::doUninstallMod(QString modname)
- 	if (!localMods.contains(modname))
- 		return addError(modname, "Data with this mod was not found");
- 
--	if (!QDir(modDir).removeRecursively())
-+	if (!removeModDir(modDir))
- 		return addError(modname, "Failed to delete mod data");
- 
- 	localMods.remove(modname);
-@@ -279,3 +279,21 @@ bool CModManager::doUninstallMod(QString modname)
- 
- 	return true;
- }
-+
-+bool CModManager::removeModDir(QString path)
-+{
-+	// issues 2673 and 2680 its why you do not recursively remove without sanity check
-+	QDir checkDir(path);
-+	if(!checkDir.cdUp() || QString::compare("Mods", checkDir.dirName(), Qt::CaseInsensitive))
-+		return false;
-+	if(!checkDir.cdUp() || QString::compare("vcmi", checkDir.dirName(), Qt::CaseInsensitive))
-+		return false;
-+
-+	QDir dir(path);
-+	if(!dir.absolutePath().contains("vcmi", Qt::CaseInsensitive))
-+		return false;
-+	if(!dir.absolutePath().contains("Mods", Qt::CaseInsensitive))
-+		return false;
-+
-+	return dir.removeRecursively();
-+}
-diff --git a/launcher/modManager/cmodmanager.h b/launcher/modManager/cmodmanager.h
-index 800db6b5..b759ef06 100644
---- a/launcher/modManager/cmodmanager.h
-+++ b/launcher/modManager/cmodmanager.h
-@@ -18,6 +18,7 @@ class CModManager
- 
- 	QStringList recentErrors;
- 	bool addError(QString modname, QString message);
-+	bool removeModDir(QString mod);
- public:
- 	CModManager(CModList * modList);
- 
--- 
-2.16.1
-
diff --git a/boostasiofix.patch b/boostasiofix.patch
deleted file mode 100644
index f7c0f7db3099..000000000000
--- a/boostasiofix.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-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

- {