From 0d27429e947b2fad67f288f8770622a1bc9d1553 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Mon, 5 Aug 2019 14:05:35 +0200 Subject: [PATCH] i3status-rust: fix 32bit platforms. See https://build.voidlinux.org/builders/armv7l-musl_builder/builds/20286/steps/shell_3/logs/stdio --- srcpkgs/i3status-rust/patches/fix-i686.patch | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/srcpkgs/i3status-rust/patches/fix-i686.patch b/srcpkgs/i3status-rust/patches/fix-i686.patch index 8d80d9163a..841069e1fb 100644 --- a/srcpkgs/i3status-rust/patches/fix-i686.patch +++ b/srcpkgs/i3status-rust/patches/fix-i686.patch @@ -1,15 +1,4 @@ -From 2de5afb0fee02253dc2d9436d9783a2d26c92f95 Mon Sep 17 00:00:00 2001 -From: Enno Boland -Date: Wed, 17 Jul 2019 13:44:43 +0200 -Subject: [PATCH] src/blocks/disk_space.rs: fix build on i686 - -fixes #403. ---- - src/blocks/disk_space.rs | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - diff --git a/src/blocks/disk_space.rs b/src/blocks/disk_space.rs -index 2a6c111..2269fda 100644 --- src/blocks/disk_space.rs +++ src/blocks/disk_space.rs @@ -189,16 +189,16 @@ impl Block for DiskSpace { @@ -18,18 +7,18 @@ index 2a6c111..2269fda 100644 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() * 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(); -+ 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(); -+ 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 => {