From 947a26ee6d7a908996a7e522b6a89056fc82cae2 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Mon, 19 Nov 2018 14:06:37 -0200 Subject: [PATCH] pijul: update to 0.11.0. thanks to @jnbr for musl fix --- srcpkgs/pijul/patches/fix-musl.patch | 11 +++++++++++ srcpkgs/pijul/template | 12 ++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) create mode 100644 srcpkgs/pijul/patches/fix-musl.patch diff --git a/srcpkgs/pijul/patches/fix-musl.patch b/srcpkgs/pijul/patches/fix-musl.patch new file mode 100644 index 0000000000..01d1c915d8 --- /dev/null +++ b/srcpkgs/pijul/patches/fix-musl.patch @@ -0,0 +1,11 @@ +--- line/src/unix.rs.orig 2018-11-19 19:17:02.606568203 +0100 ++++ line/src/unix.rs 2018-11-19 19:17:13.762473164 +0100 +@@ -6,7 +6,7 @@ + fn size() -> (usize, usize) { + unsafe { + let mut size: libc::winsize = std::mem::zeroed(); +- if libc::ioctl(1, libc::TIOCGWINSZ as libc::c_ulong, &mut size) == 0 { ++ if libc::ioctl(1, libc::TIOCGWINSZ, &mut size) == 0 { + (size.ws_col as usize, size.ws_row as usize) + } else { + (0, 0) diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template index ef03c9a7e6..24209620f3 100644 --- a/srcpkgs/pijul/template +++ b/srcpkgs/pijul/template @@ -1,20 +1,16 @@ # Template file for 'pijul' pkgname=pijul -version=0.10.0 -revision=2 +version=0.11.0 +revision=1 build_style=cargo hostmakedepends="pkg-config" makedepends="libsodium-devel libressl-devel" short_desc="Distributed version control system based on patches" maintainer="Toyam Cox " -license="GPL-2" +license="GPL-2.0-only" homepage="https://pijul.org/" distfiles="https://pijul.org/releases/pijul-${version}.tar.gz" -checksum=da3fcba4ab39a4371cda7273691364c2355c9b216bb7867d92dae5812ebb71d2 - -case "$XBPS_TARGET_MACHINE" in - arm*) broken="mismatched types --> line/src/unix.rs:9:27 expect u32, found u64" -esac +checksum=e60793ab124e9054c1d5509698acbae507ebb2fab5364d964067bc9ae8b6b5e5 # We only want to install the binary, so don't run cargo install do_install() {