Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] dua-cli: update to 2.15.0
@ 2022-01-06  3:30 cinerea0
  2022-01-09  0:07 ` [PR REVIEW] " ericonr
                   ` (6 more replies)
  0 siblings, 7 replies; 8+ messages in thread
From: cinerea0 @ 2022-01-06  3:30 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 462 bytes --]

There is a new pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages dua
https://github.com/void-linux/void-packages/pull/34896

dua-cli: update to 2.15.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**


A patch file from https://github.com/void-linux/void-packages/pull/34896.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dua-34896.patch --]
[-- Type: text/x-diff, Size: 4013 bytes --]

From fd50ba9cce06fb6444eb04a4692b4f9a9d4fd058 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 5 Jan 2022 22:29:47 -0500
Subject: [PATCH] dua-cli: update to 2.15.0

---
 ...-on-platforms-without-64-bit-atomics.patch | 31 +++++++++++++++++
 srcpkgs/dua-cli/patches/atomicu64.patch       | 34 -------------------
 srcpkgs/dua-cli/template                      |  5 +--
 3 files changed, 34 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..afc83f8ca1d5
--- /dev/null
+++ b/srcpkgs/dua-cli/patches/0001-PATCH-fix-on-platforms-without-64-bit-atomics.patch
@@ -0,0 +1,31 @@
+From e49a4bfc495e347834f7b3e8fc3a1501a0b313d7 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+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 {
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 <daniel@octaforge.org>
-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..e46278740082 100644
--- a/srcpkgs/dua-cli/template
+++ b/srcpkgs/dua-cli/template
@@ -1,14 +1,15 @@
 # Template file for 'dua-cli'
 pkgname=dua-cli
-version=2.14.2
+version=2.15.0
 revision=1
 build_style=cargo
 short_desc="Tool to conveniently learn about the disk usage of directories"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"
 homepage="https://github.com/Byron/dua-cli"
+changelog="https://raw.githubusercontent.com/Byron/dua-cli/main/CHANGELOG.md"
 distfiles="https://github.com/Byron/dua-cli/archive/v${version}.tar.gz"
-checksum=05e7c67d986369a8fc53237522c6f696357fb9f0fe5c823da601653fb5c5a1fa
+checksum=f90ff47d6fd92528cea14c82f5744861675b3bb69f322542a4442ddea4dc42ad
 
 post_install() {
 	vlicense LICENSE

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PR REVIEW] dua-cli: update to 2.15.0
  2022-01-06  3:30 [PR PATCH] dua-cli: update to 2.15.0 cinerea0
@ 2022-01-09  0:07 ` ericonr
  2022-01-09  3:34 ` [PR PATCH] [Updated] " cinerea0
                   ` (5 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: ericonr @ 2022-01-09  0:07 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 297 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/34896#discussion_r780719329

Comment:
Could you rename the file and remove the header differences to minimize the patch?

If you think they could take this upstream too, that'd be great!

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PR PATCH] [Updated] dua-cli: update to 2.15.0
  2022-01-06  3:30 [PR PATCH] dua-cli: update to 2.15.0 cinerea0
  2022-01-09  0:07 ` [PR REVIEW] " ericonr
@ 2022-01-09  3:34 ` cinerea0
  2022-01-09  3:54 ` cinerea0
                   ` (4 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: cinerea0 @ 2022-01-09  3:34 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 489 bytes --]

There is an updated pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages dua
https://github.com/void-linux/void-packages/pull/34896

dua-cli: update to 2.15.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

---

Closes #33954

A patch file from https://github.com/void-linux/void-packages/pull/34896.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dua-34896.patch --]
[-- Type: text/x-diff, Size: 2845 bytes --]

From 1705ef7df3621d78ddee57f10d4b2e49eefd2695 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 8 Jan 2022 22:33:58 -0500
Subject: [PATCH] dua-cli: update to 2.15.0

---
 srcpkgs/dua-cli/patches/atomicu64.patch | 32 +++++++++----------------
 srcpkgs/dua-cli/template                |  5 ++--
 2 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/srcpkgs/dua-cli/patches/atomicu64.patch b/srcpkgs/dua-cli/patches/atomicu64.patch
index 801601a2fceb..1cd5e761deba 100644
--- a/srcpkgs/dua-cli/patches/atomicu64.patch
+++ b/srcpkgs/dua-cli/patches/atomicu64.patch
@@ -1,34 +1,24 @@
-From 5857da8941bdfde02d10c9380086525f2199bbcb Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Wed, 9 Jun 2021 02:28:55 +0200
-Subject: [PATCH] fix on platforms without 64-bit atomics
+# 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
+diff --git a/src/aggregate.rs b/src/aggregate.rs
+index 1255515..9d0f266 100644
 --- a/src/aggregate.rs
 +++ b/src/aggregate.rs
-@@ -8,7 +8,7 @@ use std::{
-     io,
-     path::Path,
+@@ -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,
-@@ -35,7 +35,7 @@ pub fn aggregate(
-     let mut aggregates = Vec::new();
+@@ -37,7 +37,7 @@ pub fn aggregate(
      let mut inodes = InodeFilter::default();
-     let paths: Vec<_> = paths.into_iter().collect();
+ 
+     #[cfg(feature = "aggregate-scan-progress")]
 -    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
-
+     #[cfg(feature = "aggregate-scan-progress")]
+     if let Some(mut out) = err {
diff --git a/srcpkgs/dua-cli/template b/srcpkgs/dua-cli/template
index 2f763846b3ec..e46278740082 100644
--- a/srcpkgs/dua-cli/template
+++ b/srcpkgs/dua-cli/template
@@ -1,14 +1,15 @@
 # Template file for 'dua-cli'
 pkgname=dua-cli
-version=2.14.2
+version=2.15.0
 revision=1
 build_style=cargo
 short_desc="Tool to conveniently learn about the disk usage of directories"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"
 homepage="https://github.com/Byron/dua-cli"
+changelog="https://raw.githubusercontent.com/Byron/dua-cli/main/CHANGELOG.md"
 distfiles="https://github.com/Byron/dua-cli/archive/v${version}.tar.gz"
-checksum=05e7c67d986369a8fc53237522c6f696357fb9f0fe5c823da601653fb5c5a1fa
+checksum=f90ff47d6fd92528cea14c82f5744861675b3bb69f322542a4442ddea4dc42ad
 
 post_install() {
 	vlicense LICENSE

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: dua-cli: update to 2.15.0
  2022-01-06  3:30 [PR PATCH] dua-cli: update to 2.15.0 cinerea0
  2022-01-09  0:07 ` [PR REVIEW] " ericonr
  2022-01-09  3:34 ` [PR PATCH] [Updated] " cinerea0
@ 2022-01-09  3:54 ` cinerea0
  2022-01-09  6:41 ` [PR PATCH] [Updated] " cinerea0
                   ` (3 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: cinerea0 @ 2022-01-09  3:54 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 233 bytes --]

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/34896#issuecomment-1008224311

Comment:
PR to potentially get the patch merged upstream: https://github.com/Byron/dua-cli/pull/117

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PR PATCH] [Updated] dua-cli: update to 2.15.0
  2022-01-06  3:30 [PR PATCH] dua-cli: update to 2.15.0 cinerea0
                   ` (2 preceding siblings ...)
  2022-01-09  3:54 ` cinerea0
