pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

bottom: add missed out patch files.



Module Name:	pkgsrc-wip
Committed By:	Santhosh Raju <fox%NetBSD.org@localhost>
Pushed By:	fox
Date:		Wed Jun 24 12:54:25 2026 +0200
Changeset:	6320406cc8d0dc2b56abfd383386ba917061be18

Modified Files:
	bottom/distinfo
	bottom/patches/patch-src_collection_disks.rs
	bottom/patches/patch-src_collection_processes.rs

Log Message:
bottom: add missed out patch files.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6320406cc8d0dc2b56abfd383386ba917061be18

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 bottom/distinfo                                  |  6 +++---
 bottom/patches/patch-src_collection_disks.rs     | 25 ++++++++++++------------
 bottom/patches/patch-src_collection_processes.rs | 14 ++++++-------
 3 files changed, 23 insertions(+), 22 deletions(-)

diffs:
diff --git a/bottom/distinfo b/bottom/distinfo
index 9a84a96899..12703200b4 100644
--- a/bottom/distinfo
+++ b/bottom/distinfo
@@ -690,6 +690,6 @@ Size (wrapcenum-derive-0.4.1.crate) = 7400 bytes
 BLAKE2s (zmij-1.0.19.crate) = e6857f8f672ab60cba6575bda0b64bfd4898ee7c34cb1f799842885965039969
 SHA512 (zmij-1.0.19.crate) = aa191ba286f10d59727981e68f7fb0214d53b02d6c28951e6f16670433cd79abc4615384b3b1e1f74adc81a3f51c15d906fda0340b03938984693332feeac2cc
 Size (zmij-1.0.19.crate) = 23948 bytes
-SHA1 (patch-src_collection_disks.rs) = 3f63a6e8e88eee50951787dc584f4d59fafd5ad9
-SHA1 (patch-src_collection_disks_netbsd.rs) = d6198b71d117356ab98f227c8cdb9c01c51d67c1
-SHA1 (patch-src_collection_processes.rs) = 1ea691c733c3367b9912a89b9e8752771674bd73
+SHA1 (patch-src_collection_disks.rs) = 158b9f252ee8b1a0cc9a90d36cd3d488fe22f2f2
+SHA1 (patch-src_collection_disks_netbsd.rs) = 07bf336ec347df5eb8a344c11c10041cac674f70
+SHA1 (patch-src_collection_processes.rs) = 9c6ac1c1402526252ec3559fa64015ed8ee6d8fd
diff --git a/bottom/patches/patch-src_collection_disks.rs b/bottom/patches/patch-src_collection_disks.rs
index dec8783641..4b62366cc0 100644
--- a/bottom/patches/patch-src_collection_disks.rs
+++ b/bottom/patches/patch-src_collection_disks.rs
@@ -2,24 +2,25 @@ $NetBSD$
 
 Disable catch-all for disks in NetBSD.
 
---- src/collection/disks.rs.orig	2026-04-18 02:12:01.054885511 +0000
+--- src/collection/disks.rs.orig	2026-06-22 06:25:54.000000000 +0000
 +++ src/collection/disks.rs
-@@ -21,6 +21,9 @@ cfg_if! {
-     } else if #[cfg(target_os = "macos")] {
+@@ -25,6 +25,10 @@ cfg_select! {
          mod unix;
          pub(crate) use self::unix::*;
-+    } else if #[cfg(target_os = "netbsd")] {
+     }
++    target_os = "netbsd" => {
 +        mod netbsd;
-+        pub(crate) use self::netbsd::*;
-     } else {
++        pub(crate) use self::unix::*;
++    }    
+     _ => {
          mod other;
          pub(crate) use self::other::*;
-@@ -79,7 +82,7 @@ cfg_if! {
- 
+@@ -87,7 +91,7 @@ cfg_select! {
              Ok(io_hash)
          }
--    } else if #[cfg(not(target_os = "freebsd"))] {
-+    } else if #[cfg(not(any(target_os = "freebsd", target_os = "netbsd")))] {
-         pub fn get_io_usage() -> anyhow::Result<IoHarvest> {
+     }
+-    not(target_os = "freebsd") => {
++    not(all(target_os = "freebsd", target_os = "netbsd")) => {
+         use crate::collection::DataCollector;
+         pub fn get_io_usage(_collector: &DataCollector) -> anyhow::Result<IoHarvest> {
              anyhow::bail!("Unsupported OS");
-         }
diff --git a/bottom/patches/patch-src_collection_processes.rs b/bottom/patches/patch-src_collection_processes.rs
index 999ead039f..5127945db8 100644
--- a/bottom/patches/patch-src_collection_processes.rs
+++ b/bottom/patches/patch-src_collection_processes.rs
@@ -2,14 +2,14 @@ $NetBSD$
 
 Enable process info collection for NetBSD.
 
---- src/collection/processes.rs.orig	2026-04-18 01:11:47.496423789 +0000
+--- src/collection/processes.rs.orig	2026-06-24 10:52:04.504828582 +0000
 +++ src/collection/processes.rs
-@@ -171,7 +171,7 @@ impl DataCollector {
-                     self,
+@@ -181,7 +181,7 @@ impl DataCollector {
                      time_diff,
                  )
--            } else if #[cfg(any(target_os = "freebsd", target_os = "macos", target_os = "windows", target_os = "android", target_os = "ios"))] {
-+            } else if #[cfg(any(target_os = "freebsd", target_os = "netbsd", target_os = "macos", target_os = "windows", target_os = "android", target_os = "ios"))] {
+             }
+-            any(target_os = "freebsd", target_os = "macos", target_os = "windows", target_os = "android", target_os = "ios") => {
++            any(target_os = "freebsd", target_os = "macos", target_os = "netbsd", target_os = "windows", target_os = "android", target_os = "ios") => {
                  sysinfo_process_data(self)
-             } else {
-                 Err(crate::collection::error::CollectionError::Unsupported)
+             }
+             _ => {


Home | Main Index | Thread Index | Old Index