diff --git a/community/jujutsu/APKBUILD b/community/jujutsu/APKBUILD index 687781b921b..f8c7bed0867 100644 --- a/community/jujutsu/APKBUILD +++ b/community/jujutsu/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Jingyun Hua maintainer="Jingyun Hua " pkgname=jujutsu -pkgver=0.39.0 +pkgver=0.40.0 pkgrel=0 pkgdesc="Git-compatible distributed version control system" url="https://www.jj-vcs.dev/" @@ -27,10 +27,7 @@ subpackages=" $pkgname-fish-completion $pkgname-zsh-completion " -source=" - https://github.com/jj-vcs/jj/archive/v$pkgver/jujutsu-$pkgver.tar.gz - Revert-fix-gix-index-handle-loongarch64-musl-stat-st.patch - " +source="https://github.com/jj-vcs/jj/archive/v$pkgver/jujutsu-$pkgver.tar.gz" builddir="$srcdir/jj-$pkgver" options="net" # cargo fetch @@ -112,6 +109,5 @@ package() { } sha512sums=" -b5820cae1344463677f23354f6f162463e8646464d4cb45749b4cc0fefcf620e80c6595b9f602f33f9849e2feff4ce03fdcde03fb55ef9ac273f72476024fa35 jujutsu-0.39.0.tar.gz -76600d57b8038edad68e78667cbb3ecddfb4a9ef6ef323723b98dd6a1f6c239c1266f952607c55d53ca94a1baee9adc0f60f0b42a72957c3f5dc3d27d0e4c56e Revert-fix-gix-index-handle-loongarch64-musl-stat-st.patch +1ac2ee46d0993f8013f9bfc79bbc40f0e92031966642d9fd7059a404fa1a14090b9ba74ba367c03bdf1bac291fc50c577525a1cf5b32e00b57c38ed287693257 jujutsu-0.40.0.tar.gz " diff --git a/community/jujutsu/Revert-fix-gix-index-handle-loongarch64-musl-stat-st.patch b/community/jujutsu/Revert-fix-gix-index-handle-loongarch64-musl-stat-st.patch deleted file mode 100644 index 251926818fd..00000000000 --- a/community/jujutsu/Revert-fix-gix-index-handle-loongarch64-musl-stat-st.patch +++ /dev/null @@ -1,88 +0,0 @@ -From a304cc490f2f662a384fe83bbd51feaf7fe1d0cd Mon Sep 17 00:00:00 2001 -From: Jingyun Hua -Date: Thu, 5 Mar 2026 02:59:13 +0000 -Subject: [PATCH] Revert "fix(gix-index): handle loongarch64-musl stat struct - field names" - -This reverts commit 7e25c3426b382493007fa6982873f76baa9d020d. ---- - vendor/gix-index/src/fs.rs | 48 ++++++++------------------------------------- - 1 file changed, 8 insertions(+), 40 deletions(-) - -diff --git a/vendor/gix-index/src/fs.rs b/vendor/gix-index/src/fs.rs -index f2ca1ad91..2be45bb8d 100644 ---- a/vendor/gix-index/src/fs.rs -+++ b/vendor/gix-index/src/fs.rs -@@ -54,30 +54,14 @@ impl Metadata { - pub fn modified(&self) -> Option { - #[cfg(not(windows))] - { -- #[cfg(not(any( -- target_os = "aix", -- target_os = "hurd", -- all(target_arch = "loongarch64", target_env = "musl") -- )))] -+ #[cfg(not(any(target_os = "aix", target_os = "hurd")))] - let seconds = self.0.st_mtime; -- #[cfg(any( -- target_os = "aix", -- target_os = "hurd", -- all(target_arch = "loongarch64", target_env = "musl") -- ))] -+ #[cfg(any(target_os = "aix", target_os = "hurd"))] - let seconds = self.0.st_mtim.tv_sec; - -- #[cfg(not(any( -- target_os = "aix", -- target_os = "hurd", -- all(target_arch = "loongarch64", target_env = "musl") -- )))] -+ #[cfg(not(any(target_os = "aix", target_os = "hurd")))] - let nanoseconds = self.0.st_mtime_nsec; -- #[cfg(any( -- target_os = "aix", -- target_os = "hurd", -- all(target_arch = "loongarch64", target_env = "musl") -- ))] -+ #[cfg(any(target_os = "aix", target_os = "hurd"))] - let nanoseconds = self.0.st_mtim.tv_nsec; - - // All operating systems treat the seconds as offset from unix epoch, hence it must -@@ -97,30 +81,14 @@ impl Metadata { - pub fn created(&self) -> Option { - #[cfg(not(windows))] - { -- #[cfg(not(any( -- target_os = "aix", -- target_os = "hurd", -- all(target_arch = "loongarch64", target_env = "musl") -- )))] -+ #[cfg(not(any(target_os = "aix", target_os = "hurd")))] - let seconds = self.0.st_ctime; -- #[cfg(any( -- target_os = "aix", -- target_os = "hurd", -- all(target_arch = "loongarch64", target_env = "musl") -- ))] -+ #[cfg(any(target_os = "aix", target_os = "hurd"))] - let seconds = self.0.st_ctim.tv_sec; - -- #[cfg(not(any( -- target_os = "aix", -- target_os = "hurd", -- all(target_arch = "loongarch64", target_env = "musl") -- )))] -+ #[cfg(not(any(target_os = "aix", target_os = "hurd")))] - let nanoseconds = self.0.st_ctime_nsec; -- #[cfg(any( -- target_os = "aix", -- target_os = "hurd", -- all(target_arch = "loongarch64", target_env = "musl") -- ))] -+ #[cfg(any(target_os = "aix", target_os = "hurd"))] - let nanoseconds = self.0.st_ctim.tv_nsec; - - // All operating systems treat the seconds as offset from unix epoch, hence it must --- -2.53.0 -