From 227acfb01d98022f7c373b15d202a081d204cd81 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Thu, 5 Sep 2019 14:48:34 +0200 Subject: [PATCH] pijul: update to 0.12.2. --- srcpkgs/pijul/patches/bindgen.patch | 10 ---------- srcpkgs/pijul/template | 15 ++++----------- 2 files changed, 4 insertions(+), 21 deletions(-) delete mode 100644 srcpkgs/pijul/patches/bindgen.patch diff --git a/srcpkgs/pijul/patches/bindgen.patch b/srcpkgs/pijul/patches/bindgen.patch deleted file mode 100644 index dd124b79c2f..00000000000 --- a/srcpkgs/pijul/patches/bindgen.patch +++ /dev/null @@ -1,10 +0,0 @@ -patch bindgen to use BINDGEN_EXTRA_CLANG_ARGS variable to set sysroot for cross builds -https://github.com/jnbr/rust-bindgen/tree/0.43.2-clang_args - ---- Cargo.toml.orig 2019-06-15 02:33:02.105715462 +0200 -+++ Cargo.toml 2019-06-15 02:36:33.905701785 +0200 -@@ -6,3 +6,4 @@ - "libpijul:0.12.0" = { path = "libpijul" } - "line:0.1.15" = { path = "line" } - "diffs:0.3.0" = { path = "diffs" } -+"bindgen:0.43.2" = {git = 'https://github.com/jnbr/rust-bindgen', rev = "1467ac97c669c1ddda8117ccf1d398609b0e6fa9"} diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template index 6d5cbfcf23a..d46ca14e242 100644 --- a/srcpkgs/pijul/template +++ b/srcpkgs/pijul/template @@ -1,7 +1,7 @@ # Template file for 'pijul' pkgname=pijul -version=0.12.0 -revision=3 +version=0.12.2 +revision=1 build_style=cargo hostmakedepends="pkg-config clang" makedepends="libsodium-devel libressl-devel nettle-devel" @@ -9,10 +9,8 @@ short_desc="Distributed version control system based on patches" maintainer="Toyam Cox " license="GPL-2.0-only" homepage="https://pijul.org/" -distfiles="https://pijul.org/releases/pijul-${version}.tar.gz" -checksum=987820fa2a6fe92a9f516f5e9b41ad59a597973e72cb0c7a44ca0f38e741a7e6 - -broken="broken until I fix it" +distfiles="https://crates.io/api/v1/crates/pijul/${version}/download>pijul-${version}.tar.gz" +checksum=f92a3f4063e780ca45c161ceb0f42baf34dfeddf3359ebf6c2e0442d9abb5889 if [ "$CROSS_BUILD" ]; then export HOST_CC="$BUILD_CC" @@ -20,11 +18,6 @@ if [ "$CROSS_BUILD" ]; then export BINDGEN_EXTRA_CLANG_ARGS="--sysroot=$XBPS_CROSS_BASE" fi -pre_build() { - cargo update --package openssl-sys --precise 0.9.46 - cargo update --package openssl --precise 0.10.22 -} - # We only want to install the binary, so don't run cargo install do_install() { vbin target/${RUST_TARGET}/release/pijul