diff --git a/mingw-w64-gr/PKGBUILD b/mingw-w64-gr/PKGBUILD
index fec877266a..81acf21c5e 100644
--- a/mingw-w64-gr/PKGBUILD
+++ b/mingw-w64-gr/PKGBUILD
@@ -39,6 +39,7 @@ prepare() {
 
   # Set version manually, otherwise it resets to zero
   echo "${pkgver}" > version.txt
+  sed -i "s|\${GR_VERSION}|${pkgver}|g" CMakeLists.txt
 }
 
 build() {
diff --git a/mingw-w64-itk/PKGBUILD b/mingw-w64-itk/PKGBUILD
index a2e3bb114c..fe7234ec35 100644
--- a/mingw-w64-itk/PKGBUILD
+++ b/mingw-w64-itk/PKGBUILD
@@ -22,7 +22,8 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-opencv"
-             "${MINGW_PACKAGE_PREFIX}-vtk")
+             "${MINGW_PACKAGE_PREFIX}-vtk"
+             "${MINGW_PACKAGE_PREFIX}-qt5-base")
 optdepends=("${MINGW_PACKAGE_PREFIX}-opencv: ITK-OpenCV bridge"
             "${MINGW_PACKAGE_PREFIX}-vtk: ITK-VTK bridge")
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/InsightSoftwareConsortium/ITK/archive/v${pkgver}.tar.gz")
diff --git a/mingw-w64-libvmime-git/PKGBUILD b/mingw-w64-libvmime-git/PKGBUILD
index 2402d90916..e34375881f 100644
--- a/mingw-w64-libvmime-git/PKGBUILD
+++ b/mingw-w64-libvmime-git/PKGBUILD
@@ -32,7 +32,7 @@ sha256sums=('SKIP'
 
 pkgver() {
   cd "${srcdir}/${_realname}"
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  printf "r%s.%s" "$(git rev-list --count $_commit)" "$(git rev-parse --short $_commit)"
 }
 
 prepare() {
diff --git a/mingw-w64-luajit/PKGBUILD b/mingw-w64-luajit/PKGBUILD
index 844d6defc3..af2f5f31ef 100644
--- a/mingw-w64-luajit/PKGBUILD
+++ b/mingw-w64-luajit/PKGBUILD
@@ -14,8 +14,7 @@ license=('MIT')
 depends=('winpty')
 conflicts=("${MINGW_PACKAGE_PREFIX}-lua51"
            "${MINGW_PACKAGE_PREFIX}-luajit-git")
-provides=("${MINGW_PACKAGE_PREFIX}-lua51"
-          "${MINGW_PACKAGE_PREFIX}-luajit-git")
+provides=("${MINGW_PACKAGE_PREFIX}-luajit-git")
 replaces=("${MINGW_PACKAGE_PREFIX}-lua51"
           "${MINGW_PACKAGE_PREFIX}-luajit-git")
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc")
diff --git a/mingw-w64-openshadinglanguage/PKGBUILD b/mingw-w64-openshadinglanguage/PKGBUILD
index a3de1d2abd..dc65711fd1 100644
--- a/mingw-w64-openshadinglanguage/PKGBUILD
+++ b/mingw-w64-openshadinglanguage/PKGBUILD
@@ -94,6 +94,8 @@ build() {
   [[ -d build-${MINGW_CHOST} ]] && rm -r build-${MINGW_CHOST}
   mkdir build-${MINGW_CHOST} && cd build-${MINGW_CHOST}
 
+  unset CI
+
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake.exe \
     -G"MSYS Makefiles" \
diff --git a/mingw-w64-vera++/0001-fix_python_detection_issues.patch b/mingw-w64-vera++/0001-fix_python_detection_issues.patch
index 92980c7c0f..21b0df75ee 100644
--- a/mingw-w64-vera++/0001-fix_python_detection_issues.patch
+++ b/mingw-w64-vera++/0001-fix_python_detection_issues.patch
@@ -8,8 +8,8 @@ Index: src/python.cmake
    set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
 -  find_package(PythonInterp 2.0)
 -  find_package(PythonLibs 2.0)
-+  find_package(PythonInterp 3.8)
-+  find_package(PythonLibs 3.8)
++  find_package(PythonInterp 3.9)
++  find_package(PythonLibs 3.9)
    if(WIN32 AND NOT PYTHONLIBS_FOUND)
      message(FATAL_ERROR "Could NOT find Python. Turn VERA_USE_SYSTEM_PYTHON to OFF to build it with vera++.")
    endif()
@@ -31,7 +31,7 @@ Index: src/boost.cmake
 +  # be used as suffixes, but note that they are not portable.
 +  #
 +  # from https://cmake.org/cmake/help/latest/module/FindBoost.html
-+  list(APPEND boostLibs python38)
++  list(APPEND boostLibs python39)
  endif()
 
  if(VERA_USE_SYSTEM_BOOST)
@@ -39,7 +39,7 @@ Index: src/boost.cmake
    set(SOURCEFORGE downloads.sourceforge.net CACHE STRING
      "Sourceforge host used to download external projects. Use it to force a specific mirror.")
    mark_as_advanced(SOURCEFORGE)
-+  string(REPLACE "python38" "python" boostLibs "${boostLibs}")
++  string(REPLACE "python39" "python" boostLibs "${boostLibs}")
    string(REPLACE ";" "," boostLibsComma "${boostLibs}")
    string(REPLACE ";" " --with-" WITH_LIBS "${boostLibs}")
    set(WITH_LIBS "--with-${WITH_LIBS}")
diff --git a/mingw-w64-vera++/PKGBUILD b/mingw-w64-vera++/PKGBUILD
index fd17684642..f0b1f6f8df 100644
--- a/mingw-w64-vera++/PKGBUILD
+++ b/mingw-w64-vera++/PKGBUILD
@@ -1,9 +1,10 @@
 # Maintainer: David Demelier <markand@malikania.fr
+
 _realname=vera++
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.3.0
-pkgrel=3
+pkgrel=4
 pkgdesc="A programmable tool for verification, analysis and transformation of C++ source code"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -16,7 +17,7 @@ makedepends=(${MINGW_PACKAGE_PREFIX}-cmake)
 source=(https://bitbucket.org/verateam/vera/downloads/${_realname}-${pkgver}.tar.gz
         0001-fix_python_detection_issues.patch)
 sha256sums=('9415657a09438353489db10ca860dd6459e446cfd9c649a1a2e02268da66f270'
-            '29411f71eb1ee1f727253ea3893b6556e7c3b2dfa19da5f0b0a2fc955fc08f8c')
+            '6cf72e234688c6875579a20a51268bebb10f9d12cfe35748ab4d513d2c00f762')
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
diff --git a/mingw-w64-yaml-cpp0.3/PKGBUILD b/mingw-w64-yaml-cpp0.3/PKGBUILD
index de6055ad19..aedcc47977 100644
--- a/mingw-w64-yaml-cpp0.3/PKGBUILD
+++ b/mingw-w64-yaml-cpp0.3/PKGBUILD
@@ -10,7 +10,6 @@ arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 url="https://github.com/jbeder/yaml-cpp"
 license=("MIT")
-provides=("${MINGW_PACKAGE_PREFIX}-yaml-cpp")
 conflicts=("${MINGW_PACKAGE_PREFIX}-yaml-cpp")
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
              "${MINGW_PACKAGE_PREFIX}-cmake"