From: marmeladema <marmeladema@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] capnproto: update to 0.9.1
Date: Sun, 19 Dec 2021 22:00:12 +0100 [thread overview]
Message-ID: <20211219210012.-NRhLCZ4TQ50KYx0ErcAhgXQ77AY5aeXMeWnv8Bh1CM@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-34584@inbox.vuxu.org>
[-- 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
next prev parent reply other threads:[~2021-12-19 21:00 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-17 11:02 [PR PATCH] " marmeladema
2021-12-19 4:11 ` [PR REVIEW] " ericonr
2021-12-19 18:35 ` [PR PATCH] [Updated] " marmeladema
2021-12-19 18:36 ` [PR REVIEW] " marmeladema
2021-12-19 18:36 ` [PR PATCH] [Updated] " marmeladema
2021-12-19 18:38 ` marmeladema
2021-12-19 18:46 ` [PR PATCH] [Updated] " marmeladema
2021-12-19 19:20 ` marmeladema
2021-12-19 19:50 ` ericonr
2021-12-19 19:57 ` [PR PATCH] [Updated] " marmeladema
2021-12-19 20:21 ` marmeladema
2021-12-19 21:00 ` marmeladema [this message]
2021-12-21 6:47 ` Vaelatern
2021-12-22 4:00 ` [PR REVIEW] " ericonr
2021-12-22 4:00 ` ericonr
2021-12-22 4:00 ` ericonr
2021-12-22 15:07 ` marmeladema
2021-12-22 15:12 ` the-eater
2021-12-22 15:21 ` [PR PATCH] [Updated] " marmeladema
2021-12-22 15:21 ` [PR REVIEW] " marmeladema
2021-12-22 15:21 ` marmeladema
2021-12-22 15:22 ` marmeladema
2021-12-23 4:16 ` ericonr
2021-12-23 4:16 ` [PR PATCH] [Merged]: " ericonr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211219210012.-NRhLCZ4TQ50KYx0ErcAhgXQ77AY5aeXMeWnv8Bh1CM@z \
--to=marmeladema@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).