[arch-commits] Commit in websocketpp/trunk (PKGBUILD scons-python3.patch)

2020-05-17 Thread Levente Polyak via arch-commits 
Date: Sunday, May 17, 2020 @ 12:03:12
  Author: anthraxx
Revision: 628244

upgpkg: websocketpp 0.8.2-1

Modified:
  websocketpp/trunk/PKGBUILD
Deleted:
  websocketpp/trunk/scons-python3.patch

-+
 PKGBUILD|   36 +++--
 scons-python3.patch |  104 --
 2 files changed, 16 insertions(+), 124 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-05-17 11:12:06 UTC (rev 628243)
+++ PKGBUILD2020-05-17 12:03:12 UTC (rev 628244)
@@ -5,7 +5,7 @@
 # Contributor: MTsoul
 
 pkgname=websocketpp
-pkgver=0.8.1
+pkgver=0.8.2
 pkgrel=1
 pkgdesc='C++/Boost Asio based websocket client/server library'
 url='https://www.zaphoyd.com/websocketpp/'
@@ -17,40 +17,36 @@
   'boost: non C++11 environments support'
   'boost-libs: non C++11 environments support'
 )
-makedepends=('cmake' 'boost' 'boost-libs' 'scons')
-source=(${pkgname}-${pkgver}.tar.gz::https://github.com/zaphoyd/${pkgname}/archive/${pkgver}.tar.gz
 scons-python3.patch)
-sha512sums=('35e0261ed0285acf77d300768819bd380197de8acdf68223e2d7598481b9bfd69cb1653b435139771b1db6c16530c8d8cf9a887a8a6bba3fea126d0da4dbc13c'
-
'410f51b0920ceba0cf597de5ef953fd4bc11ed440502455997d608dec7f3535e3212e929917c0f54e64914868e9fb3e76c75a39e916708a4d2d9d090d7ed1f41')
+makedepends=('cmake' 'boost' 'boost-libs' 'boost' 'zlib' 'openssl')
+source=(https://github.com/zaphoyd/${pkgname}/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz)
+sha512sums=('b2afc63edb69ce81a3a6c06b3d857b3e8820f0e22300ac32bb20ab30ff07bd58bd5ada3e526ed8ab52de934e0e3a26cad2118b0e68ecf3e5e9e8d7101348fd06')
+b2sums=('dacee33832f493d465afe208f9edea1393414a22c8db8f8c86b8f913521d0d8d68b95673a2e82b7479acfbab1ac541eda2d713a55d5de387b3879461d5884df7')
 
 prepare() {
-  cd $pkgname-$pkgver
-  patch -p1 -i ../scons-python3.patch # Fix build with python3 scons
+  cd ${pkgname}-${pkgver}
+  sed 's|"${WEBSOCKETPP_BOOST_LIBS}"|${WEBSOCKETPP_BOOST_LIBS}|' -i 
CMakeLists.txt
 }
 
 build() {
   cd ${pkgname}-${pkgver}
-  WSPP_ENABLE_CPP11=1 \
-BOOST_LIBS=/usr/lib \
-BOOST_INCLUDES=/usr/include/boost \
-scons "${MAKEFLAGS}"
-  (cd build
-cmake -DCMAKE_INSTALL_PREFIX=/usr ..
-  )
+  cmake -B build \
+-DCMAKE_BUILD_TYPE=None \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DENABLE_CPP11=ON \
+-DBUILD_TESTS=ON
+  make -C build
 }
 
 check() {
   cd ${pkgname}-${pkgver}
-  WSPP_ENABLE_CPP11=1 \
-BOOST_LIBS=/usr/lib \
-BOOST_INCLUDES=/usr/include/boost \
-scons test
+  make -C build test
 }
 
 package() {
   cd ${pkgname}-${pkgver}
   make -C build DESTDIR="${pkgdir}" install
-  install -Dm 644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  install -Dm 644 readme.md "${pkgdir}/usr/share/doc/${pkgname}/README"
+  install -Dm 644 COPYING -t "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -Dm 644 readme.md -t "${pkgdir}/usr/share/doc/${pkgname}"
 }
 
 # vim: ts=2 sw=2 et:

Deleted: scons-python3.patch
===
--- scons-python3.patch 2020-05-17 11:12:06 UTC (rev 628243)
+++ scons-python3.patch 2020-05-17 12:03:12 UTC (rev 628244)
@@ -1,104 +0,0 @@
 websocketpp-0.8.1/SConstruct.orig  2019-07-27 08:46:48.227994968 +
-+++ websocketpp-0.8.1/SConstruct   2019-07-27 08:47:33.128590838 +
-@@ -1,18 +1,18 @@
--import os, sys, commands
-+import os, sys, subprocess
- env = Environment(ENV = os.environ)
-
- # figure out a better way to configure this
--if os.environ.has_key('CXX'):
-+if os.environ.get('CXX'):
- env['CXX'] = os.environ['CXX']
-
--if os.environ.has_key('DEBUG'):
-+if os.environ.get('DEBUG'):
- env['DEBUG'] = os.environ['DEBUG']
-
--if os.environ.has_key('CXXFLAGS'):
-+if os.environ.get('CXXFLAGS'):
- #env['CXXFLAGS'] = os.environ['CXXFLAGS']
- env.Append(CXXFLAGS = os.environ['CXXFLAGS'])
-
--if os.environ.has_key('LINKFLAGS'):
-+if os.environ.get('LINKFLAGS'):
- #env['LDFLAGS'] = os.environ['LDFLAGS']
- env.Append(LINKFLAGS = os.environ['LINKFLAGS'])
-
-@@ -22,24 +22,24 @@
- ## 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 os.environ.get('BOOSTROOT'):
- os.environ['BOOST_ROOT'] = os.environ['BOOSTROOT']
-
--if os.environ.has_key('BOOST_ROOT'):
-+if os.environ.get('BOOST_ROOT'):
-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 os.environ.get('BOOST_INCLUDES') and os.environ.get('BOOST_LIBS'):
-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 +

[arch-commits] Commit in websocketpp/trunk (PKGBUILD scons-python3.patch)

2019-07-27 Thread Antonio Rojas via arch-commits 
Date: Saturday, July 27, 2019 @ 09:02:14
  Author: arojas
Revision: 493081

Fix build with python3 scons

Added:
  websocketpp/trunk/scons-python3.patch
Modified:
  websocketpp/trunk/PKGBUILD

-+
 PKGBUILD|   10 +++-
 scons-python3.patch |  104 ++
 2 files changed, 112 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-07-27 08:45:59 UTC (rev 493080)
+++ PKGBUILD2019-07-27 09:02:14 UTC (rev 493081)
@@ -18,9 +18,15 @@
   'boost-libs: non C++11 environments support'
 )
 makedepends=('cmake' 'boost' 'boost-libs' 'scons')
