From bff3a068afa32c0db2ac373e890dbcae564efecd Mon Sep 17 00:00:00 2001
From: Celeste <20312-Celeste@users.gitlab.alpinelinux.org>
Date: Fri, 21 Jun 2024 08:03:03 +0000
Subject: [PATCH] testing/task3: add cargo fetch & use system corrosion

corrosion 0.5.0 fixes build with rust 1.79.0
---
 testing/task3/0004-use-system-corrosion.patch | 13 +++++++++++++
 testing/task3/0005-rust-1.79.0-compat.patch   |  8 ++++++++
 testing/task3/APKBUILD                        |  8 ++++++++
 3 files changed, 29 insertions(+)
 create mode 100644 testing/task3/0004-use-system-corrosion.patch
 create mode 100644 testing/task3/0005-rust-1.79.0-compat.patch

diff --git a/testing/task3/0004-use-system-corrosion.patch b/testing/task3/0004-use-system-corrosion.patch
new file mode 100644
index 00000000000..b76be47f369
--- /dev/null
+++ b/testing/task3/0004-use-system-corrosion.patch
@@ -0,0 +1,13 @@
+--- a/src/tc/CMakeLists.txt
++++ b/src/tc/CMakeLists.txt
+@@ -1,6 +1,9 @@
+ cmake_minimum_required (VERSION 3.22)
+ 
+-add_subdirectory(${CMAKE_SOURCE_DIR}/src/tc/corrosion)
++find_package(Corrosion QUIET)
++if (NOT Corrosion_FOUND)
++  add_subdirectory(${CMAKE_SOURCE_DIR}/src/tc/corrosion)
++endif()
+ 
+ # Import taskchampion-lib as a CMake library.
+ corrosion_import_crate(
diff --git a/testing/task3/0005-rust-1.79.0-compat.patch b/testing/task3/0005-rust-1.79.0-compat.patch
new file mode 100644
index 00000000000..8817d8d3894
--- /dev/null
+++ b/testing/task3/0005-rust-1.79.0-compat.patch
@@ -0,0 +1,8 @@
+--- a/src/tc/CMakeLists.txt
++++ b/src/tc/CMakeLists.txt
+@@ -27,4 +27,4 @@
+   Task.cpp Task.h)
+ 
+ add_library (tc STATIC ${tc_SRCS})
+-target_link_libraries(tc taskchampion-lib)
++target_link_libraries(tc taskchampion_lib)
diff --git a/testing/task3/APKBUILD b/testing/task3/APKBUILD
index 3310469e55d..5183a454768 100644
--- a/testing/task3/APKBUILD
+++ b/testing/task3/APKBUILD
@@ -11,6 +11,7 @@ install="$pkgname.post-install"
 makedepends="
 	cargo
 	cmake
+	corrosion
 	gnutls-dev
 	util-linux-dev
 	"
@@ -27,14 +28,19 @@ source="https://github.com/GothenburgBitFactory/taskwarrior/releases/download/v$
 	0001-atomic-timestamp-32bit.patch
 	0002-enable-tests.patch
 	0003-use-newer-ring.patch
+	0004-use-system-corrosion.patch
+	0005-rust-1.79.0-compat.patch
 	"
 builddir="$srcdir"/task-$pkgver
 
 prepare() {
 	default_prepare
+
 	cp -r "$srcdir"/taskwarrior-$pkgver/test "$builddir"/
 	# TestCMakeLists.txt should be unneeded in future release >3.0.2
 	cp -r "$srcdir"/TestCMakeLists.txt "$builddir"/test/CMakeLists.txt
+
+	cargo fetch --target="$CTARGET" --locked
 }
 
 build() {
@@ -68,4 +74,6 @@ a1027c8bcf2baa25604b0a052185418c047dc3008ba445d689cfb214910e73e820170b2a3531457c
 4fefd76c0933a519a2419a06c7f7466b8ed7b08b99097f32cf255d3f2a849114dc11f1cec519f98a9af5eb67ab992cd3ce6e8abf90737201c4adbf4a232c0f40  0001-atomic-timestamp-32bit.patch
 5648d3666916e2286f9ec49ff770f5d9faaa0c7fc256a79ef2101d5e7637a416e0d8bcfdf70afef84857897b6ee50b37d245132fba80b5da1dba35d4fa69195e  0002-enable-tests.patch
 38748b6b00b284d603c22432054cc68d3d6d55f7ba5065ab16bc960e6cdb2213293453c2856a713f7c192eadd129da9d0af227075dc47e19cfe166925a368367  0003-use-newer-ring.patch
+f27673ef30d660db34bac819679aa956059723cade6b0c22b6db0b9b72578bf2aa87e061771560398b003d1cd4e0f88d64174a30a95a9117a7a82d13e43e6b3f  0004-use-system-corrosion.patch
+fe54830d9e847283d42a2441fc1e9804bce81adcdb60cb9d5b92d32cced48e5d1f554979d6b7be70b220493177770ed6a740e63b08412b0ba26c7ab8799ca730  0005-rust-1.79.0-compat.patch
 "