From 93f22f99e2471f54103ba6e285e2f1c86f7766f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?=
 =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= <mehdi.chinoune@hotmail.com>
Date: Sat, 17 Feb 2024 23:06:36 +0100
Subject: [PATCH] drop 32-bit environments from some leaf packages (4/n)

---
 mingw-w64-badvpn/PKGBUILD                     |  6 ++---
 mingw-w64-capnproto/PKGBUILD                  |  4 +--
 mingw-w64-civetweb/PKGBUILD                   |  4 +--
 mingw-w64-cjose/PKGBUILD                      |  4 +--
 mingw-w64-fossil/PKGBUILD                     |  4 +--
 mingw-w64-freetds/PKGBUILD                    | 10 +++----
 mingw-w64-gplugin/PKGBUILD                    | 24 ++++++++---------
 mingw-w64-granite/PKGBUILD                    | 21 ++++++---------
 mingw-w64-granite7/PKGBUILD                   | 27 ++++++++-----------
 mingw-w64-gsoap/PKGBUILD                      |  4 +--
 mingw-w64-ideviceinstaller/PKGBUILD           | 10 +++----
 mingw-w64-idevicerestore/PKGBUILD             | 10 +++----
 mingw-w64-innoextract/PKGBUILD                |  2 +-
 mingw-w64-libgedit-gtksourceview/PKGBUILD     | 14 +++++-----
 mingw-w64-libguess/PKGBUILD                   |  3 +--
 mingw-w64-libpcap/PKGBUILD                    |  2 +-
 mingw-w64-librdkafka/PKGBUILD                 |  6 ++---
 mingw-w64-libshout/PKGBUILD                   |  5 ++--
 mingw-w64-libwebsockets/PKGBUILD              | 10 +++----
 mingw-w64-libwpd/PKGBUILD                     | 15 +++++------
 mingw-w64-live-media/PKGBUILD                 |  4 +--
 mingw-w64-livechart-gtk3/PKGBUILD             | 27 ++++++++-----------
 mingw-w64-lua-lgi/PKGBUILD                    |  6 ++---
 mingw-w64-neon/PKGBUILD                       |  5 ++--
 mingw-w64-nimble/PKGBUILD                     |  6 ++---
 mingw-w64-openldap/PKGBUILD                   |  9 ++++---
 mingw-w64-osm-gps-map/PKGBUILD                |  7 ++---
 mingw-w64-osslsigncode/PKGBUILD               |  6 ++---
 mingw-w64-podofo/PKGBUILD                     |  3 ++-
 mingw-w64-pybind11/PKGBUILD                   | 12 ++++++---
 mingw-w64-python-dulwich/PKGBUILD             |  4 +--
 mingw-w64-python-elastic-transport/PKGBUILD   |  6 ++---
 .../PKGBUILD                                  |  4 +--
 mingw-w64-python-httpretty/PKGBUILD           |  6 ++---
 mingw-w64-python-paramiko/PKGBUILD            |  5 ++--
 mingw-w64-python-redis/PKGBUILD               |  2 +-
 mingw-w64-python-requests-kerberos/PKGBUILD   |  7 +++--
 mingw-w64-python-requests-oauthlib/PKGBUILD   | 17 ++++++------
 mingw-w64-python-requests-unixsocket/PKGBUILD |  6 ++---
 mingw-w64-python-responses/PKGBUILD           | 12 ++++-----
 mingw-w64-rabbitmq-c/PKGBUILD                 |  8 +++---
 mingw-w64-tor/PKGBUILD                        |  6 ++---
 mingw-w64-unbound/PKGBUILD                    |  2 +-
 mingw-w64-volk/PKGBUILD                       |  7 +++--
 mingw-w64-wget2/PKGBUILD                      |  5 ++--
 mingw-w64-xmlsec/PKGBUILD                     |  6 ++---
 46 files changed, 180 insertions(+), 193 deletions(-)

diff --git a/mingw-w64-badvpn/PKGBUILD b/mingw-w64-badvpn/PKGBUILD
index dfbf0bcc99..7b4f241f73 100644
--- a/mingw-w64-badvpn/PKGBUILD
+++ b/mingw-w64-badvpn/PKGBUILD
@@ -8,9 +8,9 @@ pkgver=1.999.130
 pkgrel=4
 pkgdesc="NCD scripting language, tun2socks proxifier, P2P VPN (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://github.com/ambrop72/badvpn"
-license=('BSD')
+license=('spdx:BSD-3-Clause')
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja")
@@ -18,7 +18,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-glib2"
          "${MINGW_PACKAGE_PREFIX}-nspr"
          "${MINGW_PACKAGE_PREFIX}-nss"
          "${MINGW_PACKAGE_PREFIX}-openssl")
