Re: [PR PATCH] [Updated] sequoia-sq: update to 0.33.0.

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

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