diff --git a/packages/starship/0001-Cargo.toml.patch b/packages/starship/0001-Cargo.toml.patch index 79a7ed6418..cdb0eed903 100644 --- a/packages/starship/0001-Cargo.toml.patch +++ b/packages/starship/0001-Cargo.toml.patch @@ -11,12 +11,12 @@ notify = ["notify-rust"] @@ -74,9 +73,6 @@ - serde_json = "1.0.86" - sha-1 = "0.10.0" - shadow-rs = { version = "0.16.3", default-features = false } + serde_json = "1.0.89" + sha1 = "0.10.5" + shadow-rs = { version = "0.18.0", default-features = false } -# battery is optional (on by default) because the crate doesn't currently build for Termux -# see: https://github.com/svartalf/rust-battery/issues/33 -starship-battery = { version = "0.7.9", optional = true } strsim = "0.10.0" - systemstat = "=0.2.1" - terminal_size = "0.2.1" + systemstat = "=0.2.2" + terminal_size = "0.2.3" diff --git a/packages/starship/build.sh b/packages/starship/build.sh index af274d73b2..219e83b1be 100644 --- a/packages/starship/build.sh +++ b/packages/starship/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://starship.rs TERMUX_PKG_DESCRIPTION="A minimal, blazing fast, and extremely customizable prompt for any shell" TERMUX_PKG_LICENSE="ISC" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="1.11.0" +TERMUX_PKG_VERSION="1.12.0" TERMUX_PKG_SRCURL=https://github.com/starship/starship/archive/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=7b408ef8a2ab47d7a7d0e120889bf12c8f2a965796f8a027d8b2176287fdec6b +TERMUX_PKG_SHA256=748a0541009b0bee5f51b716d072f244d8d5cb3fb8d768519ed305494ea11e02 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_DEPENDS="openssl, zlib" TERMUX_PKG_BUILD_IN_SRC=true @@ -16,16 +16,8 @@ termux_step_pre_configure() { : "${CARGO_HOME:=${HOME}/.cargo}" export CARGO_HOME - rm -rf "${CARGO_HOME}"/registry/src/github.com-*/git-config-value*/ cargo fetch --target "${CARGO_TARGET_NAME}" - for d in "${CARGO_HOME}"/registry/src/github.com-*/git-config-value*/; do - patch --silent -p1 -d "${d}" <"${TERMUX_PKG_BUILDER_DIR}"/rust-git-config-path.diff || { - echo "[${FUNCNAME[0]}]: failed to patch git-config. Exiting now." - exit 1 - } - done - CFLAGS+=" ${CPPFLAGS}" mv "${TERMUX_PREFIX}"/lib/libz.so.1{,.tmp} diff --git a/packages/starship/rust-git-config-path.diff b/packages/starship/rust-git-config-path.diff deleted file mode 100644 index 47681dfa1d..0000000000 --- a/packages/starship/rust-git-config-path.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/path.rs -+++ b/src/path.rs -@@ -170,7 +170,7 @@ - Err(interpolate::Error::UserInterpolationUnsupported) - } - -- #[cfg(not(windows))] -+ #[cfg(not(any(target_os = "windows", target_os = "android")))] - fn interpolate_user( - self, - home_for_user: fn(&str) -> Option,