-source=(${pkgname}-${pkgver}.tar.gz::https://github.com/zaphoyd/${pkgname}/archive/${pkgver}.tar.gz)
-sha512sums=('35e0261ed0285acf77d300768819bd380197de8acdf68223e2d7598481b9bfd69cb1653b435139771b1db6c16530c8d8cf9a887a8a6bba3fea126d0da4dbc13c')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/zaphoyd/${pkgname}/archive/${pkgver}.tar.gz
 scons-python3.patch)
+sha512sums=('35e0261ed0285acf77d300768819bd380197de8acdf68223e2d7598481b9bfd69cb1653b435139771b1db6c16530c8d8cf9a887a8a6bba3fea126d0da4dbc13c'
+
'410f51b0920ceba0cf597de5ef953fd4bc11ed440502455997d608dec7f3535e3212e929917c0f54e64914868e9fb3e76c75a39e916708a4d2d9d090d7ed1f41')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i ../scons-python3.patch # Fix build with python3 scons
+}
+
 build() {
   cd ${pkgname}-${pkgver}
   WSPP_ENABLE_CPP11=1 \

Added: scons-python3.patch
===
--- scons-python3.patch (rev 0)
+++ scons-python3.patch 2019-07-27 09:02:14 UTC (rev 493081)
@@ -0,0 +1,104 @@
+--- websocketpp-0.8.1/SConstruct.orig  2019-07-27 08:46:48.227994968 +
 websocketpp-0.8.1/SConstruct   2019-07-27 08:47:33.128590838 +
+@@ -1,18 +1,18 @@
+-import os, sys, commands
++import os, sys, subprocess
+ env = Environment(ENV = os.environ)
+
+ # figure out a better way to configure this
+-if os.environ.has_key('CXX'):
++if os.environ.get('CXX'):
+ env['CXX'] = os.environ['CXX']
+
+-if os.environ.has_key('DEBUG'):
++if os.environ.get('DEBUG'):
+ env['DEBUG'] = os.environ['DEBUG']
+
+-if os.environ.has_key('CXXFLAGS'):
++if os.environ.get('CXXFLAGS'):
+ #env['CXXFLAGS'] = os.environ['CXXFLAGS']
+ env.Append(CXXFLAGS = os.environ['CXXFLAGS'])
+
+-if os.environ.has_key('LINKFLAGS'):
++if os.environ.get('LINKFLAGS'):
+ #env['LDFLAGS'] = os.environ['LDFLAGS']
+ env.Append(LINKFLAGS = os.environ['LINKFLAGS'])
+
+@@ -22,24 +22,24 @@
+ ## 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 os.environ.get('BOOSTROOT'):
+ os.environ['BOOST_ROOT'] = os.environ['BOOSTROOT']
+
+-if os.environ.has_key('BOOST_ROOT'):
++if os.environ.get('BOOST_ROOT'):
+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 os.environ.get('BOOST_INCLUDES') and os.environ.get('BOOST_LIBS'):
+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 os.environ.get('OPENSSL_PATH'):
+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 os.environ.get('WSPP_ENABLE_CPP11'):
+env['WSPP_ENABLE_CPP11'] = True
+ else:
+env['WSPP_ENABLE_CPP11'] = False
+@@ -84,7 +84,7 @@
+env.Append(CCFLAGS = ['-Wall'])
+#env['LINKFLAGS'] = ''
+ elif env['PLATFORM'] == 'darwin':
+-   if not os.environ.has_key('CXX'):
++   if not os.environ.get('CXX'):
+   env['CXX'] = "clang++"
+if env.has_key('DEBUG'):
+   env.Append(CCFLAGS = ['-g', '-O0'])
+@@ -157,15 +157,15 @@
+
+ if env_cpp11['CXX'].startswith('g++'):
+# TODO: check g++ version
+-   GCC_VERSION = commands.getoutput(env_cpp11['CXX'] + ' -dumpversion')
++   GCC_VERSION = subprocess.getoutput(env_cpp11['CXX'] + ' -dumpversion')
+
+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

[arch-commits] Commit in websocketpp/trunk (PKGBUILD)

2018-07-16 Thread Levente Polyak via arch-commits 
Date: Monday, July 16, 2018 @ 23:31:19
  Author: anthraxx
Revision: 360315

upgpkg: websocketpp 0.8.1-1

Modified:
  websocketpp/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-07-16 23:26:22 UTC (rev 360314)
+++ PKGBUILD2018-07-16 23:31:19 UTC (rev 360315)
@@ -5,7 +5,7 @@
 # Contributor: MTsoul
 
 pkgname=websocketpp
-pkgver=0.7.0
+pkgver=0.8.1
 pkgrel=1
 pkgdesc='C++/Boost Asio based websocket client/server library'
 url='http://www.zaphoyd.com/websocketpp/'
@@ -19,7 +19,7 @@
 )
 makedepends=('cmake' 'boost' 'boost-libs' 'scons')
 
