updated to 0.8.3.1726.52eb086

3 files changed, 5 insertions, 131 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7d283b781c84..2c192f9998f0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = websocketpp-git-dev
 	pkgdesc = C++/Boost Asio based websocket client/server library, Develop branch
-	pkgver = 0.8.3.1706.fc41dd5
+	pkgver = 0.8.3.1726.52eb086
 	pkgrel = 1
 	url = http://www.zaphoyd.com/websocketpp/
 	arch = any
@@ -17,10 +17,8 @@ pkgbase = websocketpp-git-dev
 	optdepends = boost-libs: non C++11 environments support
 	provides = websocketpp
 	conflicts = websocketpp
-	source = websocketpp-git-dev::git+https://github.com/zaphoyd/websocketpp#commit=fc41dd5f1e1ac19a495d1adf7bd5b8a1659d9eff
-	source = 0001-migrated-SConstrcut-from-python2-to-python3.patch
+	source = websocketpp-git-dev::git+https://github.com/zaphoyd/websocketpp#branch=develop
 	sha512sums = SKIP
-	sha512sums = 6e3081c6857599e83179200c0a2096760e3d6903e4ca4bf45acd66460921f84d8934ec8e73062ef3a53948514a8eaf3a5e658d370c716b1b4ef0ff60d0c43eaa
 
 pkgname = websocketpp-git-dev
 
diff --git a/0001-migrated-SConstrcut-from-python2-to-python3.patch b/0001-migrated-SConstrcut-from-python2-to-python3.patch
deleted file mode 100644
index cd2a4545a01b..000000000000
--- a/0001-migrated-SConstrcut-from-python2-to-python3.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From 812c9ff669553065520c47e51477fcd81cb102d2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jochen=20J=C3=A4gers?= <jochen.jaegers@riedel-at.de>
-Date: Sat, 26 Oct 2019 14:21:31 +0200
-Subject: [PATCH] migrated SConstrcut from python2 to python3
-
----
- SConstruct | 39 ++++++++++++++++++++-------------------
- 1 file changed, 20 insertions(+), 19 deletions(-)
-
-diff --git a/SConstruct b/SConstruct
-index ae3df10..4fd3876 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -1,18 +1,19 @@
--import os, sys, commands
-+import os, sys, subprocess, SCons.Errors
-+
- env = Environment(ENV = os.environ)
- 
- # figure out a better way to configure this
--if os.environ.has_key('CXX'):
-+if 'CXX' in os.environ:
-     env['CXX'] = os.environ['CXX']
- 
--if os.environ.has_key('DEBUG'):
-+if 'DEBUG' in os.environ:
-     env['DEBUG'] = os.environ['DEBUG']
- 
--if os.environ.has_key('CXXFLAGS'):
-+if 'CXXFLAGS' in os.environ:
-     #env['CXXFLAGS'] = os.environ['CXXFLAGS']
-     env.Append(CXXFLAGS = os.environ['CXXFLAGS'])
- 
--if os.environ.has_key('LINKFLAGS'):
-+if 'LINKFLAGS' in os.environ:
-     #env['LDFLAGS'] = os.environ['LDFLAGS']
-     env.Append(LINKFLAGS = os.environ['LINKFLAGS'])
- 
-@@ -22,24 +23,24 @@ if os.environ.has_key('LINKFLAGS'):
- ## or set BOOST_INCLUDES and BOOST_LIBS if Boost comes with your OS distro e.g. and
- ## needs BOOST_INCLUDES=/usr/include/boost and BOOST_LIBS=/usr/lib like Ubuntu.
- ##
--if os.environ.has_key('BOOSTROOT'):
-+if 'BOOSTROOT' in os.environ:
-     os.environ['BOOST_ROOT'] = os.environ['BOOSTROOT']
- 
--if os.environ.has_key('BOOST_ROOT'):
-+if 'BOOST_ROOT' in os.environ:
-    env['BOOST_INCLUDES'] = os.environ['BOOST_ROOT']
-    env['BOOST_LIBS'] = os.path.join(os.environ['BOOST_ROOT'], 'stage', 'lib')
--elif os.environ.has_key('BOOST_INCLUDES') and os.environ.has_key('BOOST_LIBS'):
-+elif 'BOOST_INCLUDES' in os.environ and 'BOOST_LIBS' in os.environ:
-    env['BOOST_INCLUDES'] = os.environ['BOOST_INCLUDES']
-    env['BOOST_LIBS'] = os.environ['BOOST_LIBS']
- else:
--   raise SCons.Errors.UserError, "Neither BOOST_ROOT, nor BOOST_INCLUDES + BOOST_LIBS was set!"
-+   raise SCons.Errors.UserError("Neither BOOST_ROOT, nor BOOST_INCLUDES + BOOST_LIBS was set!")
- 
- ## Custom OpenSSL
--if os.environ.has_key('OPENSSL_PATH'):
-+if 'OPENSSL_PATH' in os.environ:
-    env.Append(CPPPATH = os.path.join(os.environ['OPENSSL_PATH'], 'include'))
-    env.Append(LIBPATH = os.environ['OPENSSL_PATH'])
- 
--if os.environ.has_key('WSPP_ENABLE_CPP11'):
-+if 'WSPP_ENABLE_CPP11' in os.environ:
-    env['WSPP_ENABLE_CPP11'] = True
- else:
-    env['WSPP_ENABLE_CPP11'] = False
-@@ -84,7 +85,7 @@ elif env['PLATFORM'] == 'posix':
-    env.Append(CCFLAGS = ['-Wall'])
-    #env['LINKFLAGS'] = ''
- elif env['PLATFORM'] == 'darwin':
--   if not os.environ.has_key('CXX'):
-+   if not 'CXX' in os.environ:
-       env['CXX'] = "clang++"
-    if env.has_key('DEBUG'):
-       env.Append(CCFLAGS = ['-g', '-O0'])
-@@ -157,29 +158,29 @@ env_cpp11 = env.Clone ()
- 
- if env_cpp11['CXX'].startswith('g++'):
-    # TODO: check g++ version
--   GCC_VERSION = commands.getoutput(env_cpp11['CXX'] + ' -dumpversion')
-+   GCC_VERSION = subprocess.check_output([env_cpp11['CXX'], '-dumpversion']).decode("utf-8")
- 
-    if GCC_VERSION > "4.4.0":
--      print "C++11 build environment partially enabled"
-+      print("C++11 build environment partially enabled")
-       env_cpp11.Append(WSPP_CPP11_ENABLED = "true",CXXFLAGS = ['-std=c++0x'],TOOLSET = ['g++'],CPPDEFINES = ['_WEBSOCKETPP_CPP11_STL_'])
-    else:
--      print "C++11 build environment is not supported on this version of G++"
-+      print("C++11 build environment is not supported on this version of G++")
- elif env_cpp11['CXX'].startswith('clang++'):
--   print "C++11 build environment enabled"
-+   print("C++11 build environment enabled")
-    env.Append(CXXFLANGS = ['-stdlib=libc++'],LINKFLAGS=['-stdlib=libc++'])
-    env_cpp11.Append(WSPP_CPP11_ENABLED = "true",CXXFLAGS = ['-std=c++0x','-stdlib=libc++'],LINKFLAGS = ['-stdlib=libc++'],TOOLSET = ['clang++'],CPPDEFINES = ['_WEBSOCKETPP_CPP11_STL_'])
- 
-    # look for optional second boostroot compiled with clang's libc++ STL library
-    # this prevents warnings/errors when linking code built with two different
-    # incompatible STL libraries.
--   if os.environ.has_key('BOOST_ROOT_CPP11'):
-+   if 'BOOST_ROOT_CPP11' in os.environ:
-       env_cpp11['BOOST_INCLUDES'] = os.environ['BOOST_ROOT_CPP11']
-       env_cpp11['BOOST_LIBS'] = os.path.join(os.environ['BOOST_ROOT_CPP11'], 'stage', 'lib')
--   elif os.environ.has_key('BOOST_INCLUDES_CPP11') and os.environ.has_key('BOOST_LIBS_CPP11'):
-+   elif 'BOOST_INCLUDES_CPP11' in os.environ and 'BOOST_LIBS_CPP11' in os.environ:
-       env_cpp11['BOOST_INCLUDES'] = os.environ['BOOST_INCLUDES_CPP11']
-       env_cpp11['BOOST_LIBS'] = os.environ['BOOST_LIBS_CPP11']
- else:
--   print "C++11 build environment disabled"
-+   print("C++11 build environment disabled")
- 
- # if the build system is known to allow the isystem modifier for library include
- # values then use it for the boost libraries. Otherwise just add them to the
--- 
-2.23.0
-
diff --git a/PKGBUILD b/PKGBUILD
index f95ef6e37b46..e908dcb3b376 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=websocketpp-git-dev
 _gitname=websocketpp
