From f6051a80bac3ccfe9a256b7a3a086ccb02493577 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Mon, 8 Nov 2021 12:14:34 +0100 Subject: [PATCH] dua-cli: update to 2.14.11. --- ...-on-platforms-without-64-bit-atomics.patch | 34 +++++++++++++++++++ srcpkgs/dua-cli/patches/atomicu64.patch | 34 ------------------- srcpkgs/dua-cli/template | 4 +-- 3 files changed, 36 insertions(+), 36 deletions(-) create mode 100644 srcpkgs/dua-cli/patches/0001-PATCH-fix-on-platforms-without-64-bit-atomics.patch delete mode 100644 srcpkgs/dua-cli/patches/atomicu64.patch diff --git a/srcpkgs/dua-cli/patches/0001-PATCH-fix-on-platforms-without-64-bit-atomics.patch b/srcpkgs/dua-cli/patches/0001-PATCH-fix-on-platforms-without-64-bit-atomics.patch new file mode 100644 index 000000000000..48cb81f88cb8 --- /dev/null +++ b/srcpkgs/dua-cli/patches/0001-PATCH-fix-on-platforms-without-64-bit-atomics.patch @@ -0,0 +1,34 @@ +From e49a4bfc495e347834f7b3e8fc3a1501a0b313d7 Mon Sep 17 00:00:00 2001 +From: q66 +Date: Fri, 9 Jul 2021 02:28:55 +0200 +Subject: [PATCH] [PATCH] fix on platforms without 64-bit atomics + +--- + src/aggregate.rs | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/aggregate.rs b/src/aggregate.rs +index 1255515..9d0f266 100644 +--- a/src/aggregate.rs ++++ b/src/aggregate.rs +@@ -6,7 +6,7 @@ use std::{borrow::Cow, io, path::Path}; + #[cfg(feature = "aggregate-scan-progress")] + use std::{ + sync::{ +- atomic::{AtomicU64, Ordering}, ++ atomic::{AtomicUsize, Ordering}, + Arc, + }, + thread, +@@ -37,7 +37,7 @@ pub fn aggregate( + let mut inodes = InodeFilter::default(); + + #[cfg(feature = "aggregate-scan-progress")] +- let shared_count = Arc::new(AtomicU64::new(0)); ++ let shared_count = Arc::new(AtomicUsize::new(0)); + + #[cfg(feature = "aggregate-scan-progress")] + if let Some(mut out) = err { +-- +2.33.1 + diff --git a/srcpkgs/dua-cli/patches/atomicu64.patch b/srcpkgs/dua-cli/patches/atomicu64.patch deleted file mode 100644 index 801601a2fceb..000000000000 --- a/srcpkgs/dua-cli/patches/atomicu64.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 5857da8941bdfde02d10c9380086525f2199bbcb Mon Sep 17 00:00:00 2001 -From: q66 -Date: Wed, 9 Jun 2021 02:28:55 +0200 -Subject: [PATCH] fix on platforms without 64-bit atomics - ---- - src/aggregate.rs | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git src/aggregate.rs src/aggregate.rs -index dacaaa7..6fc474d 100644 ---- a/src/aggregate.rs -+++ b/src/aggregate.rs -@@ -8,7 +8,7 @@ use std::{ - io, - path::Path, - sync::{ -- atomic::{AtomicU64, Ordering}, -+ atomic::{AtomicUsize, Ordering}, - Arc, - }, - thread, -@@ -35,7 +35,7 @@ pub fn aggregate( - let mut aggregates = Vec::new(); - let mut inodes = InodeFilter::default(); - let paths: Vec<_> = paths.into_iter().collect(); -- let shared_count = Arc::new(AtomicU64::new(0)); -+ let shared_count = Arc::new(AtomicUsize::new(0)); - - if let Some(mut err) = err { - thread::spawn({ --- -2.31.1 - diff --git a/srcpkgs/dua-cli/template b/srcpkgs/dua-cli/template index 2f763846b3ec..de9dbb2dbe71 100644 --- a/srcpkgs/dua-cli/template +++ b/srcpkgs/dua-cli/template @@ -1,6 +1,6 @@ # Template file for 'dua-cli' pkgname=dua-cli -version=2.14.2 +version=2.14.11 revision=1 build_style=cargo short_desc="Tool to conveniently learn about the disk usage of directories" @@ -8,7 +8,7 @@ maintainer="Jan Christian Grünhage " license="MIT" homepage="https://github.com/Byron/dua-cli" distfiles="https://github.com/Byron/dua-cli/archive/v${version}.tar.gz" -checksum=05e7c67d986369a8fc53237522c6f696357fb9f0fe5c823da601653fb5c5a1fa +checksum=31c95fc4e9e034f9ba892397dc3d3844635c6b03852983fcf3b0cc326b751c83 post_install() { vlicense LICENSE