diff --git a/mingw-w64-86box/PKGBUILD b/mingw-w64-86box/PKGBUILD
index b9f9cadd6b..66a7727bcb 100644
--- a/mingw-w64-86box/PKGBUILD
+++ b/mingw-w64-86box/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=4.0.1
 pkgrel=2
 pkgdesc="An emulator for classic IBM PC clones (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url='https://86box.net/'
 msys2_repository_url="https://github.com/86box/86box"
 msys2_references=(
@@ -23,17 +23,13 @@ depends=(
   "${MINGW_PACKAGE_PREFIX}-libpng"
   "${MINGW_PACKAGE_PREFIX}-rtmidi"
   "${MINGW_PACKAGE_PREFIX}-libslirp"
-  $([[ ${CARCH} != i686 ]] && echo \
-    "${MINGW_PACKAGE_PREFIX}-qt6-base" || echo \
-    "${MINGW_PACKAGE_PREFIX}-qt5-base")
+  "${MINGW_PACKAGE_PREFIX}-qt6-base"
 )
 makedepends=(
   "${MINGW_PACKAGE_PREFIX}-cc"
   "${MINGW_PACKAGE_PREFIX}-cmake"
   "${MINGW_PACKAGE_PREFIX}-ninja"
-  $([[ ${CARCH} != i686 ]] && echo \
-    "${MINGW_PACKAGE_PREFIX}-qt6-tools" || echo \
-    "${MINGW_PACKAGE_PREFIX}-qt5-tools")
+  "${MINGW_PACKAGE_PREFIX}-qt6-tools"
 )
 source=("https://github.com/${_realname}/${_realname}/archive/refs/tags/v${pkgver}.tar.gz"
         "0001-use-unix-install-layout.patch")
@@ -66,7 +62,7 @@ build() {
       -GNinja \
       -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \
       -DSTATIC_BUILD=OFF \
-      -DUSE_QT6=$([[ ${CARCH} != i686 ]] && echo "ON" || echo "OFF") \
+      -DUSE_QT6=ON \
       "${extra_config[@]}" \
       "../${_realname}-${pkgver}"
 
diff --git a/mingw-w64-cgal/PKGBUILD b/mingw-w64-cgal/PKGBUILD
index 37a0327982..8bdf1761b1 100644
--- a/mingw-w64-cgal/PKGBUILD
+++ b/mingw-w64-cgal/PKGBUILD
@@ -7,9 +7,10 @@ pkgver=5.6
 pkgrel=1
 pkgdesc="Computational Geometry Algorithms Library (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://www.cgal.org/"
-license=("LGPL, GPL")
+msys2_repository_url="https://github.com/CGAL/cgal"
+license=("spdx:CC0-1.0 AND BSL-1.0 AND MIT AND LGPL-3.0-or-later AND GPL-3.0-or-later")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-eigen3"
@@ -29,14 +30,8 @@ optdepends=("${MINGW_PACKAGE_PREFIX}-eigen3: for some packages, see the CGAL man
 source=(https://github.com/CGAL/cgal/releases/download/v${pkgver}/CGAL-${pkgver}.tar.xz)
 sha256sums=('dcab9b08a50a06a7cc2cc69a8a12200f8d8f391b9b8013ae476965c10b45161f')
 
-prepare() {
-  plain 'No Step'
-}
-
 build() {
-  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
-  mkdir ${srcdir}/build-${MSYSTEM}
-  cd ${srcdir}/build-${MSYSTEM}
+  mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
diff --git a/mingw-w64-djview/PKGBUILD b/mingw-w64-djview/PKGBUILD
index 4622f71533..7da86ed78c 100644
--- a/mingw-w64-djview/PKGBUILD
+++ b/mingw-w64-djview/PKGBUILD
@@ -6,17 +6,17 @@ pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=4.12
 pkgrel=2
 pkgdesc='Portable DjVu viewer (mingw-w64)'
-url='https://djvu.sourceforge.io/djview4.html'
-license=('GPL')
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+url='https://djvu.sourceforge.io/djview4.html'
+license=('spdx:GPL-2.0-or-later')
 depends=("${MINGW_PACKAGE_PREFIX}-djvulibre"
          "${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-qt5-base"
          "${MINGW_PACKAGE_PREFIX}-libtiff")
-makedepends=("${MINGW_PACKAGE_PREFIX}-qt5-tools"
-             "${MINGW_PACKAGE_PREFIX}-autotools"
-             "${MINGW_PACKAGE_PREFIX}-cc")
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-qt5-tools"
+             "${MINGW_PACKAGE_PREFIX}-autotools")
 source=("https://downloads.sourceforge.net/djvu/${_realname}-${pkgver}.tar.gz")
 sha256sums=('5673c6a8b7e195b91a1720b24091915b8145de34879db1158bc936b100eaf3e3')
 conflicts=("${MINGW_PACKAGE_PREFIX}-djview4")
diff --git a/mingw-w64-grantlee/PKGBUILD b/mingw-w64-grantlee/PKGBUILD
index 176e4ddf04..e33529b4f1 100644
--- a/mingw-w64-grantlee/PKGBUILD
+++ b/mingw-w64-grantlee/PKGBUILD
@@ -7,12 +7,10 @@ pkgver=5.3.1
 pkgrel=1
 pkgdesc="Libraries for text templating with Qt (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://github.com/steveire/grantlee"
 license=('spdx:LGPL-2.1-or-later')
-depends=($([[ ${CARCH} != i686 ]] && echo \
-           "${MINGW_PACKAGE_PREFIX}-qt6-declarative" || echo \
-           "${MINGW_PACKAGE_PREFIX}-qt5-declarative"))
+depends=("${MINGW_PACKAGE_PREFIX}-qt6-declarative")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
@@ -42,10 +40,6 @@ del_file_exists() {
 }
 # =========================================== #
 
-prepare() {
-  cd "${srcdir}"/${_realname}-${pkgver}
-}
-
 build() {
   mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
@@ -61,7 +55,7 @@ build() {
       -G'Ninja' \
       -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
       "${_extra_config[@]}" \
-      -DGRANTLEE_BUILD_WITH_QT6=$([[ ${CARCH} != i686 ]] && echo "ON" || echo "OFF") \
+      -DGRANTLEE_BUILD_WITH_QT6=ON \
       -DBUILD_SHARED_LIBS=ON \
       -DBUILD_TESTS=OFF \
       ../${_realname}-${pkgver}
diff --git a/mingw-w64-jom/PKGBUILD b/mingw-w64-jom/PKGBUILD
index 7a6607f8d2..301168dfec 100644
--- a/mingw-w64-jom/PKGBUILD
+++ b/mingw-w64-jom/PKGBUILD
@@ -7,21 +7,18 @@ pkgdesc="JOM - the parallel make tool for Windows (mingw-w64)"
 pkgver=1.1.3
 pkgrel=2
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64')
 url='https://wiki.qt.io/Jom'
-license=('GPL3')
+msys2_repository_url="https://codereview.qt-project.org/gitweb?p=qt-labs/jom.git"
+license=('spdx:GPL-3.0-or-later')
 depends=("${MINGW_PACKAGE_PREFIX}-qt5-base")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake")
-options=('strip' 'staticlibs')
-#options=('!strip' 'debug' 'staticlibs')
 source=("${_realname}-v${pkgver}.tar.gz::https://codereview.qt-project.org/gitweb?p=qt-labs/jom.git;a=snapshot;h=refs/tags/v${pkgver};sf=tgz")
 sha256sums=('1207452997f428505203741a4de4bb7b35fb37b357bf56092280c57c8e47d18b')
 
 build() {
-  cd "${srcdir}"
-  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
-  mkdir build-${MSYSTEM} && cd build-${MSYSTEM}
+  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake.exe \
@@ -30,12 +27,12 @@ build() {
     -DCMAKE_BUILD_TYPE=Release \
     ../${_realname}-v${pkgver}
 
-  make
+  ${MINGW_PREFIX}/bin/cmake --build .
 }
 
 package() {
   cd "${srcdir}/build-${MSYSTEM}"
-  make DESTDIR=${pkgdir} install
+  DESTDIR=${pkgdir} ${MINGW_PREFIX}/bin/cmake --install .
 
   install -Dm644 "${srcdir}/${_realname}-v${pkgver}/LICENSE.GPL" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
 }
diff --git a/mingw-w64-keepassxc/PKGBUILD b/mingw-w64-keepassxc/PKGBUILD
index de3b540aea..fa18d20440 100644
--- a/mingw-w64-keepassxc/PKGBUILD
+++ b/mingw-w64-keepassxc/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=2.7.6
 pkgrel=4
 pkgdesc="A modern, secure, and open-source password manager that stores and manages your most sensitive information (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url='https://keepassxc.org/'
 msys2_repository_url='https://github.com/keepassxreboot/keepassxc'
 license=('spdx:GPL-2.0 OR GPL-3.0')
@@ -41,7 +41,6 @@ prepare() {
 }
 
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
diff --git a/mingw-w64-liblastfm/PKGBUILD b/mingw-w64-liblastfm/PKGBUILD
index 04893479f3..14c9efafaf 100644
--- a/mingw-w64-liblastfm/PKGBUILD
+++ b/mingw-w64-liblastfm/PKGBUILD
@@ -8,21 +8,21 @@ pkgver=1.1.0
 pkgrel=3
 pkgdesc="A Qt C++ library for the Last.fm webservices https://www.last.fm"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
-license=('spdx:GPL-3.0')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://www.last.fm/download"
+msys2_repository_url="https://github.com/lastfm/liblastfm"
+license=('spdx:GPL-3.0')
 depends=("${MINGW_PACKAGE_PREFIX}-qt5-base"
          "${MINGW_PACKAGE_PREFIX}-fftw"
          "${MINGW_PACKAGE_PREFIX}-libsamplerate")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja")
-source=(${_realname}-${pkgver}.tar.gz::"https://github.com/lastfm/liblastfm/archive/${pkgver}.tar.gz")
+source=("https://github.com/lastfm/liblastfm/archive/${pkgver}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('f61f0daa384e081a8f2bd2f7a2148babff22696e5b72ecdac86940a10100b1c8')
 
 build() {
-  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
-  mkdir ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
+  mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
 
   declare -a _extra_config
   if check_option "debug" "n"; then
diff --git a/mingw-w64-mlt/PKGBUILD b/mingw-w64-mlt/PKGBUILD
index cee99c548f..294c5051ee 100644
--- a/mingw-w64-mlt/PKGBUILD
+++ b/mingw-w64-mlt/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=7.18.0
 pkgrel=2
 pkgdesc="An open source multimedia framework (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://www.mltframework.org"
 license=('spdx:LGPL-2.1-or-later')
 _plugins_deps=("${MINGW_PACKAGE_PREFIX}-ffmpeg"
@@ -20,9 +20,8 @@ _plugins_deps=("${MINGW_PACKAGE_PREFIX}-ffmpeg"
                "${MINGW_PACKAGE_PREFIX}-libvorbis"
                "${MINGW_PACKAGE_PREFIX}-pango"
                "${MINGW_PACKAGE_PREFIX}-qt5-svg"
-               $([[ ${CARCH} == i686 ]] || echo \
-                 "${MINGW_PACKAGE_PREFIX}-qt6-5compat" \
-                 "${MINGW_PACKAGE_PREFIX}-qt6-svg")
+               "${MINGW_PACKAGE_PREFIX}-qt6-5compat"
+               "${MINGW_PACKAGE_PREFIX}-qt6-svg"
                "${MINGW_PACKAGE_PREFIX}-rtaudio"
                "${MINGW_PACKAGE_PREFIX}-rubberband"
                "${MINGW_PACKAGE_PREFIX}-SDL"
@@ -84,7 +83,7 @@ build() {
       -DPython3_EXECUTABLE=${MINGW_PREFIX}/bin/python.exe \
       -DWINDOWS_DEPLOY=OFF \
       -DSWIG_PYTHON=ON \
-      -DMOD_QT6=$([[ ${CARCH} != i686 ]] && echo ON || echo OFF) \
+      -DMOD_QT6=ON \
       "${srcdir}/${_realname}-${pkgver}"
 
   "${MINGW_PREFIX}"/bin/cmake.exe --build .
diff --git a/mingw-w64-munt/PKGBUILD b/mingw-w64-munt/PKGBUILD
index dc9de5df2d..8b019173c7 100644
--- a/mingw-w64-munt/PKGBUILD
+++ b/mingw-w64-munt/PKGBUILD
@@ -7,9 +7,10 @@ pkgver=2.7.0
 pkgrel=1
 pkgdesc="Software synthesizer emulating pre-GM MIDI devices such as the Roland MT-32, CM-32L, CM-64 and LAPC-I"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://munt.sourceforge.io/"
-license=("LGPL2.1" "GPL3")
+msys2_repository_url="https://github.com/munt/munt"
+license=("spdx:GPL-3.0-or-later")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja")
@@ -17,13 +18,10 @@ depends=("${MINGW_PACKAGE_PREFIX}-glib2"
          "${MINGW_PACKAGE_PREFIX}-portaudio"
          "${MINGW_PACKAGE_PREFIX}-qt5-base"
          "${MINGW_PACKAGE_PREFIX}-qt5-multimedia")
-options=('staticlibs')
 source=("https://sourceforge.net/projects/${_realname}/files/${_realname}/${pkgver}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('b0960a1eeac8fc40319f77272bbce38a4eb090ab062d0310a11156475c51b913')
 
 build() {
-  cd "${srcdir}"/${_realname}-${pkgver}
-  [[ -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-nodeeditor/PKGBUILD b/mingw-w64-nodeeditor/PKGBUILD
index b63926853f..41ff375898 100644
--- a/mingw-w64-nodeeditor/PKGBUILD
+++ b/mingw-w64-nodeeditor/PKGBUILD
@@ -7,17 +7,15 @@ pkgver=3.0.10
 pkgrel=1
 pkgdesc="NodeEditor is conceived as a general-purpose Qt-based library aimed at graph-controlled data processing."
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://github.com/paceholder/nodeeditor"
 license=('spdx:BSD-3-Clause')
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja")
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
-         $([[ ${CARCH} != i686 ]] && echo \
-           "${MINGW_PACKAGE_PREFIX}-qt6-base" || echo \
-           "${MINGW_PACKAGE_PREFIX}-qt5-base"))
-source=(https://github.com/paceholder/nodeeditor/archive/refs/tags/${pkgver}.tar.gz)
+         "${MINGW_PACKAGE_PREFIX}-qt6-base")
+source=(https://github.com/paceholder/nodeeditor/archive/${pkgver}/${_realname}-${pkgver}.tar.gz)
 sha256sums=('110e7f6831bae87ba4c7163ac581a1a245d17fa92d28ed8633c6799ad3d948ca')
 
 build() {
diff --git a/mingw-w64-python-pysfcgal/PKGBUILD b/mingw-w64-python-pysfcgal/PKGBUILD
index f542040de3..9e70944cb4 100644
--- a/mingw-w64-python-pysfcgal/PKGBUILD
+++ b/mingw-w64-python-pysfcgal/PKGBUILD
@@ -7,18 +7,19 @@ pkgver=1.5.1
 pkgrel=1
 pkgdesc='Python SFCGAL binding (mingw-w64)'
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+url='https://gitlab.com/SFCGAL/pysfcgal'
 msys2_references=(
   'pypi: PySFCGAL'
 )
 license=('spdx:MIT')
-url='https://gitlab.com/SFCGAL/pysfcgal'
 depends=(
     ${MINGW_PACKAGE_PREFIX}-python
     ${MINGW_PACKAGE_PREFIX}-sfcgal
     ${MINGW_PACKAGE_PREFIX}-python-cffi
 )
-makedepends=(${MINGW_PACKAGE_PREFIX}-python-setuptools
+makedepends=(
+    ${MINGW_PACKAGE_PREFIX}-python-setuptools
     ${MINGW_PACKAGE_PREFIX}-python-wheel
     ${MINGW_PACKAGE_PREFIX}-python-cffi
     ${MINGW_PACKAGE_PREFIX}-cc)
@@ -31,7 +32,6 @@ prepare() {
 }
 
 build() {
-  msg "Python build for ${MSYSTEM}"
   cd "${srcdir}/python-build-${MSYSTEM}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
diff --git a/mingw-w64-qbittorrent/PKGBUILD b/mingw-w64-qbittorrent/PKGBUILD
index a38e8d5783..02fb49aba6 100644
--- a/mingw-w64-qbittorrent/PKGBUILD
+++ b/mingw-w64-qbittorrent/PKGBUILD
@@ -7,27 +7,21 @@ pkgver=4.6.3
 pkgrel=1
 pkgdesc="An advanced BitTorrent client programmed in C++, based on Qt toolkit and libtorrent-rasterbar (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64''clangarm64')
 url="https://qbittorrent.org/"
 msys2_repository_url="https://github.com/qbittorrent/qBittorrent"
 license=('spdx:GPL-2.0-or-later')
 depends=("${MINGW_PACKAGE_PREFIX}-boost"
          "${MINGW_PACKAGE_PREFIX}-openssl"
-         $([[ ${CARCH} != i686 ]] && echo \
-           "${MINGW_PACKAGE_PREFIX}-qt6-base" \
-           "${MINGW_PACKAGE_PREFIX}-qt6-svg" || echo \
-           "${MINGW_PACKAGE_PREFIX}-qt5-base" \
-           "${MINGW_PACKAGE_PREFIX}-qt5-svg" \
-           "${MINGW_PACKAGE_PREFIX}-qt5-winextras")
+         "${MINGW_PACKAGE_PREFIX}-qt6-base"
+         "${MINGW_PACKAGE_PREFIX}-qt6-svg"
          "${MINGW_PACKAGE_PREFIX}-libtorrent-rasterbar"
          "${MINGW_PACKAGE_PREFIX}-zlib")
 optdepends=("${MINGW_PACKAGE_PREFIX}-python: needed for torrent search tab")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
-             $([[ ${CARCH} != i686 ]] && echo \
-               "${MINGW_PACKAGE_PREFIX}-qt6-tools" || echo \
-               "${MINGW_PACKAGE_PREFIX}-qt5-tools"))
+             "${MINGW_PACKAGE_PREFIX}-qt6-tools")
 source=("https://downloads.sourceforge.net/sourceforge/qbittorrent/${_realname}-${pkgver}.tar.xz"{,.asc}
         001-PROCESS_CLASS_INFORMATION-require-win8.patch
         002-winconf-prepare-env-for-mingw.patch
@@ -56,15 +50,13 @@ prepare() {
   # mainly to get man pages
   patch -Np1 -i "${srcdir}/004-unixy-install.patch"
 
-  if [[ ${CARCH} != i686 ]]; then
-    # somehow qt6 defines _WIN32_WINNT=0x0A00, and qbittorrent also
-    # defining it to a differnt value errors out. make it match.
-    patch -Np1 -i "${srcdir}/005-no-invalid-redef.patch"
-  fi
+  # somehow qt6 defines _WIN32_WINNT=0x0A00, and qbittorrent also
+  # defining it to a differnt value errors out. make it match.
+  patch -Np1 -i "${srcdir}/005-no-invalid-redef.patch"
 }
 
 build() {
-  cp -rf ${_realname}-${pkgver} build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
+  mkdir -p build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
 
   declare -a extra_config
   if check_option "debug" "n"; then
@@ -73,16 +65,13 @@ build() {
     extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
   fi
 
-  if [[ ${CARCH} != i686 ]]; then
-    extra_config+=("-DQT6=ON")
-  fi
-
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
     "${MINGW_PREFIX}"/bin/cmake.exe \
       -GNinja \
       -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \
       -DSTACKTRACE=OFF \
       "${extra_config[@]}" \
+      -DQT6=ON \
       ../${_realname}-${pkgver}
 
   "${MINGW_PREFIX}"/bin/cmake.exe --build .
@@ -93,5 +82,5 @@ package() {
 
   DESTDIR="${pkgdir}" "${MINGW_PREFIX}"/bin/cmake.exe --install .
 
-  install -Dm644 "COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"
+  install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"
 }
diff --git a/mingw-w64-qdia/PKGBUILD b/mingw-w64-qdia/PKGBUILD
index 6d4c2ea01d..716dc32645 100644
--- a/mingw-w64-qdia/PKGBUILD
+++ b/mingw-w64-qdia/PKGBUILD
@@ -8,19 +8,15 @@ pkgver=0.37
 pkgrel=1
 pkgdesc='Simple schematic/diagram editor (mingw-w64)'
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url='https://github.com/sunderme/qdia'
-license=('AGPL')
-depends=($([[ ${CARCH} != i686 ]] && echo \
-           "${MINGW_PACKAGE_PREFIX}-qt6-svg" || echo \
-           "${MINGW_PACKAGE_PREFIX}-qt5-svg"))
+license=('spdx:AGPL-3.0-or-later')
+depends=("${MINGW_PACKAGE_PREFIX}-qt6-svg")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
-             $([[ ${CARCH} != i686 ]] && echo \
-               "${MINGW_PACKAGE_PREFIX}-qt6-tools" || echo \
-               "${MINGW_PACKAGE_PREFIX}-qt5-tools"))
-source=("${_realname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz")
+             "${MINGW_PACKAGE_PREFIX}-qt6-tools")
+source=("${url}/archive/${pkgver}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('b947458b3cf6cc77e34c14f35ea9dfa2d7e99f6a0721494bc103289623a8d9be')
 
 build() {
diff --git a/mingw-w64-qhttpengine/PKGBUILD b/mingw-w64-qhttpengine/PKGBUILD
index 48a73533fb..2107a25ff9 100644
--- a/mingw-w64-qhttpengine/PKGBUILD
+++ b/mingw-w64-qhttpengine/PKGBUILD
@@ -7,18 +7,17 @@ pkgver=1.0.1
 pkgrel=2
 pkgdesc="HTTP server for Qt applications (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
-license=('MIT')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url='https://github.com/nitroshare/qhttpengine'
+license=('spdx:MIT')
 depends=("${MINGW_PACKAGE_PREFIX}-qt5-base")
-makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
-             "${MINGW_PACKAGE_PREFIX}-cc")
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-cmake")
 source=("https://github.com/nitroshare/qhttpengine/archive/${pkgver}.tar.gz")
 sha256sums=('6505cf889909dc29bab4069116656e7ca5a9e879f04935139439c5691a76c55e')
 
 build() {
-  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
-  mkdir build-${MSYSTEM} && cd build-${MSYSTEM}
+  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
@@ -27,10 +26,10 @@ build() {
     -DCMAKE_BUILD_TYPE=Release \
     ${srcdir}/${_realname}-${pkgver}
 
-  cmake --build .
+  ${MINGW_PREFIX}/bin/cmake --build .
 }
 
 package() {
   cd ${srcdir}/build-${MSYSTEM}
-  DESTDIR="${pkgdir}" cmake --install .
+  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --install .
 }
diff --git a/mingw-w64-qmdnsengine/PKGBUILD b/mingw-w64-qmdnsengine/PKGBUILD
index 8a32cfa29f..65f54f5cfa 100644
--- a/mingw-w64-qmdnsengine/PKGBUILD
+++ b/mingw-w64-qmdnsengine/PKGBUILD
@@ -7,18 +7,17 @@ pkgver=0.2.0
 pkgrel=2
 pkgdesc="Multicast DNS library for Qt applications"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
-license=('MIT')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url='https://github.com/nitroshare/qmdnsengine'
+license=('spdx:MIT')
 depends=("${MINGW_PACKAGE_PREFIX}-qt5-base")
-makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
-             "${MINGW_PACKAGE_PREFIX}-cc")
-source=("https://github.com/nitroshare/qmdnsengine/archive/${pkgver}.tar.gz")
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-cmake")
+source=("https://github.com/nitroshare/qmdnsengine/archive/${pkgver}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('b9a4e86de2afd31224ca2007713a2d9bcc0334358f831a2b83a7161b7d91c614')
 
 build() {
-  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
-  mkdir build-${MSYSTEM} && cd build-${MSYSTEM}
+  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
@@ -27,10 +26,10 @@ build() {
     -DCMAKE_BUILD_TYPE=Release \
     ${srcdir}/${_realname}-${pkgver}
 
-  cmake --build .
+  ${MINGW_PREFIX}/bin/cmake --build .
 }
 
 package() {
   cd ${srcdir}/build-${MSYSTEM}
-  DESTDIR="${pkgdir}" cmake --install .
+  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --install .
 }
diff --git a/mingw-w64-qtwebkit/PKGBUILD b/mingw-w64-qtwebkit/PKGBUILD
index 239cf5ba5d..00e71d85b9 100644
--- a/mingw-w64-qtwebkit/PKGBUILD
+++ b/mingw-w64-qtwebkit/PKGBUILD
@@ -8,12 +8,11 @@ pkgver=${_pkgver//-/}
 pkgrel=17
 pkgdesc="Webkit module for Qt5 (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64')
+url="https://github.com/qtwebkit/qtwebkit/wiki"
 msys2_references=(
   'archlinux: qt5-webkit'
 )
-url="https://github.com/annulen/webkit/wiki"
-options=(!strip)
 license=(GPL3 LGPL3 FDL custom)
 makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ruby"
@@ -34,7 +33,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-icu"
          "${MINGW_PACKAGE_PREFIX}-qt5-sensors"
          "${MINGW_PACKAGE_PREFIX}-qt5-webchannel"
          "${MINGW_PACKAGE_PREFIX}-woff2")
-#install=${_realname}-qt5-git-${CARCH}.install
+options=(!strip)
 source=(https://github.com/annulen/webkit/releases/download/qtwebkit-${_pkgver}/${_realname}-${_pkgver}.tar.xz
         0003-qtwebkit-mfence-mingw.patch
         0005-fix-icu-find.patch
diff --git a/mingw-w64-serial-studio/PKGBUILD b/mingw-w64-serial-studio/PKGBUILD
index 5a91225d57..9e0b336c2c 100644
--- a/mingw-w64-serial-studio/PKGBUILD
+++ b/mingw-w64-serial-studio/PKGBUILD
@@ -5,11 +5,12 @@ pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.1.7
 pkgrel=1
-pkgdesc="Serial Studio: Multi-purpose serial data visualization & processing program (mingw-w64)"
+pkgdesc="Multi-purpose serial data visualization & processing program (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
-url="https://github.com/Serial-Studio/Serial-Studio"
-license=('MIT')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+url="https://serial-studio.github.io/"
+msys2_repository_url="https://github.com/Serial-Studio/Serial-Studio"
+license=('spdx:MIT')
 groups=("${MINGW_PACKAGE_PREFIX}-eda")
 depends=("${MINGW_PACKAGE_PREFIX}-qt5-declarative"
          "${MINGW_PACKAGE_PREFIX}-qt5-svg"
@@ -20,10 +21,10 @@ depends=("${MINGW_PACKAGE_PREFIX}-qt5-declarative"
          "${MINGW_PACKAGE_PREFIX}-qt5-quickcontrols2"
          "${MINGW_PACKAGE_PREFIX}-qt5-graphicaleffects")
 makedepends=(
-  'git'
   "${MINGW_PACKAGE_PREFIX}-cc"
   "${MINGW_PACKAGE_PREFIX}-cmake"
   "${MINGW_PACKAGE_PREFIX}-qt5-tools"
+  'git'
 )
 
 source=("${_realname}::git+https://github.com/${_realname}/${_realname}#commit=v${pkgver}")
@@ -35,7 +36,6 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="PREFIX=" \
diff --git a/mingw-w64-sfcgal/PKGBUILD b/mingw-w64-sfcgal/PKGBUILD
index 4d8e65d44f..fea1b6d990 100644
--- a/mingw-w64-sfcgal/PKGBUILD
+++ b/mingw-w64-sfcgal/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.5.1
 pkgrel=1
 pkgdesc="Wrapper around CGAL that intents to implement 2D and 3D operations on OGC standards models (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://www.sfcgal.org/"
 license=("spdx:LGPL-2.0-or-later")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
@@ -24,7 +24,6 @@ source=(https://gitlab.com/SFCGAL/SFCGAL/-/archive/v${pkgver}/SFCGAL-v${pkgver}.
 sha256sums=('ea5d1662fada7de715ad564dc810c3059024ed81ae393f5352489f706fdfa3b1')
 
 build() {
-  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
   mkdir ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
 
   declare -a _extra_config
diff --git a/mingw-w64-simple-mail/PKGBUILD b/mingw-w64-simple-mail/PKGBUILD
index 03d6722f7b..9eb4cdb415 100644
--- a/mingw-w64-simple-mail/PKGBUILD
+++ b/mingw-w64-simple-mail/PKGBUILD
@@ -7,25 +7,18 @@ pkgver=2.3.0
 pkgrel=1
 pkgdesc="An SMTP library written in C++ for Qt (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://github.com/cutelyst/simple-mail"
-license=("LGPL")
+license=("spdx:LGPL-2.1-or-later")
 depends=("${MINGW_PACKAGE_PREFIX}-qt5-base")
-makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
-            "${MINGW_PACKAGE_PREFIX}-cc"
-            "${MINGW_PACKAGE_PREFIX}-ninja"
-            "${MINGW_PACKAGE_PREFIX}-pkgconf")
-options=('strip')
-source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/cutelyst/${_realname}/archive/v${pkgver}.tar.gz")
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-cmake"
+             "${MINGW_PACKAGE_PREFIX}-ninja"
+             "${MINGW_PACKAGE_PREFIX}-pkgconf")
+source=("https://github.com/cutelyst/${_realname}/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('2026f2017662508b0f25da72694f1dd13ab3ccf82c0454f7c40f8a6cc450c410')
 
-prepare() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-}
-
 build() {
-  msg "Build shared version..."
-  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
   mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
diff --git a/mingw-w64-sqlitebrowser/PKGBUILD b/mingw-w64-sqlitebrowser/PKGBUILD
index cd5af92c9c..9daebec9fd 100644
--- a/mingw-w64-sqlitebrowser/PKGBUILD
+++ b/mingw-w64-sqlitebrowser/PKGBUILD
@@ -7,17 +7,17 @@ pkgver=3.12.2
 pkgrel=3
 pkgdesc='SQLite Database browser is a Qt GUI editor for SQLite databases (mingw-w64)'
 url='https://sqlitebrowser.org/'
+msys2_repository_url="https://github.com/sqlitebrowser/sqlitebrowser"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
-license=('GPL3')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+license=('spdx:MPL-2.0 OR GPL-3.0-or-later')
 depends=("${MINGW_PACKAGE_PREFIX}-qt5-base"
          "${MINGW_PACKAGE_PREFIX}-sqlite3")
-makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
-             "${MINGW_PACKAGE_PREFIX}-qt5-tools"
-             "${MINGW_PACKAGE_PREFIX}-cc")
-options=('strip')
-source=("${_realname}-${pkgver}.tar.gz::https://github.com/sqlitebrowser/sqlitebrowser/archive/v${pkgver}.tar.gz"
+             "${MINGW_PACKAGE_PREFIX}-qt5-tools")
+source=("https://github.com/sqlitebrowser/sqlitebrowser/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz"
         "0001-sqlitebrowser-install.patch"
         "0002-sqlitebrowser-linking.patch")
 sha256sums=('645f98d38e5d128a449e93cebf03c8070f9eacd2d16b10e433a781d54a9d478a'
@@ -32,8 +32,6 @@ prepare() {
 }
 
 build() {
-  cd "${srcdir}"/${_realname}-${pkgver}
-  [[ -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-suil/PKGBUILD b/mingw-w64-suil/PKGBUILD
index ab8065c9af..177a54f52b 100644
--- a/mingw-w64-suil/PKGBUILD
+++ b/mingw-w64-suil/PKGBUILD
@@ -6,20 +6,20 @@ pkgver=0.10.20
 pkgrel=1
 pkgdesc="A lightweight C library for loading and wrapping LV2 plugin UIs (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+url="https://drobilla.net/software/suil.html"
+msys2_repository_url="https://gitlab.com/lv2/suil/"
+msys2_documentation_url="https://drobilla.net/docs/suil/"
 msys2_references=(
   'archlinux: suil'
 )
-msys2_documentation_url="https://drobilla.net/docs/suil/"
-msys2_repository_url="https://gitlab.com/lv2/suil/"
-url="https://drobilla.net/software/suil.html"
 license=("spdx:0BSD OR ISC")
 makedepends=(
   "${MINGW_PACKAGE_PREFIX}-cc"
-  "${MINGW_PACKAGE_PREFIX}-gtk2"
-  "${MINGW_PACKAGE_PREFIX}-gtk3"
   "${MINGW_PACKAGE_PREFIX}-meson"
   "${MINGW_PACKAGE_PREFIX}-pkgconf"
+  "${MINGW_PACKAGE_PREFIX}-gtk2"
+  "${MINGW_PACKAGE_PREFIX}-gtk3"
   "${MINGW_PACKAGE_PREFIX}-qt5-base"
 )
 depends=("${MINGW_PACKAGE_PREFIX}-lv2")
@@ -35,9 +35,7 @@ sha256sums=('334a3ed3e73d5e17ff400b3db9801f63809155b0faa8b1b9046f9dd3ffef934e'
 validpgpkeys=('907D226E7E13FA337F014A083672782A9BF368F3') # David Robillard <d@drobilla.net>
 
 build() {
-  [[ -d "build-${MSYSTEM}" ]] && rm -rf "build-${MSYSTEM}"
-  mkdir -p "${srcdir}/build-${MSYSTEM}"
-  cd "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
   ${MINGW_PREFIX}/bin/meson.exe setup \
diff --git a/mingw-w64-transmission/PKGBUILD b/mingw-w64-transmission/PKGBUILD
index 4014e16cac..76f6bfd7ca 100644
--- a/mingw-w64-transmission/PKGBUILD
+++ b/mingw-w64-transmission/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}-cli"
 pkgver=4.0.5
 pkgrel=1
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64')
 msys2_references=(
   'archlinux: transmission-gtk'
 )
diff --git a/mingw-w64-wkhtmltopdf-git/PKGBUILD b/mingw-w64-wkhtmltopdf-git/PKGBUILD
index 09378ed7f5..beebafd318 100644
--- a/mingw-w64-wkhtmltopdf-git/PKGBUILD
+++ b/mingw-w64-wkhtmltopdf-git/PKGBUILD
@@ -9,9 +9,10 @@ pkgrel=2
 _commit=51f96581f878c15ac1fbf1bb62fb9cc3a4a53917
 pkgdesc="Convert HTML to PDF using QtWebkit (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64')
+mingw_arch=('mingw64' 'ucrt64')
 url="https://wkhtmltopdf.org/"
-license=('LGPL')
+msys2_repository_url="https://github.com/wkhtmltopdf/wkhtmltopdf"
+license=('spdx:LGPL-3.0-only')
 makedepends=("git" "${MINGW_PACKAGE_PREFIX}-cc")
 depends=("${MINGW_PACKAGE_PREFIX}-qt5-svg"
          "${MINGW_PACKAGE_PREFIX}-qt5-xmlpatterns"
@@ -31,7 +32,6 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
   mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
 
   ln -fs `which windres` ${MINGW_CHOST}-windres
diff --git a/mingw-w64-xpdf/PKGBUILD b/mingw-w64-xpdf/PKGBUILD
index 4335890ec6..cb56bd9ad0 100644
--- a/mingw-w64-xpdf/PKGBUILD
+++ b/mingw-w64-xpdf/PKGBUILD
@@ -7,9 +7,9 @@ pkgver=4.04
 pkgrel=2
 pkgdesc="Utilities for PDF files (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
-license=('GPL2+')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://www.xpdfreader.com/"
+license=('spdx:GPL-2.0-only OR GPL-3.0-only')
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
@@ -22,7 +22,6 @@ depends=("${MINGW_PACKAGE_PREFIX}-freetype"
          "${MINGW_PACKAGE_PREFIX}-qt5-base"
          "${MINGW_PACKAGE_PREFIX}-qt5-svg"
          "${MINGW_PACKAGE_PREFIX}-zlib")
-options=('strip')
 source=(https://dl.xpdfreader.com/xpdf-${pkgver}.tar.gz{,.sig}
         002-xpdf-4.00-64bit.patch
         005-xpdf-4.00-permissions.patch
@@ -42,8 +41,7 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
-  mkdir build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
+  mkdir -p build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX" \
   ${MINGW_PREFIX}/bin/cmake.exe \
diff --git a/mingw-w64-yuview/PKGBUILD b/mingw-w64-yuview/PKGBUILD
index e16d3d8b5f..47231bf325 100644
--- a/mingw-w64-yuview/PKGBUILD
+++ b/mingw-w64-yuview/PKGBUILD
@@ -7,12 +7,12 @@ pkgver=2.13
 pkgrel=1
 pkgdesc="YUView is a QT based, cross-platform YUV player with an advanced analytic toolset. (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url='http://ient.github.io/YUView/'
-license=('GPL3')
+license=('spdx:GPL-3.0-or-later')
 depends=("${MINGW_PACKAGE_PREFIX}-qt5-base")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc")
-source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/IENT/YUView/archive/v.${pkgver}.tar.gz")
+source=("https://github.com/IENT/YUView/archive/v.${pkgver}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('24ec418d1138416dce6e615c18896f0c78abe43802c13b5cc5c0085e9904f03f')
 
 prepare() {
diff --git a/mingw-w64-zint/PKGBUILD b/mingw-w64-zint/PKGBUILD
index c58716cbc6..581ce52244 100644
--- a/mingw-w64-zint/PKGBUILD
+++ b/mingw-w64-zint/PKGBUILD
@@ -13,7 +13,7 @@ pkgver=2.12.0
 pkgrel=1
 pkgdesc='Barcode encoding library supporting over 50 symbologies (mingw-w64)'
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="http://zint.org.uk/"
 license=('spdx:GPL-3.0-or-later')
 makedepends=(