From 2d34fe3c2e35af1c4c1ca9931a3b7785c52c05e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Wed, 9 Oct 2019 12:54:43 +0200 Subject: [PATCH] i3status-rust: update to 0.11.0 --- srcpkgs/i3status-rust/patches/fix-32bit.patch | 24 ------------------- srcpkgs/i3status-rust/patches/fix-armv6.patch | 24 +++++++++++++++++++ srcpkgs/i3status-rust/template | 10 +++----- 3 files changed, 27 insertions(+), 31 deletions(-) delete mode 100644 srcpkgs/i3status-rust/patches/fix-32bit.patch create mode 100644 srcpkgs/i3status-rust/patches/fix-armv6.patch diff --git a/srcpkgs/i3status-rust/patches/fix-32bit.patch b/srcpkgs/i3status-rust/patches/fix-32bit.patch deleted file mode 100644 index d77308460ea..00000000000 --- a/srcpkgs/i3status-rust/patches/fix-32bit.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/blocks/disk_space.rs b/src/blocks/disk_space.rs ---- src/blocks/disk_space.rs -+++ src/blocks/disk_space.rs -@@ -189,16 +189,16 @@ impl Block for DiskSpace { - let mut result; - let mut converted = 0.0f64; - let mut converted_str = String::new(); -- let total = statvfs.blocks() * statvfs.fragment_size(); -- let used = (statvfs.blocks() - statvfs.blocks_free()) * statvfs.fragment_size(); -+ let total = (statvfs.blocks() as u64 * statvfs.fragment_size() as u64) as u64; -+ let used = ((statvfs.blocks() as u64 - statvfs.blocks_free() as u64) * statvfs.fragment_size() as u64) as u64; - - match self.info_type { - InfoType::Available => { -- result = statvfs.blocks_available() * statvfs.block_size(); -+ result = (statvfs.blocks_available() as u64 * statvfs.block_size() as u64) as u64; - converted = Unit::bytes_in_unit(self.unit, result); - } - InfoType::Free => { -- result = statvfs.blocks_free() * statvfs.block_size(); -+ result = (statvfs.blocks_free() as u64 * statvfs.block_size() as u64) as u64; - converted = Unit::bytes_in_unit(self.unit, result); - } - InfoType::Total => { diff --git a/srcpkgs/i3status-rust/patches/fix-armv6.patch b/srcpkgs/i3status-rust/patches/fix-armv6.patch new file mode 100644 index 00000000000..5f45e6f64f7 --- /dev/null +++ b/srcpkgs/i3status-rust/patches/fix-armv6.patch @@ -0,0 +1,24 @@ +diff --git a/src/blocks/disk_space.rs b/src/blocks/disk_space.rs +--- src/blocks/disk_space.rs ++++ src/blocks/disk_space.rs +@@ -189,16 +189,16 @@ impl Block for DiskSpace { + let mut result; + let mut converted = 0.0f64; + let mut converted_str = String::new(); +- let total = (statvfs.blocks() * statvfs.fragment_size()) as u64; +- let used = ((statvfs.blocks() - statvfs.blocks_free()) * statvfs.fragment_size()) as u64; ++ let total = (statvfs.blocks() * (statvfs.fragment_size() as u64)) as u64; ++ let used = ((statvfs.blocks() - statvfs.blocks_free()) * (statvfs.fragment_size() as u64)) as u64; + + match self.info_type { + InfoType::Available => { +- result = (statvfs.blocks_available() * statvfs.block_size()) as u64; ++ result = (statvfs.blocks_available() * (statvfs.block_size() as u64)) as u64; + converted = Unit::bytes_in_unit(self.unit, result); + } + InfoType::Free => { +- result = (statvfs.blocks_free() * statvfs.block_size()) as u64; ++ result = (statvfs.blocks_free() * (statvfs.block_size() as u64)) as u64; + converted = Unit::bytes_in_unit(self.unit, result); + } + InfoType::Total => { diff --git a/srcpkgs/i3status-rust/template b/srcpkgs/i3status-rust/template index 8e01ed53609..8d7775ee134 100644 --- a/srcpkgs/i3status-rust/template +++ b/srcpkgs/i3status-rust/template @@ -1,7 +1,7 @@ # Template file for 'i3status-rust' pkgname=i3status-rust -version=0.10.0 -revision=3 +version=0.11.0 +revision=1 build_style=cargo hostmakedepends="pkg-config" makedepends="dbus-devel pulseaudio-devel" @@ -10,8 +10,4 @@ maintainer="Jan Christian Grünhage " license="GPL-3.0-only" homepage="https://github.com/greshake/i3status-rust" distfiles="https://github.com/greshake/i3status-rust/archive/v${version}.tar.gz" -checksum=84a12a91419fda35109a0be3980671c1d58e13c5987e6dc999cbe786d05053d9 - -case "$XBPS_TARGET_MACHINE" in - ppc*) broken="old broken version of nix (0.8.1) in dep tree" ;; -esac +checksum=2f749ba4646e2fc0af62d31c990ae8d59d454eb0e5fe947b39d64cfeabbb0a1c