pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/sysutils/yazi
Module Name: pkgsrc
Committed By: he
Date: Tue Jul 22 14:36:16 UTC 2025
Modified Files:
pkgsrc/sysutils/yazi: Makefile cargo-depends.mk distinfo
Added Files:
pkgsrc/sysutils/yazi/patches:
patch-.._vendor_async-priority-channel-0.2.0_Cargo.toml
patch-.._vendor_async-priority-channel-0.2.0_src_awaitable__atomics.rs
patch-Cargo.lock patch-yazi-dds_Cargo.toml
patch-yazi-dds_src_state.rs patch-yazi-shared_Cargo.toml
patch-yazi-shared_src_id.rs patch-yazi-shared_src_throttle.rs
Log Message:
sysutils/yazi: make this build on NetBSD/macppc.
Predominant is the use of portable_atomic instead of the std
crate.
Bump PKGREVISION.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/sysutils/yazi/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/sysutils/yazi/cargo-depends.mk
cvs rdiff -u -r1.25 -r1.26 pkgsrc/sysutils/yazi/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/sysutils/yazi/patches/patch-.._vendor_async-priority-channel-0.2.0_Cargo.toml \
pkgsrc/sysutils/yazi/patches/patch-.._vendor_async-priority-channel-0.2.0_src_awaitable__atomics.rs \
pkgsrc/sysutils/yazi/patches/patch-yazi-dds_Cargo.toml \
pkgsrc/sysutils/yazi/patches/patch-yazi-dds_src_state.rs \
pkgsrc/sysutils/yazi/patches/patch-yazi-shared_Cargo.toml \
pkgsrc/sysutils/yazi/patches/patch-yazi-shared_src_id.rs \
pkgsrc/sysutils/yazi/patches/patch-yazi-shared_src_throttle.rs
cvs rdiff -u -r0 -r1.5 pkgsrc/sysutils/yazi/patches/patch-Cargo.lock
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/sysutils/yazi/Makefile
diff -u pkgsrc/sysutils/yazi/Makefile:1.28 pkgsrc/sysutils/yazi/Makefile:1.29
--- pkgsrc/sysutils/yazi/Makefile:1.28 Mon Jul 21 22:00:55 2025
+++ pkgsrc/sysutils/yazi/Makefile Tue Jul 22 14:36:15 2025
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.28 2025/07/21 22:00:55 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2025/07/22 14:36:15 he Exp $
DISTNAME= yazi-25.5.31
PKGREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_GITHUB:=sxyazi/}
GITHUB_TAG= v${PKGVERSION_NOREV}
+PKGREVISION= 1
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://github.com/sxyazi/yazi/
Index: pkgsrc/sysutils/yazi/cargo-depends.mk
diff -u pkgsrc/sysutils/yazi/cargo-depends.mk:1.22 pkgsrc/sysutils/yazi/cargo-depends.mk:1.23
--- pkgsrc/sysutils/yazi/cargo-depends.mk:1.22 Tue Jul 1 19:14:19 2025
+++ pkgsrc/sysutils/yazi/cargo-depends.mk Tue Jul 22 14:36:15 2025
@@ -1,4 +1,4 @@
-# $NetBSD: cargo-depends.mk,v 1.22 2025/07/01 19:14:19 wiz Exp $
+# $NetBSD: cargo-depends.mk,v 1.23 2025/07/22 14:36:15 he Exp $
CARGO_CRATE_DEPENDS+= addr2line-0.24.2
CARGO_CRATE_DEPENDS+= adler2-2.0.0
@@ -202,6 +202,7 @@ CARGO_CRATE_DEPENDS+= pin-utils-0.1.0
CARGO_CRATE_DEPENDS+= pkg-config-0.3.32
CARGO_CRATE_DEPENDS+= plist-1.7.1
CARGO_CRATE_DEPENDS+= png-0.17.16
+CARGO_CRATE_DEPENDS+= portable-atomic-1.11.1
CARGO_CRATE_DEPENDS+= powerfmt-0.2.0
CARGO_CRATE_DEPENDS+= ppv-lite86-0.2.21
CARGO_CRATE_DEPENDS+= proc-macro-error-attr2-2.0.0
Index: pkgsrc/sysutils/yazi/distinfo
diff -u pkgsrc/sysutils/yazi/distinfo:1.25 pkgsrc/sysutils/yazi/distinfo:1.26
--- pkgsrc/sysutils/yazi/distinfo:1.25 Mon Jul 21 22:00:55 2025
+++ pkgsrc/sysutils/yazi/distinfo Tue Jul 22 14:36:15 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2025/07/21 22:00:55 wiz Exp $
+$NetBSD: distinfo,v 1.26 2025/07/22 14:36:15 he Exp $
BLAKE2s (addr2line-0.24.2.crate) = 5bdb03ff8621c0993eda0ec3682c467ad3fc0015f48e46a70779bbd4bfbe8267
SHA512 (addr2line-0.24.2.crate) = 39cbec3c920ffc0f37584afb55e1cfe4f182e4415319a4e9bfe842360f102f7b9315f6171c0cf71ba0337123903e604096cd573fe98698a26c8eebc2376d965b
@@ -606,6 +606,9 @@ Size (plist-1.7.1.crate) = 102902 bytes
BLAKE2s (png-0.17.16.crate) = b7004f600e3b71a4f2896eaca9ddcaf770c675e794202b8917b8ddb58d0e3800
SHA512 (png-0.17.16.crate) = fd9130d8d91fe40724f4065748bf1a6175de0b7e8df521939f169000933dadd0815bed0f95c00d12bf5ad341469983ea97be427392a85b82c232473ea753b6ba
Size (png-0.17.16.crate) = 117975 bytes
+BLAKE2s (portable-atomic-1.11.1.crate) = 3758e723fa680cf28dc6cc870b7f521f37f8a3abf788e07b7178f9c875a53d29
+SHA512 (portable-atomic-1.11.1.crate) = 4c037ae0b4aef43077bdbf803389bc078d963f20d023e2e1d339a54f67fa9b27c174e7c1b6eca8881ecf301e30c431632d2c0dcedfb5b19552892fac0f81e2e1
+Size (portable-atomic-1.11.1.crate) = 185506 bytes
BLAKE2s (powerfmt-0.2.0.crate) = bdb2e56103b2ec9bd76d865753db13d6e94acfe71e1196ee3b4e7e51efeb7cd6
SHA512 (powerfmt-0.2.0.crate) = 0623f92e4d6ab284b3f6dae58220d79d9185df4a738999d68040c50d72fe0380d70358cb622f079c629bab53bb03c6e085e165d5bddfbeea84245864fed90029
Size (powerfmt-0.2.0.crate) = 15165 bytes
@@ -1080,4 +1083,12 @@ Size (zune-inflate-0.2.54.crate) = 37973
BLAKE2s (zune-jpeg-0.4.14.crate) = 30b1e0c577996dc406e9b3740208a6ca5481c3eaefb0dab371b4b4331a4a0a9f
SHA512 (zune-jpeg-0.4.14.crate) = 1f62cd2c3f5bc1773a7654aadf45b02aec0384c0abad4c77210e9bc2c05533f47e63a6d44fa1596dc9103d7569079be7266905421f91091f77536c1407f3a0e5
Size (zune-jpeg-0.4.14.crate) = 63388 bytes
+SHA1 (patch-.._vendor_async-priority-channel-0.2.0_Cargo.toml) = af01f6ee00de93298e7b960a7e8fdab892583327
+SHA1 (patch-.._vendor_async-priority-channel-0.2.0_src_awaitable__atomics.rs) = 7ffcc8fabf7ead8aa6e26d8093ea8bc77a0a49b1
+SHA1 (patch-Cargo.lock) = 549853d270295065bac4d52151463d42bc60a2af
SHA1 (patch-yazi-core_src_mgr_watcher.rs) = f505d398d6672ab16fa50dd3083f9444a56c687c
+SHA1 (patch-yazi-dds_Cargo.toml) = 46d41b0529b8ef54c794ee905fb1f16ae61a4429
+SHA1 (patch-yazi-dds_src_state.rs) = af4d8cedfab8f2641eb140823fc2838405de5b36
+SHA1 (patch-yazi-shared_Cargo.toml) = 087d2f9a240bd3ffb263a878906cac27bf171894
+SHA1 (patch-yazi-shared_src_id.rs) = 33ed3dcf4262cdfbb3e35ea25cbd4c7caa95284e
+SHA1 (patch-yazi-shared_src_throttle.rs) = 2fd856c98b89a847fc12b42535edb016b3ed123c
Added files:
Index: pkgsrc/sysutils/yazi/patches/patch-.._vendor_async-priority-channel-0.2.0_Cargo.toml
diff -u /dev/null pkgsrc/sysutils/yazi/patches/patch-.._vendor_async-priority-channel-0.2.0_Cargo.toml:1.1
--- /dev/null Tue Jul 22 14:36:16 2025
+++ pkgsrc/sysutils/yazi/patches/patch-.._vendor_async-priority-channel-0.2.0_Cargo.toml Tue Jul 22 14:36:15 2025
@@ -0,0 +1,70 @@
+$NetBSD: patch-.._vendor_async-priority-channel-0.2.0_Cargo.toml,v 1.1 2025/07/22 14:36:15 he Exp $
+
+Regen'ed and with portable-atomic.
+
+--- ../vendor/async-priority-channel-0.2.0/Cargo.toml.orig 2006-07-24 01:21:28.000000000 +0000
++++ ../vendor/async-priority-channel-0.2.0/Cargo.toml
+@@ -1,21 +1,52 @@
++# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
++#
++# When uploading crates to the registry Cargo will automatically
++# "normalize" Cargo.toml files for maximal compatibility
++# with all versions of Cargo and also rewrite `path` dependencies
++# to registry (e.g., crates.io) dependencies.
++#
++# If you are reading this file be aware that the original Cargo.toml
++# will likely look very different (and much more reasonable).
++# See Cargo.toml.orig for the original contents.
++
+ [package]
++edition = "2018"
+ name = "async-priority-channel"
+-description = "An async channel where pending messages are delivered in order of priority"
+ version = "0.2.0"
+ authors = ["Robert T. McGibbon <rmcgibbo%gmail.com@localhost>"]
+-edition = "2018"
+-license = "Apache-2.0 OR MIT"
+-repository = "https://github.com/rmcgibbo/async-priority-channel";
++description = "An async channel where pending messages are delivered in order of priority"
+ homepage = "https://github.com/rmcgibbo/async-priority-channel";
+ documentation = "https://docs.rs/async-priority-channel";
+-keywords = ["mpmc", "mpsc", "spmc", "chan", "futures"]
+-categories = ["asynchronous", "concurrency"]
+-resolver = "2"
+ readme = "README.md"
++keywords = [
++ "mpmc",
++ "mpsc",
++ "spmc",
++ "chan",
++ "futures",
++]
++categories = [
++ "asynchronous",
++ "concurrency",
++]
++license = "Apache-2.0 OR MIT"
++repository = "https://github.com/rmcgibbo/async-priority-channel";
++resolver = "2"
+
+ [dependencies]
+-event-listener = "4.0.0"
++portable-atomic = "1"
++
++[dependencies.event-listener]
++version = "4.0.0"
++
++[dev-dependencies.futures-lite]
++version = "2.1.0"
+
+-[dev-dependencies]
+-futures-lite = "2.1.0"
+-tokio = { version = "1.35.0", features = ["sync", "rt-multi-thread", "macros", "time"] }
++[dev-dependencies.tokio]
++version = "1.35.0"
++features = [
++ "sync",
++ "rt-multi-thread",
++ "macros",
++ "time",
++]
Index: pkgsrc/sysutils/yazi/patches/patch-.._vendor_async-priority-channel-0.2.0_src_awaitable__atomics.rs
diff -u /dev/null pkgsrc/sysutils/yazi/patches/patch-.._vendor_async-priority-channel-0.2.0_src_awaitable__atomics.rs:1.1
--- /dev/null Tue Jul 22 14:36:16 2025
+++ pkgsrc/sysutils/yazi/patches/patch-.._vendor_async-priority-channel-0.2.0_src_awaitable__atomics.rs Tue Jul 22 14:36:15 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-.._vendor_async-priority-channel-0.2.0_src_awaitable__atomics.rs,v 1.1 2025/07/22 14:36:15 he Exp $
+
+--- ../vendor/async-priority-channel-0.2.0/src/awaitable_atomics.rs.orig 2025-07-22 13:53:56.573453513 +0000
++++ ../vendor/async-priority-channel-0.2.0/src/awaitable_atomics.rs
+@@ -1,8 +1,8 @@
+ use event_listener::{Event, EventListener};
+ use std::{
+ pin::Pin,
+- sync::atomic::{AtomicU64, Ordering},
+ };
++use portable_atomic::{AtomicU64, Ordering};
+
+ const U64_TOP_BIT_MASK: u64 = 0x1000000000000000;
+
Index: pkgsrc/sysutils/yazi/patches/patch-yazi-dds_Cargo.toml
diff -u /dev/null pkgsrc/sysutils/yazi/patches/patch-yazi-dds_Cargo.toml:1.1
--- /dev/null Tue Jul 22 14:36:16 2025
+++ pkgsrc/sysutils/yazi/patches/patch-yazi-dds_Cargo.toml Tue Jul 22 14:36:15 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-yazi-dds_Cargo.toml,v 1.1 2025/07/22 14:36:15 he Exp $
+
+Use portable-atomic.
+
+--- yazi-dds/Cargo.toml.orig 2025-07-22 13:32:21.086791774 +0000
++++ yazi-dds/Cargo.toml
+@@ -13,6 +13,7 @@ default = [ "vendored-lua" ]
+ vendored-lua = [ "mlua/vendored" ]
+
+ [dependencies]
++portable-atomic = "1"
+ yazi-binding = { path = "../yazi-binding", version = "25.4.8" }
+ yazi-boot = { path = "../yazi-boot", version = "25.4.8" }
+ yazi-fs = { path = "../yazi-fs", version = "25.4.8" }
Index: pkgsrc/sysutils/yazi/patches/patch-yazi-dds_src_state.rs
diff -u /dev/null pkgsrc/sysutils/yazi/patches/patch-yazi-dds_src_state.rs:1.1
--- /dev/null Tue Jul 22 14:36:16 2025
+++ pkgsrc/sysutils/yazi/patches/patch-yazi-dds_src_state.rs Tue Jul 22 14:36:15 2025
@@ -0,0 +1,13 @@
+$NetBSD: patch-yazi-dds_src_state.rs,v 1.1 2025/07/22 14:36:15 he Exp $
+
+Use portable_atomic.
+
+--- yazi-dds/src/state.rs.orig 2025-07-22 13:30:48.088532978 +0000
++++ yazi-dds/src/state.rs
+@@ -1,4 +1,5 @@
+-use std::{collections::HashMap, mem, ops::Deref, sync::atomic::{AtomicU64, Ordering}, time::UNIX_EPOCH};
++use std::{collections::HashMap, mem, ops::Deref, time::UNIX_EPOCH};
++use portable_atomic::{AtomicU64, Ordering};
+
+ use anyhow::Result;
+ use parking_lot::RwLock;
Index: pkgsrc/sysutils/yazi/patches/patch-yazi-shared_Cargo.toml
diff -u /dev/null pkgsrc/sysutils/yazi/patches/patch-yazi-shared_Cargo.toml:1.1
--- /dev/null Tue Jul 22 14:36:16 2025
+++ pkgsrc/sysutils/yazi/patches/patch-yazi-shared_Cargo.toml Tue Jul 22 14:36:15 2025
@@ -0,0 +1,12 @@
+$NetBSD: patch-yazi-shared_Cargo.toml,v 1.1 2025/07/22 14:36:15 he Exp $
+
+--- yazi-shared/Cargo.toml.orig 2025-07-22 12:13:51.218622996 +0000
++++ yazi-shared/Cargo.toml
+@@ -19,6 +19,7 @@ futures = { workspace = true }
+ memchr = "2.7.4"
+ parking_lot = { workspace = true }
+ percent-encoding = "2.3.1"
++portable-atomic = "1"
+ ratatui = { workspace = true }
+ serde = { workspace = true }
+ tokio = { workspace = true }
Index: pkgsrc/sysutils/yazi/patches/patch-yazi-shared_src_id.rs
diff -u /dev/null pkgsrc/sysutils/yazi/patches/patch-yazi-shared_src_id.rs:1.1
--- /dev/null Tue Jul 22 14:36:16 2025
+++ pkgsrc/sysutils/yazi/patches/patch-yazi-shared_src_id.rs Tue Jul 22 14:36:15 2025
@@ -0,0 +1,13 @@
+$NetBSD: patch-yazi-shared_src_id.rs,v 1.1 2025/07/22 14:36:15 he Exp $
+
+Use portable_atomic.
+
+--- yazi-shared/src/id.rs.orig 2025-07-22 12:15:08.593611533 +0000
++++ yazi-shared/src/id.rs
+@@ -1,4 +1,5 @@
+-use std::{fmt::Display, str::FromStr, sync::atomic::{AtomicU64, Ordering}};
++use std::{fmt::Display, str::FromStr};
++use portable_atomic::{AtomicU64, Ordering};
+
+ use serde::{Deserialize, Serialize};
+
Index: pkgsrc/sysutils/yazi/patches/patch-yazi-shared_src_throttle.rs
diff -u /dev/null pkgsrc/sysutils/yazi/patches/patch-yazi-shared_src_throttle.rs:1.1
--- /dev/null Tue Jul 22 14:36:16 2025
+++ pkgsrc/sysutils/yazi/patches/patch-yazi-shared_src_throttle.rs Tue Jul 22 14:36:15 2025
@@ -0,0 +1,13 @@
+$NetBSD: patch-yazi-shared_src_throttle.rs,v 1.1 2025/07/22 14:36:15 he Exp $
+
+Use portable_atomic.
+
+--- yazi-shared/src/throttle.rs.orig 2025-07-22 12:15:26.994337498 +0000
++++ yazi-shared/src/throttle.rs
+@@ -1,4 +1,5 @@
+-use std::{fmt::Debug, mem, sync::atomic::{AtomicU64, AtomicUsize, Ordering}, time::Duration};
++use std::{fmt::Debug, mem, time::Duration};
++use portable_atomic::{AtomicU64, AtomicUsize, Ordering};
+
+ use parking_lot::Mutex;
+
Index: pkgsrc/sysutils/yazi/patches/patch-Cargo.lock
diff -u /dev/null pkgsrc/sysutils/yazi/patches/patch-Cargo.lock:1.5
--- /dev/null Tue Jul 22 14:36:16 2025
+++ pkgsrc/sysutils/yazi/patches/patch-Cargo.lock Tue Jul 22 14:36:15 2025
@@ -0,0 +1,24 @@
+$NetBSD: patch-Cargo.lock,v 1.5 2025/07/22 14:36:15 he Exp $
+
+--- Cargo.lock.orig 2025-07-22 12:09:27.880810970 +0000
++++ Cargo.lock
+@@ -1749,6 +1749,11 @@ dependencies = [
+ ]
+
+ [[package]]
++name = "portable-atomic"
++version = "1.11.1"
++source = "git+https://github.com/taiki-e/portable-atomic.git#7a0b15b867790ad384ae0e8edaddc7d8b4e75800";
++
++[[package]]
+ name = "powerfmt"
+ version = "0.2.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index";
+@@ -3197,6 +3202,7 @@ dependencies = [
+ "clap_complete_fig",
+ "clap_complete_nushell",
+ "crossterm",
++ "portable-atomic",
+ "serde",
+ "serde_json",
+ "tokio",
Home |
Main Index |
Thread Index |
Old Index