[PR PATCH] capnproto: update to 0.9.1

[PR PATCH] capnproto: update to 0.9.1

[marmeladema]

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

There is a new 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: 972 bytes --]

From 7e7ad3b57d4292c9b9ae59b556590d1291da168f 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

---
 srcpkgs/capnproto/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/capnproto/template b/srcpkgs/capnproto/template
index 6c8e7a930421..e729729560ef 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,7 +10,7 @@ maintainer="eater <hello@eaterofco.de>"
 license="MIT"
 homepage="https://capnproto.org"
 distfiles="${homepage}/capnproto-c++-${version}.tar.gz"
-checksum=d1f40e47574c65700f0ec98bf66729378efabe3c72bc0cda795037498541c10d
+checksum=83680aaef8c192b884e38eab418b8482d321af6ae7ab7befa3a9370b8e716aad
 
 CXXFLAGS="-std=c++14"
 

Re: [PR REVIEW] capnproto: update to 0.9.1

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/34584#discussion_r771894745

Comment:
Can you check if it builds after removing this flag?

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

[marmeladema]

[-- 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: 1747 bytes --]

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

---
 srcpkgs/capnproto/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/capnproto/template b/srcpkgs/capnproto/template
index 6c8e7a930421..e729729560ef 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,7 +10,7 @@ maintainer="eater <hello@eaterofco.de>"
 license="MIT"
 homepage="https://capnproto.org"
 distfiles="${homepage}/capnproto-c++-${version}.tar.gz"
-checksum=d1f40e47574c65700f0ec98bf66729378efabe3c72bc0cda795037498541c10d
+checksum=83680aaef8c192b884e38eab418b8482d321af6ae7ab7befa3a9370b8e716aad
 
 CXXFLAGS="-std=c++14"
 

From d427d0f8a631b5ffe5dba1eb771f17606a8a2956 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sun, 19 Dec 2021 18:34:51 +0000
Subject: [PATCH 2/2] Remove `-std=c++14` from CXXFLAGS

---
 srcpkgs/capnproto/template | 2 --
 1 file changed, 2 deletions(-)

diff --git a/srcpkgs/capnproto/template b/srcpkgs/capnproto/template
index e729729560ef..21d58f04d3ae 100644
--- a/srcpkgs/capnproto/template
+++ b/srcpkgs/capnproto/template
@@ -12,8 +12,6 @@ homepage="https://capnproto.org"
 distfiles="${homepage}/capnproto-c++-${version}.tar.gz"
 checksum=83680aaef8c192b884e38eab418b8482d321af6ae7ab7befa3a9370b8e716aad
 
-CXXFLAGS="-std=c++14"
-
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" capnproto-devel"
 	configure_args+=" --with-external-capnp"

Re: [PR REVIEW] capnproto: update to 0.9.1

[marmeladema]

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

New review comment by marmeladema on void-packages repository

https://github.com/void-linux/void-packages/pull/34584#discussion_r771985567

Comment:
It works locally at least.

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

[marmeladema]

[-- 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: 1758 bytes --]

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

---
 srcpkgs/capnproto/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/capnproto/template b/srcpkgs/capnproto/template
index 6c8e7a930421..e729729560ef 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,7 +10,7 @@ maintainer="eater <hello@eaterofco.de>"
 license="MIT"
 homepage="https://capnproto.org"
 distfiles="${homepage}/capnproto-c++-${version}.tar.gz"
-checksum=d1f40e47574c65700f0ec98bf66729378efabe3c72bc0cda795037498541c10d
+checksum=83680aaef8c192b884e38eab418b8482d321af6ae7ab7befa3a9370b8e716aad
 
 CXXFLAGS="-std=c++14"
 

From 85819b22bb1c09ffa895292bf7cfec9901407e0e Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sun, 19 Dec 2021 18:34:51 +0000
Subject: [PATCH 2/2] capnproto: remove `-std=c++14` from CXXFLAGS

---
 srcpkgs/capnproto/template | 2 --
 1 file changed, 2 deletions(-)

diff --git a/srcpkgs/capnproto/template b/srcpkgs/capnproto/template
index e729729560ef..21d58f04d3ae 100644
--- a/srcpkgs/capnproto/template
+++ b/srcpkgs/capnproto/template
@@ -12,8 +12,6 @@ homepage="https://capnproto.org"
 distfiles="${homepage}/capnproto-c++-${version}.tar.gz"
 checksum=83680aaef8c192b884e38eab418b8482d321af6ae7ab7befa3a9370b8e716aad
 
-CXXFLAGS="-std=c++14"
-
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" capnproto-devel"
 	configure_args+=" --with-external-capnp"

Re: capnproto: update to 0.9.1

[marmeladema]

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

New comment by marmeladema on void-packages repository

https://github.com/void-linux/void-packages/pull/34584#issuecomment-997440425