-pkgver=0.8.3.1706.fc41dd5
+pkgver=0.8.3.1726.52eb086
 pkgrel=1
 pkgdesc='C++/Boost Asio based websocket client/server library, Develop branch'
 url='http://www.zaphoyd.com/websocketpp/'
@@ -18,9 +18,8 @@ optdepends=(
 makedepends=('git' 'cmake' 'boost' 'boost-libs' 'scons' 'gawk')
 provides=('websocketpp')
 conflicts=('websocketpp')
-source=(${pkgname}::git+https://github.com/zaphoyd/${_gitname}#commit=fc41dd5f1e1ac19a495d1adf7bd5b8a1659d9eff '0001-migrated-SConstrcut-from-python2-to-python3.patch')
-sha512sums=('SKIP'
-            '6e3081c6857599e83179200c0a2096760e3d6903e4ca4bf45acd66460921f84d8934ec8e73062ef3a53948514a8eaf3a5e658d370c716b1b4ef0ff60d0c43eaa')
+source=(${pkgname}::git+https://github.com/zaphoyd/${_gitname}#branch=develop)
+sha512sums=('SKIP')
 
 pkgver() {
   cd ${pkgname}
@@ -32,11 +31,6 @@ pkgver() {
     "$(git rev-parse --short HEAD)"
 }
 
-prepare() {
-  cd ${pkgname}
-   patch --forward --strip=1 --input="${srcdir}/0001-migrated-SConstrcut-from-python2-to-python3.patch"
-}
-
 build() {
   cd ${pkgname}
   WSPP_ENABLE_CPP11=1 \