summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJochen Jägers2020-06-16 15:57:16 +0200
committerJochen Jägers2020-06-16 15:57:16 +0200
commit9d8b985018bed669f58c376c578db98b9efed6be (patch)
tree95bcb1d3d9104ce6a6fa7d495998125303231dee
parentf276c637c181888065fde4a2ee6d49e8681cd57f (diff)
downloadaur-9d8b985018bed669f58c376c578db98b9efed6be.tar.gz
updated to 0.8.3.1732.0d4f361
-rw-r--r--.SRCINFO6
-rw-r--r--893.patch21
-rw-r--r--PKGBUILD12
3 files changed, 8 insertions, 31 deletions
diff --git a/.SRCINFO b/.SRCINFO
index afc48d34ff30..c1a1993332d6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = websocketpp-git-dev
pkgdesc = C++/Boost Asio based websocket client/server library, Develop branch
- pkgver = 0.8.3.1726.52eb086
- pkgrel = 2
+ pkgver = 0.8.3.1732.0d4f361
+ pkgrel = 1
url = http://www.zaphoyd.com/websocketpp/
arch = any
license = BSD
@@ -18,10 +18,8 @@ pkgbase = websocketpp-git-dev
provides = websocketpp
conflicts = websocketpp
source = websocketpp-git-dev::git+https://github.com/zaphoyd/websocketpp#branch=develop
- source = 893.patch
source = 895.patch
sha512sums = SKIP
- sha512sums = 2d1e212f2c13358d478997d7573c257f1bfc3c2aa5f52f9cf5a451d718c657e9e3f169433f5e1ef11333398348210385cfb26810e037f45f2be5753ad155095a
sha512sums = fa35e00e80c0c9129161df700b0be3a82bf924e074db5ccad45fe3f6a106f7d4dc03acaa6ce37185caad0aece3846e2a07b6f3c58158652277d0c081103f1bbc
pkgname = websocketpp-git-dev
diff --git a/893.patch b/893.patch
deleted file mode 100644
index 5d973b1367a0..000000000000
--- a/893.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 64119d5302b22c7506d46f73b832aed498e2b55b Mon Sep 17 00:00:00 2001
-From: kautsig <cr@kautsig.org>
-Date: Sat, 16 May 2020 12:33:49 +0200
-Subject: [PATCH] Fix copy/paste mistake
-
----
- examples/scratch_client/SConscript | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/examples/scratch_client/SConscript b/examples/scratch_client/SConscript
-index 6e7b2ef0..36f0d403 100644
---- a/examples/scratch_client/SConscript
-+++ b/examples/scratch_client/SConscript
-@@ -19,6 +19,6 @@ if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
- prgs += env_cpp11.Program('scratch_client', ["scratch_client.cpp"], LIBS = ALL_LIBS)
- else:
- ALL_LIBS = boostlibs(['system','random'],env) + [platform_libs] + [polyfill_libs]
-- prgs += env.Program('utility_client', ["utility_client.cpp"], LIBS = ALL_LIBS)
-+ prgs += env.Program('scratch_client', ["scratch_client.cpp"], LIBS = ALL_LIBS)
-
- Return('prgs')
diff --git a/PKGBUILD b/PKGBUILD
index 9af7935d498e..5779244eeaf2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
pkgname=websocketpp-git-dev
_gitname=websocketpp
-pkgver=0.8.3.1726.52eb086
-pkgrel=2
+pkgver=0.8.3.1732.0d4f361
+pkgrel=1
pkgdesc='C++/Boost Asio based websocket client/server library, Develop branch'
url='http://www.zaphoyd.com/websocketpp/'
arch=('any')
@@ -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}#branch=develop 893.patch 895.patch)
+source=(${pkgname}::git+https://github.com/zaphoyd/${_gitname}#branch=develop 895.patch)
sha512sums=('SKIP'
- '2d1e212f2c13358d478997d7573c257f1bfc3c2aa5f52f9cf5a451d718c657e9e3f169433f5e1ef11333398348210385cfb26810e037f45f2be5753ad155095a'
'fa35e00e80c0c9129161df700b0be3a82bf924e074db5ccad45fe3f6a106f7d4dc03acaa6ce37185caad0aece3846e2a07b6f3c58158652277d0c081103f1bbc' )
pkgver() {
@@ -35,8 +34,9 @@ pkgver() {
prepare() {
cd ${pkgname}
- patch --forward --strip=1 --input="${srcdir}/893.patch"
- patch --forward --strip=1 --input="${srcdir}/895.patch"
+ ls -lah
+ pwd
+ patch -p1 < ../895.patch
}
build() {