Comment:
xbps-src is complaining that some libs are missing from `common/shlibs`:
```
=> WARNING: capnproto-0.9.1_1: libcapnp-rpc-0.9.1.so not found in common/shlibs!
=> WARNING: capnproto-0.9.1_1: libkj-async-0.9.1.so not found in common/shlibs!
=> WARNING: capnproto-0.9.1_1: libkj-test-0.9.1.so not found in common/shlibs!
=> WARNING: capnproto-0.9.1_1: libcapnpc-0.9.1.so not found in common/shlibs!
=> WARNING: capnproto-0.9.1_1: libkj-http-0.9.1.so not found in common/shlibs!
=> WARNING: capnproto-0.9.1_1: libcapnp-0.9.1.so not found in common/shlibs!
=> WARNING: capnproto-0.9.1_1: libkj-0.9.1.so not found in common/shlibs!
=> WARNING: capnproto-0.9.1_1: libcapnp-websocket-0.9.1.so not found in common/shlibs!
=> WARNING: capnproto-0.9.1_1: libcapnp-json-0.9.1.so not found in common/shlibs!
```
i'll push another commit shortly updating the libraries version numbers.

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

[marmeladema]

[-- 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: 3121 bytes --]

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

---
 srcpkgs/capnproto/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/capnproto/template b/srcpkgs/capnproto/template
index 6c8e7a930421..e729729560ef 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,7 +10,7 @@ maintainer="eater <hello@eaterofco.de>"
 license="MIT"
 homepage="https://capnproto.org"
 distfiles="${homepage}/capnproto-c++-${version}.tar.gz"
-checksum=d1f40e47574c65700f0ec98bf66729378efabe3c72bc0cda795037498541c10d
+checksum=83680aaef8c192b884e38eab418b8482d321af6ae7ab7befa3a9370b8e716aad
 
 CXXFLAGS="-std=c++14"
 

From 85819b22bb1c09ffa895292bf7cfec9901407e0e Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sun, 19 Dec 2021 18:34:51 +0000
Subject: [PATCH 2/3] capnproto: remove `-std=c++14` from CXXFLAGS

---
 srcpkgs/capnproto/template | 2 --
 1 file changed, 2 deletions(-)

diff --git a/srcpkgs/capnproto/template b/srcpkgs/capnproto/template
index e729729560ef..21d58f04d3ae 100644
--- a/srcpkgs/capnproto/template
+++ b/srcpkgs/capnproto/template
@@ -12,8 +12,6 @@ homepage="https://capnproto.org"
 distfiles="${homepage}/capnproto-c++-${version}.tar.gz"
 checksum=83680aaef8c192b884e38eab418b8482d321af6ae7ab7befa3a9370b8e716aad
 
-CXXFLAGS="-std=c++14"
-
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" capnproto-devel"
 	configure_args+=" --with-external-capnp"

From 7911e6f8336af2c2a716fcf4a839f347f032c9ba Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sun, 19 Dec 2021 18:43:17 +0000
Subject: [PATCH 3/3] capnproto: update `common/shlibs`

---
 common/shlibs | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 4edfe7d909d7..7a75b358e77d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2908,14 +2908,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

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

[marmeladema]

[-- 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: 3361 bytes --]

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

---
 srcpkgs/capnproto/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/capnproto/template b/srcpkgs/capnproto/template
index 6c8e7a930421..b511807b3059 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,7 +10,7 @@ maintainer="eater <hello@eaterofco.de>"
 license="MIT"
 homepage="https://capnproto.org"
 distfiles="${homepage}/capnproto-c++-${version}.tar.gz"
-checksum=d1f40e47574c65700f0ec98bf66729378efabe3c72bc0cda795037498541c10d
+checksum=83680aaef8c192b884e38eab418b8482d321af6ae7ab7befa3a9370b8e716aad
 
 CXXFLAGS="-std=c++14"
 
