mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-08-06 05:47:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

testing/task3: add cargo fetch & use system corrosion

Browse Source 
corrosion 0.5.0 fixes build with rust 1.79.0
This commit is contained in:
Celeste 2024-06-21 08:03:03 +00:00
parent f4f48de5e7
commit bff3a068af
3 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
testing/task3/0004-use-system-corrosion.patch Normal file
View File

@ -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(

8
testing/task3/0005-rust-1.79.0-compat.patch Normal file
View File

@ -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)

8
testing/task3/APKBUILD
View File

@ -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
"