From 4734fc9d7fbd4368e7b01295f1a821dd6781abd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophile=20Gaudin?= Date: Sun, 26 May 2024 17:04:13 +0200 Subject: [PATCH] task: update to 3.0.2 --- srcpkgs/task/patches/cmake-ninja.patch | 23 ----------------------- srcpkgs/task/patches/taskchampion.patch | 11 +++++++++++ srcpkgs/task/template | 8 +++++--- 3 files changed, 16 insertions(+), 26 deletions(-) delete mode 100644 srcpkgs/task/patches/cmake-ninja.patch create mode 100644 srcpkgs/task/patches/taskchampion.patch diff --git a/srcpkgs/task/patches/cmake-ninja.patch b/srcpkgs/task/patches/cmake-ninja.patch deleted file mode 100644 index 65e1c2b9d85d21..00000000000000 --- a/srcpkgs/task/patches/cmake-ninja.patch +++ /dev/null @@ -1,23 +0,0 @@ -single $ produce syntax error in build.ninja. these custom_target are -not required anyway - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -165,17 +165,6 @@ - install (FILES ${doc_FILE} DESTINATION ${TASK_DOCDIR}) - endforeach (doc_FILE) - --add_custom_command(OUTPUT run-review -- COMMAND docker build -q --build-arg PR=$(PR) --build-arg LIBPR=$(LIBPR) -t taskwarrior-review:$(PR)s$(LIBPR) - < scripts/review-dockerfile -- COMMAND docker run --rm --memory 1g --hostname pr-$(PR)s$(LIBPR) -it taskwarrior-review:$(PR)s$(LIBPR) bash || : --) --add_custom_target(review DEPENDS run-review) -- --add_custom_command(OUTPUT run-reproduce -- COMMAND docker build -q --build-arg RELEASE=$(RELEASE) -t taskwarrior-reproduce:$(RELEASE) - < scripts/reproduce-dockerfile -- COMMAND docker run --rm --memory 1g --hostname tw-$(RELEASE) -it taskwarrior-reproduce:$(RELEASE) bash || : --) --add_custom_target(reproduce DEPENDS run-reproduce) - - # --- - diff --git a/srcpkgs/task/patches/taskchampion.patch b/srcpkgs/task/patches/taskchampion.patch new file mode 100644 index 00000000000000..67aa707774c5a1 --- /dev/null +++ b/srcpkgs/task/patches/taskchampion.patch @@ -0,0 +1,11 @@ +--- a/taskchampion/lib/src/atomic.rs~ ++++ b/taskchampion/lib/src/atomic.rs +@@ -22,7 +22,7 @@ + + unsafe fn from_ctype(self) -> Option> { + if self != 0 { +- return Some(utc_timestamp(self)); ++ return Some(utc_timestamp(self.into())); + } + None + } diff --git a/srcpkgs/task/template b/srcpkgs/task/template index 0f28ceb0e02b0a..246414ab703a62 100644 --- a/srcpkgs/task/template +++ b/srcpkgs/task/template @@ -1,15 +1,17 @@ # Template file for 'task' pkgname=task -version=2.6.2 +version=3.0.2 revision=1 build_style=cmake -makedepends="libuuid-devel gnutls-devel" +build_helper="rust" +hostmakedepends="rust cargo" +makedepends="libuuid-devel gnutls-devel rust-std" short_desc="Task Warrior command-line todo list manager" maintainer="Orphaned " license="MIT" homepage="https://taskwarrior.org" distfiles="https://github.com/GothenburgBitFactory/taskwarrior/releases/download/v${version}/task-${version}.tar.gz" -checksum=b1d3a7f000cd0fd60640670064e0e001613c9e1cb2242b9b3a9066c78862cfec +checksum=633b76637b0c74e4845ffa28249f01a16ed2c84000ece58d4358e72bf88d5f10 post_install() { vcompletion scripts/zsh/_task zsh