source=(${pkgname}-${pkgver}.tar.gz::https://github.com/zaphoyd/${pkgname}/archive/${pkgver}.tar.gz)
-sha512sums=('91a86d4f5120db3f474169bb146f865f82167b1e9eedabec8793b31005e4ce3d22083283bc1b9f9e37fa0da835addcb2b68260a27c753852c06b3b1bb2f3c12e')
+sha512sums=('35e0261ed0285acf77d300768819bd380197de8acdf68223e2d7598481b9bfd69cb1653b435139771b1db6c16530c8d8cf9a887a8a6bba3fea126d0da4dbc13c')
 
 build() {
   cd ${pkgname}-${pkgver}

[arch-commits] Commit in websocketpp/trunk (PKGBUILD)

2016-02-23 Thread Levente Polyak 
Date: Wednesday, February 24, 2016 @ 01:22:19
  Author: anthraxx
Revision: 163250

upgpkg: websocketpp 0.7.0-1

Modified:
  websocketpp/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-02-24 00:17:17 UTC (rev 163249)
+++ PKGBUILD2016-02-24 00:22:19 UTC (rev 163250)
@@ -5,8 +5,8 @@
 # Contributor: MTsoul
 
 pkgname=websocketpp
-pkgver=0.6.0
-pkgrel=2
+pkgver=0.7.0
+pkgrel=1
 pkgdesc='C++/Boost Asio based websocket client/server library'
 url='http://www.zaphoyd.com/websocketpp/'
 arch=('any')
@@ -19,7 +19,7 @@
 )
 makedepends=('cmake' 'boost' 'boost-libs' 'scons')
 
source=(${pkgname}-${pkgver}.tar.gz::https://github.com/zaphoyd/${pkgname}/archive/${pkgver}.tar.gz)
-sha512sums=('55dbb8d1666ae0d35d4b46ec2c375c9d3d66f57a473f526175a63bc147279c12bd8e605e5812a68ef45d8b6f51f4cfd6e61a1b971d223b5dc6e5528a6937fef8')
+sha512sums=('91a86d4f5120db3f474169bb146f865f82167b1e9eedabec8793b31005e4ce3d22083283bc1b9f9e37fa0da835addcb2b68260a27c753852c06b3b1bb2f3c12e')
 
 build() {
   cd ${pkgname}-${pkgver}