sequoia-sq: update to 0.32.0.
This commit is contained in:
parent
674e8b2c74
commit
1cd7f65246
2 changed files with 61 additions and 8 deletions
|
@ -0,0 +1,54 @@
|
||||||
|
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
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'sequoia-sq'
|
# Template file for 'sequoia-sq'
|
||||||
pkgname=sequoia-sq
|
pkgname=sequoia-sq
|
||||||
version=0.31.0
|
version=0.32.0
|
||||||
revision=2
|
revision=1
|
||||||
build_style=cargo
|
build_style=cargo
|
||||||
build_helper=qemu
|
build_helper=qemu
|
||||||
_deps="nettle-devel openssl-devel sqlite-devel"
|
_deps="nettle-devel openssl-devel sqlite-devel"
|
||||||
|
@ -12,19 +12,18 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
|
||||||
license="GPL-2.0-or-later"
|
license="GPL-2.0-or-later"
|
||||||
homepage="https://sequoia-pgp.org/projects/#sq"
|
homepage="https://sequoia-pgp.org/projects/#sq"
|
||||||
distfiles="https://gitlab.com/sequoia-pgp/sequoia-sq/-/archive/v${version}/sequoia-sq-v${version}.tar.gz"
|
distfiles="https://gitlab.com/sequoia-pgp/sequoia-sq/-/archive/v${version}/sequoia-sq-v${version}.tar.gz"
|
||||||
checksum=2bb62ce5fcc33a5340dae678a6628a9be992ff234141015256deb2cf45092b44
|
checksum=3d8a1cefb9db977696e84875bbd3401763695de32ec88afd7ea1f1823d8059c5
|
||||||
conflicts="squirrel"
|
conflicts="squirrel"
|
||||||
|
|
||||||
case "$XBPS_TARGET_MACHINE" in
|
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";;
|
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
|
esac
|
||||||
|
|
||||||
post_build() {
|
|
||||||
SQ_MAN=man-sq vtargetrun ./target/${RUST_TARGET}/release/sq
|
|
||||||
}
|
|
||||||
|
|
||||||
post_install() {
|
post_install() {
|
||||||
for page in man-sq/*; do
|
for page in man/*; do
|
||||||
vman ${page}
|
vman ${page}
|
||||||
done
|
done
|
||||||
|
vcompletion completions/sq.bash bash
|
||||||
|
vcompletion completions/sq.fish fish
|
||||||
|
vcompletion completions/_sq zsh
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue