From a2716dde75b7348cadd69c5998b64ad7df872958 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 18 Feb 2021 20:14:16 +0100 Subject: [PATCH] pijul: fix build sequoia was so wise to yank the unmaintained rfc2822 package from crates.io but kept like all their old sequio crates up that depend on it. So just fetch that crate from their gitlab. --- srcpkgs/pijul/patches/bindgen.patch | 7 ++++--- srcpkgs/pijul/template | 7 +++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/srcpkgs/pijul/patches/bindgen.patch b/srcpkgs/pijul/patches/bindgen.patch index c90bb9dba2b..fd46ef59279 100644 --- a/srcpkgs/pijul/patches/bindgen.patch +++ b/srcpkgs/pijul/patches/bindgen.patch @@ -1,9 +1,10 @@ --- Cargo.toml.orig +++ Cargo.toml -@@ -133,3 +133,6 @@ +@@ -133,3 +133,7 @@ version = "2.0" [target."cfg(unix)".dependencies.tokio-uds] version = "0.2" + -+[replace] -+"bindgen:0.47.3" = {git = 'https://github.com/Duncaen/rust-bindgen', rev = "e70d9568887ffb6c2a7d7d165a71aed311a29129"} ++[patch.crates-io] ++"bindgen" = {git = 'https://github.com/Duncaen/rust-bindgen', rev = "e70d9568887ffb6c2a7d7d165a71aed311a29129"} ++"sequoia-rfc2822" = {path = '/builddir/sequoia-v0.9.0/rfc2822'} diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template index 6287895016a..2a750381983 100644 --- a/srcpkgs/pijul/template +++ b/srcpkgs/pijul/template @@ -3,14 +3,17 @@ pkgname=pijul version=0.12.2 revision=3 build_style=cargo +_sequoia_ver=0.9.0 hostmakedepends="pkg-config clang" makedepends="libsodium-devel libressl-devel nettle-devel" short_desc="Distributed version control system based on patches" maintainer="Toyam Cox " license="GPL-2.0-only" homepage="https://pijul.org/" -distfiles="https://crates.io/api/v1/crates/pijul/${version}/download>pijul-${version}.tar.gz" -checksum=f92a3f4063e780ca45c161ceb0f42baf34dfeddf3359ebf6c2e0442d9abb5889 +distfiles="https://crates.io/api/v1/crates/pijul/${version}/download>pijul-${version}.tar.gz + https://gitlab.com/sequoia-pgp/sequoia/-/archive/v${_sequoia_ver}/sequoia-v${_sequoia_ver}.tar.gz" +checksum="f92a3f4063e780ca45c161ceb0f42baf34dfeddf3359ebf6c2e0442d9abb5889 + 71823c88b9666611f3cfa6b1d923bd66fda92fa6a53368b195bd2f962fdf7f4b" if [ "$CROSS_BUILD" ]; then export HOST_CC="$BUILD_CC"