Removed boost-1.66 patch - it was merged upstream finally

3 files changed, 4 insertions, 68 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 410a193a8123..319d39389fc0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = curecoin-qt-git
 	pkgdesc = GUI client (wallet) for CureCoin cryptocurrency
-	pkgver = r130.17d71dd
-	pkgrel = 3
+	pkgver = r132.f570a26
+	pkgrel = 1
 	url = https://curecoin.net/
 	arch = x86_64
 	arch = i686
@@ -18,11 +18,9 @@ pkgbase = curecoin-qt-git
 	conflicts = curecoin-qt
 	source = git+https://github.com/cygnusxi/CurecoinSource.git#branch=master
 	source = 0001-miniupnpc.patch
-	source = 0002-boost166.patch
 	source = curecoin.desktop
 	sha256sums = SKIP
 	sha256sums = ef598aee46b5ad12b43db8942c08ef2cbece002efa731394066ebff654bea5e1
-	sha256sums = a61d0bec8c5d5955b6eb8cbb4e39e65dc6f564c15af80712dc7d8736c340881c
 	sha256sums = 47e4c7305240dd16361d922bf6bc3a86ee53d7e0bc43bdf12c341ea0b7968387
 
 pkgname = curecoin-qt-git
diff --git a/0002-boost166.patch b/0002-boost166.patch
deleted file mode 100644
index abf058ffa2b3..000000000000
--- a/0002-boost166.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 934a7710eaaab9a5dc2a4d8e98e1b6a6efc5cf85 Mon Sep 17 00:00:00 2001
-From: Michael Thalmeier <michael@thalmeier.at>
-Date: Wed, 24 Jan 2018 22:02:59 +0100
-Subject: [PATCH] fix build with boost 1.66
-
-Since boost 1.66 some deprecated interfaces got removed.
-Use BOOST_ASIO_ENABLE_OLD_SERVICES to re-enable some interfaces.
----
- curecoin-qt.pro     | 2 +-
- src/curecoinrpc.cpp | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/curecoin-qt.pro b/curecoin-qt.pro
-index 0bde4b3..cac6054 100644
---- a/curecoin-qt.pro
-+++ b/curecoin-qt.pro
-@@ -2,7 +2,7 @@ TEMPLATE = app
- TARGET = curecoin-qt
- VERSION = 1.9.5.1
- INCLUDEPATH += src src/json src/qt
--DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE BOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN __NO_SYSTEM_INCLUDES
-+DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE BOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN BOOST_ASIO_ENABLE_OLD_SERVICES __NO_SYSTEM_INCLUDES
- CONFIG += no_include_pwd
- QT += core gui network
- 
-diff --git a/src/curecoinrpc.cpp b/src/curecoinrpc.cpp
-index 99853c1..5fd576e 100644
---- a/src/curecoinrpc.cpp
-+++ b/src/curecoinrpc.cpp
-@@ -757,7 +757,7 @@ void ThreadRPCServer2(void* parg)
- 
-     asio::io_service io_service;
- 
--    ssl::context context(io_service, ssl::context::sslv23);
-+    ssl::context context(ssl::context::sslv23);
-     if (fUseSSL)
-     {
-         context.set_options(ssl::context::no_sslv2);
-@@ -773,7 +773,7 @@ void ThreadRPCServer2(void* parg)
-         else printf("ThreadRPCServer ERROR: missing server private key file %s\n", pathPKFile.string().c_str());
- 
-         string strCiphers = GetArg("-rpcsslciphers", "TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH");
--        SSL_CTX_set_cipher_list(context.impl(), strCiphers.c_str());
-+        SSL_CTX_set_cipher_list(context.native_handle(), strCiphers.c_str());
-     }
- 
-     // Try a dual IPv6/IPv4 socket, falling back to separate IPv4 and IPv6 sockets
-@@ -1067,7 +1067,7 @@ Object CallRPC(const string& strMethod, const Array& params)
-     // Connect to localhost
-     bool fUseSSL = GetBoolArg("-rpcssl");
-     asio::io_service io_service;
--    ssl::context context(io_service, ssl::context::sslv23);
-+    ssl::context context(ssl::context::sslv23);
-     context.set_options(ssl::context::no_sslv2);
-     asio::ssl::stream<asio::ip::tcp::socket> sslStream(io_service, context);
-     SSLIOStreamDevice<asio::ip::tcp> d(sslStream, fUseSSL);
diff --git a/PKGBUILD b/PKGBUILD
index 27c9f9879613..84b9890b71e4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Dmitry Kharitonov <darksab0r at gmail com>
 
 pkgname=curecoin-qt-git
-pkgver=r130.17d71dd
-pkgrel=3
+pkgver=r132.f570a26
+pkgrel=1
 pkgdesc="GUI client (wallet) for CureCoin cryptocurrency"
 arch=('x86_64' 'i686')
 url="https://curecoin.net/"
@@ -13,12 +13,10 @@ depends=('qt5-base' 'qt5-tools' 'miniupnpc' 'boost-libs' 'openssl-1.0')
 makedepends=('boost' 'db' 'git')
 source=("git+https://github.com/cygnusxi/CurecoinSource.git#branch=master"
         "0001-miniupnpc.patch"
-        "0002-boost166.patch"
         "curecoin.desktop")
 
 sha256sums=('SKIP'
             'ef598aee46b5ad12b43db8942c08ef2cbece002efa731394066ebff654bea5e1'
-            'a61d0bec8c5d5955b6eb8cbb4e39e65dc6f564c15af80712dc7d8736c340881c'
             '47e4c7305240dd16361d922bf6bc3a86ee53d7e0bc43bdf12c341ea0b7968387')
 
 pkgver() {
@@ -36,16 +34,12 @@ prepare() {
 
   # Fix compilation error with miniupnpc v 1.9
   patch -p1 <"${srcdir}/0001-miniupnpc.patch"
-
-  # Fix compilation error with boost v 1.66
-  patch -p1 <"${srcdir}/0002-boost166.patch"
 }
 
 build() {
   cd "${srcdir}/CurecoinSource"
   qmake
   make ${MAKEFLAGS}
-
 }
 
 package() {