diff --git a/mingw-w64-mathgl/PKGBUILD b/mingw-w64-mathgl/PKGBUILD
index 646d78ad28..499ed80da1 100644
--- a/mingw-w64-mathgl/PKGBUILD
+++ b/mingw-w64-mathgl/PKGBUILD
@@ -4,7 +4,7 @@ _realname=mathgl
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=2.4.4
-pkgrel=4
+pkgrel=5
 pkgdesc="Library for high-quality scientific graphics (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64')
@@ -20,8 +20,9 @@ depends=("${MINGW_PACKAGE_PREFIX}-giflib"
          "${MINGW_PACKAGE_PREFIX}-libharu"
          "${MINGW_PACKAGE_PREFIX}-libjpeg-turbo"
          "${MINGW_PACKAGE_PREFIX}-libpng"
-         "${MINGW_PACKAGE_PREFIX}-qt5"
-         "${MINGW_PACKAGE_PREFIX}-qtwebkit")
+         "${MINGW_PACKAGE_PREFIX}-qt5-base"
+         $([[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]] ||
+           echo "${MINGW_PACKAGE_PREFIX}-qtwebkit") )
          #"${MINGW_PACKAGE_PREFIX}-wxWidgets"
 source=("${_realname}-${pkgver}.tar.gz::https://downloads.sourceforge.net/${_realname}/${_realname}-${pkgver}.tar.gz"
         "${_realname}-2.4.2.patch")
@@ -34,8 +35,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   CXXFLAGS=" -Wno-deprecated-declarations" \
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
@@ -64,7 +65,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install
 
   # fixup references in associated cmake modules
diff --git a/mingw-w64-tulip/PKGBUILD b/mingw-w64-tulip/PKGBUILD
index 3b7b817a0a..e79b9c9bcb 100644
--- a/mingw-w64-tulip/PKGBUILD
+++ b/mingw-w64-tulip/PKGBUILD
@@ -6,7 +6,7 @@ pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 _pre=
 _ver=5.5.1
 pkgver=${_ver}${_pre}
-pkgrel=1
+pkgrel=2
 pkgdesc="Large graphs analysis, drawing and visualization framework"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64')
@@ -23,7 +23,8 @@ depends=("${MINGW_PACKAGE_PREFIX}-freetype"
          "${MINGW_PACKAGE_PREFIX}-libjpeg"
          "${MINGW_PACKAGE_PREFIX}-python"
          "${MINGW_PACKAGE_PREFIX}-qhull"
-         "${MINGW_PACKAGE_PREFIX}-qt5"
+         "${MINGW_PACKAGE_PREFIX}-qt5-base"
+         "${MINGW_PACKAGE_PREFIX}-qt5-xmlpatterns"
          "${MINGW_PACKAGE_PREFIX}-qtwebkit"
          "${MINGW_PACKAGE_PREFIX}-quazip"
          "${MINGW_PACKAGE_PREFIX}-yajl")
@@ -31,7 +32,8 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-doxygen"
              "${MINGW_PACKAGE_PREFIX}-sip"
-             "${MINGW_PACKAGE_PREFIX}-python-sphinx")
+             "${MINGW_PACKAGE_PREFIX}-python-sphinx"
+             "${MINGW_PACKAGE_PREFIX}-qt5-tools")
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
@@ -39,9 +41,8 @@ prepare() {
 }
 
 build() {
-  rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -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=" \
   ${MINGW_PREFIX}/bin/cmake \
@@ -54,10 +55,10 @@ build() {
     -DTULIP_PYTHON_SITE_INSTALL=ON \
     ../${_realname}-${_ver}${_pre}
 
-  make
+  cmake --build .
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/build-${MSYSTEM}"
+  DESTDIR=${pkgdir} cmake --install .
 }
diff --git a/mingw-w64-wkhtmltopdf-git/PKGBUILD b/mingw-w64-wkhtmltopdf-git/PKGBUILD
index 4e78207c84..2b4f6e8c0c 100644
--- a/mingw-w64-wkhtmltopdf-git/PKGBUILD
+++ b/mingw-w64-wkhtmltopdf-git/PKGBUILD
@@ -5,16 +5,18 @@ pkgbase=mingw-w64-${_realname}-git
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
 _basever=0.13
 pkgver=0.13.r1049.51f9658
-pkgrel=1
+pkgrel=2
+_commit=51f96581f878c15ac1fbf1bb62fb9cc3a4a53917
 pkgdesc="Convert HTML to PDF using QtWebkit (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64')
 url="https://wkhtmltopdf.org/"
 license=('LGPL')
 makedepends=("git" "${MINGW_PACKAGE_PREFIX}-gcc")
-depends=("${MINGW_PACKAGE_PREFIX}-qt5"
+depends=("${MINGW_PACKAGE_PREFIX}-qt5-svg"
+         "${MINGW_PACKAGE_PREFIX}-qt5-xmlpatterns"
          "${MINGW_PACKAGE_PREFIX}-qtwebkit")
-source=("${_realname}::git+https://github.com/${_realname}/${_realname}.git#branch=merge-${_basever}")
+source=(git+https://github.com/${_realname}/${_realname}.git#commit=$_commit)
 sha256sums=('SKIP')
 
 pkgver() {
@@ -29,9 +31,8 @@ prepare() {
 }
 
 build() {
-  rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -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
   PATH=`pwd`:$PATH
@@ -39,11 +40,12 @@ build() {
 
   ${MINGW_PREFIX}/bin/qmake -set CROSS_COMPILE "${MINGW_CHOST}-"
   ${MINGW_PREFIX}/bin/qmake -spec win32-g++ "../${_realname}/${_realname}.pro"
+
   make release
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   install -D ../${_realname}/include/wkhtmltox/dllbegin.inc "${pkgdir}${MINGW_PREFIX}/include/wkhtmltox/dllbegin.inc"
   install -D ../${_realname}/include/wkhtmltox/dllend.inc "${pkgdir}${MINGW_PREFIX}/include/wkhtmltox/dllend.inc"
diff --git a/mingw-w64-zeal/PKGBUILD b/mingw-w64-zeal/PKGBUILD
index 7b973ad9f8..fce37922ac 100644
--- a/mingw-w64-zeal/PKGBUILD
+++ b/mingw-w64-zeal/PKGBUILD
@@ -5,14 +5,14 @@ _builddir=build
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.6.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Offline documentation browser inspired by Dash (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64')
 url="https://github.com/zealdocs/${_realname}"
 license=("GPL3")
 depends=("${MINGW_PACKAGE_PREFIX}-libarchive"
-         "${MINGW_PACKAGE_PREFIX}-qt5"
+         "${MINGW_PACKAGE_PREFIX}-qt5-base"
          "${MINGW_PACKAGE_PREFIX}-qtwebkit")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
@@ -28,8 +28,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}"/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
+  [[ -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=" \
   ${MINGW_PREFIX}/bin/cmake.exe \
@@ -43,7 +43,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   install -Dm755 bin/zeal.exe ${pkgdir}${MINGW_PREFIX}/bin/zeal.exe
   install -Dm644 ${srcdir}/${_realname}-${pkgver}/COPYING ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING
 }