From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] i3status-rust: update to 0.11.0
Date: Fri, 11 Oct 2019 12:51:04 +0200 [thread overview]
Message-ID: <20191011105104.9_l5Mg7rDHRr8ISaLxe7nFAAAqWmQYEakHzAFZAy35Q@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-15275@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 346 bytes --]
There is an updated pull request by jcgruenhage against master on the void-packages repository
https://github.com/jcgruenhage/void-packages i3status-rust-0.11.0
https://github.com/void-linux/void-packages/pull/15275
i3status-rust: update to 0.11.0
None
A patch file from https://github.com/void-linux/void-packages/pull/15275.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-i3status-rust-0.11.0-15275.patch --]
[-- Type: text/x-diff, Size: 4684 bytes --]
From 2d34fe3c2e35af1c4c1ca9931a3b7785c52c05e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
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 <jan.christian@gruenhage.xyz>"
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
next prev parent reply other threads:[~2019-10-11 10:51 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-09 10:56 [PR PATCH] " voidlinux-github
2019-10-11 10:51 ` [PR PATCH] [Updated] " voidlinux-github
2019-10-11 10:51 ` voidlinux-github [this message]
2019-10-12 11:47 ` voidlinux-github
2019-10-12 11:47 ` voidlinux-github
2019-10-12 12:26 ` [PR PATCH] [Merged]: " voidlinux-github
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191011105104.9_l5Mg7rDHRr8ISaLxe7nFAAAqWmQYEakHzAFZAy35Q@z \
--to=voidlinux-github@inbox.vuxu.org \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).