[packages/fish] add x32 patch
atler
atler at pld-linux.org
Fri Oct 24 21:57:37 CEST 2025
commit 9dcf07b21913e8a3008218b1e7bf4dd6b6142d1b
Author: Jan Palus <atler at pld-linux.org>
Date: Fri Oct 24 21:56:45 2025 +0200
add x32 patch
fish.spec | 2 ++
x32.patch | 17 +++++++++++++++++
2 files changed, 19 insertions(+)
---
diff --git a/fish.spec b/fish.spec
index 67f5b43..72c31eb 100644
--- a/fish.spec
+++ b/fish.spec
@@ -9,6 +9,7 @@ Source0: https://github.com/fish-shell/fish-shell/releases/download/%{version}/%
# Source0-md5: 33abf3cfaa592a43b4823b8ff46d5246
Source1: vendor.tar.zst
# Source1-md5: 4524ed43b1e3c069077cb21f9da627b8
+Patch0: x32.patch
URL: http://fishshell.com/
BuildRequires: cargo
BuildRequires: cmake >= 3.15
@@ -55,6 +56,7 @@ Pliki programistyczne dla fish.
%prep
%setup -q -a1
+%patch -P0 -p1
%{__sed} -i -e '1s,/usr/bin/env python3$,%{__python3},' share/tools/create_manpage_completions.py
diff --git a/x32.patch b/x32.patch
new file mode 100644
index 0000000..46f127d
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,17 @@
+--- fish-4.0.6/src/env_universal_common.rs.orig 2025-09-12 11:47:41.000000000 +0200
++++ fish-4.0.6/src/env_universal_common.rs 2025-10-24 21:42:50.152263763 +0200
+@@ -800,7 +800,14 @@
+ #[cfg(any(target_os = "linux", target_os = "android"))]
+ {
+ let mut times: [libc::timespec; 2] = unsafe { std::mem::zeroed() };
++ #[cfg(not(all(target_arch = "x86_64", target_pointer_width = "32")))]
++ {
+ times[0].tv_nsec = libc::UTIME_OMIT; // don't change ctime
++ }
++ #[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))]
++ {
++ times[0].tv_nsec = libc::UTIME_OMIT as i64; // don't change ctime
++ }
+ if unsafe { libc::clock_gettime(libc::CLOCK_REALTIME, &mut times[1]) } == 0 {
+ unsafe {
+ libc::futimens(private_fd.as_raw_fd(), ×[0]);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/fish.git/commitdiff/9dcf07b21913e8a3008218b1e7bf4dd6b6142d1b
More information about the pld-cvs-commit
mailing list