@ 2022-01-09  6:41 ` cinerea0
  2022-01-09  6:51 ` cinerea0
                   ` (2 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: cinerea0 @ 2022-01-09  6:41 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 489 bytes --]

There is an updated pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages dua
https://github.com/void-linux/void-packages/pull/34896

dua-cli: update to 2.15.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

---

Closes #33954

A patch file from https://github.com/void-linux/void-packages/pull/34896.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dua-34896.patch --]
[-- Type: text/x-diff, Size: 2474 bytes --]

From cceb144e73f587858d02011397bcc6dea04a5243 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sun, 9 Jan 2022 01:41:16 -0500
Subject: [PATCH] dua-cli: update to 2.16.0

---
 srcpkgs/dua-cli/patches/atomicu64.patch | 34 -------------------------
 srcpkgs/dua-cli/template                |  5 ++--
 2 files changed, 3 insertions(+), 36 deletions(-)
 delete mode 100644 srcpkgs/dua-cli/patches/atomicu64.patch

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 <daniel@octaforge.org>
-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..21ed84885706 100644
--- a/srcpkgs/dua-cli/template
+++ b/srcpkgs/dua-cli/template
@@ -1,14 +1,15 @@
 # Template file for 'dua-cli'
 pkgname=dua-cli
-version=2.14.2
+version=2.16.0
 revision=1
 build_style=cargo
 short_desc="Tool to conveniently learn about the disk usage of directories"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"
 homepage="https://github.com/Byron/dua-cli"
+changelog="https://raw.githubusercontent.com/Byron/dua-cli/main/CHANGELOG.md"
 distfiles="https://github.com/Byron/dua-cli/archive/v${version}.tar.gz"
-checksum=05e7c67d986369a8fc53237522c6f696357fb9f0fe5c823da601653fb5c5a1fa
+checksum=02de8d80347405a876867901bd16539b7d7ceac3095cabcbf9abae3d7da1f357
 
 post_install() {
 	vlicense LICENSE

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: dua-cli: update to 2.15.0
  2022-01-06  3:30 [PR PATCH] dua-cli: update to 2.15.0 cinerea0
                   ` (3 preceding siblings ...)
  2022-01-09  6:41 ` [PR PATCH] [Updated] " cinerea0
@ 2022-01-09  6:51 ` cinerea0
  2022-01-11 19:03 ` dua-cli: update to 2.16.0 ericonr
  2022-01-11 19:03 ` [PR PATCH] [Merged]: " ericonr
  6 siblings, 0 replies; 8+ messages in thread
