* [PR PATCH] sequoia-sq: update to 0.33.0.
@ 2024-01-25 13:02 jcgruenhage
2024-03-04 8:53 ` [PR PATCH] [Updated] " jcgruenhage
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: jcgruenhage @ 2024-01-25 13:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 402 bytes --]
There is a new pull request by jcgruenhage against master on the void-packages repository
https://github.com/jcgruenhage/void-packages sequoia-sq-0.33.0_1
https://github.com/void-linux/void-packages/pull/48364
sequoia-sq: update to 0.33.0.
#### Testing the changes
- I tested the changes in this PR: **YES**
A patch file from https://github.com/void-linux/void-packages/pull/48364.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sequoia-sq-0.33.0_1-48364.patch --]
[-- Type: text/x-diff, Size: 3870 bytes --]
From 9775e913613cb97c8d0f371ef2e69cd326cfbcd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Thu, 25 Jan 2024 14:00:33 +0100
Subject: [PATCH] sequoia-sq: update to 0.33.0.
---
...mpletion-artifacts-to-reasonable-dir.patch | 54 -------------------
srcpkgs/sequoia-sq/template | 16 +++---
2 files changed, 10 insertions(+), 60 deletions(-)
delete mode 100644 srcpkgs/sequoia-sq/patches/0001-write-man-and-completion-artifacts-to-reasonable-dir.patch
diff --git a/srcpkgs/sequoia-sq/patches/0001-write-man-and-completion-artifacts-to-reasonable-dir.patch b/srcpkgs/sequoia-sq/patches/0001-write-man-and-completion-artifacts-to-reasonable-dir.patch
deleted file mode 100644
index 606d9e636233d..0000000000000
--- a/srcpkgs/sequoia-sq/patches/0001-write-man-and-completion-artifacts-to-reasonable-dir.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 28c55b1a20b75b72e52532a7227db041a41f8bf4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
- <jan.christian@gruenhage.xyz>
-Date: Mon, 11 Dec 2023 12:25:51 +0100
-Subject: [PATCH] write man and completion artifacts to reasonable directories
-
----
- .gitignore | 2 ++
- build.rs | 12 ++++--------
- 2 files changed, 6 insertions(+), 8 deletions(-)
-
-diff --git a/.gitignore b/.gitignore
-index 6de91e9..a61ad00 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -5,3 +5,5 @@
- .dir-locals.el
- /*.html
- /*.pdf
-+/man
-+/completions
-diff --git a/build.rs b/build.rs
-index 1a844ad..268c54b 100644
---- a/build.rs
-+++ b/build.rs
-@@ -25,11 +25,7 @@ fn main() {
- dump_help(sq.clone()).unwrap();
-
- // Generate shell completions
-- let outdir = match env::var_os("CARGO_TARGET_DIR") {
-- None => return,
-- Some(outdir) => outdir,
-- };
--
-+ let outdir = "completions";
- fs::create_dir_all(&outdir).unwrap();
-
- for shell in &[Shell::Bash, Shell::Fish, Shell::Zsh, Shell::PowerShell,
-@@ -102,9 +98,9 @@ fn dump_help_inner(
-
- fn build_man_pages() -> Result<()> {
- // Man page support.
-- let out_dir = std::path::PathBuf::from(
-- std::env::var_os("OUT_DIR")
-- .ok_or(std::io::Error::from(std::io::ErrorKind::NotFound))?);
-+ let out_dir = std::path::PathBuf::from("man");
-+
-+ std::fs::create_dir_all(&out_dir)?;
-
- let man = clap_mangen::Man::new(cli::build());
- let mut buffer: Vec<u8> = Default::default();
---
-2.43.0
-
diff --git a/srcpkgs/sequoia-sq/template b/srcpkgs/sequoia-sq/template
index 8c1f896cbd1a3..68766aa452e5a 100644
--- a/srcpkgs/sequoia-sq/template
+++ b/srcpkgs/sequoia-sq/template
@@ -1,6 +1,6 @@
# Template file for 'sequoia-sq'
pkgname=sequoia-sq
-version=0.32.0
+version=0.33.0
revision=1
build_style=cargo
build_helper=qemu
@@ -12,18 +12,22 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="GPL-2.0-or-later"
homepage="https://sequoia-pgp.org/projects/#sq"
distfiles="https://gitlab.com/sequoia-pgp/sequoia-sq/-/archive/v${version}/sequoia-sq-v${version}.tar.gz"
-checksum=3d8a1cefb9db977696e84875bbd3401763695de32ec88afd7ea1f1823d8059c5
+checksum=d587ecd8c8633def019d21aa2c140f1af5fb618477098aeef6efa0a97666efe6
conflicts="squirrel"
case "$XBPS_TARGET_MACHINE" in
armv*l) nocross="Requires C libs included in build.rs, which is currently broken in xbps-src. These failures only manifest on a hf archs right now";;
esac
+pre_build() {
+ export ASSET_OUT_DIR=assets
+}
+
post_install() {
- for page in man/*; do
+ for page in assets/man-pages/*; do
vman ${page}
done
- vcompletion completions/sq.bash bash
- vcompletion completions/sq.fish fish
- vcompletion completions/_sq zsh
+ vcompletion assets/shell-completions/sq.bash bash sq
+ vcompletion assets/shell-completions/sq.fish fish sq
+ vcompletion assets/shell-completions/_sq zsh sq
}
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] sequoia-sq: update to 0.33.0.
2024-01-25 13:02 [PR PATCH] sequoia-sq: update to 0.33.0 jcgruenhage
@ 2024-03-04 8:53 ` jcgruenhage
2024-03-04 8:54 ` jcgruenhage
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: jcgruenhage @ 2024-03-04 8:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 407 bytes --]
There is an updated pull request by jcgruenhage against master on the void-packages repository
https://github.com/jcgruenhage/void-packages sequoia-sq-0.33.0_1
https://github.com/void-linux/void-packages/pull/48364
sequoia-sq: update to 0.33.0.
#### Testing the changes
- I tested the changes in this PR: **YES**
A patch file from https://github.com/void-linux/void-packages/pull/48364.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sequoia-sq-0.33.0_1-48364.patch --]
[-- Type: text/x-diff, Size: 3874 bytes --]
From 09f8528d8ffcfec161f9e44bd56b11a54f177e2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Thu, 25 Jan 2024 14:00:33 +0100
Subject: [PATCH] sequoia-sq: update to 0.33.0.
---
...mpletion-artifacts-to-reasonable-dir.patch | 54 -------------------
srcpkgs/sequoia-sq/template | 16 +++---
2 files changed, 10 insertions(+), 60 deletions(-)
delete mode 100644 srcpkgs/sequoia-sq/patches/0001-write-man-and-completion-artifacts-to-reasonable-dir.patch
diff --git a/srcpkgs/sequoia-sq/patches/0001-write-man-and-completion-artifacts-to-reasonable-dir.patch b/srcpkgs/sequoia-sq/patches/0001-write-man-and-completion-artifacts-to-reasonable-dir.patch
deleted file mode 100644
index 606d9e636233dd..00000000000000
--- a/srcpkgs/sequoia-sq/patches/0001-write-man-and-completion-artifacts-to-reasonable-dir.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 28c55b1a20b75b72e52532a7227db041a41f8bf4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
- <jan.christian@gruenhage.xyz>
-Date: Mon, 11 Dec 2023 12:25:51 +0100
-Subject: [PATCH] write man and completion artifacts to reasonable directories
-
----
- .gitignore | 2 ++
- build.rs | 12 ++++--------
- 2 files changed, 6 insertions(+), 8 deletions(-)
-
-diff --git a/.gitignore b/.gitignore
-index 6de91e9..a61ad00 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -5,3 +5,5 @@
- .dir-locals.el
- /*.html
- /*.pdf
-+/man
-+/completions
-diff --git a/build.rs b/build.rs
-index 1a844ad..268c54b 100644
---- a/build.rs
-+++ b/build.rs
-@@ -25,11 +25,7 @@ fn main() {
- dump_help(sq.clone()).unwrap();
-
- // Generate shell completions
-- let outdir = match env::var_os("CARGO_TARGET_DIR") {
-- None => return,
-- Some(outdir) => outdir,
-- };
--
-+ let outdir = "completions";
- fs::create_dir_all(&outdir).unwrap();
-
- for shell in &[Shell::Bash, Shell::Fish, Shell::Zsh, Shell::PowerShell,
-@@ -102,9 +98,9 @@ fn dump_help_inner(
-
- fn build_man_pages() -> Result<()> {
- // Man page support.
-- let out_dir = std::path::PathBuf::from(
-- std::env::var_os("OUT_DIR")
-- .ok_or(std::io::Error::from(std::io::ErrorKind::NotFound))?);
-+ let out_dir = std::path::PathBuf::from("man");
-+
-+ std::fs::create_dir_all(&out_dir)?;
-
- let man = clap_mangen::Man::new(cli::build());
- let mut buffer: Vec<u8> = Default::default();
---
-2.43.0
-
diff --git a/srcpkgs/sequoia-sq/template b/srcpkgs/sequoia-sq/template
index 8c1f896cbd1a3b..68766aa452e5a1 100644
--- a/srcpkgs/sequoia-sq/template
+++ b/srcpkgs/sequoia-sq/template
@@ -1,6 +1,6 @@
# Template file for 'sequoia-sq'
pkgname=sequoia-sq
-version=0.32.0
+version=0.33.0
revision=1
build_style=cargo
build_helper=qemu
@@ -12,18 +12,22 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="GPL-2.0-or-later"
homepage="https://sequoia-pgp.org/projects/#sq"
distfiles="https://gitlab.com/sequoia-pgp/sequoia-sq/-/archive/v${version}/sequoia-sq-v${version}.tar.gz"
-checksum=3d8a1cefb9db977696e84875bbd3401763695de32ec88afd7ea1f1823d8059c5
+checksum=d587ecd8c8633def019d21aa2c140f1af5fb618477098aeef6efa0a97666efe6
conflicts="squirrel"
case "$XBPS_TARGET_MACHINE" in
armv*l) nocross="Requires C libs included in build.rs, which is currently broken in xbps-src. These failures only manifest on a hf archs right now";;
esac
+pre_build() {
+ export ASSET_OUT_DIR=assets
+}
+
post_install() {
- for page in man/*; do
+ for page in assets/man-pages/*; do
vman ${page}
done
- vcompletion completions/sq.bash bash
- vcompletion completions/sq.fish fish
- vcompletion completions/_sq zsh
+ vcompletion assets/shell-completions/sq.bash bash sq
+ vcompletion assets/shell-completions/sq.fish fish sq
+ vcompletion assets/shell-completions/_sq zsh sq
}
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] sequoia-sq: update to 0.33.0.
2024-01-25 13:02 [PR PATCH] sequoia-sq: update to 0.33.0 jcgruenhage
2024-03-04 8:53 ` [PR PATCH] [Updated] " jcgruenhage
@ 2024-03-04 8:54 ` jcgruenhage
2024-03-14 11:46 ` sequoia-sq: update to 0.34.0 jcgruenhage
2024-03-14 11:46 ` [PR PATCH] [Closed]: " jcgruenhage
3 siblings, 0 replies; 5+ messages in thread
From: jcgruenhage @ 2024-03-04 8:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 407 bytes --]
There is an updated pull request by jcgruenhage against master on the void-packages repository
https://github.com/jcgruenhage/void-packages sequoia-sq-0.33.0_1
https://github.com/void-linux/void-packages/pull/48364
sequoia-sq: update to 0.33.0.
#### Testing the changes
- I tested the changes in this PR: **YES**
A patch file from https://github.com/void-linux/void-packages/pull/48364.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sequoia-sq-0.33.0_1-48364.patch --]
[-- Type: text/x-diff, Size: 4148 bytes --]
From bfd9c5f7c91d66ab793bc3d51176cc2b065ce1f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Thu, 25 Jan 2024 14:00:33 +0100
Subject: [PATCH] sequoia-sq: update to 0.34.0.
---
...mpletion-artifacts-to-reasonable-dir.patch | 54 -------------------
srcpkgs/sequoia-sq/template | 20 ++++---
2 files changed, 12 insertions(+), 62 deletions(-)
delete mode 100644 srcpkgs/sequoia-sq/patches/0001-write-man-and-completion-artifacts-to-reasonable-dir.patch
diff --git a/srcpkgs/sequoia-sq/patches/0001-write-man-and-completion-artifacts-to-reasonable-dir.patch b/srcpkgs/sequoia-sq/patches/0001-write-man-and-completion-artifacts-to-reasonable-dir.patch
deleted file mode 100644
index 606d9e636233dd..00000000000000
--- a/srcpkgs/sequoia-sq/patches/0001-write-man-and-completion-artifacts-to-reasonable-dir.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 28c55b1a20b75b72e52532a7227db041a41f8bf4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
- <jan.christian@gruenhage.xyz>
-Date: Mon, 11 Dec 2023 12:25:51 +0100
-Subject: [PATCH] write man and completion artifacts to reasonable directories
-
----
- .gitignore | 2 ++
- build.rs | 12 ++++--------
- 2 files changed, 6 insertions(+), 8 deletions(-)
-
-diff --git a/.gitignore b/.gitignore
-index 6de91e9..a61ad00 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -5,3 +5,5 @@
- .dir-locals.el
- /*.html
- /*.pdf
-+/man
-+/completions
-diff --git a/build.rs b/build.rs
-index 1a844ad..268c54b 100644
---- a/build.rs
-+++ b/build.rs
-@@ -25,11 +25,7 @@ fn main() {
- dump_help(sq.clone()).unwrap();
-
- // Generate shell completions
-- let outdir = match env::var_os("CARGO_TARGET_DIR") {
-- None => return,
-- Some(outdir) => outdir,
-- };
--
-+ let outdir = "completions";
- fs::create_dir_all(&outdir).unwrap();
-
- for shell in &[Shell::Bash, Shell::Fish, Shell::Zsh, Shell::PowerShell,
-@@ -102,9 +98,9 @@ fn dump_help_inner(
-
- fn build_man_pages() -> Result<()> {
- // Man page support.
-- let out_dir = std::path::PathBuf::from(
-- std::env::var_os("OUT_DIR")
-- .ok_or(std::io::Error::from(std::io::ErrorKind::NotFound))?);
-+ let out_dir = std::path::PathBuf::from("man");
-+
-+ std::fs::create_dir_all(&out_dir)?;
-
- let man = clap_mangen::Man::new(cli::build());
- let mut buffer: Vec<u8> = Default::default();
---
-2.43.0
-
diff --git a/srcpkgs/sequoia-sq/template b/srcpkgs/sequoia-sq/template
index 8c1f896cbd1a3b..79d50038676ef9 100644
--- a/srcpkgs/sequoia-sq/template
+++ b/srcpkgs/sequoia-sq/template
@@ -1,29 +1,33 @@
# Template file for 'sequoia-sq'
pkgname=sequoia-sq
-version=0.32.0
+version=0.34.0
revision=1
build_style=cargo
build_helper=qemu
_deps="nettle-devel openssl-devel sqlite-devel"
-hostmakedepends="pkg-config llvm clang ${_deps}"
+hostmakedepends="pkg-config llvm clang capnproto ${_deps}"
makedepends="${_deps}"
short_desc="Command-line frontend for Sequoia, a new OpenPGP implementation"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
-license="GPL-2.0-or-later"
+license="LGPL-2.0-or-later"
homepage="https://sequoia-pgp.org/projects/#sq"
distfiles="https://gitlab.com/sequoia-pgp/sequoia-sq/-/archive/v${version}/sequoia-sq-v${version}.tar.gz"
-checksum=3d8a1cefb9db977696e84875bbd3401763695de32ec88afd7ea1f1823d8059c5
+checksum=6458274008ef06362c912eb67e285b734906acdb5c56e8490144f45bc1b81d51
conflicts="squirrel"
case "$XBPS_TARGET_MACHINE" in
armv*l) nocross="Requires C libs included in build.rs, which is currently broken in xbps-src. These failures only manifest on a hf archs right now";;
esac
+pre_build() {
+ export ASSET_OUT_DIR=assets
+}
+
post_install() {
- for page in man/*; do
+ for page in assets/man-pages/*; do
vman ${page}
done
- vcompletion completions/sq.bash bash
- vcompletion completions/sq.fish fish
- vcompletion completions/_sq zsh
+ vcompletion assets/shell-completions/sq.bash bash sq
+ vcompletion assets/shell-completions/sq.fish fish sq
+ vcompletion assets/shell-completions/_sq zsh sq
}
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: sequoia-sq: update to 0.34.0.
2024-01-25 13:02 [PR PATCH] sequoia-sq: update to 0.33.0 jcgruenhage
2024-03-04 8:53 ` [PR PATCH] [Updated] " jcgruenhage
2024-03-04 8:54 ` jcgruenhage
@ 2024-03-14 11:46 ` jcgruenhage
2024-03-14 11:46 ` [PR PATCH] [Closed]: " jcgruenhage
3 siblings, 0 replies; 5+ messages in thread
From: jcgruenhage @ 2024-03-14 11:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 156 bytes --]
New comment by jcgruenhage on void-packages repository
https://github.com/void-linux/void-packages/pull/48364#issuecomment-1997262199
Comment:
See #49286
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Closed]: sequoia-sq: update to 0.34.0.
2024-01-25 13:02 [PR PATCH] sequoia-sq: update to 0.33.0 jcgruenhage
` (2 preceding siblings ...)
2024-03-14 11:46 ` sequoia-sq: update to 0.34.0 jcgruenhage
@ 2024-03-14 11:46 ` jcgruenhage
3 siblings, 0 replies; 5+ messages in thread
From: jcgruenhage @ 2024-03-14 11:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 231 bytes --]
There's a closed pull request on the void-packages repository
sequoia-sq: update to 0.34.0.
https://github.com/void-linux/void-packages/pull/48364
Description:
#### Testing the changes
- I tested the changes in this PR: **YES**
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-03-14 11:46 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-01-25 13:02 [PR PATCH] sequoia-sq: update to 0.33.0 jcgruenhage
2024-03-04 8:53 ` [PR PATCH] [Updated] " jcgruenhage
2024-03-04 8:54 ` jcgruenhage
2024-03-14 11:46 ` sequoia-sq: update to 0.34.0 jcgruenhage
2024-03-14 11:46 ` [PR PATCH] [Closed]: " jcgruenhage
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).