pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/shells/fish4
Module Name: pkgsrc
Committed By: vins
Date: Wed Nov 12 18:44:11 UTC 2025
Modified Files:
pkgsrc/shells/fish4: Makefile distinfo
pkgsrc/shells/fish4/patches: patch-Cargo.toml
patch-src_fork__exec_spawn.rs patch-src_wutil_dir__iter.rs
Removed Files:
pkgsrc/shells/fish4/patches: patch-src_wildcard.rs
Log Message:
shells/fish4: minor fixes
* Use cfg_if to avoid calling illumos twice
* Remove s/reg/regr patch: needed to pass tests on earlier release.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/shells/fish4/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/shells/fish4/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/shells/fish4/patches/patch-Cargo.toml \
pkgsrc/shells/fish4/patches/patch-src_fork__exec_spawn.rs \
pkgsrc/shells/fish4/patches/patch-src_wutil_dir__iter.rs
cvs rdiff -u -r1.1 -r0 pkgsrc/shells/fish4/patches/patch-src_wildcard.rs
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/shells/fish4/Makefile
diff -u pkgsrc/shells/fish4/Makefile:1.4 pkgsrc/shells/fish4/Makefile:1.5
--- pkgsrc/shells/fish4/Makefile:1.4 Sun Nov 2 20:16:17 2025
+++ pkgsrc/shells/fish4/Makefile Wed Nov 12 18:44:10 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2025/11/02 20:16:17 vins Exp $
+# $NetBSD: Makefile,v 1.5 2025/11/12 18:44:10 vins Exp $
DISTNAME= fish-4.1.2
+PKGREVISION= 1
CATEGORIES= shells
MASTER_SITES= ${MASTER_SITE_GITHUB:=fish-shell/}
GITHUB_PROJECT= fish-shell
Index: pkgsrc/shells/fish4/distinfo
diff -u pkgsrc/shells/fish4/distinfo:1.1 pkgsrc/shells/fish4/distinfo:1.2
--- pkgsrc/shells/fish4/distinfo:1.1 Sun Nov 2 18:44:06 2025
+++ pkgsrc/shells/fish4/distinfo Wed Nov 12 18:44:10 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2025/11/02 18:44:06 vins Exp $
+$NetBSD: distinfo,v 1.2 2025/11/12 18:44:10 vins Exp $
BLAKE2s (0.2.9-utf32.tar.gz) = 52de08088cc288e5fd826066d3105a3826b524b4acfbd1a2afb45e2b8cdd2c12
SHA512 (0.2.9-utf32.tar.gz) = d00577beee02edf3f35c4371e9a7fb35a2ed9225cd5bc4e539b6a2cd1f31f2a3c55a91832f3310afdeb004e4c59f24aa06c72c2e31ce1827d349b058a7a91a3c
@@ -255,12 +255,11 @@ Size (windows_x86_64_gnullvm-0.52.6.crat
BLAKE2s (windows_x86_64_msvc-0.52.6.crate) = 5b8f356fbbd3d304c939f19f79a10b72a39c1b27decca9b0449a4af3761e9a79
SHA512 (windows_x86_64_msvc-0.52.6.crate) = 21944cd8e3a481b514509e73ae3f62722fe7ed380d37ea0c25f8fbdeba79174dd52ff65d898838da5df4197894b74e00f45d47489418e978753b4e55c7e623e7
Size (windows_x86_64_msvc-0.52.6.crate) = 832564 bytes
-SHA1 (patch-Cargo.toml) = 7a8c6ffe698da7752edf2ce089bde033ff4f3186
+SHA1 (patch-Cargo.toml) = a53a16eba81463c66df4c65f6d6ecb33dd9d0c63
SHA1 (patch-build.rs) = d199d39a536871b385250c478452882bace14911
SHA1 (patch-cmake_Install.cmake) = 36f3074f7aa5ded118a2fe0182c35bfb013b58f2
SHA1 (patch-crates_gettext-maps_build.rs) = c41f7385b05cdfefad8a5a8c15e2416666eafbce
SHA1 (patch-src_builtins_ulimit.rs) = 27f0d74933bd771688df63321d35a461d2581d1a
-SHA1 (patch-src_fork__exec_spawn.rs) = 887b99d79832d5e040d0e3b5b97ebbb2220cad9b
+SHA1 (patch-src_fork__exec_spawn.rs) = 1f71fe537f00bfb7dd646389ce0f66c3d752cf30
SHA1 (patch-src_path.rs) = 70425c340f68f35c1023be98c85efe339f851cbc
-SHA1 (patch-src_wildcard.rs) = bbc2210dccf35e4ba19aa30023ddaa04406c6d5d
-SHA1 (patch-src_wutil_dir__iter.rs) = 6cba6544fea3a6d100b02026781fef90ceb6f2aa
+SHA1 (patch-src_wutil_dir__iter.rs) = c3e5855e33eb7d72e1260099a3cc7cf7443840b4
Index: pkgsrc/shells/fish4/patches/patch-Cargo.toml
diff -u pkgsrc/shells/fish4/patches/patch-Cargo.toml:1.1 pkgsrc/shells/fish4/patches/patch-Cargo.toml:1.2
--- pkgsrc/shells/fish4/patches/patch-Cargo.toml:1.1 Sun Nov 2 18:44:06 2025
+++ pkgsrc/shells/fish4/patches/patch-Cargo.toml Wed Nov 12 18:44:10 2025
@@ -1,8 +1,8 @@
-$NetBSD: patch-Cargo.toml,v 1.1 2025/11/02 18:44:06 vins Exp $
+$NetBSD: patch-Cargo.toml,v 1.2 2025/11/12 18:44:10 vins Exp $
Do not attempt to fetch sources at build time.
---- Cargo.toml.orig 2025-11-01 22:50:07.188748922 +0000
+--- Cargo.toml.orig 2025-10-07 20:56:06.000000000 +0000
+++ Cargo.toml
@@ -31,7 +31,7 @@ nix = { version = "0.30.1", default-feat
] }
@@ -13,3 +13,11 @@ Do not attempt to fetch sources at build
"utf32",
] }
phf = { version = "0.12", default-features = false }
+@@ -76,6 +76,7 @@ readme = "README.rst"
+
+ [dependencies]
+ bitflags.workspace = true
++cfg-if = "1.0.0"
+ errno.workspace = true
+ fish-build-helper.workspace = true
+ fish-build-man-pages = { workspace = true, optional = true }
Index: pkgsrc/shells/fish4/patches/patch-src_fork__exec_spawn.rs
diff -u pkgsrc/shells/fish4/patches/patch-src_fork__exec_spawn.rs:1.1 pkgsrc/shells/fish4/patches/patch-src_fork__exec_spawn.rs:1.2
--- pkgsrc/shells/fish4/patches/patch-src_fork__exec_spawn.rs:1.1 Sun Nov 2 18:44:07 2025
+++ pkgsrc/shells/fish4/patches/patch-src_fork__exec_spawn.rs Wed Nov 12 18:44:10 2025
@@ -1,16 +1,20 @@
-$NetBSD: patch-src_fork__exec_spawn.rs,v 1.1 2025/11/02 18:44:07 vins Exp $
+$NetBSD: patch-src_fork__exec_spawn.rs,v 1.2 2025/11/12 18:44:10 vins Exp $
Prevent mismatched types for POSIX_SPAWN_SETSIGDEF on SunOS.
--- src/fork_exec/spawn.rs.orig 2025-10-07 20:56:06.000000000 +0000
+++ src/fork_exec/spawn.rs
-@@ -117,6 +117,9 @@ impl PosixSpawner {
+@@ -117,7 +117,12 @@ impl PosixSpawner {
};
// Set our flags.
-+ #[cfg(target_os = "illumos")]
-+ let mut flags: i16 = 0;
-+ #[cfg(not(target_os = "illumos"))]
- let mut flags: i32 = 0;
+- let mut flags: i32 = 0;
++ cfg_if::cfg_if! {
++ if #[cfg(target_os = "illumos")] {
++ let mut flags: i16 = 0; }
++ else {
++ let mut flags: i32 = 0; }
++ }
flags |= libc::POSIX_SPAWN_SETSIGDEF;
flags |= libc::POSIX_SPAWN_SETSIGMASK;
+ if desired_pgid.is_some() {
Index: pkgsrc/shells/fish4/patches/patch-src_wutil_dir__iter.rs
diff -u pkgsrc/shells/fish4/patches/patch-src_wutil_dir__iter.rs:1.1 pkgsrc/shells/fish4/patches/patch-src_wutil_dir__iter.rs:1.2
--- pkgsrc/shells/fish4/patches/patch-src_wutil_dir__iter.rs:1.1 Sun Nov 2 18:44:07 2025
+++ pkgsrc/shells/fish4/patches/patch-src_wutil_dir__iter.rs Wed Nov 12 18:44:11 2025
@@ -1,37 +1,9 @@
-$NetBSD: patch-src_wutil_dir__iter.rs,v 1.1 2025/11/02 18:44:07 vins Exp $
+$NetBSD: patch-src_wutil_dir__iter.rs,v 1.2 2025/11/12 18:44:11 vins Exp $
* Struct dirent lacks d_type on SunOS.
-* Prevent type clash on illumos.
--- src/wutil/dir_iter.rs.orig 2025-10-07 20:56:06.000000000 +0000
+++ src/wutil/dir_iter.rs
-@@ -21,7 +21,7 @@ pub enum DirEntryType {
- chr, // character device
- dir, // directory
- blk, // block device
-- reg, // regular file
-+ regr, // regular file
- lnk, // symlink
- sock, // socket
- whiteout, // whiteout (from BSD)
-@@ -142,7 +142,7 @@ fn dirent_type_to_entry_type(dt: u8) ->
- DT_CHR => Some(DirEntryType::chr),
- DT_DIR => Some(DirEntryType::dir),
- DT_BLK => Some(DirEntryType::blk),
-- DT_REG => Some(DirEntryType::reg),
-+ DT_REG => Some(DirEntryType::regr),
- DT_LNK => Some(DirEntryType::lnk),
- DT_SOCK => Some(DirEntryType::sock),
- // todo!("whiteout")
-@@ -156,7 +156,7 @@ fn stat_mode_to_entry_type(m: libc::mode
- S_IFCHR => Some(DirEntryType::chr),
- S_IFDIR => Some(DirEntryType::dir),
- S_IFBLK => Some(DirEntryType::blk),
-- S_IFREG => Some(DirEntryType::reg),
-+ S_IFREG => Some(DirEntryType::regr),
- S_IFLNK => Some(DirEntryType::lnk),
- S_IFSOCK => Some(DirEntryType::sock),
- _ => {
@@ -293,6 +293,8 @@ impl DirIter {
{
self.entry.inode = dent.d_ino;
@@ -49,15 +21,3 @@ $NetBSD: patch-src_wutil_dir__iter.rs,v
Some(Ok(&self.entry))
}
-@@ -448,9 +451,9 @@ fn test_dir_iter() {
- let expected = if entry.name == dirname {
- Some(DirEntryType::dir)
- } else if entry.name == regname {
-- Some(DirEntryType::reg)
-+ Some(DirEntryType::regr)
- } else if entry.name == reglinkname {
-- Some(DirEntryType::reg)
-+ Some(DirEntryType::regr)
- } else if entry.name == dirlinkname {
- Some(DirEntryType::dir)
- } else if entry.name == badlinkname {
Home |
Main Index |
Thread Index |
Old Index