diff --git a/mingw-w64-bat/PKGBUILD b/mingw-w64-bat/PKGBUILD
index 3a02490ae8e92..64ecddc56391a 100644
--- a/mingw-w64-bat/PKGBUILD
+++ b/mingw-w64-bat/PKGBUILD
@@ -7,11 +7,11 @@ pkgver=0.24.0
 pkgrel=2
 pkgdesc="Cat clone with syntax highlighting and git integration (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+url='https://github.com/sharkdp/bat'
 msys2_references=(
   'archlinux: bat'
 )
-url='https://github.com/sharkdp/bat'
 license=('spdx:MIT OR Apache-2.0')
 depends=(
   "${MINGW_PACKAGE_PREFIX}-libgit2"
@@ -21,7 +21,7 @@ depends=(
 makedepends=(
   "${MINGW_PACKAGE_PREFIX}-rust"
 )
-source=("${_realname}-${pkgver}.tar.gz::https://github.com/sharkdp/bat/archive/refs/tags/v${pkgver}.tar.gz")
+source=("https://github.com/sharkdp/bat/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('907554a9eff239f256ee8fe05a922aad84febe4fe10a499def72a4557e9eedfb')
 
 prepare() {
diff --git a/mingw-w64-bottom/PKGBUILD b/mingw-w64-bottom/PKGBUILD
index 91b1b6f4790dd..51b11fd2d38ae 100644
--- a/mingw-w64-bottom/PKGBUILD
+++ b/mingw-w64-bottom/PKGBUILD
@@ -6,11 +6,11 @@ pkgname=$MINGW_PACKAGE_PREFIX-$_realname
 pkgver=0.9.6
 pkgrel=1
 pkgdesc="A graphical process/system monitor (mingw-w64)"
-url="https://github.com/ClementTsang/bottom"
 arch=(any)
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+url="https://github.com/ClementTsang/bottom"
 license=('spdx:MIT')
-makedepends=($MINGW_PACKAGE_PREFIX-rust tree)
+makedepends=("$MINGW_PACKAGE_PREFIX-rust" "tree")
 source=("$url/archive/$pkgver/$_realname-$pkgver.tar.gz"
         "$url/releases/download/$pkgver/completion.tar.gz"
         "$url/releases/download/$pkgver/manpage.tar.gz"
diff --git a/mingw-w64-cargo-generate/PKGBUILD b/mingw-w64-cargo-generate/PKGBUILD
index bb193cbebc7da..7c082ca317f36 100644
--- a/mingw-w64-cargo-generate/PKGBUILD
+++ b/mingw-w64-cargo-generate/PKGBUILD
@@ -7,12 +7,12 @@ pkgver=0.19.0
 pkgrel=1
 pkgdesc="Use pre-existing git repositories as templates (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://github.com/cargo-generate/cargo-generate"
-license=('spdx:MIT' 'spdx:Apache-2.0')
+license=('spdx:MIT OR Apache-2.0')
 makedepends=("${MINGW_PACKAGE_PREFIX}-rust"
              "${MINGW_PACKAGE_PREFIX}-mdbook")
-source=("$_realname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz")
+source=("$url/archive/v$pkgver/$_realname-$pkgver.tar.gz")
 sha256sums=('520e7a98bf82f368e911c14e774f8ef16a4c8ffd785d492c9d518ee563dc3864')
 
 prepare() {
diff --git a/mingw-w64-cargo-local-registry/PKGBUILD b/mingw-w64-cargo-local-registry/PKGBUILD
index b0a6fa33af810..6eb6c6e60b6ed 100644
--- a/mingw-w64-cargo-local-registry/PKGBUILD
+++ b/mingw-w64-cargo-local-registry/PKGBUILD
@@ -7,12 +7,11 @@ pkgver=0.2.6
 pkgrel=2
 pkgdesc="A cargo subcommand to manage local registries (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://github.com/dhovart/cargo-local-registry"
-license=('MIT' 'Apache')
+license=('spdx:MIT OR Apache-2.0')
 makedepends=("${MINGW_PACKAGE_PREFIX}-rust")
-options=('staticlibs' 'strip')
-source=("$_realname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz")
+source=("$url/archive/$pkgver/$_realname-$pkgver.tar.gz")
 sha256sums=('b42e4904e4db100c27d81cf94a034438b20ae6dbb34d0fee39012f2d548680ca')
 
 prepare() {
diff --git a/mingw-w64-cargo-tauri/PKGBUILD b/mingw-w64-cargo-tauri/PKGBUILD
index b23ead204608a..6c793a3debd12 100644
--- a/mingw-w64-cargo-tauri/PKGBUILD
+++ b/mingw-w64-cargo-tauri/PKGBUILD
@@ -8,12 +8,11 @@ pkgver=1.5.9
 pkgrel=1
 pkgdesc="Command line interface for building Tauri apps (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://github.com/tauri-apps/tauri"
-license=('MIT' 'Apache')
+license=('spdx:MIT OR Apache-2.0')
 makedepends=("${MINGW_PACKAGE_PREFIX}-rust")
-options=('staticlibs' 'strip')
-source=("${_basename}-${_basename}-cli-v${pkgver}.tar.gz::${url}/archive/${_basename}-cli-v${pkgver}.tar.gz")
+source=("${url}/archive/${_basename}-cli-v${pkgver}/${_basename}-${_basename}-cli-v${pkgver}.tar.gz")
 noextract=("${_basename}-${_basename}-cli-v${pkgver}.tar.gz")
 sha256sums=('292d7ffb7ba70d34281688888532375fe90e0349eafe68ff9b74d942e6bbe30e')
 
diff --git a/mingw-w64-czkawka/PKGBUILD b/mingw-w64-czkawka/PKGBUILD
index fcacd68a15f68..b81f8e02ed31f 100644
--- a/mingw-w64-czkawka/PKGBUILD
+++ b/mingw-w64-czkawka/PKGBUILD
@@ -8,9 +8,9 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}-cli"
 pkgver=6.1.0
 pkgrel=1
 pkgdesc="Multi functional app to find duplicates, empty folders, similar images etc (mingw-w64)"
-url='https://github.com/qarmin/czkawka'
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang32' 'clang64' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+url='https://github.com/qarmin/czkawka'
 license=('spdx:MIT')
 depends=("${MINGW_PACKAGE_PREFIX}-bzip2"
          "${MINGW_PACKAGE_PREFIX}-cairo"
diff --git a/mingw-w64-delta/PKGBUILD b/mingw-w64-delta/PKGBUILD
index a9ba0efb032cc..41156b19bf5c7 100644
--- a/mingw-w64-delta/PKGBUILD
+++ b/mingw-w64-delta/PKGBUILD
@@ -7,17 +7,17 @@ pkgver=0.16.5
 pkgrel=1
 pkgdesc='A syntax-highlighting pager for git and diff output (mingw-w64)'
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://github.com/dandavison/delta"
-license=('spdx:MIT')
 msys2_references=(
   'archlinux: git-delta'
   'aur'
   'cygwin'
 )
+license=('spdx:MIT')
 depends=('git')
 makedepends=("${MINGW_PACKAGE_PREFIX}-rust")
-source=("https://github.com/dandavison/delta/archive/refs/tags/$pkgver.tar.gz"
+source=("https://github.com/dandavison/delta/archive/$pkgver/${_realname}-${pkgver}.tar.gz"
         "ntapi-link-ntdll-arm64.patch")
 sha256sums=('00d4740e9da4f543f34a2a0503615f8190d307d1180dfb753b6911aa6940197f'
             'c17674896bd2cd559fdf48812200096e5dcd93160874c05a46f21585d8202f16')
diff --git a/mingw-w64-dust/PKGBUILD b/mingw-w64-dust/PKGBUILD
index d8075b86ca49e..5c04f543f593b 100644
--- a/mingw-w64-dust/PKGBUILD
+++ b/mingw-w64-dust/PKGBUILD
@@ -7,14 +7,14 @@ pkgver=0.8.6
 pkgrel=2
 pkgdesc="A more intuitive version of du in rust (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url='https://github.com/bootandy/dust'
 license=(spdx:Apache-2.0)
 makedepends=(
   "${MINGW_PACKAGE_PREFIX}-rust"
 )
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
-source=("${_realname}-${pkgver}.tar.gz::${url}/archive/refs/tags/v${pkgver}.tar.gz"
+source=("${url}/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz"
         "ntapi-link-ntdll-arm64.patch")
 sha256sums=('feede818e814011207c5bfeaf06dd9fc95825c59ab70942aa9b9314791c5d6b6'
             '4a6a64884fd7e3da96b1df71adfe12fc909cd85470eb382d6282f5e2b5645fe1')
diff --git a/mingw-w64-helix/PKGBUILD b/mingw-w64-helix/PKGBUILD
index 8b850fbf56a27..deec9c3d92069 100644
--- a/mingw-w64-helix/PKGBUILD
+++ b/mingw-w64-helix/PKGBUILD
@@ -7,13 +7,13 @@ pkgver=23.10
 pkgrel=1
 pkgdesc="A post-modern modal text editor (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://github.com/helix-editor/helix"
 license=('spdx:MPL-2.0')
 makedepends=("${MINGW_PACKAGE_PREFIX}-rust"
              "${MINGW_PACKAGE_PREFIX}-mdbook"
              "git")
-source=("$_realname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz"
+source=("$url/archive/$pkgver/${_realname}-${pkgver}.tar.gz"
         'helix.sh')
 noextract=("${_realname}-${pkgver}.tar.gz")
 sha256sums=('a1a98b24692ba8fc648245bebc3511b27eb4edf9eb97d97d8aed7157316d01e8'
diff --git a/mingw-w64-hyperfine/PKGBUILD b/mingw-w64-hyperfine/PKGBUILD
index f77772b3fec81..86148942b40fb 100644
--- a/mingw-w64-hyperfine/PKGBUILD
+++ b/mingw-w64-hyperfine/PKGBUILD
@@ -1,17 +1,17 @@
 # Maintainer: Wu Zhenyu <wuzy01@qq.com>
-_realname=hyperfine
 
+_realname=hyperfine
 pkgbase=mingw-w64-$_realname
 pkgname=$MINGW_PACKAGE_PREFIX-$_realname
 pkgver=1.18.0
 pkgrel=1
 pkgdesc='A command-line benchmarking tool (mingw-w64)'
 arch=(any)
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url='https://github.com/sharkdp/hyperfine'
-makedepends=($MINGW_PACKAGE_PREFIX-rust)
 license=('spdx:MIT OR Apache-2.0')
-source=("$url/archive/v$pkgver.tar.gz")
+makedepends=($MINGW_PACKAGE_PREFIX-rust)
+source=("$url/archive/v$pkgver/${_realname}-${pkgver}.tar.gz")
 sha256sums=('fea7b92922117ed04b9c84bb9998026264346768804f66baa40743c5528bed6b')
 
 prepare() {
diff --git a/mingw-w64-keepawake/PKGBUILD b/mingw-w64-keepawake/PKGBUILD
index da8c36c11bcb4..4f68a821b531b 100644
--- a/mingw-w64-keepawake/PKGBUILD
+++ b/mingw-w64-keepawake/PKGBUILD
@@ -7,15 +7,15 @@ pkgver=0.4.5
 pkgrel=1
 pkgdesc="Keep your computer awake (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang32' 'clang64' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://github.com/segevfiner/keepawake-rs"
-license=('spdx:MIT')
 msys2_references=(
     'aur'
 )
+license=('spdx:MIT')
 makedepends=("${MINGW_PACKAGE_PREFIX}-rust")
 options=('!strip') # upstream strips while building
-source=("https://github.com/segevfiner/keepawake-rs/archive/refs/tags/v${pkgver}/${_realname}-rs-${pkgver}.tar.gz")
+source=("https://github.com/segevfiner/keepawake-rs/archive/v${pkgver}/${_realname}-rs-${pkgver}.tar.gz")
 sha256sums=('bb3960e4aea90ae8a9fc6a0044d820d1c8443e29dc9f7936c26012999d5f0365')
 
 prepare() {
diff --git a/mingw-w64-mdbook-pikchr/PKGBUILD b/mingw-w64-mdbook-pikchr/PKGBUILD
index 9cef1407b3295..76fbca6d1702f 100644
--- a/mingw-w64-mdbook-pikchr/PKGBUILD
+++ b/mingw-w64-mdbook-pikchr/PKGBUILD
@@ -7,12 +7,11 @@ pkgver=0.1.7
 pkgrel=1
 pkgdesc="A mdbook preprocessor to render pikchr code blocks as images in your book (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://github.com/podsvirov/mdbook-pikchr"
-license=('MIT')
+license=('spdx:MIT')
 depends=("${MINGW_PACKAGE_PREFIX}-mdbook")
 makedepends=("${MINGW_PACKAGE_PREFIX}-rust")
-options=('staticlibs' 'strip')
 source=("${_realname}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz")
 sha256sums=('e3f1bcba19db94fa66ea12152e7082de0e1ad6171b1fd6638f2b65a9cfbb5b60')
 
diff --git a/mingw-w64-mdbook/PKGBUILD b/mingw-w64-mdbook/PKGBUILD
index 97b2e83723024..cfe04f6ec26c1 100644
--- a/mingw-w64-mdbook/PKGBUILD
+++ b/mingw-w64-mdbook/PKGBUILD
@@ -8,13 +8,12 @@ pkgver=0.4.36
 pkgrel=1
 pkgdesc="Create book from markdown files, like Gitbook but implemented in Rust (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://github.com/rust-lang/mdBook"
 license=('spdx:MPL-2.0')
 makedepends=("${MINGW_PACKAGE_PREFIX}-rust")
 optdepends=("${MINGW_PACKAGE_PREFIX}-mdbook-pikchr: To render pikchr code blocks as image")
-options=('staticlibs' 'strip')
-source=("$_realName-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz")
+source=("$url/archive/v$pkgver/$_realName-$pkgver.tar.gz")
 sha256sums=('dd47214172ecf95e1b2cbcbebb8428d0b029e0de5dce74204b3c3a91f26223a1')
 
 prepare() {
diff --git a/mingw-w64-minidump-stackwalk/PKGBUILD b/mingw-w64-minidump-stackwalk/PKGBUILD
index f4e7f65d2e314..23ef792319202 100644
--- a/mingw-w64-minidump-stackwalk/PKGBUILD
+++ b/mingw-w64-minidump-stackwalk/PKGBUILD
@@ -8,13 +8,13 @@ pkgver=0.19.1
 pkgrel=1
 pkgdesc="Provides both machine-readable and human-readable digests of a minidump, with backtraces and symbolication (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url='https://github.com/rust-minidump/rust-minidump/tree/main/minidump-stackwalk'
 license=('spdx:MIT')
 makedepends=(
   "${MINGW_PACKAGE_PREFIX}-rust"
 )
-source=("${_realname}-${pkgver}.tar.gz::https://github.com/rust-minidump/rust-minidump/archive/v${pkgver}.tar.gz")
+source=("https://github.com/rust-minidump/rust-minidump/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('bf8d8f69318ff5687c48bd51623bd434a3210ed16c708a02be797c1f3003fe3f')
 
 prepare() {
diff --git a/mingw-w64-onefetch/PKGBUILD b/mingw-w64-onefetch/PKGBUILD
index 5f7d4a0ce5c2a..1b5ee03ac20d0 100644
--- a/mingw-w64-onefetch/PKGBUILD
+++ b/mingw-w64-onefetch/PKGBUILD
@@ -4,17 +4,17 @@ pkgname=$MINGW_PACKAGE_PREFIX-$_realname
 pkgver=2.19.0
 pkgrel=1
 pkgdesc="Git repository summary on your terminal (mingw-w64)"
+arch=(any)
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://github.com/o2sh/onefetch"
-license=('spdx:MIT')
 msys2_references=(
   'archlinux: onefetch'
 )
-arch=(any)
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+license=('spdx:MIT')
 depends=("$MINGW_PACKAGE_PREFIX-libgit2")
 makedepends=("$MINGW_PACKAGE_PREFIX-rust"
              "$MINGW_PACKAGE_PREFIX-cmake")
-source=("$_realname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz")
+source=("$url/archive/$pkgver/$_realname-$pkgver.tar.gz")
 sha256sums=('e6aa7504730de86f307d6c3671875b11a447a4088daf74df280c8f644dea4819')
 
 prepare() {
diff --git a/mingw-w64-python-jellyfish/PKGBUILD b/mingw-w64-python-jellyfish/PKGBUILD
index decba8a3f8651..5c68c68b7241b 100644
--- a/mingw-w64-python-jellyfish/PKGBUILD
+++ b/mingw-w64-python-jellyfish/PKGBUILD
@@ -7,12 +7,12 @@ pkgver=1.0.3
 pkgrel=1
 pkgdesc='A python library for doing approximate and phonetic matching of strings (mingw-w64)'
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+url='https://github.com/jamesturk/jellyfish'
 msys2_references=(
   'pypi: jellyfish'
 )
 license=('spdx:MIT')
-url='https://github.com/jamesturk/jellyfish'
 depends=("${MINGW_PACKAGE_PREFIX}-python")
 makedepends=("${MINGW_PACKAGE_PREFIX}-python-build"
              "${MINGW_PACKAGE_PREFIX}-python-installer"
diff --git a/mingw-w64-python-maturin/001-fix-default-target-on-mingw-32bit.patch b/mingw-w64-python-maturin/001-fix-default-target-on-mingw-32bit.patch
deleted file mode 100644
index 40f3364828b29..0000000000000
--- a/mingw-w64-python-maturin/001-fix-default-target-on-mingw-32bit.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/maturin/__init__.py
-+++ b/maturin/__init__.py
-@@ -41,7 +41,7 @@
-     if platform.system().lower() == "windows" and platform.machine().lower() == "amd64":
-         pointer_width = struct.calcsize("P") * 8
-         if pointer_width == 32:
--            return ["--target", "i686-pc-windows-msvc"]
-+            return ["--target", "i686-pc-windows-gnu"]
-     return []
- 
- 
diff --git a/mingw-w64-python-maturin/PKGBUILD b/mingw-w64-python-maturin/PKGBUILD
index ccfcf7367fc1a..52a1a40dbba5c 100644
--- a/mingw-w64-python-maturin/PKGBUILD
+++ b/mingw-w64-python-maturin/PKGBUILD
@@ -6,9 +6,9 @@ pkgname=${MINGW_PACKAGE_PREFIX}-python-${_realname}
 pkgver=1.4.0
 pkgrel=1
 pkgdesc='Build and publish crates with pyo3, rust-cpython and cffi bindings as well as rust binaries as python packages (mingw-w64)'
-url='https://github.com/pyo3/maturin'
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+url='https://github.com/pyo3/maturin'
 msys2_references=(
   'pypi: maturin'
 )
@@ -21,16 +21,8 @@ makedepends=(
     "${MINGW_PACKAGE_PREFIX}-python-wheel"
     "${MINGW_PACKAGE_PREFIX}-python-setuptools-rust")
 options=(!strip)
-source=("https://pypi.io/packages/source/${_realname:0:1}/${_realname}/${_realname}-${pkgver}.tar.gz"
-        "001-fix-default-target-on-mingw-32bit.patch")
-sha256sums=('ed12e1768094a7adeafc3a74ebdb8dc2201fa64c4e7e31f14cfc70378bf93790'
-            '5d363f2540f84651439f47782c9d60ababde58f7187b09945040f3795745bf45')
-
-prepare() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  patch -Np1 -i "${srcdir}/001-fix-default-target-on-mingw-32bit.patch"
-}
+source=("https://pypi.io/packages/source/${_realname:0:1}/${_realname}/${_realname}-${pkgver}.tar.gz")
+sha256sums=('ed12e1768094a7adeafc3a74ebdb8dc2201fa64c4e7e31f14cfc70378bf93790')
 
 build() {
   cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}" && cd "python-build-${MSYSTEM}"
diff --git a/mingw-w64-python-pywinpty/PKGBUILD b/mingw-w64-python-pywinpty/PKGBUILD
index 96ad8de29640b..3b5da907fa079 100644
--- a/mingw-w64-python-pywinpty/PKGBUILD
+++ b/mingw-w64-python-pywinpty/PKGBUILD
@@ -7,12 +7,12 @@ pkgver=2.0.12
 pkgrel=1
 pkgdesc="Pseudo terminal support for Windows from Python. (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+url='https://github.com/andfoy/pywinpty'
 msys2_references=(
   'pypi: pywinpty'
 )
-url='https://github.com/andfoy/pywinpty'
-license=('MIT')
+license=('spdx:MIT')
 depends=("${MINGW_PACKAGE_PREFIX}-python")
 makedepends=("${MINGW_PACKAGE_PREFIX}-python-build"
              "${MINGW_PACKAGE_PREFIX}-python-installer"
diff --git a/mingw-w64-python-rpds-py/PKGBUILD b/mingw-w64-python-rpds-py/PKGBUILD
index b04cb8915900b..950e3a3be5688 100644
--- a/mingw-w64-python-rpds-py/PKGBUILD
+++ b/mingw-w64-python-rpds-py/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=0.16.2
 pkgrel=1
 pkgdesc='Python bindings to the Rust rpds crate for persistent data structures (mingw-w64)'
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url='https://github.com/crate-py/rpds'
 msys2_references=(
   'archlinux: python-rpds-py'
diff --git a/mingw-w64-python-terminado/PKGBUILD b/mingw-w64-python-terminado/PKGBUILD
index fd2f150514637..2c9dfcee51783 100644
--- a/mingw-w64-python-terminado/PKGBUILD
+++ b/mingw-w64-python-terminado/PKGBUILD
@@ -10,13 +10,13 @@ pkgver=0.18.0
 pkgrel=1
 pkgdesc="Terminals served to term.js using Tornado websockets (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+url='https://github.com/jupyter/terminado'
+msys2_documentation_url='https://terminado.readthedocs.io/'
 msys2_references=(
   'archlinux: python-terminado'
   'pypi: terminado'
 )
-msys2_documentation_url='https://terminado.readthedocs.io/'
-url='https://github.com/jupyter/terminado'
 license=('spdx:BSD-2-Clause')
 depends=("${MINGW_PACKAGE_PREFIX}-python"
          "${MINGW_PACKAGE_PREFIX}-python-tornado"
diff --git a/mingw-w64-python-watchfiles/PKGBUILD b/mingw-w64-python-watchfiles/PKGBUILD
index dfc41fdd8b0b0..906455c782277 100644
--- a/mingw-w64-python-watchfiles/PKGBUILD
+++ b/mingw-w64-python-watchfiles/PKGBUILD
@@ -7,10 +7,9 @@ pkgver=0.21.0
 pkgrel=1
 pkgdesc="Simple, modern and high performance file watching and code reload in python (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64')
 url='https://github.com/samuelcolvin/watchfiles'
-license=('MIT')
-options=('!strip')
+license=('spdx:MIT')
 depends=(
   "${MINGW_PACKAGE_PREFIX}-python"
   "${MINGW_PACKAGE_PREFIX}-python-anyio"
@@ -20,6 +19,7 @@ makedepends=(
   "${MINGW_PACKAGE_PREFIX}-python-maturin"
   "${MINGW_PACKAGE_PREFIX}-python-installer"
 )
+options=('!strip')
 source=("https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('c76c635fabf542bb78524905718c39f736a98e5ab25b23ec6d4abede1a85a6a3')
 
diff --git a/mingw-w64-sccache/PKGBUILD b/mingw-w64-sccache/PKGBUILD
index 0353a59fc5d97..40cb9a955c7e6 100644
--- a/mingw-w64-sccache/PKGBUILD
+++ b/mingw-w64-sccache/PKGBUILD
@@ -7,15 +7,15 @@ pkgver=0.7.4
 pkgrel=1
 pkgdesc='Shared compilation cache (mingw-w64)'
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64')
+url="https://github.com/mozilla/sccache"
 msys2_references=(
   'archlinux: sccache'
 )
-url="https://github.com/mozilla/sccache"
 license=('spdx:Apache-2.0')
 depends=("${MINGW_PACKAGE_PREFIX}-openssl" "${MINGW_PACKAGE_PREFIX}-zlib")
 makedepends=("${MINGW_PACKAGE_PREFIX}-rust")
-source=("https://github.com/mozilla/sccache/archive/refs/tags/v$pkgver.tar.gz")
+source=("https://github.com/mozilla/sccache/archive/v$pkgver/${_realname}-${pkgver}.tar.gz")
 sha256sums=('32301f125d5b1d73830b163fd15fe9b5c22cf4a4a6b835d893dec563aba5b4fc')
 
 prepare() {
diff --git a/mingw-w64-stork/PKGBUILD b/mingw-w64-stork/PKGBUILD
index 17fdc3dee6e56..fc83f2fbb3f1f 100644
--- a/mingw-w64-stork/PKGBUILD
+++ b/mingw-w64-stork/PKGBUILD
@@ -7,9 +7,9 @@ pkgver=1.6.0
 pkgrel=2
 pkgdesc="Impossibly fast web search, made for static sites (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://github.com/jameslittle230/stork"
-license=('Apache')
+license=('spdx:Apache-2.0')
 depends=(
   "${MINGW_PACKAGE_PREFIX}-gcc-libs"
   "${MINGW_PACKAGE_PREFIX}-zlib"
@@ -17,8 +17,7 @@ depends=(
 makedepends=(
   "${MINGW_PACKAGE_PREFIX}-rust"
 )
-options=('staticlibs' 'strip')
-source=("$_realname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz")
+source=("$url/archive/v$pkgver/$_realname-$pkgver.tar.gz")
 sha256sums=('cf7f5ed75815bf7e302fd76ec55ac89db2d06a682c5a07b1431d18105b3ada62')
 
 prepare() {
@@ -32,7 +31,6 @@ prepare() {
 }
 
 build() {
-  msg "Cargo build for ${MSYSTEM}"
   cd "${srcdir}/build-${MSYSTEM}"
 
   ${MINGW_PREFIX}/bin/cargo build \
diff --git a/mingw-w64-tree-sitter/PKGBUILD b/mingw-w64-tree-sitter/PKGBUILD
index edf8590caeab8..1be8066dcac50 100644
--- a/mingw-w64-tree-sitter/PKGBUILD
+++ b/mingw-w64-tree-sitter/PKGBUILD
@@ -7,11 +7,14 @@ pkgver=0.20.8
 pkgrel=1
 pkgdesc="An incremental parsing system for programming tools (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://tree-sitter.github.io/"
-license=('MIT')
-makedepends=("unzip" "${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-rust")
-source=("${_realname}-${pkgver}.zip::https://github.com/tree-sitter/tree-sitter/archive/v${pkgver}.zip"
+msys2_repository_url="https://github.com/tree-sitter/tree-sitter"
+license=('spdx:MIT')
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-rust"
+             "unzip")
+source=("https://github.com/tree-sitter/tree-sitter/archive/v${pkgver}/${_realname}-${pkgver}.zip"
         001-mingw-build.patch)
 sha256sums=('5f04d75f2b2b9424131e4b769c1e64f7a82bfcf930c79a87c118d251d44ef6e2'
             '19d2a1608ca5c6138c228b97815c48ac95be2bec1265c207fdc0950a65b8ebad')
diff --git a/mingw-w64-typstudio/PKGBUILD b/mingw-w64-typstudio/PKGBUILD
index 8654c60859b2b..0f61ba775ba37 100644
--- a/mingw-w64-typstudio/PKGBUILD
+++ b/mingw-w64-typstudio/PKGBUILD
@@ -8,15 +8,14 @@ _pkgver=${pkgver/dev/-dev}
 pkgrel=1
 pkgdesc="desktop application for typst (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64')
+mingw_arch=('mingw64' 'ucrt64')
 url="https://github.com/Cubxity/typstudio"
-license=('GPL3')
+license=('spdx:GPL-3.0-or-later')
 makedepends=("${MINGW_PACKAGE_PREFIX}-yarn"
              "${MINGW_PACKAGE_PREFIX}-rust"
              "${MINGW_PACKAGE_PREFIX}-cargo-tauri"
              "${MINGW_PACKAGE_PREFIX}-jq")
-options=('staticlibs' 'strip')
-source=("${_realname}-${_pkgver}.tar.gz::${url}/archive/v${_pkgver}.tar.gz")
+source=("${url}/archive/v${_pkgver}/${_realname}-${_pkgver}.tar.gz")
 sha256sums=('971287e38857a6544765d93697589dd91b0401f9b8ce8d8dfc2ad07a2b039903')
 
 prepare() {
diff --git a/mingw-w64-vivid/PKGBUILD b/mingw-w64-vivid/PKGBUILD
index 2dcb474a89529..2275d34054621 100644
--- a/mingw-w64-vivid/PKGBUILD
+++ b/mingw-w64-vivid/PKGBUILD
@@ -1,17 +1,17 @@
 # Maintainer: Wu Zhenyu <wuzy01@qq.com>
-_realname=vivid
 
+_realname=vivid
 pkgbase=mingw-w64-$_realname
 pkgname=$MINGW_PACKAGE_PREFIX-$_realname
 pkgver=0.9.0
 pkgrel=1
 pkgdesc='A themeable LS_COLORS generator with a rich filetype datebase (mingw-w64)'
 arch=(any)
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url='https://github.com/sharkdp/vivid'
+license=('spdx:MIT OR Apache-2.0')
 makedepends=($MINGW_PACKAGE_PREFIX-rust)
-license=(MIT Apache)
-source=("$url/archive/v$pkgver.tar.gz")
+source=("$url/archive/v$pkgver/${_realname}-${pkgver}.tar.gz")
 sha256sums=('325f16df916e4192d56d589839be474801ffd3d6a105f4a1a033221570ff6b56')
 b2sums=('6bae858a27d704ff73ded2560ae74f6821c97517c8e8e3f9058619cfdf11bd3bd626074978951adb07cd799dc032a509f7e0c7171d8c7c0996d1f423bd9d7bf8')
 
@@ -29,4 +29,5 @@ package() {
   cd vivid-$pkgver
   install -Dt "$pkgdir"$MINGW_PREFIX/bin target/release/vivid
   install -Dm644 -t "$pkgdir"$MINGW_PREFIX/share/licenses/vivid LICENSE-MIT
+  install -Dm644 -t "$pkgdir"$MINGW_PREFIX/share/licenses/vivid LICENSE-APACHE
 }
diff --git a/mingw-w64-wasm-pack/PKGBUILD b/mingw-w64-wasm-pack/PKGBUILD
index 08a246022d4c9..3c35b729f70bf 100644
--- a/mingw-w64-wasm-pack/PKGBUILD
+++ b/mingw-w64-wasm-pack/PKGBUILD
@@ -7,9 +7,9 @@ pkgver=0.12.1
 pkgrel=1
 pkgdesc="Your favorite rust -> wasm workflow tool! (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64')
 url="https://github.com/rustwasm/wasm-pack"
-license=('MIT' 'Apache')
+license=('spdx:MIT OR Apache-2.0')
 depends=(
   "${MINGW_PACKAGE_PREFIX}-bzip2"
   "${MINGW_PACKAGE_PREFIX}-curl"
@@ -19,8 +19,7 @@ makedepends=(
   "${MINGW_PACKAGE_PREFIX}-mdbook"
   "${MINGW_PACKAGE_PREFIX}-pkgconf"
 )
-options=('staticlibs' 'strip')
-source=("$_realname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz")
+source=("$url/archive/v$pkgver/$_realname-$pkgver.tar.gz")
 sha256sums=('afa164fec0b119e2c47e38aad9e83351cb414e8ca3c062de292ec8008a45ac09')
 
 prepare() {