From dcd398ad237c0ce972fafab5b538807ff6f5c40c Mon Sep 17 00:00:00 2001
From: qaqland <qaq@qaq.land>
Date: Tue, 1 Oct 2024 01:16:02 +0800
Subject: [PATCH] community/git-interactive-rebase-tool: upgrade to 2.4.1 &
enable loongarch64
---
...-to-avoid-linting-failure-with-rust-.patch | 163 ------------------
.../0002-cargo-update.patch | 8 +-
.../git-interactive-rebase-tool/APKBUILD | 16 +-
3 files changed, 9 insertions(+), 178 deletions(-)
delete mode 100644 community/git-interactive-rebase-tool/0001-Fix-lint-warning-to-avoid-linting-failure-with-rust-.patch
diff --git a/community/git-interactive-rebase-tool/0001-Fix-lint-warning-to-avoid-linting-failure-with-rust-.patch b/community/git-interactive-rebase-tool/0001-Fix-lint-warning-to-avoid-linting-failure-with-rust-.patch
deleted file mode 100644
index efffa88e4d42..000000000000
--- a/community/git-interactive-rebase-tool/0001-Fix-lint-warning-to-avoid-linting-failure-with-rust-.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-From 5659c6886d26dfd48d50c4508f607aaf28715f92 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Sun, 5 May 2024 07:57:10 +0200
-Subject: [PATCH] Fix lint warning to avoid linting failure with rust 1.77.0
-
-See https://github.com/MitMaro/git-interactive-rebase-tool/issues/906
----
- scripts/data/lints.rs | 2 +-
- src/config/src/lib.rs | 2 +-
- src/core/src/lib.rs | 2 +-
- src/display/src/lib.rs | 2 +-
- src/git/src/lib.rs | 2 +-
- src/input/src/lib.rs | 2 +-
- src/main.rs | 2 +-
- src/runtime/src/lib.rs | 2 +-
- src/testutils/src/lib.rs | 2 +-
- src/todo_file/src/lib.rs | 2 +-
- src/view/src/lib.rs | 2 +-
- 11 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/scripts/data/lints.rs b/scripts/data/lints.rs
-index b33c70f..2e2b25d 100644
---- a/scripts/data/lints.rs
-+++ b/scripts/data/lints.rs
-@@ -47,7 +47,7 @@
- unused_macro_rules,
- unused_qualifications,
- unused_results,
-- unused_tuple_struct_fields,
-+ dead_code,
- variant_size_differences
- )]
- // enable all of Clippy's lints
-diff --git a/src/config/src/lib.rs b/src/config/src/lib.rs
-index 8c02d74..dc0237f 100644
---- a/src/config/src/lib.rs
-+++ b/src/config/src/lib.rs
-@@ -48,7 +48,7 @@
- unused_macro_rules,
- unused_qualifications,
- unused_results,
-- unused_tuple_struct_fields,
-+ dead_code,
- variant_size_differences
- )]
- // enable all of Clippy's lints
-diff --git a/src/core/src/lib.rs b/src/core/src/lib.rs
-index cdf4ad7..9bea4d5 100644
---- a/src/core/src/lib.rs
-+++ b/src/core/src/lib.rs
-@@ -48,7 +48,7 @@
- unused_macro_rules,
- unused_qualifications,
- unused_results,
-- unused_tuple_struct_fields,
-+ dead_code,
- variant_size_differences
- )]
- // enable all of Clippy's lints
-diff --git a/src/display/src/lib.rs b/src/display/src/lib.rs
-index 741d562..45a82a8 100644
---- a/src/display/src/lib.rs
-+++ b/src/display/src/lib.rs
-@@ -48,7 +48,7 @@
- unused_macro_rules,
- unused_qualifications,
- unused_results,
-- unused_tuple_struct_fields,
-+ dead_code,
- variant_size_differences
- )]
- // enable all of Clippy's lints
-diff --git a/src/git/src/lib.rs b/src/git/src/lib.rs
-index bcbb18a..74a05f3 100644
---- a/src/git/src/lib.rs
-+++ b/src/git/src/lib.rs
-@@ -48,7 +48,7 @@
- unused_macro_rules,
- unused_qualifications,
- unused_results,
-- unused_tuple_struct_fields,
-+ dead_code,
- variant_size_differences
- )]
- // enable all of Clippy's lints
-diff --git a/src/input/src/lib.rs b/src/input/src/lib.rs
-index d0b11d2..4c216bf 100644
---- a/src/input/src/lib.rs
-+++ b/src/input/src/lib.rs
-@@ -48,7 +48,7 @@
- unused_macro_rules,
- unused_qualifications,
- unused_results,
-- unused_tuple_struct_fields,
-+ dead_code,
- variant_size_differences
- )]
- // enable all of Clippy's lints
-diff --git a/src/main.rs b/src/main.rs
-index 99ff1a6..6d6a28e 100644
---- a/src/main.rs
-+++ b/src/main.rs
-@@ -48,7 +48,7 @@
- unused_macro_rules,
- unused_qualifications,
- unused_results,
-- unused_tuple_struct_fields,
-+ dead_code,
- variant_size_differences
- )]
- // enable all of Clippy's lints
-diff --git a/src/runtime/src/lib.rs b/src/runtime/src/lib.rs
-index a7197d6..7d7dfef 100644
---- a/src/runtime/src/lib.rs
-+++ b/src/runtime/src/lib.rs
-@@ -48,7 +48,7 @@
- unused_macro_rules,
- unused_qualifications,
- unused_results,
-- unused_tuple_struct_fields,
-+ dead_code,
- variant_size_differences
- )]
- // enable all of Clippy's lints
-diff --git a/src/testutils/src/lib.rs b/src/testutils/src/lib.rs
-index 38bf351..6143506 100644
---- a/src/testutils/src/lib.rs
-+++ b/src/testutils/src/lib.rs
-@@ -48,7 +48,7 @@
- unused_macro_rules,
- unused_qualifications,
- unused_results,
-- unused_tuple_struct_fields,
-+ dead_code,
- variant_size_differences
- )]
- // enable all of Clippy's lints
-diff --git a/src/todo_file/src/lib.rs b/src/todo_file/src/lib.rs
-index 782ff4a..4051027 100644
---- a/src/todo_file/src/lib.rs
-+++ b/src/todo_file/src/lib.rs
-@@ -48,7 +48,7 @@
- unused_macro_rules,
- unused_qualifications,
- unused_results,
-- unused_tuple_struct_fields,
-+ dead_code,
- variant_size_differences
- )]
- // enable all of Clippy's lints
-diff --git a/src/view/src/lib.rs b/src/view/src/lib.rs
-index 74af3da..c441909 100644
---- a/src/view/src/lib.rs
-+++ b/src/view/src/lib.rs
-@@ -48,7 +48,7 @@
- unused_macro_rules,
- unused_qualifications,
- unused_results,
-- unused_tuple_struct_fields,
-+ dead_code,
- variant_size_differences
- )]
- // enable all of Clippy's lints
diff --git a/community/git-interactive-rebase-tool/0002-cargo-update.patch b/community/git-interactive-rebase-tool/0002-cargo-update.patch
index 39ad65f16f55..acc473cb1580 100644
--- a/community/git-interactive-rebase-tool/0002-cargo-update.patch
+++ b/community/git-interactive-rebase-tool/0002-cargo-update.patch
@@ -1,15 +1,13 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index c96f833..22653a9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
-@@ -581,9 +581,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+@@ -448,9 +448,9 @@
[[package]]
name = "libc"
--version = "0.2.147"
+-version = "0.2.153"
+version = "0.2.155"
source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
+-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
[[package]]
diff --git a/community/git-interactive-rebase-tool/APKBUILD b/community/git-interactive-rebase-tool/APKBUILD
index 5e952b3fc1c7..5fdf9f4c2c6f 100644
--- a/community/git-interactive-rebase-tool/APKBUILD
+++ b/community/git-interactive-rebase-tool/APKBUILD
@@ -1,17 +1,15 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=git-interactive-rebase-tool
-pkgver=2.3.0
+pkgver=2.4.1
pkgrel=0
pkgdesc="Terminal based sequence editor for interactive rebase"
url="https://gitrebasetool.mitmaro.ca"
-# loongarch64: libc crate fails to build
-arch="all !loongarch64"
+arch="all"
license="GPL-3.0-or-later"
makedepends="cargo libgit2-dev zlib-dev cargo-auditable"
subpackages="$pkgname-doc"
source="https://github.com/MitMaro/git-interactive-rebase-tool/archive/$pkgver/git-interactive-rebase-tool-$pkgver.tar.gz
- 0001-Fix-lint-warning-to-avoid-linting-failure-with-rust-.patch
0002-cargo-update.patch"
options="net"
@@ -30,9 +28,6 @@ prepare() {
git2 = { rustc-link-lib = ["git2"] }
EOF
- # open64
- cargo update -p getrandom --precise 0.2.10
-
cargo fetch --target="$CTARGET" --locked
}
@@ -41,6 +36,8 @@ build() {
}
check() {
+ # test in src/version.rs need environments
+ export GIRT_BUILD_GIT_HASH="" GIRT_BUILD_DATE=""
cargo test --frozen
}
@@ -52,7 +49,6 @@ package() {
}
sha512sums="
-11d4be71bf6f55f541046ea607b965ffd0f044e525ed3dfbfc37c8d986cda6819c1838d2852e7d6468f43f9482766a3cddb5b8305d09a0d6fd5596b85d6671af git-interactive-rebase-tool-2.3.0.tar.gz
-284d01290776e193adb837f3cb0c062aa7ea6c7d5d89b729bbbcaa7a63b487742e535e795db3ce62b7440e3f456bfadf034cff6c1cbb43ef6921e8701128f9c6 0001-Fix-lint-warning-to-avoid-linting-failure-with-rust-.patch
-5cdb58bd868c1ed21b29f640c7c17577a71050e74042a74b6441aabf8e6675953dfcdd04a6554a256d6f0f4307eb456953632395c708c858e05c12eecbaf3664 0002-cargo-update.patch
+3ad021e5089db9824b41f99f3569f68307ebc223c458be41d104b2b09691a027cd299cce0d256aec08720e03114a5b6e41a3110413b845e363b38142d02a9ef6 git-interactive-rebase-tool-2.4.1.tar.gz
+9171e4d1356fd1ddb919ff0677d4b61801ee710859c7e5b68d69cdd43c7d04ebc348461360c94dc33dfa2831778077e1626c5890d9e331857124a983b4caef39 0002-cargo-update.patch
"
--
GitLab