From 02cd86886d646af1888910f253979be308c4fd2f Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Fri, 17 Dec 2021 11:00:11 +0000
Subject: [PATCH] capnproto: update to 0.9.1

---
 common/shlibs              | 17 +++++++++--------
 srcpkgs/capnproto/template | 33 +++++++++++++++++++++------------
 2 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 593ab9a317..86b3a4f424 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2909,14 +2909,15 @@ liblog4cplus-2.0.so.3 log4cplus-2.0.0_1
 liblog4cplusU-2.0.so.3 log4cplus-2.0.3_1
 libpng12.so.0 libpng12-1.2.56_2
 libpng.so.3 libpng12-1.2.56_2
-libcapnpc-0.8.0.so capnproto-0.8.0_1
-libcapnp-json-0.8.0.so capnproto-0.8.0_1
-libcapnp-rpc-0.8.0.so capnproto-0.8.0_1
-libcapnp-0.8.0.so capnproto-0.8.0_1
-libkj-http-0.8.0.so capnproto-0.8.0_1
-libkj-async-0.8.0.so capnproto-0.8.0_1
-libkj-test-0.8.0.so capnproto-0.8.0_1
-libkj-0.8.0.so capnproto-0.8.0_1
+libcapnpc-0.9.1.so capnproto-0.9.1_1
+libcapnp-json-0.9.1.so capnproto-0.9.1_1
+libcapnp-rpc-0.9.1.so capnproto-0.9.1_1
+libcapnp-websocket-0.9.1.so capnproto-0.9.1_1
+libcapnp-0.9.1.so capnproto-0.9.1_1
+libkj-http-0.9.1.so capnproto-0.9.1_1
+libkj-async-0.9.1.so capnproto-0.9.1_1
+libkj-test-0.9.1.so capnproto-0.9.1_1
+libkj-0.9.1.so capnproto-0.9.1_1
 libkea-asiodns.so.12 libkea-1.9.5_2
 libkea-asiolink.so.23 libkea-1.9.5_2
 libkea-cc.so.22 libkea-1.9.5_2
diff --git a/srcpkgs/capnproto/template b/srcpkgs/capnproto/template
index 6c8e7a9304..1087f86e82 100644
--- a/srcpkgs/capnproto/template
+++ b/srcpkgs/capnproto/template
@@ -1,6 +1,6 @@
 # Template file for 'capnproto'
 pkgname=capnproto
-version=0.8.0
+version=0.9.1
 revision=1
 wrksrc="${pkgname}-c++-${version}"
 build_style=gnu-configure
@@ -10,15 +10,23 @@ maintainer="eater <hello@eaterofco.de>"
 license="MIT"
 homepage="https://capnproto.org"
 distfiles="${homepage}/capnproto-c++-${version}.tar.gz"
-checksum=d1f40e47574c65700f0ec98bf66729378efabe3c72bc0cda795037498541c10d
-
-CXXFLAGS="-std=c++14"
+checksum=83680aaef8c192b884e38eab418b8482d321af6ae7ab7befa3a9370b8e716aad
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" capnproto-devel"
 	configure_args+=" --with-external-capnp"
 fi
 
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	LDFLAGS+=" -latomic"
+fi
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	# fibers require ucontext and it'd be better to avoid libucontext dependencies
+	CPPFLAGS="-DKJ_USE_FIBERS=0"
+fi
+
 pre_configure() {
 	autoreconf -vfi
 }
@@ -34,14 +42,15 @@ capnproto-devel_package() {
 		vmove usr/include
 		vmove usr/lib/*.a
 		vmove usr/lib/*.la
-		vmove /usr/lib/libkj.so
-		vmove /usr/lib/libkj-test.so
-		vmove /usr/lib/libkj-http.so
-		vmove /usr/lib/libkj-async.so
-		vmove /usr/lib/libcapnpc.so
-		vmove /usr/lib/libcapnp.so
-		vmove /usr/lib/libcapnp-rpc.so
-		vmove /usr/lib/libcapnp-json.so
+		vmove usr/lib/libkj.so
+		vmove usr/lib/libkj-test.so
+		vmove usr/lib/libkj-http.so
+		vmove usr/lib/libkj-async.so
+		vmove usr/lib/libcapnpc.so
+		vmove usr/lib/libcapnp.so
+		vmove usr/lib/libcapnp-rpc.so
+		vmove usr/lib/libcapnp-json.so
+		vmove usr/lib/libcapnp-websocket.so
 		vmove usr/lib/pkgconfig
 		vmove usr/lib/cmake
 	}