@@ -42,6 +42,7 @@ capnproto-devel_package() {
 		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 0f6716376d4bc5d367a4a62d0ae75629523832c2 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sun, 19 Dec 2021 18:34:51 +0000
Subject: [PATCH 2/3] capnproto: remove `-std=c++14` from CXXFLAGS

---
 srcpkgs/capnproto/template | 2 --
 1 file changed, 2 deletions(-)

diff --git a/srcpkgs/capnproto/template b/srcpkgs/capnproto/template
index b511807b3059..ca49649909a5 100644
--- a/srcpkgs/capnproto/template
+++ b/srcpkgs/capnproto/template
@@ -12,8 +12,6 @@ homepage="https://capnproto.org"
 distfiles="${homepage}/capnproto-c++-${version}.tar.gz"
 checksum=83680aaef8c192b884e38eab418b8482d321af6ae7ab7befa3a9370b8e716aad
 
-CXXFLAGS="-std=c++14"
-
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" capnproto-devel"
 	configure_args+=" --with-external-capnp"

From cf0b767b2fcaf405d90133fd824ca9084e42a49f Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sun, 19 Dec 2021 18:43:17 +0000
Subject: [PATCH 3/3] capnproto: update `common/shlibs`

---
 common/shlibs | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 4edfe7d909d7..7a75b358e77d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2908,14 +2908,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

Re: capnproto: update to 0.9.1

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/34584#issuecomment-997450618

Comment:
Remember to squash the capnproto commits.

And you need to revbump every package that depends on capnproto. `xrevbump "rebuild for capnproto-0.9.1." $(xrevshlib capnproto)` or something like that should do it.

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

[marmeladema]

[-- 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: 4560 bytes --]

From a3c6187d4a83d052857d79eaa165ab74dc57c711 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 |  7 +++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 4edfe7d909d7..7a75b358e77d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2908,14 +2908,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..ca49649909a5 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,9 +10,7 @@ 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"
@@ -42,6 +40,7 @@ capnproto-devel_package() {
 		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 d04e6da137a47b3e564b58169383c76e89778be4 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 6067921fede2587f92799e7c9fab5102afa5e3d8 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 6cc6b94e7d672c8f932f75d908af4e3cfc1a0331 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

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

[marmeladema]

[-- 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: 4759 bytes --]

From 2105084b909bf4083c59940b6c5b4ea69576b1a6 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 | 12 ++++++++----
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 4edfe7d909d7..7a75b358e77d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2908,14 +2908,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..c49b4ee65b5a 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,18 @@ 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
+
 pre_configure() {
 	autoreconf -vfi
 }
@@ -42,6 +45,7 @@ capnproto-devel_package() {
 		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 1854de9f8434c8ab42d59bb7fe01edcccde73470 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 6250f6bb514b0d6ad7afb0f95f2b97a065e7213c 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 057c807ce18a8012364184baa7b1acc7a4c245b2 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

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

[marmeladema]

[-- 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: 4845 bytes --]

From f32ba5253e11266a40da5b95d625c0a8ffcf5fa9 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 | 16 ++++++++++++----
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 4edfe7d909d7..7a75b358e77d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2908,14 +2908,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..ca4ab91c7a6d 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,22 @@ 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
+	CPPFLAGS+=" -DKJ_USE_FIBERS=0"
+fi
+
 pre_configure() {
 	autoreconf -vfi
 }
@@ -42,6 +49,7 @@ capnproto-devel_package() {
 		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 d522f07833a217fdc18809deb6d858de8f291e29 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 fe46002d53089c5b73004b401fab71161f322aae 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 5256f007a14961fc56b037f4c9d92e7448dab3b4 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

Re: capnproto: update to 0.9.1

[Vaelatern]

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

New comment by Vaelatern on void-packages repository

https://github.com/void-linux/void-packages/pull/34584#issuecomment-998517537

Comment:
I think this is fine

Re: [PR REVIEW] capnproto: update to 0.9.1

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/34584#discussion_r773583712

Comment:
Any reason we just don't do `vmove "usr/lib/*.so"`?

And please remove the leading slashes from all paths here.

Re: [PR REVIEW] capnproto: update to 0.9.1

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/34584#discussion_r773584494

Comment:
You should be able to just set these (`=`) instead of adding to them.

Re: [PR REVIEW] capnproto: update to 0.9.1

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/34584#discussion_r773583963

Comment:
Please add a comment: `# fibers require ucontext and it'd be better to avoid libucontext dependencies`

Re: [PR REVIEW] capnproto: update to 0.9.1

[marmeladema]

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

New review comment by marmeladema on void-packages repository

https://github.com/void-linux/void-packages/pull/34584#discussion_r773957625

Comment:
I just amended what was already there. I am not the official maintainer of the package.

Re: [PR REVIEW] capnproto: update to 0.9.1

[the-eater]

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

New review comment by the-eater on void-packages repository

https://github.com/void-linux/void-packages/pull/34584#discussion_r773962021

Comment:
because capnproto has "versions" before the .so instead after e.g.

`libkj-async-0.9.1.so`

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

[marmeladema]

[-- 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

Re: [PR REVIEW] capnproto: update to 0.9.1

[marmeladema]

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

New review comment by marmeladema on void-packages repository

https://github.com/void-linux/void-packages/pull/34584#discussion_r773968516

Comment:
Done

Re: [PR REVIEW] capnproto: update to 0.9.1

[marmeladema]

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

New review comment by marmeladema on void-packages repository

https://github.com/void-linux/void-packages/pull/34584#discussion_r773968621

Comment:
Done

Re: [PR REVIEW] capnproto: update to 0.9.1

[marmeladema]

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

New review comment by marmeladema on void-packages repository

https://github.com/void-linux/void-packages/pull/34584#discussion_r773968817

Comment:
> And please remove the leading slashes from all paths here.

Done

Re: [PR REVIEW] capnproto: update to 0.9.1

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/34584#discussion_r774306387

Comment:
Thanks eater!

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

[ericonr]

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

There's a merged pull request on the void-packages repository

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

Description:
<!-- 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
-->