-source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/ambrop72/badvpn/archive/${pkgver}.tar.gz")
+source=("https://github.com/ambrop72/badvpn/archive/${pkgver}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('bfd4bbfebd7274bcec792558c9a2fd60e39cd92e04673825ade5d04154766109')
 
 build() {
diff --git a/mingw-w64-capnproto/PKGBUILD b/mingw-w64-capnproto/PKGBUILD
index a4211d4a36..de1a803bd7 100644
--- a/mingw-w64-capnproto/PKGBUILD
+++ b/mingw-w64-capnproto/PKGBUILD
@@ -13,7 +13,7 @@ pkgver=0.10.4
 pkgrel=1
 pkgdesc="Cap'n Proto serialization/RPC system (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url='https://capnproto.org/'
 license=('spdx:MIT')
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
@@ -23,7 +23,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
              "unzip")
-source=("${_realname}-${pkgver}.zip::https://github.com/capnproto/capnproto/archive/refs/tags/v${pkgver}.zip")
+source=("https://github.com/capnproto/capnproto/archive/v${pkgver}/${_realname}-${pkgver}.zip")
 noextract=("${_realname}-${pkgver}.zip")
 sha512sums=('4ead9093ae6716adee79703d374ac7028a94f0b0030afd4d0fc1118c40b2833791eb6f5e73120b2f921caf44d9fde43e747d00b86bfdaa8381253960b6d07034')
 
diff --git a/mingw-w64-civetweb/PKGBUILD b/mingw-w64-civetweb/PKGBUILD
index 355ec4caf4..fdadded8f9 100644
--- a/mingw-w64-civetweb/PKGBUILD
+++ b/mingw-w64-civetweb/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.16
 pkgrel=1
 pkgdesc="Embedded C/C++ web server (mingw-w64)"
 arch=(any)
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://github.com/civetweb/civetweb"
 license=("spdx:MIT")
 depends=("${MINGW_PACKAGE_PREFIX}-openssl"
@@ -15,7 +15,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-openssl"
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja")
-source=("${_realname}-${pkgver}.tar.gz::https://github.com/civetweb/civetweb/archive/v$pkgver.tar.gz")
+source=("https://github.com/civetweb/civetweb/archive/v$pkgver/${_realname}-${pkgver}.tar.gz")
 sha256sums=('f0e471c1bf4e7804a6cfb41ea9d13e7d623b2bcc7bc1e2a4dd54951a24d60285')
 
 build() {
diff --git a/mingw-w64-cjose/PKGBUILD b/mingw-w64-cjose/PKGBUILD
index 4d857d7494..58a560d1ae 100644
--- a/mingw-w64-cjose/PKGBUILD
+++ b/mingw-w64-cjose/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=0.6.2.2
 pkgrel=1
 pkgdesc="C library implementing the Javascript Object Signing and Encryption (JOSE) (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://github.com/OpenIDC/cjose"
 license=('spdx:MIT')
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
@@ -15,7 +15,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-check")
 depends=("${MINGW_PACKAGE_PREFIX}-jansson"
          "${MINGW_PACKAGE_PREFIX}-openssl")
-source=("${_realname}-${pkgver}.tar.gz::https://github.com/OpenIDC/cjose/releases/download/v${pkgver}/cjose-${pkgver}.tar.gz"
+source=("https://github.com/OpenIDC/cjose/releases/download/v${pkgver}/cjose-${pkgver}.tar.gz"
         "001-cjose-0.6.1-fix-mingw-build.patch")
 sha256sums=('2de8652b23ee3e15398176e8b2aaa513aa89635368f2748fbc304f8aefe910a4'
             'd43f20f5a2bd23ede21823fd1e5115f2247f8dcfaddd7092f8f0204d411db335')
diff --git a/mingw-w64-fossil/PKGBUILD b/mingw-w64-fossil/PKGBUILD
index b2dd5ca63a..e66e0cc6e0 100644
--- a/mingw-w64-fossil/PKGBUILD
+++ b/mingw-w64-fossil/PKGBUILD
@@ -11,9 +11,9 @@ _pkgsha=47362306
 pkgrel=1
 pkgdesc='Simple, high-reliability, distributed software configuration management (mingw-w64)'
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
-license=('BSD')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url='https://www.fossil-scm.org/'
+license=('BSD')
 depends=("${MINGW_PACKAGE_PREFIX}-openssl"
          "${MINGW_PACKAGE_PREFIX}-readline"
          "${MINGW_PACKAGE_PREFIX}-sqlite3"
diff --git a/mingw-w64-freetds/PKGBUILD b/mingw-w64-freetds/PKGBUILD
index 04b756a838..fdf3dbf836 100644
--- a/mingw-w64-freetds/PKGBUILD
+++ b/mingw-w64-freetds/PKGBUILD
@@ -8,15 +8,15 @@ pkgver=1.4.10
 pkgrel=1
 pkgdesc="A free implementation of Sybase's DB-Library, CT-Library and ODBC libraries (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
-msys2_references=(
-  'archlinux: freetds'
-)
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+url='https://www.freetds.org/'
 msys2_repository_url='https://github.com/FreeTDS/freetds/'
 msys2_changelog_url='https://www.freetds.org/news.html'
 msys2_documentation_url='https://www.freetds.org/docs.html'
 msys2_issue_tracker_url='https://github.com/FreeTDS/freetds/issues/'
-url='https://www.freetds.org/'
+msys2_references=(
+  'archlinux: freetds'
+)
 license=('spdx:LGPL-2.0-or-later')
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-openssl"
diff --git a/mingw-w64-gplugin/PKGBUILD b/mingw-w64-gplugin/PKGBUILD
index 4bc61005de..3bfc5a76ad 100644
--- a/mingw-w64-gplugin/PKGBUILD
+++ b/mingw-w64-gplugin/PKGBUILD
@@ -5,23 +5,22 @@ pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.29.0
 pkgrel=5
-arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
 pkgdesc="A GObject based library that implements a reusable plugin system (mingw-w64)"
-license=("LGPL 2")
+arch=('any')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+license=("spdx:LGPL-2.0-or-later")
 url="https://keep.imfreedom.org/gplugin/gplugin"
 depends=("${MINGW_PACKAGE_PREFIX}-gtk3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-asciidoc"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-meson"
+             "${MINGW_PACKAGE_PREFIX}-pkgconf"
              "${MINGW_PACKAGE_PREFIX}-ninja"
-             "${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-asciidoc"
              "${MINGW_PACKAGE_PREFIX}-vala"
              "${MINGW_PACKAGE_PREFIX}-gobject-introspection"
-             "${MINGW_PACKAGE_PREFIX}-pkgconf"
              "${MINGW_PACKAGE_PREFIX}-gtk-doc"
              "mercurial"
              "gettext")
-options=('strip' '!debug' 'staticlibs')
 source=("hg+https://keep.imfreedom.org/$_realname/$_realname#tag=v$pkgver"
         001-win.patch)
 sha256sums=('SKIP'
@@ -33,11 +32,10 @@ prepare() {
 }
 
 build() {
-  [[ -d build-${MINGW_CHOST} ]] && rm -rf build-${MINGW_CHOST}
-  mkdir -p build-${MINGW_CHOST} && cd build-${MINGW_CHOST}
+  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
-  ${MINGW_PREFIX}/bin/meson \
+  ${MINGW_PREFIX}/bin/meson setup \
     --prefix="${MINGW_PREFIX}" \
     --buildtype=plain \
     -Dgtk3=true \
@@ -48,12 +46,12 @@ build() {
     -Dhelp2man=false \
     "../${_realname}"
 
-  ${MINGW_PREFIX}/bin/ninja
+  ${MINGW_PREFIX}/bin/meson compile
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
-  DESTDIR="${pkgdir}" ninja install
+  cd "${srcdir}/build-${MSYSTEM}"
+  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/meson install
 
   install -Dm644 ${srcdir}/${_realname}/COPYING ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING
 }
diff --git a/mingw-w64-granite/PKGBUILD b/mingw-w64-granite/PKGBUILD
index fa9448b1a4..569cd53364 100644
--- a/mingw-w64-granite/PKGBUILD
+++ b/mingw-w64-granite/PKGBUILD
@@ -5,27 +5,22 @@ pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=6.2.0
 pkgrel=3
-arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
 pkgdesc="git repository viewer for GTK+/GNOME (mingw-w64)"
+arch=('any')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+url="https://github.com/elementary/granite"
+license=('spdx:LGPL-3.0-or-later')
 depends=( "${MINGW_PACKAGE_PREFIX}-libgee"
           "${MINGW_PACKAGE_PREFIX}-gtk3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-meson"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-meson"
              "${MINGW_PACKAGE_PREFIX}-pkgconf"
              "${MINGW_PACKAGE_PREFIX}-vala"
              "${MINGW_PACKAGE_PREFIX}-gobject-introspection"
-             "${MINGW_PACKAGE_PREFIX}-itstool"
-             "${MINGW_PACKAGE_PREFIX}-cc")
-license=('spdx:LGPL-3.0-or-later')
-url="https://github.com/elementary/granite"
-source=("${_realname}-${pkgver}.tar.gz::https://github.com/elementary/${_realname}/archive/refs/tags/${pkgver}.tar.gz")
+             "${MINGW_PACKAGE_PREFIX}-itstool")
+source=("https://github.com/elementary/${_realname}/archive/${pkgver}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('067d31445da9808a802fca523630c3e4b84d2d7c78ae547ced017cb7f3b9c6b5')
 
-prepare() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-}
-
 build() {
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
diff --git a/mingw-w64-granite7/PKGBUILD b/mingw-w64-granite7/PKGBUILD
index 5f833b7bac..73dc563589 100644
--- a/mingw-w64-granite7/PKGBUILD
+++ b/mingw-w64-granite7/PKGBUILD
@@ -5,32 +5,27 @@ pkgbase=mingw-w64-${_realname}7
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}7"
 pkgver=7.4.0
 pkgrel=1
-arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
 pkgdesc="Library that extends Gtk+ (mingw-w64)"
+arch=('any')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+url="https://github.com/elementary/granite"
+msys2_references=(
+  'archlinux: granite7'
+)
+license=('spdx:LGPL-3.0-or-later')
 depends=( "${MINGW_PACKAGE_PREFIX}-libgee"
           "${MINGW_PACKAGE_PREFIX}-gtk4")
-makedepends=("${MINGW_PACKAGE_PREFIX}-meson"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-meson"
              "${MINGW_PACKAGE_PREFIX}-ninja"
              "${MINGW_PACKAGE_PREFIX}-pkgconf"
              "${MINGW_PACKAGE_PREFIX}-sassc"
              "${MINGW_PACKAGE_PREFIX}-vala"
              "${MINGW_PACKAGE_PREFIX}-gobject-introspection"
-             "${MINGW_PACKAGE_PREFIX}-itstool"
-             "${MINGW_PACKAGE_PREFIX}-cc")
-license=('spdx:LGPL-3.0-or-later')
-msys2_references=(
-  'archlinux: granite7'
-)
-url="https://github.com/elementary/granite"
-source=("${_realname}-${pkgver}.tar.gz::https://github.com/elementary/${_realname}/archive/refs/tags/${pkgver}.tar.gz")
+             "${MINGW_PACKAGE_PREFIX}-itstool")
+source=("https://github.com/elementary/${_realname}/archive/${pkgver}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('594fe6670940bf2e5d094c73071025d77efab9c5b147a6f64134fe10d370e40e')
 
-prepare() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-}
-
 build() {
   mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
diff --git a/mingw-w64-gsoap/PKGBUILD b/mingw-w64-gsoap/PKGBUILD
index 8712c55132..b172cb7c99 100644
--- a/mingw-w64-gsoap/PKGBUILD
+++ b/mingw-w64-gsoap/PKGBUILD
@@ -7,9 +7,9 @@ pkgver=2.8.132
 pkgrel=2
 pkgdesc="An extensive suite of portable C and C++ software to develop XML Web services with powerful type-safe XML data bindings (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
-license=('spdx:GPL-2.0-or-later')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url='https://www.genivia.com/dev.html'
+license=('spdx:GPL-2.0-or-later')
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-openssl")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
diff --git a/mingw-w64-ideviceinstaller/PKGBUILD b/mingw-w64-ideviceinstaller/PKGBUILD
index 6eacb938b4..9b3aec71bc 100644
--- a/mingw-w64-ideviceinstaller/PKGBUILD
+++ b/mingw-w64-ideviceinstaller/PKGBUILD
@@ -9,9 +9,10 @@ pkgdesc='Manage apps of iOS devices (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
 url='https://www.libimobiledevice.org/'
+msys2_repository_url="https://github.com/libimobiledevice/ideviceinstaller"
 license=('spdx:GPL-2.0-or-later')
 makedepends=("${MINGW_PACKAGE_PREFIX}-autotools" "${MINGW_PACKAGE_PREFIX}-cc")
-source=("${_realname}-${pkgver}.tar.gz"::https://github.com/libimobiledevice/ideviceinstaller/archive/${pkgver}.tar.gz)
+source=(https://github.com/libimobiledevice/ideviceinstaller/archive/${pkgver}/${_realname}-${pkgver}.tar.gz)
 depends=("${MINGW_PACKAGE_PREFIX}-libplist"
          "${MINGW_PACKAGE_PREFIX}-libimobiledevice"
          "${MINGW_PACKAGE_PREFIX}-libzip")
@@ -24,8 +25,7 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   ../${_realname}-${pkgver}/configure \
       --prefix=${MINGW_PREFIX} \
@@ -39,11 +39,11 @@ build() {
 }
 
 check() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
   make check
 }
 
 package() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}
   make install DESTDIR="${pkgdir}"
 }
diff --git a/mingw-w64-idevicerestore/PKGBUILD b/mingw-w64-idevicerestore/PKGBUILD
index 0b687509e6..ba9176b282 100644
--- a/mingw-w64-idevicerestore/PKGBUILD
+++ b/mingw-w64-idevicerestore/PKGBUILD
@@ -7,17 +7,18 @@ pkgver=1.0.0
 pkgrel=3
 pkgdesc='A command-line application to restore firmware files to iOS devices. (mingw-w64)'
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url='https://www.libimobiledevice.org/'
-license=('GPL2+')
-source=(https://github.com/libimobiledevice/${_realname}/releases/download/${pkgver}/${_realname}-${pkgver}.tar.bz2
-        010-o2.patch)
+msys2_repository_url="https://github.com/libimobiledevice/idevicerestore"
+license=('spdx:LGPL-3.0-only')
 depends=("${MINGW_PACKAGE_PREFIX}-libimobiledevice"
          "${MINGW_PACKAGE_PREFIX}-libirecovery"
          "${MINGW_PACKAGE_PREFIX}-libzip"
          "${MINGW_PACKAGE_PREFIX}-openssl"
          "${MINGW_PACKAGE_PREFIX}-curl")
 makedepends=("${MINGW_PACKAGE_PREFIX}-autotools" "${MINGW_PACKAGE_PREFIX}-cc")
+source=(https://github.com/libimobiledevice/${_realname}/releases/download/${pkgver}/${_realname}-${pkgver}.tar.bz2
+        010-o2.patch)
 sha256sums=('32712e86315397fd2e8999e77a2d2f790c67f6b4aa50d4d1c64cb2c4609836f7'
             'ba09b70db225ef2163796788c552dbc62d25d07b12811bb81ad71285db3a368f')
 
@@ -29,7 +30,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
   mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   ../${_realname}-${pkgver}/configure \
diff --git a/mingw-w64-innoextract/PKGBUILD b/mingw-w64-innoextract/PKGBUILD
index 679a6eeaa9..a42131c4cb 100644
--- a/mingw-w64-innoextract/PKGBUILD
+++ b/mingw-w64-innoextract/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.9
 pkgrel=8
 pkgdesc="A tool to extract installers created by Inno Setup (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://constexpr.org/innoextract/"
 license=("spdx:MIT")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
diff --git a/mingw-w64-libgedit-gtksourceview/PKGBUILD b/mingw-w64-libgedit-gtksourceview/PKGBUILD
index 246281f70f..7b272df6d7 100644
--- a/mingw-w64-libgedit-gtksourceview/PKGBUILD
+++ b/mingw-w64-libgedit-gtksourceview/PKGBUILD
@@ -7,13 +7,13 @@ pkgver=299.0.5
 pkgrel=1
 pkgdesc="A source code editing widget (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+url='https://gedit-technology.github.io/'
+msys2_repository_url='https://github.com/gedit-technology/libgedit-gtksourceview/'
+msys2_documentation_url='https://gedit-technology.github.io/developer-docs/'
 msys2_references=(
   'archlinux: libgedit-gtksourceview'
 )
-msys2_documentation_url='https://gedit-technology.github.io/developer-docs/'
-msys2_repository_url='https://github.com/gedit-technology/libgedit-gtksourceview/'
-url='https://gedit-technology.github.io/'
 license=('spdx:LGPL-2.1-or-later')
 depends=(
   "${MINGW_PACKAGE_PREFIX}-cairo"
@@ -24,12 +24,12 @@ depends=(
 )
 makedepends=(
   "${MINGW_PACKAGE_PREFIX}-cc"
-  "${MINGW_PACKAGE_PREFIX}-gobject-introspection"
-  "${MINGW_PACKAGE_PREFIX}-gtk-doc"
   "${MINGW_PACKAGE_PREFIX}-meson"
   "${MINGW_PACKAGE_PREFIX}-pkgconf"
+  "${MINGW_PACKAGE_PREFIX}-gobject-introspection"
+  "${MINGW_PACKAGE_PREFIX}-gtk-doc"
 )
-source=("${_realname}-${pkgver}.tar.gz::https://github.com/gedit-technology/libgedit-gtksourceview/archive/refs/tags/${pkgver}.tar.gz")
+source=("https://github.com/gedit-technology/libgedit-gtksourceview/archive/${pkgver}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('bca38a79fe8360abbd1d5a6d7c339c0a1bafd6695abd0971094dac9262f82d5d')
 
 build() {
diff --git a/mingw-w64-libguess/PKGBUILD b/mingw-w64-libguess/PKGBUILD
index d0177a5a18..ddcf781b1d 100644
--- a/mingw-w64-libguess/PKGBUILD
+++ b/mingw-w64-libguess/PKGBUILD
@@ -7,12 +7,11 @@ pkgver=1.2
 pkgrel=4
 pkgdesc="High-speed character set detection library (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64')
 url="https://github.com/kaniini/libguess"
 license=('custom')
 depends=("${MINGW_PACKAGE_PREFIX}-libmowgli")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-autotools")
-options=('staticlibs' 'strip')
 source=("https://sources.archlinux.org/other/packages/libguess/${_realname}-${pkgver}.tar.bz2")
 sha256sums=('8019a16bdc7ca9d2efbdcc1429d48d033d5053d42e45fccea10abf98074f05f8')
 
diff --git a/mingw-w64-libpcap/PKGBUILD b/mingw-w64-libpcap/PKGBUILD
index 7337a2ed92..a88b4c4d8f 100644
--- a/mingw-w64-libpcap/PKGBUILD
+++ b/mingw-w64-libpcap/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.10.4
 pkgrel=1
 pkgdesc="A system-independent interface for user-level packet capture (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://www.tcpdump.org/"
 license=('spdx:BSD-3-Clause')
 depends=("${MINGW_PACKAGE_PREFIX}-openssl")
diff --git a/mingw-w64-librdkafka/PKGBUILD b/mingw-w64-librdkafka/PKGBUILD
index befe8d045d..d058cecee7 100644
--- a/mingw-w64-librdkafka/PKGBUILD
+++ b/mingw-w64-librdkafka/PKGBUILD
@@ -7,11 +7,11 @@ pkgver=2.3.0
 pkgrel=1
 pkgdesc="The Apache Kafka C/C++ client library (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+url="https://github.com/confluentinc/librdkafka"
 msys2_references=(
   'archlinux: librdkafka'
 )
-url="https://github.com/confluentinc/librdkafka"
 license=('spdx:BSD-2-Clause')
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
@@ -22,7 +22,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-cyrus-sasl"
          "${MINGW_PACKAGE_PREFIX}-openssl"
          "${MINGW_PACKAGE_PREFIX}-zlib"
          "${MINGW_PACKAGE_PREFIX}-zstd")
-source=("${_realname}-${pkgver}.tar.gz::https://github.com/confluentinc/librdkafka/archive/refs/tags/v${pkgver}.tar.gz")
+source=("https://github.com/confluentinc/librdkafka/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('2d49c35c77eeb3d42fa61c43757fcbb6a206daa560247154e60642bcdcc14d12')
 
 build() {
diff --git a/mingw-w64-libshout/PKGBUILD b/mingw-w64-libshout/PKGBUILD
index 914204e7d6..327ff04d0b 100644
--- a/mingw-w64-libshout/PKGBUILD
+++ b/mingw-w64-libshout/PKGBUILD
@@ -7,9 +7,10 @@ pkgver=2.4.6
 pkgrel=2
 pkgdesc="Library for accessing a shoutcast/icecast server (mingw-w64)"
 arch=(any)
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://www.icecast.org/"
-license=('LGPL')
+msys2_repository_url="https://gitlab.xiph.org/xiph/icecast-libshout"
+license=('spdx:LGPL-2.0-only')
 depends=("${MINGW_PACKAGE_PREFIX}-libvorbis"
          "${MINGW_PACKAGE_PREFIX}-libtheora"
          "${MINGW_PACKAGE_PREFIX}-openssl"
diff --git a/mingw-w64-libwebsockets/PKGBUILD b/mingw-w64-libwebsockets/PKGBUILD
index 6e43c252b0..381db60cad 100644
--- a/mingw-w64-libwebsockets/PKGBUILD
+++ b/mingw-w64-libwebsockets/PKGBUILD
@@ -7,19 +7,19 @@ pkgver=4.3.3
 pkgrel=1
 pkgdesc="C library for websocket clients and servers (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+url='https://libwebsockets.org/'
+msys2_repository_url='https://libwebsockets.org/git/libwebsockets/'
 msys2_references=(
   'archlinux: libwebsockets'
 )
-msys2_repository_url='https://libwebsockets.org/git/libwebsockets/'
-url='https://libwebsockets.org/'
 license=('spdx:MIT')
 depends=("${MINGW_PACKAGE_PREFIX}-zlib"
          "${MINGW_PACKAGE_PREFIX}-openssl")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja")
-source=("${_realname}-${pkgver}.tar.gz::https://github.com/warmcat/${_realname}/archive/v${pkgver}.tar.gz"
+source=("https://github.com/warmcat/${_realname}/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz"
         001-posix-layout.patch
         002-cmake-remove-build-hash.patch)
 sha256sums=('6fd33527b410a37ebc91bb64ca51bdabab12b076bc99d153d7c5dd405e4bdf90'
@@ -57,7 +57,7 @@ build() {
 
 package() {
   cd ${srcdir}/build-${MSYSTEM}
-  DESTDIR=${pkgdir} ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install
+  DESTDIR=${pkgdir} ${MINGW_PREFIX}/bin/cmake.exe --install .
   install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
 
   local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
diff --git a/mingw-w64-libwpd/PKGBUILD b/mingw-w64-libwpd/PKGBUILD
index 0cbec271e4..cacd989789 100644
--- a/mingw-w64-libwpd/PKGBUILD
+++ b/mingw-w64-libwpd/PKGBUILD
@@ -7,9 +7,9 @@ pkgver=0.10.3
 pkgrel=2
 pkgdesc="Library for Importing WordPerfect (tm) Documents (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://libwpd.sourceforge.io/"
-license=('spdx:LGPL-2.1-or-later' 'spdx:MPL-2.0')
+license=('spdx:LGPL-2.1-or-later OR MPL-2.0')
 makedepends=(
   "${MINGW_PACKAGE_PREFIX}-cc"
   "${MINGW_PACKAGE_PREFIX}-autotools"
@@ -19,7 +19,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-librevenge"
          "${MINGW_PACKAGE_PREFIX}-xz"
          "${MINGW_PACKAGE_PREFIX}-zlib")
-options=(staticlibs strip !buildflags)
+options=(!buildflags)
 source=("https://downloads.sourceforge.net/project/${_realname}/${_realname}/${_realname}-${pkgver}/${_realname}-${pkgver}.tar.xz"
         fix-condition.patch
         fix-var-sizes.patch)
@@ -35,11 +35,10 @@ prepare() {
 }
 
 build() {
-  export lt_cv_deplibs_check_method='pass_all'
-  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
+  mkdir -p ${srcdir}/build-${MSYSTEM} && cd "${srcdir}/build-${MSYSTEM}"
+
+  export lt_cv_deplibs_check_method='pass_all'
 
-  mkdir -p ${srcdir}/build-${MINGW_CHOST}
-  cd "${srcdir}/build-${MINGW_CHOST}"
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -54,6 +53,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/mingw-w64-live-media/PKGBUILD b/mingw-w64-live-media/PKGBUILD
index 8bb39f0a64..f6638ff8fe 100644
--- a/mingw-w64-live-media/PKGBUILD
+++ b/mingw-w64-live-media/PKGBUILD
@@ -10,9 +10,9 @@ pkgver=2022.04.26
 pkgrel=2
 pkgdesc="A set of C++ libraries for multimedia streaming (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
-license=('spdx:LGPL-3.0-or-later')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="http://live555.com/liveMedia"
+license=('spdx:LGPL-3.0-or-later')
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-openssl")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "rsync")
diff --git a/mingw-w64-livechart-gtk3/PKGBUILD b/mingw-w64-livechart-gtk3/PKGBUILD
index 177f532569..c9f0b15036 100644
--- a/mingw-w64-livechart-gtk3/PKGBUILD
+++ b/mingw-w64-livechart-gtk3/PKGBUILD
@@ -5,41 +5,36 @@ pkgbase=mingw-w64-${_realname}-gtk3
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-gtk3"
 pkgver=1.9.1
 pkgrel=1
-pkgdesc="Live Chart is a real-time charting library for GTK3 and Vala, based on Cairo."
+pkgdesc="Live Chart is a real-time charting library for GTK3 and Vala, based on Cairo. (mingw-w64)"
 arch=(any)
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://github.com/lcallarec/live-chart"
-license=('MIT')
+license=('spdx:MIT')
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
-             "${MINGW_PACKAGE_PREFIX}-vala"
              "${MINGW_PACKAGE_PREFIX}-meson"
              "${MINGW_PACKAGE_PREFIX}-ninja"
              "${MINGW_PACKAGE_PREFIX}-pkgconf"
-             "${MINGW_PACKAGE_PREFIX}-python3")
+             "${MINGW_PACKAGE_PREFIX}-vala"
+             "${MINGW_PACKAGE_PREFIX}-python")
 depends=("${MINGW_PACKAGE_PREFIX}-glib2"
          "${MINGW_PACKAGE_PREFIX}-gtk3"
          "${MINGW_PACKAGE_PREFIX}-libgee")
-source=(https://github.com/lcallarec/${_realname}/archive/${pkgver}.tar.gz)
+source=(https://github.com/lcallarec/${_realname}/archive/${pkgver}/${_realname}-${pkgver}.tar.gz)
 sha256sums=('7b5f1d0807b5f6e8b09e2c1dd468af22379578b55b38afd530c0ff006bc33e53')
 
-prepare() {
-  cd ${_realname}-${pkgver}
-}
-
 build() {
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
-  mkdir "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  mkdir "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
-  ${MINGW_PREFIX}/bin/meson \
+  ${MINGW_PREFIX}/bin/meson setup \
     --prefix="${MINGW_PREFIX}" \
     --buildtype=plain \
     ../${_realname}-${pkgver}
 
-  ${MINGW_PREFIX}/bin/ninja
+  ${MINGW_PREFIX}/bin/meson compile
 }
 
 package() {
-  cd "${srcdir}"/build-${CARCH}
-  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/ninja install
+  cd "${srcdir}"/build-${MSYSTEM}
+  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/meson install
 }
diff --git a/mingw-w64-lua-lgi/PKGBUILD b/mingw-w64-lua-lgi/PKGBUILD
index 2bcb45b519..f60e5123b5 100644
--- a/mingw-w64-lua-lgi/PKGBUILD
+++ b/mingw-w64-lua-lgi/PKGBUILD
@@ -7,15 +7,15 @@ pkgver=0.9.2
 pkgrel=3
 pkgdesc="LGI is gobject-introspection based dynamic Lua binding to GObject based libraries (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://github.com/pavouk/lgi"
-license=("MIT")
+license=("spdx:MIT")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc")
 depends=("${MINGW_PACKAGE_PREFIX}-lua51"
          "${MINGW_PACKAGE_PREFIX}-gtk3"
          "${MINGW_PACKAGE_PREFIX}-libffi"
          "${MINGW_PACKAGE_PREFIX}-gobject-introspection")
-source=(${_realname}-${pkgver}.zip::"https://github.com/pavouk/${_realname}/archive/${pkgver}.zip"
+source=("https://github.com/pavouk/${_realname}/archive/${pkgver}/${_realname}-${pkgver}.zip"
         "001-lua5.1.patch")
 sha256sums=('c6cdb7cca6b745790454b45ebb9c3e8be96aca948c7d640d79c969a1c78b35e9'
             '7c10a414e57f07a89fd1847b5d1c4baf61dc568c2737841eb94a6f2c76b3a5c5')
diff --git a/mingw-w64-neon/PKGBUILD b/mingw-w64-neon/PKGBUILD
index b60ce93ec4..1059bf15c6 100644
--- a/mingw-w64-neon/PKGBUILD
+++ b/mingw-w64-neon/PKGBUILD
@@ -7,9 +7,10 @@ pkgver=0.33.0
 pkgrel=1
 pkgdesc="HTTP and WebDAV client library with a C interface (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://notroj.github.io/neon/"
-license=('GPL' 'LGPL')
+msys2_repository_url="https://github.com/notroj/neon"
+license=('spdx:LGPL-2.0-or-later')
 depends=("${MINGW_PACKAGE_PREFIX}-expat"
          "${MINGW_PACKAGE_PREFIX}-gettext"
          "${MINGW_PACKAGE_PREFIX}-openssl"
diff --git a/mingw-w64-nimble/PKGBUILD b/mingw-w64-nimble/PKGBUILD
index a671de695a..dc7260deee 100644
--- a/mingw-w64-nimble/PKGBUILD
+++ b/mingw-w64-nimble/PKGBUILD
@@ -7,12 +7,12 @@ pkgver=0.14.2
 pkgrel=1
 pkgdesc='Package manager for the Nim programming language (mingw-w64)'
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64')
 url='https://github.com/nim-lang/nimble'
-license=('BSD')
+license=('spdx:BSD-3-Clause')
 depends=("${MINGW_PACKAGE_PREFIX}-openssl")
 makedepends=("${MINGW_PACKAGE_PREFIX}-nim" "${MINGW_PACKAGE_PREFIX}-cc")
-source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/nim-lang/nimble/archive/v${pkgver}.tar.gz")
+source=("https://github.com/nim-lang/nimble/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('d94f11c592d49aed6c5a492289f187010eb8c103b2b653252763d2f65a82abac')
 
 build() {
diff --git a/mingw-w64-openldap/PKGBUILD b/mingw-w64-openldap/PKGBUILD
index 26bb11a330..3fb46a7f33 100644
--- a/mingw-w64-openldap/PKGBUILD
+++ b/mingw-w64-openldap/PKGBUILD
@@ -5,9 +5,12 @@ pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=2.6.7
 pkgrel=1
-arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 pkgdesc="OpenLDAP Software is an open source implementation of the Lightweight Directory Access Protocol (only client) (mingw-w64)"
+arch=('any')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+url="https://www.openldap.org/"
+msys2_repository_url="https://git.openldap.org/openldap/openldap"
+license=("The OpenLDAP Public License")
 depends=("${MINGW_PACKAGE_PREFIX}-cyrus-sasl"
          "${MINGW_PACKAGE_PREFIX}-libltdl"
          "${MINGW_PACKAGE_PREFIX}-openssl"
@@ -18,8 +21,6 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-libsystre"
              "groff")
 options=('!makeflags')
-license=("The OpenLDAP Public License")
-url="https://www.openldap.org/"
 source=(https://www.openldap.org/software/download/OpenLDAP/openldap-release/${_realname}-${pkgver}.tgz
         001-backmdb.patch
         002-mingw-build-fixes.patch
diff --git a/mingw-w64-osm-gps-map/PKGBUILD b/mingw-w64-osm-gps-map/PKGBUILD
index bf67a18b5b..c8f64a8099 100644
--- a/mingw-w64-osm-gps-map/PKGBUILD
+++ b/mingw-w64-osm-gps-map/PKGBUILD
@@ -7,9 +7,10 @@ pkgver=1.2.0
 pkgrel=2
 pkgdesc="A Gtk+ Widget for Displaying OpenStreetMap tiles. (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://nzjrs.github.io/osm-gps-map/"
-license=("GPLv2+")
+msys2_repository_url="https://github.com/nzjrs/osm-gps-map"
+license=("spdx:GPL-2.0-only")
 depends=(
     "${MINGW_PACKAGE_PREFIX}-libsoup"
     "${MINGW_PACKAGE_PREFIX}-gtk3"
@@ -22,7 +23,7 @@ makedepends=(
     "${MINGW_PACKAGE_PREFIX}-gtk-doc"
 )
 
-source=( https://github.com/nzjrs/osm-gps-map/releases/download/${pkgver}/${_realname}-${pkgver}.tar.gz) 
+source=(https://github.com/nzjrs/osm-gps-map/releases/download/${pkgver}/${_realname}-${pkgver}.tar.gz) 
 sha256sums=('ddec11449f37b5dffb4bca134d024623897c6140af1f9981a8acc512dbf6a7a5')
 
 prepare() {
diff --git a/mingw-w64-osslsigncode/PKGBUILD b/mingw-w64-osslsigncode/PKGBUILD
index 755768f6e2..1c4adf70f9 100644
--- a/mingw-w64-osslsigncode/PKGBUILD
+++ b/mingw-w64-osslsigncode/PKGBUILD
@@ -7,15 +7,15 @@ pkgver=2.7
 pkgrel=1
 pkgdesc="Tool for Authenticode signing of PE, CAB and MSI files (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://github.com/mtrojnar/osslsigncode"
-license=("GPL3")
+license=("spdx:GPL-3.0-or-later")
 depends=("${MINGW_PACKAGE_PREFIX}-curl"
          "${MINGW_PACKAGE_PREFIX}-openssl")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja")
-source=("${_realname}-${pkgver}.tar.gz::https://github.com/mtrojnar/${_realname}/archive/${pkgver}.tar.gz"
+source=("https://github.com/mtrojnar/${_realname}/archive/${pkgver}/${_realname}-${pkgver}.tar.gz"
         "0001-fix-install-destination.patch")
 sha256sums=('00fc2b43395d89a2d07ebbd4981e7a9dbc676c7115d122a1385441c0294239b8'
             '1d00a0f4a8d5009802f01292466eff1fa96ed520024a00397cc8d3514207b7bd')
diff --git a/mingw-w64-podofo/PKGBUILD b/mingw-w64-podofo/PKGBUILD
index b2c9a25067..3f2122b476 100644
--- a/mingw-w64-podofo/PKGBUILD
+++ b/mingw-w64-podofo/PKGBUILD
@@ -7,8 +7,9 @@ pkgver=0.9.8
 pkgrel=5
 pkgdesc="A C++ library to work with the PDF file format (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://podofo.sourceforge.io/"
+msys2_repository_url="https://github.com/podofo/podofo"
 license=('spdx:LGPL-2.0-or-later AND GPL-2.0-or-later')
 depends=("${MINGW_PACKAGE_PREFIX}-fontconfig"
          "${MINGW_PACKAGE_PREFIX}-libtiff"
diff --git a/mingw-w64-pybind11/PKGBUILD b/mingw-w64-pybind11/PKGBUILD
index 830e5dd634..9b054e3c3b 100644
--- a/mingw-w64-pybind11/PKGBUILD
+++ b/mingw-w64-pybind11/PKGBUILD
@@ -6,10 +6,14 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=2.11.1
 pkgrel=1
 pkgdesc="A lightweight header-only library that exposes C++ types in Python and vice versa (mingw-w64)"
-url='https://pybind11.readthedocs.org/'
-license=('BSD')
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+url='https://pybind11.readthedocs.org/'
+msys2_repository_url="https://github.com/pybind/pybind11"
+msys2_references=(
+  'pypi: pybind11'
+)
+license=('spdx:BSD-3-Clause')
 depends=("${MINGW_PACKAGE_PREFIX}-python")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
@@ -27,7 +31,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-python-sphinxcontrib-svg2pdfconverter"
              "${MINGW_PACKAGE_PREFIX}-python-pytest")
 checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest")
-source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/pybind/pybind11/archive/v${pkgver}.tar.gz")
+source=("https://github.com/pybind/pybind11/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('d475978da0cdc2d43b73f30910786759d593a9d8ee05b1b6846d1eb16c6d2e0c')
 
 build () {
diff --git a/mingw-w64-python-dulwich/PKGBUILD b/mingw-w64-python-dulwich/PKGBUILD
index 7e4cd5c2f7..45253221ac 100644
--- a/mingw-w64-python-dulwich/PKGBUILD
+++ b/mingw-w64-python-dulwich/PKGBUILD
@@ -7,11 +7,11 @@ pkgver=0.21.7
 pkgrel=1
 pkgdesc="Python Git Library (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+url='https://www.dulwich.io/'
 msys2_references=(
   'pypi: dulwich'
 )
-url='https://www.dulwich.io/'
 license=('spdx:Apache-2.0 OR spdx:GPL-2.0-or-later')
 depends=("${MINGW_PACKAGE_PREFIX}-python"
          "${MINGW_PACKAGE_PREFIX}-python-urllib3")
diff --git a/mingw-w64-python-elastic-transport/PKGBUILD b/mingw-w64-python-elastic-transport/PKGBUILD
index 163fbf55b7..2215ee530d 100644
--- a/mingw-w64-python-elastic-transport/PKGBUILD
+++ b/mingw-w64-python-elastic-transport/PKGBUILD
@@ -7,12 +7,12 @@ pkgver=8.12.0
 pkgrel=1
 pkgdesc="Transport classes and utilities shared among Python Elastic client libraries (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+url='https://elastic-transport-python.readthedocs.io/'
+msys2_repository_url='https://github.com/elastic/elastic-transport-python/'
 msys2_references=(
   'pypi: elastic-transport'
 )
-url='https://elastic-transport-python.readthedocs.io/'
-msys2_repository_url='https://github.com/elastic/elastic-transport-python/'
 license=('spdx:Apache-2.0')
 depends=("${MINGW_PACKAGE_PREFIX}-python"
          "${MINGW_PACKAGE_PREFIX}-python-urllib3"
diff --git a/mingw-w64-python-gcs-oauth2-boto-plugin/PKGBUILD b/mingw-w64-python-gcs-oauth2-boto-plugin/PKGBUILD
index 7fb28ea9ac..745fb3e79f 100644
--- a/mingw-w64-python-gcs-oauth2-boto-plugin/PKGBUILD
+++ b/mingw-w64-python-gcs-oauth2-boto-plugin/PKGBUILD
@@ -7,11 +7,11 @@ pkgver=3.0
 pkgrel=2
 pkgdesc="Auth plugin allowing use the use of OAuth 2.0 credentials for Google Cloud Storage in the Boto library. (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+url='https://developers.google.com/storage/docs/gspythonlibrary'
 msys2_references=(
   'pypi: gcs-oauth2-boto-plugin'
 )
-url='https://developers.google.com/storage/docs/gspythonlibrary'
 license=('spdx:Apache-2.0')
 depends=("${MINGW_PACKAGE_PREFIX}-python"
          "${MINGW_PACKAGE_PREFIX}-python-rsa"
diff --git a/mingw-w64-python-httpretty/PKGBUILD b/mingw-w64-python-httpretty/PKGBUILD
index 9fadc0d1ba..13a84a28d4 100644
--- a/mingw-w64-python-httpretty/PKGBUILD
+++ b/mingw-w64-python-httpretty/PKGBUILD
@@ -7,12 +7,12 @@ pkgver=1.1.4
 pkgrel=3
 pkgdesc="HTTP client mock for Python (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+url='https://github.com/gabrielfalcao/httpretty'
 msys2_references=(
   'pypi: httpretty'
 )
-url='https://github.com/gabrielfalcao/httpretty'
-license=('MIT')
+license=('spdx:MIT')
 depends=("${MINGW_PACKAGE_PREFIX}-python-urllib3")
 makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 source=("https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz")
diff --git a/mingw-w64-python-paramiko/PKGBUILD b/mingw-w64-python-paramiko/PKGBUILD
index 1640040f0f..55b69e4019 100644
--- a/mingw-w64-python-paramiko/PKGBUILD
+++ b/mingw-w64-python-paramiko/PKGBUILD
@@ -10,11 +10,11 @@ pkgver=3.4.0
 pkgrel=1
 pkgdesc="The leading native Python SSHv2 protocol library (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+url='https://github.com/paramiko/paramiko/'
 msys2_references=(
   'pypi: paramiko'
 )
-url='https://github.com/paramiko/paramiko/'
 license=('spdx:LGPL-2.1-or-later')
 depends=(
     ${MINGW_PACKAGE_PREFIX}-python
@@ -24,7 +24,6 @@ depends=(
     ${MINGW_PACKAGE_PREFIX}-python-six)
 makedepends=(
     ${MINGW_PACKAGE_PREFIX}-python-setuptools)
-options=('staticlibs' 'strip' '!debug')
 source=("https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('aac08f26a31dc4dffd92821527d1682d99d52f9ef6851968114a8728f3c274d3')
 
diff --git a/mingw-w64-python-redis/PKGBUILD b/mingw-w64-python-redis/PKGBUILD
index 841a7fb0b1..6f2fc3c124 100644
--- a/mingw-w64-python-redis/PKGBUILD
+++ b/mingw-w64-python-redis/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=5.0.1
 pkgrel=1
 pkgdesc="The Python interface to the Redis key-value store (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url='https://github.com/redis/redis-py'
 license=('spdx:MIT')
 depends=("${MINGW_PACKAGE_PREFIX}-python-async-timeout")
diff --git a/mingw-w64-python-requests-kerberos/PKGBUILD b/mingw-w64-python-requests-kerberos/PKGBUILD
index d2bfdeb0f6..a2dad22a2f 100644
--- a/mingw-w64-python-requests-kerberos/PKGBUILD
+++ b/mingw-w64-python-requests-kerberos/PKGBUILD
@@ -10,9 +10,9 @@ pkgver=0.14.0
 pkgrel=5
 pkgdesc="A kerberos of useful classes and functions to be used with python-requests (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url='https://github.com/requests/requests-kerberos'
-license=('Apache')
+license=('spdx:ISC')
 depends=("${MINGW_PACKAGE_PREFIX}-python"
          "${MINGW_PACKAGE_PREFIX}-python-cryptography"
          "${MINGW_PACKAGE_PREFIX}-python-requests"
@@ -21,8 +21,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-python"
 makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
 checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest"
               "${MINGW_PACKAGE_PREFIX}-python-mock")
-options=('staticlibs' 'strip' '!debug')
-source=("${_realname}-${pkgver}.tar.gz::https://github.com/requests/requests-kerberos/archive/v${pkgver}.tar.gz")
+source=("https://github.com/requests/requests-kerberos/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz")
 sha512sums=('9dd6eed0d6afe4b852ba96f621be3af2965e9011bf372c5dce77e0bca18191255ea407ba313904271615d722d60029807db2d6815b24437b021b02b026eb60d6')
 
 prepare() {
diff --git a/mingw-w64-python-requests-oauthlib/PKGBUILD b/mingw-w64-python-requests-oauthlib/PKGBUILD
index dfae3eb322..96751de6ae 100644
--- a/mingw-w64-python-requests-oauthlib/PKGBUILD
+++ b/mingw-w64-python-requests-oauthlib/PKGBUILD
@@ -7,8 +7,8 @@ pkgver=1.3.1
 pkgrel=3
 pkgdesc='"First-class OAuth library support for Requests (mingw-w64)'
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
-url="https://pypi.python.org/pypi/requests-oauthlib"
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+url="https://github.com/requests/requests-oauthlib"
 license=('spdx:ISC')
 depends=("${MINGW_PACKAGE_PREFIX}-python-oauthlib"
          "${MINGW_PACKAGE_PREFIX}-python-requests")
@@ -23,25 +23,24 @@ sha256sums=('2eeaa4764c58e78cb4334b3d748c08961e3ae5cb3d765e5d89854222a48e8d14')
 
 export PBR_VERSION=$pkgver
 
-prepare() {  
+prepare() {
   cd "$srcdir"
-  rm -rf python-build-${CARCH}
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM}
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 }
 
 build() {
-  msg "Python build for ${CARCH}"  
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/py.test || warning "Tests failed"
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
diff --git a/mingw-w64-python-requests-unixsocket/PKGBUILD b/mingw-w64-python-requests-unixsocket/PKGBUILD
index d69b73b06f..c5f372bbf4 100644
--- a/mingw-w64-python-requests-unixsocket/PKGBUILD
+++ b/mingw-w64-python-requests-unixsocket/PKGBUILD
@@ -7,11 +7,11 @@ pkgver=0.3.0
 pkgrel=4
 pkgdesc='Use requests to talk HTTP via a UNIX domain socket (mingw-w64)'
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+url='https://github.com/msabramo/requests-unixsocket'
 msys2_references=(
   'pypi: requests-unixsocket'
 )
-url='https://github.com/msabramo/requests-unixsocket'
 license=('spdx:Apache-2.0')
 depends=(
     ${MINGW_PACKAGE_PREFIX}-python
@@ -21,7 +21,7 @@ makedepends=(
     ${MINGW_PACKAGE_PREFIX}-python-pbr
     ${MINGW_PACKAGE_PREFIX}-python-setuptools
     ${MINGW_PACKAGE_PREFIX}-python-wheel)
-source=("${_realname}-${pkgver}.tar.gz::https://pypi.org/packages/source/r/${_realname}/${_realname}-${pkgver}.tar.gz")
+source=("https://pypi.org/packages/source/r/${_realname}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('28304283ea9357d45fff58ad5b11e47708cfbf5806817aa59b2a363228ee971e')
 
 prepare() {
diff --git a/mingw-w64-python-responses/PKGBUILD b/mingw-w64-python-responses/PKGBUILD
index c9402ca8ce..5f1b4c5626 100644
--- a/mingw-w64-python-responses/PKGBUILD
+++ b/mingw-w64-python-responses/PKGBUILD
@@ -7,16 +7,16 @@ pkgver=0.24.1
 pkgrel=1
 pkgdesc='A utility library for mocking out the `requests` Python library. (mingw-w64)'
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
-msys2_references=(
-  'archlinux: python-responses'
-  'pypi: responses'
-)
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+url="https://github.com/getsentry/responses"
 msys2_repository_url='https://github.com/getsentry/responses'
 msys2_changelog_url='https://github.com/getsentry/responses/blob/master/CHANGES'
 msys2_documentation_url='https://github.com/getsentry/responses/blob/master/README.rst'
 msys2_issue_tracker_url='https://github.com/getsentry/responses/issues'
-url="https://github.com/getsentry/responses"
+msys2_references=(
+  'archlinux: python-responses'
+  'pypi: responses'
+)
 license=('spdx:Apache-2.0')
 depends=("${MINGW_PACKAGE_PREFIX}-python"
          "${MINGW_PACKAGE_PREFIX}-python-requests"
diff --git a/mingw-w64-rabbitmq-c/PKGBUILD b/mingw-w64-rabbitmq-c/PKGBUILD
index 13dde0488f..f218f569de 100644
--- a/mingw-w64-rabbitmq-c/PKGBUILD
+++ b/mingw-w64-rabbitmq-c/PKGBUILD
@@ -7,19 +7,19 @@ pkgver=0.13.0
 pkgrel=1
 pkgdesc="RabbitMQ C client (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+url='https://github.com/alanxz/rabbitmq-c'
 msys2_references=(
   'archlinux: librabbitmq-c'
 )
-url='https://github.com/alanxz/rabbitmq-c'
-license=('MIT')
+license=('spdx:MIT')
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja")
 depends=("${MINGW_PACKAGE_PREFIX}-openssl"
          "${MINGW_PACKAGE_PREFIX}-popt"
          "${MINGW_PACKAGE_PREFIX}-libwinpthread-git")
-source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/alanxz/${_realname}/archive/v${pkgver}.tar.gz"
+source=("https://github.com/alanxz/${_realname}/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz"
         "0001-librabbitmq-CMakeLists.txt.patch")
 sha256sums=('8b224e41bba504fc52b02f918d8df7e4bf5359d493cbbff36c06078655c676e6'
             'c82b9964e4e569303ca4369e632e7bec7c3c0d75992c5ffb2555700aba46d472')
diff --git a/mingw-w64-tor/PKGBUILD b/mingw-w64-tor/PKGBUILD
index a46fa86882..c10a39cbf6 100644
--- a/mingw-w64-tor/PKGBUILD
+++ b/mingw-w64-tor/PKGBUILD
@@ -7,12 +7,12 @@ pkgver=0.4.8.10
 pkgrel=1
 pkgdesc="Anonymizing overlay network (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64')
+url='https://www.torproject.org/'
+msys2_repository_url='https://gitlab.torproject.org/tpo/core/tor/'
 msys2_references=(
   'archlinux: tor'
 )
-msys2_repository_url='https://gitlab.torproject.org/tpo/core/tor/'
-url='https://www.torproject.org/'
 license=('spdx:BSD-3-Clause')
 depends=("${MINGW_PACKAGE_PREFIX}-libevent"
          "${MINGW_PACKAGE_PREFIX}-openssl"
diff --git a/mingw-w64-unbound/PKGBUILD b/mingw-w64-unbound/PKGBUILD
index 8b25a9693b..2c61b7a3fd 100644
--- a/mingw-w64-unbound/PKGBUILD
+++ b/mingw-w64-unbound/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.17.0
 pkgrel=2
 pkgdesc="Validating, recursive, and caching DNS resolver (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url='https://unbound.net/'
 license=('spdx:BSD-3-Clause')
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
diff --git a/mingw-w64-volk/PKGBUILD b/mingw-w64-volk/PKGBUILD
index 6b2ecb237a..81b15cdc61 100644
--- a/mingw-w64-volk/PKGBUILD
+++ b/mingw-w64-volk/PKGBUILD
@@ -8,11 +8,11 @@ _cpuver=0.9.0
 pkgrel=1
 pkgdesc="The Vector Optimized Library of Kernels (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64')
+url='https://github.com/gnuradio/volk'
 msys2_references=(
   'archlinux: libvolk'
 )
-url='https://github.com/gnuradio/volk'
 license=('spdx:LGPL-3.0-or-later')
 depends=("${MINGW_PACKAGE_PREFIX}-boost"
          "${MINGW_PACKAGE_PREFIX}-gcc-libs"
@@ -23,7 +23,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-ninja"
              "${MINGW_PACKAGE_PREFIX}-python-mako")
 source=("https://github.com/gnuradio/volk/releases/download/v${pkgver}/volk-${pkgver}.tar.xz"{,.asc}
-        "cpufeatures-${_cpuver}.tar.gz::https://github.com/google/cpu_features/archive/v${_cpuver}.tar.gz")
+        "https://github.com/google/cpu_features/archive/v${_cpuver}/cpufeatures-${_cpuver}.tar.gz")
 sha256sums=('ab0efe8c098484617c2b130e9d4ae518893d88368e8f04f5049c3fa9659a93a1'
             'SKIP'
             'bdb3484de8297c49b59955c3b22dba834401bc2df984ef5cfc17acbe69c5018e')
@@ -36,7 +36,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
   mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   declare -a extra_config
diff --git a/mingw-w64-wget2/PKGBUILD b/mingw-w64-wget2/PKGBUILD
index d8670972f9..c5ce578ad7 100644
--- a/mingw-w64-wget2/PKGBUILD
+++ b/mingw-w64-wget2/PKGBUILD
@@ -7,9 +7,10 @@ pkgver=2.1.0
 pkgrel=1
 pkgdesc='Updated version of popular wget URL retrieval tool (mingw-w64)'
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url='https://www.gnu.org/software/wget/'
-license=('spdx:GPL-3.0-or-later' 'spdx:LGPL-3.0-or-later')
+msys2_repository_url="https://gitlab.com/gnuwget/wget2"
+license=('spdx:GPL-3.0-or-later AND LGPL-3.0-or-later')
 depends=("${MINGW_PACKAGE_PREFIX}-brotli"
          "${MINGW_PACKAGE_PREFIX}-bzip2"
          "${MINGW_PACKAGE_PREFIX}-gettext"
diff --git a/mingw-w64-xmlsec/PKGBUILD b/mingw-w64-xmlsec/PKGBUILD
index 207e9316f8..90c49bbd61 100644
--- a/mingw-w64-xmlsec/PKGBUILD
+++ b/mingw-w64-xmlsec/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.2.39
 pkgrel=1
 pkgdesc="XML Security Library is a C library based on LibXML2 (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://www.aleksey.com/xmlsec/"
 license=('spdx:MIT')
 depends=("${MINGW_PACKAGE_PREFIX}-libxml2"
@@ -17,8 +17,8 @@ depends=("${MINGW_PACKAGE_PREFIX}-libxml2"
          "${MINGW_PACKAGE_PREFIX}-libgcrypt"
          "${MINGW_PACKAGE_PREFIX}-nss"
          "${MINGW_PACKAGE_PREFIX}-libltdl")
-makedepends=("${MINGW_PACKAGE_PREFIX}-autotools"
-             "${MINGW_PACKAGE_PREFIX}-cc")
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-autotools")
 source=(https://www.aleksey.com/xmlsec/download/${_realname}1-${pkgver}.tar.gz
         01-include-openssl-last.patch
         02-make-new-wincrypt-functions-available.patch)