Re: [PR PATCH] [Updated] capnproto: update to 0.9.1

[marmeladema <marmeladema@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1224 bytes --]

There is an updated pull request by marmeladema against master on the void-packages repository

https://github.com/marmeladema/void-packages capnproto-0.9.1
https://github.com/void-linux/void-packages/pull/34584

capnproto: update to 0.9.1
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, x86-64
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

A patch file from https://github.com/void-linux/void-packages/pull/34584.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-capnproto-0.9.1-34584.patch --]
[-- Type: text/x-diff, Size: 5407 bytes --]

From 05e7484bf4fe1359c2c41c88c1181603d7cb4acf Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Fri, 17 Dec 2021 11:00:11 +0000
Subject: [PATCH 1/4] 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 17c9ca42de46..a199fa746b30 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 6c8e7a930421..1087f86e8211 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
 	}

From c4e8d14148199d62e56c703f437939dc08876e8a Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sun, 19 Dec 2021 19:56:48 +0000
Subject: [PATCH 2/4] librime: rebuild for capnproto-0.9.1.

---
 srcpkgs/librime/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/librime/template b/srcpkgs/librime/template
index 37cce1595ffb..8a1b2b8a3e04 100644
--- a/srcpkgs/librime/template
+++ b/srcpkgs/librime/template
@@ -1,7 +1,7 @@
 # Template file for 'librime'
 pkgname=librime
 version=1.7.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DCMAKE_BUILD_TYPE=None -DENABLE_LOGGING=OFF -DBUILD_TEST=ON
  -DCAPNP_EXECUTABLE=/usr/bin/capnp -DCAPNPC_CXX_EXECUTABLE=/usr/bin/capnpc-c++"

From 5b058dfb106cf26e2f09e72d08f637727b6ffc47 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sun, 19 Dec 2021 19:56:48 +0000
Subject: [PATCH 3/4] rr: rebuild for capnproto-0.9.1.

---
 srcpkgs/rr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rr/template b/srcpkgs/rr/template
index f949db7f411a..0dd304535b15 100644
--- a/srcpkgs/rr/template
+++ b/srcpkgs/rr/template
@@ -1,7 +1,7 @@
 # Template file for 'rr'
 pkgname=rr
 version=5.4.0
-revision=1
+revision=2
 archs="i686 x86_64"
 build_style=cmake
 configure_args="-DBUILD_TESTS=OFF -DCMAKE_CXX_STANDARD=14"

From 1b1368be598e8e4a7560dd9632aabeaa11221fb4 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sun, 19 Dec 2021 19:56:48 +0000
Subject: [PATCH 4/4] sonic-visualiser: rebuild for capnproto-0.9.1.

---
 srcpkgs/sonic-visualiser/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sonic-visualiser/template b/srcpkgs/sonic-visualiser/template
index 6b091832f666..fbc1ea3067c2 100644
--- a/srcpkgs/sonic-visualiser/template
+++ b/srcpkgs/sonic-visualiser/template
@@ -1,7 +1,7 @@
 # Template file for 'sonic-visualiser'
 pkgname=sonic-visualiser
 version=4.4
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config capnproto-devel qt5-host-tools"
 makedepends="capnproto-devel jack-devel libfishsound-devel libid3tag-devel