Skip to content

Commit

Permalink
taskwarrior: bump to 3.0.2 (#20265)
Browse files Browse the repository at this point in the history
  • Loading branch information
licy183 committed May 22, 2024
1 parent 22a5438 commit 0658b35
Show file tree
Hide file tree
Showing 4 changed files with 140 additions and 4 deletions.
11 changes: 11 additions & 0 deletions packages/taskwarrior/0001-timestamp.patch32
Original file line number Diff line number Diff line change
@@ -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<DateTime<Utc>> {
if self != 0 {
- return Some(utc_timestamp(self));
+ return Some(utc_timestamp(self.into()));
}
None
}
35 changes: 31 additions & 4 deletions packages/taskwarrior/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,39 @@ TERMUX_PKG_HOMEPAGE=https://taskwarrior.org
TERMUX_PKG_DESCRIPTION="Utility for managing your TODO list"
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=2.6.2
TERMUX_PKG_REVISION=3
TERMUX_PKG_VERSION=3.0.2
TERMUX_PKG_SRCURL=https://github.com/GothenburgBitFactory/taskwarrior/releases/download/v${TERMUX_PKG_VERSION}/task-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=b1d3a7f000cd0fd60640670064e0e001613c9e1cb2242b9b3a9066c78862cfec
TERMUX_PKG_SHA256=633b76637b0c74e4845ffa28249f01a16ed2c84000ece58d4358e72bf88d5f10
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_DEPENDS="libc++, libgnutls, libuuid, libandroid-glob"
TERMUX_PKG_DEPENDS="libandroid-glob, libc++, libgnutls, libuuid"
TERMUX_CMAKE_BUILD="Unix Makefiles"

termux_step_pre_configure() {
termux_setup_rust
: "${CARGO_HOME:=$HOME/.cargo}"
export CARGO_HOME

rm -rf $CARGO_HOME/registry/src/*/linkme-*
cargo fetch --target $CARGO_TARGET_NAME

local d p
p="linkme-android.diff"
for d in $CARGO_HOME/registry/src/*/linkme-0.3.8; do
patch --silent -p1 -d ${d} \
< "$TERMUX_PKG_BUILDER_DIR/${p}"
done

p="linkme-impl-android.diff"
for d in $CARGO_HOME/registry/src/*/linkme-impl-0.3.8; do
patch --silent -p1 -d ${d} \
< "$TERMUX_PKG_BUILDER_DIR/${p}"
done

LDFLAGS+=" -landroid-glob"

if [ "$TERMUX_ARCH" = "arm" ]; then
rustup target add thumbv7neon-linux-androideabi
fi
}

termux_step_post_make_install() {
Expand All @@ -20,3 +43,7 @@ termux_step_post_make_install() {
install -Dm600 -t $TERMUX_PREFIX/share/fish/vendor_completions.d \
"$TERMUX_PKG_SRCDIR"/scripts/fish/task.fish
}

termux_step_post_massage() {
rm -rf $CARGO_HOME/registry/src/*/linkme-*
}
12 changes: 12 additions & 0 deletions packages/taskwarrior/linkme-android.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
https://github.com/dtolnay/linkme/pull/66/commits/38cb074be7193d87e386a02c0e3b20a01f8ba6aa

--- a/src/distributed_slice.rs
+++ b/src/distributed_slice.rs
@@ -156,6 +156,7 @@
impl<T> DistributedSlice<[T]> {
#[doc(hidden)]
#[cfg(any(
+ target_os = "android",
target_os = "none",
target_os = "linux",
target_os = "macos",
86 changes: 86 additions & 0 deletions packages/taskwarrior/linkme-impl-android.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
https://github.com/dtolnay/linkme/pull/66/commits/38cb074be7193d87e386a02c0e3b20a01f8ba6aa

--- a/src/declaration.rs
+++ b/src/declaration.rs
@@ -118,6 +118,7 @@
#(#attrs)*
#vis static #ident: #linkme_path::DistributedSlice<#ty> = {
#[cfg(any(
+ target_os = "android",
target_os = "none",
target_os = "linux",
target_os = "macos",
@@ -127,25 +128,25 @@
target_os = "freebsd",
))]
extern "Rust" {
- #[cfg_attr(any(target_os = "none", target_os = "linux"), link_name = #linux_section_start)]
+ #[cfg_attr(any(target_os = "android", target_os = "none", target_os = "linux"), link_name = #linux_section_start)]
#[cfg_attr(any(target_os = "macos", target_os = "ios", target_os = "tvos"), link_name = #macho_section_start)]
#[cfg_attr(target_os = "illumos", link_name = #illumos_section_start)]
#[cfg_attr(target_os = "freebsd", link_name = #freebsd_section_start)]
static LINKME_START: <#ty as #linkme_path::__private::Slice>::Element;

- #[cfg_attr(any(target_os = "none", target_os = "linux"), link_name = #linux_section_stop)]
+ #[cfg_attr(any(target_os = "android", target_os = "none", target_os = "linux"), link_name = #linux_section_stop)]
#[cfg_attr(any(target_os = "macos", target_os = "ios", target_os = "tvos"), link_name = #macho_section_stop)]
#[cfg_attr(target_os = "illumos", link_name = #illumos_section_stop)]
#[cfg_attr(target_os = "freebsd", link_name = #freebsd_section_stop)]
static LINKME_STOP: <#ty as #linkme_path::__private::Slice>::Element;

- #[cfg_attr(any(target_os = "none", target_os = "linux"), link_name = #linux_dupcheck_start)]
+ #[cfg_attr(any(target_os = "android", target_os = "none", target_os = "linux"), link_name = #linux_dupcheck_start)]
#[cfg_attr(any(target_os = "macos", target_os = "ios", target_os = "tvos"), link_name = #macho_dupcheck_start)]
#[cfg_attr(target_os = "illumos", link_name = #illumos_dupcheck_start)]
#[cfg_attr(target_os = "freebsd", link_name = #freebsd_dupcheck_start)]
static DUPCHECK_START: #linkme_path::__private::usize;

- #[cfg_attr(any(target_os = "none", target_os = "linux"), link_name = #linux_dupcheck_stop)]
+ #[cfg_attr(any(target_os = "android", target_os = "none", target_os = "linux"), link_name = #linux_dupcheck_stop)]
#[cfg_attr(any(target_os = "macos", target_os = "ios", target_os = "tvos"), link_name = #macho_dupcheck_stop)]
#[cfg_attr(target_os = "illumos", link_name = #illumos_dupcheck_stop)]
#[cfg_attr(target_os = "freebsd", link_name = #freebsd_dupcheck_stop)]
@@ -169,14 +170,14 @@
static DUPCHECK_STOP: () = ();

#used
- #[cfg(any(target_os = "none", target_os = "linux", target_os = "illumos", target_os = "freebsd"))]
- #[cfg_attr(any(target_os = "none", target_os = "linux"), link_section = #linux_section)]
+ #[cfg(any(target_os = "android", target_os = "none", target_os = "linux", target_os = "illumos", target_os = "freebsd"))]
+ #[cfg_attr(any(target_os = "android", target_os = "none", target_os = "linux"), link_section = #linux_section)]
#[cfg_attr(target_os = "illumos", link_section = #illumos_section)]
#[cfg_attr(target_os = "freebsd", link_section = #freebsd_section)]
static mut LINKME_PLEASE: [<#ty as #linkme_path::__private::Slice>::Element; 0] = [];

#used
- #[cfg_attr(any(target_os = "none", target_os = "linux"), link_section = #linux_dupcheck)]
+ #[cfg_attr(any(target_os = "android", target_os = "none", target_os = "linux"), link_section = #linux_dupcheck)]
#[cfg_attr(any(target_os = "macos", target_os = "ios", target_os = "tvos"), link_section = #macho_dupcheck)]
#[cfg_attr(target_os = "windows", link_section = #windows_dupcheck)]
#[cfg_attr(target_os = "illumos", link_section = #illumos_dupcheck)]
@@ -184,6 +185,7 @@
static DUPCHECK: #linkme_path::__private::usize = 1;

#[cfg(not(any(
+ target_os = "android",
target_os = "none",
target_os = "linux",
target_os = "macos",
@@ -236,7 +238,7 @@
$item:item
) => {
#used
- #[cfg_attr(any(target_os = "none", target_os = "linux"), link_section = $linux_section)]
+ #[cfg_attr(any(target_os = "android", target_os = "none", target_os = "linux"), link_section = $linux_section)]
#[cfg_attr(any(target_os = "macos", target_os = "ios", target_os = "tvos"), link_section = $macho_section)]
#[cfg_attr(target_os = "windows", link_section = $windows_section)]
#[cfg_attr(target_os = "illumos", link_section = $illumos_section)]
@@ -245,7 +247,7 @@
};
($item:item) => {
#used
- #[cfg_attr(any(target_os = "none", target_os = "linux"), link_section = #linux_section)]
+ #[cfg_attr(any(target_os = "android", target_os = "none", target_os = "linux"), link_section = #linux_section)]
#[cfg_attr(any(target_os = "macos", target_os = "ios", target_os = "tvos"), link_section = #macho_section)]
#[cfg_attr(target_os = "windows", link_section = #windows_section)]
#[cfg_attr(target_os = "illumos", link_section = #illumos_section)]

0 comments on commit 0658b35

Please sign in to comment.