From d73f456b73ffc71a00a955470743c81e57cfe8dc Mon Sep 17 00:00:00 2001 From: Jeremy Drake Date: Sun, 30 Jul 2023 14:26:30 -0700 Subject: [PATCH] starship: add workarounds for arm64 and x86 --- mingw-w64-starship/PKGBUILD | 31 ++++++++++++---- mingw-w64-starship/sha1-asm-x86-windows.patch | 18 ++++++++++ .../windows-0.39.0-gnullvm.patch | 36 +++++++++++++++++++ 3 files changed, 78 insertions(+), 7 deletions(-) create mode 100644 mingw-w64-starship/sha1-asm-x86-windows.patch create mode 100644 mingw-w64-starship/windows-0.39.0-gnullvm.patch diff --git a/mingw-w64-starship/PKGBUILD b/mingw-w64-starship/PKGBUILD index 8b6de186a1..8e1a0293c9 100644 --- a/mingw-w64-starship/PKGBUILD +++ b/mingw-w64-starship/PKGBUILD @@ -4,26 +4,43 @@ _realname=starship pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.16.0 -pkgrel=1 +pkgrel=2 pkgdesc="The cross-shell prompt for astronauts (mingw-w64)" arch=('any') -# i686 is disabled, see -# https://github.com/msys2/MINGW-packages/pull/17831#issuecomment-1648392525 -mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') url="https://starship.rs" license=('spdx:ISC') depends=("${MINGW_PACKAGE_PREFIX}-libgit2") makedepends=("${MINGW_PACKAGE_PREFIX}-rust" "${MINGW_PACKAGE_PREFIX}-cmake") options=('staticlibs' 'strip') -source=("${_realname}-${pkgver}.tar.gz::https://github.com/starship/starship/archive/refs/tags/v${pkgver}.tar.gz") -sha256sums=('133888e190ce1563927e16ee693da3026d2e668d975ac373f853e030743775c5') +source=("${_realname}-${pkgver}.tar.gz::https://github.com/starship/starship/archive/refs/tags/v${pkgver}.tar.gz" + "windows-0.39.0-gnullvm.patch" + "sha1-asm-x86-windows.patch") +sha256sums=('133888e190ce1563927e16ee693da3026d2e668d975ac373f853e030743775c5' + 'fa217d67779706fd504e0cdce654e9bc8b15c2f29e5e3c9d62219637c51d32a8' + '2c76c732e3b132af905e31732a729158ea1b1f3cf1c275a882d5349157c34835') noextract=("${_realname}-${pkgver}.tar.gz") prepare() { tar -xzf "${srcdir}"/${_realname}-${pkgver}.tar.gz -C ${srcdir} || true cd "${srcdir}/${_realname}-${pkgver}" - "${MINGW_PREFIX}/bin/cargo.exe" fetch --locked + cargo vendor \ + --locked \ + --versioned-dirs + + mkdir -p .cargo + cat >> .cargo/config.toml <