From: cinerea0 @ 2022-01-09  6:51 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 252 bytes --]

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/34896#issuecomment-1008241155

Comment:
My upstream PR has been merged and a new version has been released; this PR has been updated to reflect that.

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: dua-cli: update to 2.16.0
  2022-01-06  3:30 [PR PATCH] dua-cli: update to 2.15.0 cinerea0
                   ` (4 preceding siblings ...)
  2022-01-09  6:51 ` cinerea0
@ 2022-01-11 19:03 ` ericonr
  2022-01-11 19:03 ` [PR PATCH] [Merged]: " ericonr
  6 siblings, 0 replies; 8+ messages in thread
From: ericonr @ 2022-01-11 19:03 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 147 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/34896#issuecomment-1010271900

Comment:
Nice!

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PR PATCH] [Merged]: dua-cli: update to 2.16.0
  2022-01-06  3:30 [PR PATCH] dua-cli: update to 2.15.0 cinerea0
                   ` (5 preceding siblings ...)
  2022-01-11 19:03 ` dua-cli: update to 2.16.0 ericonr
@ 2022-01-11 19:03 ` ericonr
  6 siblings, 0 replies; 8+ messages in thread
From: ericonr @ 2022-01-11 19:03 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 335 bytes --]

There's a merged pull request on the void-packages repository

dua-cli: update to 2.16.0
https://github.com/void-linux/void-packages/pull/34896

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

---

Closes #33954

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2022-01-11 19:03 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-06  3:30 [PR PATCH] dua-cli: update to 2.15.0 cinerea0
2022-01-09  0:07 ` [PR REVIEW] " ericonr
2022-01-09  3:34 ` [PR PATCH] [Updated] " cinerea0
2022-01-09  3:54 ` cinerea0
2022-01-09  6:41 ` [PR PATCH] [Updated] " cinerea0
2022-01-09  6:51 ` cinerea0
2022-01-11 19:03 ` dua-cli: update to 2.16.0 ericonr
2022-01-11 19:03 ` [PR PATCH] [Merged]: " ericonr

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).