Update *-qt6-* packages to 6.1.0

2021-04-28 17:11:48 +02:00 · 2021-04-28 17:11:48 +02:00 · 24127f223f
parent 792e55bdd3
commit 24127f223f
164 changed files with 1504 additions and 236 deletions
--- a/devel/generator/templates/layouts/android-qt6-base.sh.ep
+++ b/devel/generator/templates/layouts/android-qt6-base.sh.ep
@ -14,7 +14,7 @@

 _android_arch=<%= $variant_prefix_part =~ s/android-// && $variant_prefix_part %>
 pkgname=<%= $package_name %>
-_qtver=6.0.1
+_qtver=6.1.0
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
--- a/devel/generator/templates/layouts/mingw-w64-qt6-base.sh.ep
+++ b/devel/generator/templates/layouts/mingw-w64-qt6-base.sh.ep
@ -14,7 +14,7 @@
 % }

 pkgname=<%= $package_name %>
-_qtver=6.0.1
+_qtver=6.1.0
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
@ -62,6 +62,7 @@ build() {
 % if ($static_variant) {
      -DCMAKE_INSTALL_PREFIX:PATH="/usr/$_arch/static" \\
      -DFEATURE_static_runtime=ON \\
+      -DFEATURE_openssl_linked=ON \\
 % }
      -DFEATURE_pkg_config=ON \\
      -DFEATURE_system_pcre2=ON \\
--- a/devel/qt5/update-patches.sh
+++ b/devel/qt5/update-patches.sh
@ -94,7 +94,9 @@ fi
 msg2 "Exporting patches for branch '$branch' (based on '$tag')"
 git format-patch "$tag" --output-directory "$dest"
 new_patches=("$dest"/*.patch)
-for other_variant_dir in "$dest/../$variant"?*; do
+also_covered_variants=none # for sake of simplicity: use same set of patches also for android packages
+[[ $variant == mingw-w64 ]] && also_covered_variants=android-
+for other_variant_dir in "$dest/../$variant"?* "$dest/../$also_covered_variants"?*; do
    [[ -d $other_variant_dir ]] || continue
    find "$other_variant_dir" -iname '*.patch' -delete
    if [[ ${#new_patches[@]} -gt 0 ]]; then
--- a/qt6-3d/mingw-w64-static/PKGBUILD
+++ b/qt6-3d/mingw-w64-static/PKGBUILD
@ -4,7 +4,7 @@
 # you also find the URL of a binary repository.

 pkgname=mingw-w64-qt6-3d-static
-_qtver=6.0.1
+_qtver=6.1.0
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
--- a/qt6-3d/mingw-w64/PKGBUILD
+++ b/qt6-3d/mingw-w64/PKGBUILD
@ -4,7 +4,7 @@
 # you also find the URL of a binary repository.

 pkgname=mingw-w64-qt6-3d
-_qtver=6.0.1
+_qtver=6.1.0
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
--- a/qt6-3d/mingw-w64/PKGBUILD.sh.ep
+++ b/qt6-3d/mingw-w64/PKGBUILD.sh.ep
@ -1,6 +1,6 @@
 % layout 'mingw-w64-qt6-module', additional_library => 1, has_binaries => 1;
 \
-_qtver=6.0.1
+_qtver=6.1.0
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
--- a/qt6-5compat/android-aarch64/PKGBUILD
+++ b/qt6-5compat/android-aarch64/PKGBUILD
@ -5,7 +5,7 @@

 _android_arch=aarch64
 pkgname=android-$_android_arch-qt6-5compat
-_qtver=6.0.1
+_qtver=6.1.0
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
@ -18,7 +18,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
 groups=(android-${_android_arch}-qt6)
 _pkgfqn="qt5compat-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-sha256sums=('058a723f6be33748a5ecaab7a0e398993d9b7788bed3a196aee26432cb8e9a1e')
+sha256sums=('c7d7e6ca2702b8b8b8b251bd271771ec319e5d107bb65f4dba024c200c8fd23c')

 build() {
  source android-env ${_android_arch}
--- a/qt6-5compat/android-aarch64/PKGBUILD.sh.ep
+++ b/qt6-5compat/android-aarch64/PKGBUILD.sh.ep
@ -1,6 +1,6 @@
 % layout 'android-qt6-module';
 \
-_qtver=6.0.1
+_qtver=6.1.0
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
--- a/qt6-5compat/android-aarch64/qt5compat-sha256.txt
+++ b/qt6-5compat/android-aarch64/qt5compat-sha256.txt
@ -1 +1 @@
-058a723f6be33748a5ecaab7a0e398993d9b7788bed3a196aee26432cb8e9a1e
+c7d7e6ca2702b8b8b8b251bd271771ec319e5d107bb65f4dba024c200c8fd23c
--- a/qt6-5compat/mingw-w64-static/PKGBUILD
+++ b/qt6-5compat/mingw-w64-static/PKGBUILD
@ -4,7 +4,7 @@
 # you also find the URL of a binary repository.

 pkgname=mingw-w64-qt6-5compat-static
-_qtver=6.0.1
+_qtver=6.1.0
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
@ -17,7 +17,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
 groups=(mingw-w64-qt6)
 _pkgfqn="qt5compat-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-sha256sums=('058a723f6be33748a5ecaab7a0e398993d9b7788bed3a196aee26432cb8e9a1e')
+sha256sums=('c7d7e6ca2702b8b8b8b251bd271771ec319e5d107bb65f4dba024c200c8fd23c')

 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'

--- a/qt6-5compat/mingw-w64-static/qt5compat-sha256.txt
+++ b/qt6-5compat/mingw-w64-static/qt5compat-sha256.txt
@ -1 +1 @@
-058a723f6be33748a5ecaab7a0e398993d9b7788bed3a196aee26432cb8e9a1e
+c7d7e6ca2702b8b8b8b251bd271771ec319e5d107bb65f4dba024c200c8fd23c
--- a/qt6-5compat/mingw-w64/PKGBUILD
+++ b/qt6-5compat/mingw-w64/PKGBUILD
@ -4,7 +4,7 @@
 # you also find the URL of a binary repository.

 pkgname=mingw-w64-qt6-5compat
-_qtver=6.0.1
+_qtver=6.1.0
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
@ -17,7 +17,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
 groups=(mingw-w64-qt6)
 _pkgfqn="qt5compat-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-sha256sums=('058a723f6be33748a5ecaab7a0e398993d9b7788bed3a196aee26432cb8e9a1e')
+sha256sums=('c7d7e6ca2702b8b8b8b251bd271771ec319e5d107bb65f4dba024c200c8fd23c')

 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'

--- a/qt6-5compat/mingw-w64/PKGBUILD.sh.ep
+++ b/qt6-5compat/mingw-w64/PKGBUILD.sh.ep
@ -1,6 +1,6 @@
 % layout 'mingw-w64-qt6-module';
 \
-_qtver=6.0.1
+_qtver=6.1.0
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
--- a/qt6-5compat/mingw-w64/qt5compat-sha256.txt
+++ b/qt6-5compat/mingw-w64/qt5compat-sha256.txt
@ -1 +1 @@
-058a723f6be33748a5ecaab7a0e398993d9b7788bed3a196aee26432cb8e9a1e
+c7d7e6ca2702b8b8b8b251bd271771ec319e5d107bb65f4dba024c200c8fd23c
--- a/qt6-activeqt/mingw-w64-static/0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch
+++ b/qt6-activeqt/mingw-w64-static/0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch
@ -0,0 +1 @@
+../mingw-w64/0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch
--- a/qt6-activeqt/mingw-w64-static/0002-Build-tools-for-the-target-platform.patch
+++ b/qt6-activeqt/mingw-w64-static/0002-Build-tools-for-the-target-platform.patch
@ -0,0 +1 @@
+../mingw-w64/0002-Build-tools-for-the-target-platform.patch
--- a/qt6-activeqt/mingw-w64-static/PKGBUILD
+++ b/qt6-activeqt/mingw-w64-static/PKGBUILD
@ -0,0 +1,64 @@
+# Maintainer: Martchus <martchus@gmx.net>
+
+# All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
+# you also find the URL of a binary repository.
+
+pkgname=mingw-w64-qt6-activeqt-static
+_qtver=6.1.0
+pkgver=${_qtver/-/}
+pkgrel=1
+arch=(any)
+url='https://www.qt.io'
+license=(GPL3 LGPL3 FDL custom)
+pkgdesc='ActiveX integration framework (mingw-w64)'
+depends=('mingw-w64-qt6-base-static')
+optdepends=('mingw-w64-qt6-declarative-static: QML bindings')
+makedepends=('mingw-w64-cmake-static' 'mingw-w64-qt6-declarative-static' 'mingw-w64-vulkan-headers' 'mingw-w64-vulkan-icd-loader' 'qt6-declarative' 'ninja')
+options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
+groups=(mingw-w64-qt6)
+_pkgfqn="qtactiveqt-everywhere-src-${_qtver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
+        '0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch'
+        '0002-Build-tools-for-the-target-platform.patch')
+sha256sums=('d79f964054a98b7edcfcb3f3590a58d599bcb2f9569ec10f5f5d9c0070701b4a'
+            'dc557cc9fed6f542ad8123a0bc3c384a065c019f630c8d80a8c2ff33843d7516'
+            'e0dfaee2453e03f97c784bdd934ba9f58c21fe0f16a8727154d515191a93f0fa')
+
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
+
+prepare () {
+  cd $_pkgfqn
+
+  # apply patches; further descriptions can be found in patch files itself
+  for patch in "$srcdir/"*.patch; do
+    msg2 "Applying patch $patch"
+    patch -p1 -i "$patch"
+  done
+}
+
+build() {
+  for _arch in ${_architectures}; do
+    export PKG_CONFIG=/usr/bin/$_arch-pkg-config
+    $_arch-cmake-static -G Ninja -B build-$_arch -S $_pkgfqn \
+      -DCMAKE_INSTALL_PREFIX:PATH="/usr/$_arch/static" \
+      -DFEATURE_static_runtime=ON \
+      -DFEATURE_pkg_config=ON
+    cmake --build build-$_arch
+  done
+}
+
+package() {
+  for _arch in ${_architectures}; do
+    DESTDIR="$pkgdir" cmake --install build-$_arch
+
+    find "$pkgdir/usr/$_arch" -iname '*.exe' -exec $_arch-strip --strip-all {} \;
+    find "$pkgdir/usr/$_arch" -iname '*.dll' -exec $_arch-strip --strip-unneeded {} \;
+    find "$pkgdir/usr/$_arch" -iname '*.a'   -exec $_arch-strip -g {} \;
+    [[ -d "$pkgdir/usr/$_arch/static/share/doc" ]] && rm -r "$pkgdir/usr/$_arch/static/share/doc"
+  done
+
+  install -d "$pkgdir"/usr/share/licenses
+  ln -s /usr/share/licenses/mingw-w64-qt6-base-static "$pkgdir"/usr/share/licenses/$pkgname
+
+}
+
--- a/qt6-activeqt/mingw-w64-static/PKGBUILD.sh.ep
+++ b/qt6-activeqt/mingw-w64-static/PKGBUILD.sh.ep
@ -0,0 +1 @@
+%= include "$default_package_name/mingw-w64/PKGBUILD";
--- a/qt6-activeqt/mingw-w64-static/qtactiveqt-sha256.txt
+++ b/qt6-activeqt/mingw-w64-static/qtactiveqt-sha256.txt
@ -0,0 +1 @@
+d79f964054a98b7edcfcb3f3590a58d599bcb2f9569ec10f5f5d9c0070701b4a
--- a/qt6-activeqt/mingw-w64/0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch
+++ b/qt6-activeqt/mingw-w64/0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch
@ -0,0 +1,56 @@
+From 52bafd8ad71ac730ee03a2827b1bda32527c0780 Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Fri, 2 Jun 2017 17:21:08 +0200
+Subject: [PATCH 1/2] Handle win64 in dumpcpp and
+ MetaObjectGenerator::readClassInfo
+
+See https://bugreports.qt.io/browse/QTBUG-46827
+---
+ src/activeqt/container/qaxbase.cpp | 4 ++++
+ tools/dumpcpp/main.cpp             | 8 ++++++++
+ 2 files changed, 12 insertions(+)
+
+diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp
+index e97dd91..e0d9dbd 100644
+--- a/src/activeqt/container/qaxbase.cpp
+++ b/src/activeqt/container/qaxbase.cpp
+@@ -2104,6 +2104,10 @@ void MetaObjectGenerator::readClassInfo()
+             const QStringList versions = controls.childGroups();
+             for (const QString &version : versions) {
+                 tlfile = controls.value(QLatin1Char('/') + version + QLatin1String("/0/win32/.")).toString();
+                if(tlfile.isEmpty())
+                {
+                  tlfile = controls.value(QLatin1Char('/') + version + QLatin1String("/0/win64/.")).toString();
+                }
+                 if (!tlfile.isEmpty())
+                     break;
+             }
+diff --git a/tools/dumpcpp/main.cpp b/tools/dumpcpp/main.cpp
+index 092a3c0..c597942 100644
+--- a/tools/dumpcpp/main.cpp
+++ b/tools/dumpcpp/main.cpp
+@@ -1090,6 +1090,10 @@ int main(int argc, char **argv)
+             typeLib = settings.value(keyPrefix + QLatin1String("win32/.")).toString();
+             if (QFile::exists(typeLib))
+                 break;
+            typeLib = settings.value(QLatin1String("/") + codes.at(c) + QLatin1String("/0/win64/.")).toByteArray();
+            if (QFile::exists(typeLib)) {
+                break;
+            }
+         }
+ 
+         if (!typeLib.isEmpty())
+@@ -1154,6 +1158,10 @@ int main(int argc, char **argv)
+             typeLib = settings.value(keyPrefix + QLatin1String("win32/.")).toString();
+             if (QFile::exists(typeLib))
+                 break;
+            typeLib = settings.value(key + QLatin1String("/") + codes.at(c) + QLatin1String("/win64/.")).toByteArray();
+            if (QFile::exists(typeLib)) {
+                break;
+            }
+         }
+     }
+ 
+-- 
+2.31.1
+
--- a/qt6-activeqt/mingw-w64/0002-Build-tools-for-the-target-platform.patch
+++ b/qt6-activeqt/mingw-w64/0002-Build-tools-for-the-target-platform.patch
@ -0,0 +1,67 @@
+From 58ecfedd3e4868c7ac9bb3402e6b44c5e0a1091f Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Fri, 7 May 2021 16:10:47 +0200
+Subject: [PATCH 2/2] Build tools for the target platform
+
+These tools seem to be not portable so they should not be built for the
+host platform. If they need to be executed on the host they could be
+executed using WINE.
+---
+ src/tools/idc/CMakeLists.txt | 5 +++--
+ tools/dumpcpp/CMakeLists.txt | 3 +--
+ tools/dumpdoc/CMakeLists.txt | 3 +--
+ 3 files changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/src/tools/idc/CMakeLists.txt b/src/tools/idc/CMakeLists.txt
+index d21b9f0..d401e45 100644
+--- a/src/tools/idc/CMakeLists.txt
+++ b/src/tools/idc/CMakeLists.txt
+@@ -5,12 +5,13 @@
+ #####################################################################
+ 
+ qt_get_tool_target_name(target_name idc)
+-qt_internal_add_tool(${target_name} # special case
+qt_internal_add_app(${target_name} # special case
+ #    BOOTSTRAP # special case
+     TARGET_DESCRIPTION "Active Qt Interface Description Compiler"
+-    TOOLS_TARGET AxContainer # special case
+     SOURCES
+         main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Core
+ )
+ 
+ #### Keys ignored in scope 1:.:.:idc.pro:<TRUE>:
+diff --git a/tools/dumpcpp/CMakeLists.txt b/tools/dumpcpp/CMakeLists.txt
+index 8d8db8f..2c86194 100644
+--- a/tools/dumpcpp/CMakeLists.txt
+++ b/tools/dumpcpp/CMakeLists.txt
+@@ -5,9 +5,8 @@
+ #####################################################################
+ 
+ qt_get_tool_target_name(target_name dumpcpp)
+-qt_internal_add_tool(${target_name} # special case
+qt_internal_add_app(${target_name} # special case
+     TARGET_DESCRIPTION "Active Qt DumpCpp"
+-    TOOLS_TARGET AxContainer # special case
+     SOURCES
+         main.cpp
+         moc.cpp moc.h
+diff --git a/tools/dumpdoc/CMakeLists.txt b/tools/dumpdoc/CMakeLists.txt
+index 073ce62..a646314 100644
+--- a/tools/dumpdoc/CMakeLists.txt
+++ b/tools/dumpdoc/CMakeLists.txt
+@@ -5,9 +5,8 @@
+ #####################################################################
+ 
+ qt_get_tool_target_name(target_name dumpdoc)
+-qt_internal_add_tool(${target_name} # special case
+qt_internal_add_app(${target_name} # special case
+     TARGET_DESCRIPTION "Active Qt DumpDoc"
+-    TOOLS_TARGET AxContainer # special case
+     SOURCES
+         main.cpp
+     PUBLIC_LIBRARIES
+-- 
+2.31.1
+
--- a/qt6-activeqt/mingw-w64/PKGBUILD
+++ b/qt6-activeqt/mingw-w64/PKGBUILD
@ -0,0 +1,71 @@
+# Maintainer: Martchus <martchus@gmx.net>
+
+# All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
+# you also find the URL of a binary repository.
+
+pkgname=mingw-w64-qt6-activeqt
+_qtver=6.1.0
+pkgver=${_qtver/-/}
+pkgrel=1
+arch=(any)
+url='https://www.qt.io'
+license=(GPL3 LGPL3 FDL custom)
+pkgdesc='ActiveX integration framework (mingw-w64)'
+depends=('mingw-w64-qt6-base')
+optdepends=('mingw-w64-qt6-declarative: QML bindings')
+makedepends=('mingw-w64-cmake' 'mingw-w64-qt6-declarative' 'mingw-w64-vulkan-headers' 'mingw-w64-vulkan-icd-loader' 'qt6-declarative' 'ninja')
+options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
+groups=(mingw-w64-qt6)
+_pkgfqn="qtactiveqt-everywhere-src-${_qtver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
+        '0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch'
+        '0002-Build-tools-for-the-target-platform.patch')
+sha256sums=('d79f964054a98b7edcfcb3f3590a58d599bcb2f9569ec10f5f5d9c0070701b4a'
+            'dc557cc9fed6f542ad8123a0bc3c384a065c019f630c8d80a8c2ff33843d7516'
+            'e0dfaee2453e03f97c784bdd934ba9f58c21fe0f16a8727154d515191a93f0fa')
+
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
+
+prepare () {
+  cd $_pkgfqn
+
+  # apply patches; further descriptions can be found in patch files itself
+  for patch in "$srcdir/"*.patch; do
+    msg2 "Applying patch $patch"
+    patch -p1 -i "$patch"
+  done
+}
+
+build() {
+  for _arch in ${_architectures}; do
+    export PKG_CONFIG=/usr/bin/$_arch-pkg-config
+    $_arch-cmake -G Ninja -B build-$_arch -S $_pkgfqn \
+      -DFEATURE_pkg_config=ON
+    cmake --build build-$_arch
+  done
+}
+
+package() {
+  for _arch in ${_architectures}; do
+    DESTDIR="$pkgdir" cmake --install build-$_arch
+
+    # Add symlinks of DLLs in usual bin directory
+    mkdir -p "$pkgdir/usr/bin" "$pkgdir/usr/$_arch/bin"
+    for dll in "$pkgdir"/usr/$_arch/lib/qt6/bin/*.dll; do
+        ln -rs "$dll" "$pkgdir/usr/$_arch/bin/${dll##*/}"
+    done
+
+    # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
+    find "$pkgdir/usr/$_arch/lib" -type f -name '*.prl' \
+      -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
+
+    find "$pkgdir/usr/$_arch" -iname '*.exe' -exec $_arch-strip --strip-all {} \;
+    find "$pkgdir/usr/$_arch" -iname '*.dll' -exec $_arch-strip --strip-unneeded {} \;
+    find "$pkgdir/usr/$_arch" -iname '*.a'   -exec $_arch-strip -g {} \;
+    [[ -d "$pkgdir/usr/$_arch/share/doc" ]] && rm -r "$pkgdir/usr/$_arch/share/doc"
+  done
+
+  install -d "$pkgdir"/usr/share/licenses
+  ln -s /usr/share/licenses/mingw-w64-qt6-base "$pkgdir"/usr/share/licenses/$pkgname
+
+}
--- a/qt6-activeqt/mingw-w64/PKGBUILD.sh.ep
+++ b/qt6-activeqt/mingw-w64/PKGBUILD.sh.ep
@ -0,0 +1,12 @@
+% layout 'mingw-w64-qt6-module';
+\
+_qtver=6.1.0
+pkgver=${_qtver/-/}
+pkgrel=1
+arch=(any)
+url='https://www.qt.io'
+license=(GPL3 LGPL3 FDL custom)
+pkgdesc='ActiveX integration framework (mingw-w64)'
+depends=(<%== qt6deps qw(base) %>)
+optdepends=(<%== qt6optdeps declarative => 'QML bindings' %>)
+makedepends=('mingw-w64-cmake<%== $static_suffix %>' <%== qt6deps qw(declarative) %> 'mingw-w64-vulkan-headers' 'mingw-w64-vulkan-icd-loader' 'qt6-declarative' 'ninja')
--- a/qt6-activeqt/mingw-w64/qtactiveqt-sha256.txt
+++ b/qt6-activeqt/mingw-w64/qtactiveqt-sha256.txt
@ -0,0 +1 @@
+d79f964054a98b7edcfcb3f3590a58d599bcb2f9569ec10f5f5d9c0070701b4a
--- a/qt6-base/android-aarch64/0008-Fix-passing-QJniEnvironment-to-ANativeWindow_fromSur.patch
+++ b/qt6-base/android-aarch64/0008-Fix-passing-QJniEnvironment-to-ANativeWindow_fromSur.patch
@ -0,0 +1 @@
+../mingw-w64/0008-Fix-passing-QJniEnvironment-to-ANativeWindow_fromSur.patch
--- a/qt6-base/android-aarch64/PKGBUILD
+++ b/qt6-base/android-aarch64/PKGBUILD
@ -11,7 +11,7 @@

 _android_arch=aarch64
 pkgname=android-aarch64-qt6-base
-_qtver=6.0.1
+_qtver=6.1.0
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
@ -34,15 +34,17 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
        '0004-Fix-transitive-dependencies-of-static-libraries.patch'
        '0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch'
        '0006-Support-finding-static-MariaDB-client-library.patch'
-        '0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch')
-sha256sums=('8d2bc1829c1479e539f66c2f51a7e11c38a595c9e8b8e45a3b45f3cb41c6d6aa'
-            '82bfcddb91097e761c5c3cfe66a2153e28446a11e20638c519589dab59bf891b'
-            '06a54156c5f3145783ee41d5e2dec651f23e207faeb113b9c59ed11b8201bb53'
-            'aba65a351d26cfe2536c1115cce6448e4779998f663b71e5c4dc3fa7c3137f5d'
-            '820447581d2beda6f383ce8c7a18299b38273d162e62d5820c88dc24f2568a06'
-            '37af48d96b4265b442eac016928f0be5236f82ed7c5fa8670a389993556ffdee'
-            '074341ec2aebf7c9100022b9fedb919a426ec58c0456515cffd6131b205a11cd'
-            'fa1ae6268c7b9f773dda4950dce834adf8d5a15ebc672f096e47b554192758c2')
+        '0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch'
+        '0008-Fix-passing-QJniEnvironment-to-ANativeWindow_fromSur.patch')
+sha256sums=('f7af3c87e96051d09b5abce6c88277c33031bef241ebfe1db4106d33ed0814c4'
+            'fe716b7d966cf40fafbed2fd67b663c205bb09e3fc1ad607163be187cb5f83c6'
+            'cb28dfdf82d332fa86e67106cea41ebf7f57ac49a5a7707be25348350b9c0f6e'
+            '11a7e4939d171c3e7e8ecb8374fe0caebab2e55c8fd2a1122763caba56414358'
+            '8081cf89e48a504a39bb18ea4c5cca92869fb0f1df45e6eda1559b2a0b38ba79'
+            'b97e12f46baebeea6d9a36f23e856783c6988b92965946e881dfb5e9749739ae'
+            '9f2f542a7739024615b690fd5c2265c2ab63e5442eeb712b4df63220945a413e'
+            '6990a3d6d8fa771b88092aa02010170d56fd86771e18096f120af16fce0ab691'
+            '6498da7e772895ed58289a836c1b79a73750ffc5288fa0c6a03e4853879f00e7')

 prepare () {
  cd $_pkgfqn
--- a/qt6-base/android-aarch64/qtbase-sha256.txt
+++ b/qt6-base/android-aarch64/qtbase-sha256.txt
@ -1 +1 @@
-8d2bc1829c1479e539f66c2f51a7e11c38a595c9e8b8e45a3b45f3cb41c6d6aa
+f7af3c87e96051d09b5abce6c88277c33031bef241ebfe1db4106d33ed0814c4
--- a/qt6-base/mingw-w64-static/0008-Fix-passing-QJniEnvironment-to-ANativeWindow_fromSur.patch
+++ b/qt6-base/mingw-w64-static/0008-Fix-passing-QJniEnvironment-to-ANativeWindow_fromSur.patch
@ -0,0 +1 @@
+../mingw-w64/0008-Fix-passing-QJniEnvironment-to-ANativeWindow_fromSur.patch
--- a/qt6-base/mingw-w64-static/PKGBUILD
+++ b/qt6-base/mingw-w64-static/PKGBUILD
@ -11,7 +11,7 @@
 # All patches are managed at https://github.com/Martchus/qtbase

 pkgname=mingw-w64-qt6-base-static
-_qtver=6.0.1
+_qtver=6.1.0
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
@ -37,15 +37,17 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
        '0004-Fix-transitive-dependencies-of-static-libraries.patch'
        '0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch'
        '0006-Support-finding-static-MariaDB-client-library.patch'
-        '0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch')
-sha256sums=('8d2bc1829c1479e539f66c2f51a7e11c38a595c9e8b8e45a3b45f3cb41c6d6aa'
-            '82bfcddb91097e761c5c3cfe66a2153e28446a11e20638c519589dab59bf891b'
-            '06a54156c5f3145783ee41d5e2dec651f23e207faeb113b9c59ed11b8201bb53'
-            'aba65a351d26cfe2536c1115cce6448e4779998f663b71e5c4dc3fa7c3137f5d'
-            '820447581d2beda6f383ce8c7a18299b38273d162e62d5820c88dc24f2568a06'
-            '37af48d96b4265b442eac016928f0be5236f82ed7c5fa8670a389993556ffdee'
-            '074341ec2aebf7c9100022b9fedb919a426ec58c0456515cffd6131b205a11cd'
-            'fa1ae6268c7b9f773dda4950dce834adf8d5a15ebc672f096e47b554192758c2')
+        '0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch'
+        '0008-Fix-passing-QJniEnvironment-to-ANativeWindow_fromSur.patch')
+sha256sums=('f7af3c87e96051d09b5abce6c88277c33031bef241ebfe1db4106d33ed0814c4'
+            'fe716b7d966cf40fafbed2fd67b663c205bb09e3fc1ad607163be187cb5f83c6'
+            'cb28dfdf82d332fa86e67106cea41ebf7f57ac49a5a7707be25348350b9c0f6e'
+            '11a7e4939d171c3e7e8ecb8374fe0caebab2e55c8fd2a1122763caba56414358'
+            '8081cf89e48a504a39bb18ea4c5cca92869fb0f1df45e6eda1559b2a0b38ba79'
+            'b97e12f46baebeea6d9a36f23e856783c6988b92965946e881dfb5e9749739ae'
+            '9f2f542a7739024615b690fd5c2265c2ab63e5442eeb712b4df63220945a413e'
+            '6990a3d6d8fa771b88092aa02010170d56fd86771e18096f120af16fce0ab691'
+            '6498da7e772895ed58289a836c1b79a73750ffc5288fa0c6a03e4853879f00e7')

 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'

@ -65,6 +67,7 @@ build() {
    $_arch-cmake-static -G Ninja -B build-$_arch -S $_pkgfqn \
      -DCMAKE_INSTALL_PREFIX:PATH="/usr/$_arch/static" \
      -DFEATURE_static_runtime=ON \
+      -DFEATURE_openssl_linked=ON \
      -DFEATURE_pkg_config=ON \
      -DFEATURE_system_pcre2=ON \
      -DFEATURE_system_freetype=ON \
--- a/qt6-base/mingw-w64-static/qtbase-sha256.txt
+++ b/qt6-base/mingw-w64-static/qtbase-sha256.txt
@ -1 +1 @@
-8d2bc1829c1479e539f66c2f51a7e11c38a595c9e8b8e45a3b45f3cb41c6d6aa
+f7af3c87e96051d09b5abce6c88277c33031bef241ebfe1db4106d33ed0814c4
--- a/qt6-base/mingw-w64/0001-Use-CMake-s-default-import-library-suffix.patch
+++ b/qt6-base/mingw-w64/0001-Use-CMake-s-default-import-library-suffix.patch
@ -1,22 +1,22 @@
-From 450fa18bf971462b62ddcf4d2166b4b4d8b821e3 Mon Sep 17 00:00:00 2001
+From 4bc7d8f91f0f3695ff167bf9617510942097c82a Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 5 Nov 2020 22:08:10 +0100
-Subject: [PATCH 1/7] Use CMake's default import library suffix
+Subject: [PATCH 1/8] Use CMake's default import library suffix

-Change-Id: Iedc6a7ee8982a62ddd56ad0bf25ba0b8752a666a
+Change-Id: I3dbedaec74683e5bfd008f7f2fd1e046dfb921b2
 ---
 cmake/QtPriHelpers.cmake          | 12 ++++++++++--
 cmake/QtPrlHelpers.cmake          |  8 +++++++-
- cmake/QtTargetHelpers.cmake       |  2 --
 mkspecs/common/g++-win32.conf     |  1 +
 mkspecs/features/create_cmake.prf |  5 +++--
- 5 files changed, 21 insertions(+), 7 deletions(-)
+ src/corelib/Qt6CoreMacros.cmake   |  1 -
+ 5 files changed, 21 insertions(+), 6 deletions(-)

 diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake
-index e77e98fe76..35639684a4 100644
+index 5498b8a904..59c905eac2 100644
 --- a/cmake/QtPriHelpers.cmake
 +++ b/cmake/QtPriHelpers.cmake
-@@ -368,9 +368,13 @@ QT.${config_module_name}_private.disabled_features = ${disabled_private_features
+@@ -370,9 +370,13 @@ QT.${config_module_name}_private.disabled_features = ${disabled_private_features
         qt_path_join(private_pri_file_path "${target_path}" "${private_pri_file_name}")
         list(APPEND pri_files "${private_pri_file_path}")
 
@ -31,7 +31,7 @@ index e77e98fe76..35639684a4 100644
             ${CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES}
             ${CMAKE_STATIC_LIBRARY_SUFFIX})
         add_custom_command(
-@@ -775,9 +779,13 @@ CONFIG += ${private_config_joined}
+@@ -777,9 +781,13 @@ CONFIG += ${private_config_joined}
         list(APPEND inputs "${preliminary_pri_root}/${cfg}/${pri_data_cmake_file}")
     endforeach()
 
@ -69,19 +69,6 @@ index 0c0b7a2aec..d408245ffc 100644
 
     if(QT_GENERATOR_IS_MULTI_CONFIG)
         set(configs ${CMAKE_CONFIGURATION_TYPES})
-diff --git a/cmake/QtTargetHelpers.cmake b/cmake/QtTargetHelpers.cmake
-index 2a0a22f682..90d40e30c5 100644
--- a/cmake/QtTargetHelpers.cmake
-+++ b/cmake/QtTargetHelpers.cmake
-@@ -288,8 +288,6 @@ function(qt_internal_apply_win_prefix_and_suffix target)
- 
-         # This should cover both MINGW with GCC and CLANG.
-         if(NOT MSVC)
-            set_property(TARGET "${target}" PROPERTY IMPORT_SUFFIX ".a")
-
-             get_target_property(target_type ${target} TYPE)
-             if(target_type STREQUAL "STATIC_LIBRARY")
-                 set_property(TARGET "${target}" PROPERTY PREFIX "lib")
 diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf
 index 67ad1e3b8c..b98c7121f6 100644
 --- a/mkspecs/common/g++-win32.conf
@ -110,6 +97,18 @@ index 24ed125f12..73ebe453d3 100644
     } else {
         CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}$${debug_suffix}.lib
         CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qtmain$${QT_LIBINFIX}.lib
+diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake
+index 3d1a10ff0a..a6935875c7 100644
+--- a/src/corelib/Qt6CoreMacros.cmake
+++ b/src/corelib/Qt6CoreMacros.cmake
+@@ -447,7 +447,6 @@ function(_qt_internal_apply_win_prefix_and_suffix target)
+ 
+         # This should cover both MINGW with GCC and CLANG.
+         if(NOT MSVC)
+-            set_property(TARGET "${target}" PROPERTY IMPORT_SUFFIX ".a")
+ 
+             get_target_property(target_type ${target} TYPE)
+             if(target_type STREQUAL "STATIC_LIBRARY")
 -- 
-2.30.0
+2.31.1

--- a/qt6-base/mingw-w64/0002-Fix-finding-D-Bus.patch
+++ b/qt6-base/mingw-w64/0002-Fix-finding-D-Bus.patch
@ -1,7 +1,7 @@
-From 4e3120dee97c10cf61c3b796b5d353e172c33c75 Mon Sep 17 00:00:00 2001
+From c1ed43ebc4f0cb63832b878f8666f0b8f5366906 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 7 Oct 2020 12:13:37 +0200
-Subject: [PATCH 2/7] Fix finding D-Bus
+Subject: [PATCH 2/8] Fix finding D-Bus

 Change-Id: Ie21eb9cbc6b1b5d9c8b34eea46f54718e5926986
 ---
@ -20,5 +20,5 @@ index e227d224e0..bdbcab9eb3 100644
 +    set_property(TARGET dbus-1 PROPERTY IMPORTED_IMPLIB ${DBus1_LIBRARY})
 +endif()
 -- 
-2.30.0
+2.31.1

--- a/qt6-base/mingw-w64/0003-Fix-using-static-PCRE2-and-DBus-1.patch
+++ b/qt6-base/mingw-w64/0003-Fix-using-static-PCRE2-and-DBus-1.patch
@ -1,7 +1,7 @@
-From e97b19b49e4eaaf696b7a57cfa02ae7b07080917 Mon Sep 17 00:00:00 2001
+From 927935b0f0783760a6bfa20784354bd3b590d9f0 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 5 Nov 2020 21:13:19 +0100
-Subject: [PATCH 3/7] Fix using static PCRE2 and DBus-1
+Subject: [PATCH 3/8] Fix using static PCRE2 and DBus-1

 When making a static build of Qt we're using the static version of these
 libraries and must define the corresponding macros.
@ -13,7 +13,7 @@ Change-Id: I2387b79462b6d183b71f9433dd937f63fc7ef26e
 2 files changed, 9 insertions(+)

 diff --git a/src/corelib/text/qregularexpression.cpp b/src/corelib/text/qregularexpression.cpp
-index 6cc9011822..76041849b4 100644
+index 72079c1996..42007502af 100644
 --- a/src/corelib/text/qregularexpression.cpp
 +++ b/src/corelib/text/qregularexpression.cpp
@@ -53,6 +53,11 @@
@ -44,5 +44,5 @@ index accaa4f5ed..4b11c74caa 100644
 #  include <dbus/dbus.h>
 #else
 -- 
-2.30.0
+2.31.1

--- a/qt6-base/mingw-w64/0004-Fix-transitive-dependencies-of-static-libraries.patch
+++ b/qt6-base/mingw-w64/0004-Fix-transitive-dependencies-of-static-libraries.patch
@ -1,23 +1,27 @@
-From c037501e09603ef9ab645b0f9c909acb693ac096 Mon Sep 17 00:00:00 2001
+From 86a27658437d4d79cd010d1dd92f300f48616e45 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 5 Nov 2020 21:59:33 +0100
-Subject: [PATCH 4/7] Fix transitive dependencies (of static libraries)
+Subject: [PATCH 4/8] Fix transitive dependencies (of static libraries)

 The dependencies of these libraries are not reliably picked up by their
 corresponding find modules. This change allows adding the required
 dependencies by setting certain variables, e.g. within the toolchain file.

-Change-Id: I81dbe9eebf1529116417c5bf5332b3f135e854bd
+This change also disables the upstream hack for OpenSSL's dependencies
+as it is even more hacky to hardcode the library names and the casing
+they use doesn't even work when building on GNU/Linux.
+
+Change-Id: I9afee4f1a1debb482ede63421de86adf1c7c5adc
 ---
- cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake | 2 +-
- cmake/FindMySQL.cmake                                           | 1 +
- cmake/FindWrapDBus1.cmake                                       | 1 +
- cmake/FindWrapOpenSSL.cmake                                     | 2 +-
- cmake/FindWrapSystemFreetype.cmake                              | 2 +-
- cmake/FindWrapSystemHarfbuzz.cmake                              | 2 +-
- cmake/FindWrapSystemPNG.cmake                                   | 2 +-
- src/plugins/sqldrivers/psql/CMakeLists.txt                      | 2 +-
- 8 files changed, 8 insertions(+), 6 deletions(-)
+ .../3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake | 2 +-
+ cmake/FindMySQL.cmake                                         | 1 +
+ cmake/FindWrapDBus1.cmake                                     | 1 +
+ cmake/FindWrapOpenSSL.cmake                                   | 4 ++--
+ cmake/FindWrapSystemFreetype.cmake                            | 2 +-
+ cmake/FindWrapSystemHarfbuzz.cmake                            | 2 +-
+ cmake/FindWrapSystemPNG.cmake                                 | 2 +-
+ src/plugins/sqldrivers/psql/CMakeLists.txt                    | 2 +-
+ 8 files changed, 9 insertions(+), 7 deletions(-)

 diff --git a/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake b/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake
 index 8f873c1b45..831ca8e624 100644
@ -33,17 +37,17 @@ index 8f873c1b45..831ca8e624 100644
 endif()
 
 diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
-index f6c77d2be1..c20e7c9fa5 100644
+index a069a5eb12..0fcba2148e 100644
 --- a/cmake/FindMySQL.cmake
 +++ b/cmake/FindMySQL.cmake
-@@ -37,6 +37,7 @@ if(MySQL_FOUND AND NOT TARGET MySQL::MySQL)
+@@ -40,6 +40,7 @@ if(MySQL_FOUND)
     add_library(MySQL::MySQL UNKNOWN IMPORTED)
     set_target_properties(MySQL::MySQL PROPERTIES
                           IMPORTED_LOCATION "${MySQL_LIBRARIES}"
 +                          INTERFACE_LINK_LIBRARIES "${MYSQL_DEPENDENCIES}"
                           INTERFACE_INCLUDE_DIRECTORIES "${MySQL_INCLUDE_DIRS}")
+   endif()
 endif()
- 
 diff --git a/cmake/FindWrapDBus1.cmake b/cmake/FindWrapDBus1.cmake
 index bdbcab9eb3..06e9af49f6 100644
 --- a/cmake/FindWrapDBus1.cmake
@ -55,10 +59,19 @@ index bdbcab9eb3..06e9af49f6 100644
 +    set_property(TARGET dbus-1 PROPERTY INTERFACE_LINK_LIBRARIES "${DBUS1_DEPENDENCIES}")
 endif()
 diff --git a/cmake/FindWrapOpenSSL.cmake b/cmake/FindWrapOpenSSL.cmake
-index 6e80862258..47bea72aad 100644
+index a09aa99518..ff13e1e931 100644
 --- a/cmake/FindWrapOpenSSL.cmake
 +++ b/cmake/FindWrapOpenSSL.cmake
-@@ -14,7 +14,7 @@ if(OpenSSL_FOUND)
+@@ -11,7 +11,7 @@ set(WrapOpenSSL_FOUND OFF)
+ find_package(WrapOpenSSLHeaders ${WrapOpenSSL_FIND_VERSION})
+ 
+ if(OpenSSL_FOUND)
+-    if(WIN32)
+    if(WIN32 AND NOT MINGW)
+         get_target_property(libType OpenSSL::Crypto TYPE)
+         if(libType STREQUAL "ALIAS")
+             get_target_property(writableLib OpenSSL::Crypto ALIASED_TARGET)
+@@ -26,7 +26,7 @@ if(OpenSSL_FOUND)
     set(WrapOpenSSL_FOUND ON)
 
     add_library(WrapOpenSSL::WrapOpenSSL INTERFACE IMPORTED)
@ -107,18 +120,18 @@ index 372a064ff4..a363bfd31b 100644
 unset(__png_target_name)
 unset(__png_found)
 diff --git a/src/plugins/sqldrivers/psql/CMakeLists.txt b/src/plugins/sqldrivers/psql/CMakeLists.txt
-index 62e9619d16..939163bde7 100644
+index b151932da7..7e6b38acd1 100644
 --- a/src/plugins/sqldrivers/psql/CMakeLists.txt
 +++ b/src/plugins/sqldrivers/psql/CMakeLists.txt
-@@ -19,7 +19,7 @@ qt_internal_add_plugin(QPSQLDriverPlugin
+@@ -16,7 +16,7 @@ qt_internal_add_plugin(QPSQLDriverPlugin
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_TO_ASCII
-     PUBLIC_LIBRARIES
+     LIBRARIES
 -        PostgreSQL::PostgreSQL
 +        PostgreSQL::PostgreSQL ${POSTGRESQL_DEPENDENCIES}
         Qt::Core
         Qt::CorePrivate
         Qt::SqlPrivate
 -- 
-2.30.0
+2.31.1

--- a/qt6-base/mingw-w64/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch
+++ b/qt6-base/mingw-w64/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch
@ -1,7 +1,7 @@
-From f1bb9a297c8df01081b073ad302c949488a7dc81 Mon Sep 17 00:00:00 2001
+From f3ca9d271a0919b086ca6864d9682ae11f05543e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Mon, 2 Nov 2020 13:47:45 +0100
-Subject: [PATCH 5/7] Fix libjpeg workaround for conflict with rpcndr.h
+Subject: [PATCH 5/8] Fix libjpeg workaround for conflict with rpcndr.h

 Otherwise it won't compile against mingw-w64-libjpeg-turbo. This version of
 libjpeg seems to take care of the conflict already as long as jconfig.h is
@ -33,5 +33,5 @@ index beef18f260..72708145f4 100644
 #ifdef const
 #  undef const          // remove crazy C hackery in jconfig.h
 -- 
-2.30.0
+2.31.1

--- a/qt6-base/mingw-w64/0006-Support-finding-static-MariaDB-client-library.patch
+++ b/qt6-base/mingw-w64/0006-Support-finding-static-MariaDB-client-library.patch
@ -1,31 +1,31 @@
-From f209ca4e8726ae7502e06eaea09b5590b9050804 Mon Sep 17 00:00:00 2001
+From c0e504e5d21cbf6b708dbc34d9e52e9bf56f07b3 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 8 Nov 2020 00:33:12 +0100
-Subject: [PATCH 6/7] Support finding static MariaDB client library
+Subject: [PATCH 6/8] Support finding static MariaDB client library

 We need to reverse the order to look for mariadb first (and only then
 for mysql) because otherwise it would pick up the static library
 "libmysqlclient.a" (provided by mingw-w64-mariadb-connector-c during
 the shared build (leading to linker errors).

-Change-Id: I52f0998a67d4850d6684cdda59fc4523b8549476
+Change-Id: I9559b97540f2f928b4dec990d497bf2911ad5b60
 ---
 cmake/FindMySQL.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
-index c20e7c9fa5..9346cd55c6 100644
+index 0fcba2148e..ab4f6fdc9e 100644
 --- a/cmake/FindMySQL.cmake
 +++ b/cmake/FindMySQL.cmake
-@@ -27,7 +27,7 @@ find_path(MySQL_INCLUDE_DIRS
+@@ -27,7 +27,7 @@ find_path(MySQL_INCLUDE_DIR
           PATH_SUFFIXES mysql mariadb)
 
- find_library(MySQL_LIBRARIES
+ find_library(MySQL_LIBRARY
 -             NAMES libmysql mysql mysqlclient libmariadb mariadb
 +             NAMES libmariadb mariadb mariadbclient libmysql mysql mysqlclient
              HINTS ${PC_MySQL_LIBDIR})
 
 include(FindPackageHandleStandardArgs)
 -- 
-2.30.0
+2.31.1

--- a/qt6-base/mingw-w64/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch
+++ b/qt6-base/mingw-w64/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch
@ -1,7 +1,7 @@
-From 77ef8904f307f78613f799ad4b9946e23c7910e3 Mon Sep 17 00:00:00 2001
+From e682df25245fd2731bfe0572b2668e47f7ea3e99 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 8 Nov 2020 00:34:09 +0100
-Subject: [PATCH 7/7] Allow overriding CMAKE_FIND_LIBRARY_SUFFIXES to prefer
+Subject: [PATCH 7/8] Allow overriding CMAKE_FIND_LIBRARY_SUFFIXES to prefer
 static libraries

 Change-Id: Ic29b64b999ed9b5888a8dc1b0961a76009c5e75c
@ -10,7 +10,7 @@ Change-Id: Ic29b64b999ed9b5888a8dc1b0961a76009c5e75c
 1 file changed, 5 insertions(+)

 diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
-index 477f5d21e9..fa394cd895 100644
+index 934c34b01c..bada2aff0c 100644
 --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
 +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
@@ -1,6 +1,10 @@
@ -24,7 +24,7 @@ index 477f5d21e9..fa394cd895 100644
 ######################################
 #
 #       Macros for building Qt modules
-@@ -268,6 +272,7 @@ macro(qt_prepare_standalone_project)
+@@ -285,6 +289,7 @@ macro(qt_prepare_standalone_project)
 endmacro()
 
 macro(qt_build_repo_begin)
@ -33,5 +33,5 @@ index 477f5d21e9..fa394cd895 100644
     qt_enable_cmake_languages()
 
 -- 
-2.30.0
+2.31.1

--- a/qt6-base/mingw-w64/0008-Fix-passing-QJniEnvironment-to-ANativeWindow_fromSur.patch
+++ b/qt6-base/mingw-w64/0008-Fix-passing-QJniEnvironment-to-ANativeWindow_fromSur.patch
@ -0,0 +1,44 @@
+From e668956ba71426d495ca9e117638b8d738fd148f Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Sat, 8 May 2021 01:55:19 +0200
+Subject: [PATCH 8/8] Fix passing QJniEnvironment to ANativeWindow_fromSurface
+
+The function ANativeWindow_fromSurface (as declared by
+`$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/android/native_window_jni.h`
+from version r22.b of the Android NDK) takes a `JNIEnv*` so `.jniEnv()` must be used.
+
+This prevents the following compilation error:
+
+```
+error: no matching function for call to 'ANativeWindow_f
+romSurface'
+        m_nativeWindow = ANativeWindow_fromSurface(env, m_androidSurfaceObject.object());
+                         ^~~~~~~~~~~~~~~~~~~~~~~~~
+/opt/android-ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/android/native_window_jni.h:45:16: note: candidate function not viable: no known conversion from 'QJniEnvironment' t
+o 'JNIEnv *' (aka '_JNIEnv *') for 1st argument
+ANativeWindow* ANativeWindow_fromSurface(JNIEnv* env, jobject surface);
+               ^
+1 error generated.
+```
+
+Change-Id: I70d75cb7edc5875314fcb8a70d51d0ef40442101
+---
+ src/plugins/platforms/android/qandroidplatformvulkanwindow.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/plugins/platforms/android/qandroidplatformvulkanwindow.cpp b/src/plugins/platforms/android/qandroidplatformvulkanwindow.cpp
+index 8f2a37626a..9d4688b52d 100644
+--- a/src/plugins/platforms/android/qandroidplatformvulkanwindow.cpp
+++ b/src/plugins/platforms/android/qandroidplatformvulkanwindow.cpp
+@@ -173,7 +173,7 @@ VkSurfaceKHR *QAndroidPlatformVulkanWindow::vkSurface()
+             return &m_vkSurface;
+ 
+         QJniEnvironment env;
+-        m_nativeWindow = ANativeWindow_fromSurface(env, m_androidSurfaceObject.object());
+        m_nativeWindow = ANativeWindow_fromSurface(env.jniEnv(), m_androidSurfaceObject.object());
+ 
+         VkAndroidSurfaceCreateInfoKHR surfaceInfo;
+         memset(&surfaceInfo, 0, sizeof(surfaceInfo));
+-- 
+2.31.1
+
--- a/qt6-base/mingw-w64/PKGBUILD
+++ b/qt6-base/mingw-w64/PKGBUILD
@ -11,7 +11,7 @@
 # All patches are managed at https://github.com/Martchus/qtbase

 pkgname=mingw-w64-qt6-base
-_qtver=6.0.1
+_qtver=6.1.0
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
@ -37,15 +37,17 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
        '0004-Fix-transitive-dependencies-of-static-libraries.patch'
        '0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch'
        '0006-Support-finding-static-MariaDB-client-library.patch'
-        '0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch')
-sha256sums=('8d2bc1829c1479e539f66c2f51a7e11c38a595c9e8b8e45a3b45f3cb41c6d6aa'
-            '82bfcddb91097e761c5c3cfe66a2153e28446a11e20638c519589dab59bf891b'
-            '06a54156c5f3145783ee41d5e2dec651f23e207faeb113b9c59ed11b8201bb53'
-            'aba65a351d26cfe2536c1115cce6448e4779998f663b71e5c4dc3fa7c3137f5d'
-            '820447581d2beda6f383ce8c7a18299b38273d162e62d5820c88dc24f2568a06'
-            '37af48d96b4265b442eac016928f0be5236f82ed7c5fa8670a389993556ffdee'
-            '074341ec2aebf7c9100022b9fedb919a426ec58c0456515cffd6131b205a11cd'
-            'fa1ae6268c7b9f773dda4950dce834adf8d5a15ebc672f096e47b554192758c2')
+        '0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch'
+        '0008-Fix-passing-QJniEnvironment-to-ANativeWindow_fromSur.patch')
+sha256sums=('f7af3c87e96051d09b5abce6c88277c33031bef241ebfe1db4106d33ed0814c4'
+            'fe716b7d966cf40fafbed2fd67b663c205bb09e3fc1ad607163be187cb5f83c6'
+            'cb28dfdf82d332fa86e67106cea41ebf7f57ac49a5a7707be25348350b9c0f6e'
+            '11a7e4939d171c3e7e8ecb8374fe0caebab2e55c8fd2a1122763caba56414358'
+            '8081cf89e48a504a39bb18ea4c5cca92869fb0f1df45e6eda1559b2a0b38ba79'
+            'b97e12f46baebeea6d9a36f23e856783c6988b92965946e881dfb5e9749739ae'
+            '9f2f542a7739024615b690fd5c2265c2ab63e5442eeb712b4df63220945a413e'
+            '6990a3d6d8fa771b88092aa02010170d56fd86771e18096f120af16fce0ab691'
+            '6498da7e772895ed58289a836c1b79a73750ffc5288fa0c6a03e4853879f00e7')

 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'

--- a/qt6-base/mingw-w64/qtbase-sha256.txt
+++ b/qt6-base/mingw-w64/qtbase-sha256.txt
@ -1 +1 @@
-8d2bc1829c1479e539f66c2f51a7e11c38a595c9e8b8e45a3b45f3cb41c6d6aa
+f7af3c87e96051d09b5abce6c88277c33031bef241ebfe1db4106d33ed0814c4
--- a/qt6-charts/android-aarch64/PKGBUILD
+++ b/qt6-charts/android-aarch64/PKGBUILD
@ -0,0 +1,51 @@
+# Maintainer: Martchus <martchus@gmx.net>
+
+# All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
+# you also find the URL of a binary repository.
+
+_android_arch=aarch64
+pkgname=android-$_android_arch-qt6-charts
+_qtver=6.1.0
+pkgver=${_qtver/-/}
+pkgrel=1
+arch=(any)
+url='https://www.qt.io'
+license=(GPL3 LGPL3 FDL custom)
+pkgdesc='Provides a set of easy to use chart components (android)'
+depends=('android-aarch64-qt6-declarative')
+makedepends=('android-cmake' 'qt6-declarative' 'ninja' 'java-environment-openjdk=8')
+options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
+groups=(android-${_android_arch}-qt6)
+_pkgfqn="qtcharts-everywhere-src-${_qtver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('8f70dc54b3f29eed91cf207db4185cef25f3d0bbc479059725c75c1895cddfcd')
+
+build() {
+  source android-env ${_android_arch}
+  android-${_android_arch}-cmake -G Ninja -B build-$_android_arch -S $_pkgfqn \
+    -DCMAKE_FIND_ROOT_PATH="${ANDROID_PREFIX}" \
+    -DQT_BINARY_DIR=${ANDROID_PREFIX_BIN} \
+    -DQT_INCLUDE_DIRS_NO_SYSTEM=ON \
+    -DQT_HOST_PATH=/usr \
+    -DANDROID_SDK_ROOT=${ANDROID_HOME} \
+    -DANDROID_NDK_ROOT=${ANDROID_NDK_HOME} \
+    -DANDROID_STL="c++_shared" \
+    -DFEATURE_pkg_config=ON
+  cmake --build build-$_android_arch
+}
+
+package() {
+  DESTDIR="$pkgdir" cmake --install build-$_android_arch
+
+  # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
+  find "$pkgdir/${ANDROID_PREFIX}" -type f -name '*.prl' \
+    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
+
+  find ${pkgdir}/${ANDROID_PREFIX} -type f -name 'lib*.so' -exec ${ANDROID_STRIP} -g --strip-unneeded {} \;
+  find ${pkgdir}/${ANDROID_PREFIX} -type f -name 'lib*.a' -exec ${ANDROID_STRIP} -g {} \;
+  [[ -d "${pkgdir}/${ANDROID_PREFIX}/share/doc" ]] && rm -r "${pkgdir}/${ANDROID_PREFIX}/share/doc" || true
+
+  install -d "$pkgdir"/usr/share/licenses
+  ln -s /usr/share/licenses/android-$_android_arch-qt6-base "$pkgdir"/usr/share/licenses/$pkgname
+
+}
--- a/qt6-charts/android-aarch64/PKGBUILD.sh.ep
+++ b/qt6-charts/android-aarch64/PKGBUILD.sh.ep
@ -0,0 +1,11 @@
+% layout 'android-qt6-module';
+\
+_qtver=6.1.0
+pkgver=${_qtver/-/}
+pkgrel=1
+arch=(any)
+url='https://www.qt.io'
+license=(GPL3 LGPL3 FDL custom)
+pkgdesc='Provides a set of easy to use chart components (android)'
+depends=(<%== qt6deps qw(declarative) %>)
+makedepends=('android-cmake<%== $static_suffix %>' 'qt6-declarative' 'ninja' 'java-environment-openjdk=8')
--- a/qt6-charts/android-aarch64/qtcharts-sha256.txt
+++ b/qt6-charts/android-aarch64/qtcharts-sha256.txt
@ -0,0 +1 @@
+8f70dc54b3f29eed91cf207db4185cef25f3d0bbc479059725c75c1895cddfcd
--- a/qt6-charts/mingw-w64-static/PKGBUILD
+++ b/qt6-charts/mingw-w64-static/PKGBUILD
@ -0,0 +1,49 @@
+# Maintainer: Martchus <martchus@gmx.net>
+
+# All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
+# you also find the URL of a binary repository.
+
+pkgname=mingw-w64-qt6-charts-static
+_qtver=6.1.0
+pkgver=${_qtver/-/}
+pkgrel=1
+arch=(any)
+url='https://www.qt.io'
+license=(GPL3 LGPL3 FDL custom)
+pkgdesc='Provides a set of easy to use chart components (mingw-w64)'
+depends=('mingw-w64-qt6-declarative-static')
+makedepends=('mingw-w64-cmake-static' 'mingw-w64-vulkan-headers' 'mingw-w64-vulkan-icd-loader' 'qt6-declarative' 'ninja')
+options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
+groups=(mingw-w64-qt6)
+_pkgfqn="qtcharts-everywhere-src-${_qtver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('8f70dc54b3f29eed91cf207db4185cef25f3d0bbc479059725c75c1895cddfcd')
+
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
+
+build() {
+  for _arch in ${_architectures}; do
+    export PKG_CONFIG=/usr/bin/$_arch-pkg-config
+    $_arch-cmake-static -G Ninja -B build-$_arch -S $_pkgfqn \
+      -DCMAKE_INSTALL_PREFIX:PATH="/usr/$_arch/static" \
+      -DFEATURE_static_runtime=ON \
+      -DFEATURE_pkg_config=ON
+    cmake --build build-$_arch
+  done
+}
+
+package() {
+  for _arch in ${_architectures}; do
+    DESTDIR="$pkgdir" cmake --install build-$_arch
+
+    find "$pkgdir/usr/$_arch" -iname '*.exe' -exec $_arch-strip --strip-all {} \;
+    find "$pkgdir/usr/$_arch" -iname '*.dll' -exec $_arch-strip --strip-unneeded {} \;
+    find "$pkgdir/usr/$_arch" -iname '*.a'   -exec $_arch-strip -g {} \;
+    [[ -d "$pkgdir/usr/$_arch/static/share/doc" ]] && rm -r "$pkgdir/usr/$_arch/static/share/doc"
+  done
+
+  install -d "$pkgdir"/usr/share/licenses
+  ln -s /usr/share/licenses/mingw-w64-qt6-base-static "$pkgdir"/usr/share/licenses/$pkgname
+
+}
+
--- a/qt6-charts/mingw-w64-static/PKGBUILD.sh.ep
+++ b/qt6-charts/mingw-w64-static/PKGBUILD.sh.ep
@ -0,0 +1 @@
+%= include "$default_package_name/mingw-w64/PKGBUILD";
--- a/qt6-charts/mingw-w64-static/qtcharts-sha256.txt
+++ b/qt6-charts/mingw-w64-static/qtcharts-sha256.txt
@ -0,0 +1 @@
+8f70dc54b3f29eed91cf207db4185cef25f3d0bbc479059725c75c1895cddfcd
--- a/qt6-charts/mingw-w64/PKGBUILD
+++ b/qt6-charts/mingw-w64/PKGBUILD
@ -0,0 +1,56 @@
+# Maintainer: Martchus <martchus@gmx.net>
+
+# All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
+# you also find the URL of a binary repository.
+
+pkgname=mingw-w64-qt6-charts
+_qtver=6.1.0
+pkgver=${_qtver/-/}
+pkgrel=1
+arch=(any)
+url='https://www.qt.io'
+license=(GPL3 LGPL3 FDL custom)
+pkgdesc='Provides a set of easy to use chart components (mingw-w64)'
+depends=('mingw-w64-qt6-declarative')
+makedepends=('mingw-w64-cmake' 'mingw-w64-vulkan-headers' 'mingw-w64-vulkan-icd-loader' 'qt6-declarative' 'ninja')
+options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
+groups=(mingw-w64-qt6)
+_pkgfqn="qtcharts-everywhere-src-${_qtver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('8f70dc54b3f29eed91cf207db4185cef25f3d0bbc479059725c75c1895cddfcd')
+
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
+
+build() {
+  for _arch in ${_architectures}; do
+    export PKG_CONFIG=/usr/bin/$_arch-pkg-config
+    $_arch-cmake -G Ninja -B build-$_arch -S $_pkgfqn \
+      -DFEATURE_pkg_config=ON
+    cmake --build build-$_arch
+  done
+}
+
+package() {
+  for _arch in ${_architectures}; do
+    DESTDIR="$pkgdir" cmake --install build-$_arch
+
+    # Add symlinks of DLLs in usual bin directory
+    mkdir -p "$pkgdir/usr/bin" "$pkgdir/usr/$_arch/bin"
+    for dll in "$pkgdir"/usr/$_arch/lib/qt6/bin/*.dll; do
+        ln -rs "$dll" "$pkgdir/usr/$_arch/bin/${dll##*/}"
+    done
+
+    # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
+    find "$pkgdir/usr/$_arch/lib" -type f -name '*.prl' \
+      -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
+
+    find "$pkgdir/usr/$_arch" -iname '*.exe' -exec $_arch-strip --strip-all {} \;
+    find "$pkgdir/usr/$_arch" -iname '*.dll' -exec $_arch-strip --strip-unneeded {} \;
+    find "$pkgdir/usr/$_arch" -iname '*.a'   -exec $_arch-strip -g {} \;
+    [[ -d "$pkgdir/usr/$_arch/share/doc" ]] && rm -r "$pkgdir/usr/$_arch/share/doc"
+  done
+
+  install -d "$pkgdir"/usr/share/licenses
+  ln -s /usr/share/licenses/mingw-w64-qt6-base "$pkgdir"/usr/share/licenses/$pkgname
+
+}
--- a/qt6-charts/mingw-w64/PKGBUILD.sh.ep
+++ b/qt6-charts/mingw-w64/PKGBUILD.sh.ep
@ -0,0 +1,11 @@
+% layout 'mingw-w64-qt6-module';
+\
+_qtver=6.1.0
+pkgver=${_qtver/-/}
+pkgrel=1
+arch=(any)
+url='https://www.qt.io'
+license=(GPL3 LGPL3 FDL custom)
+pkgdesc='Provides a set of easy to use chart components (mingw-w64)'
+depends=(<%== qt6deps qw(declarative) %>)
+makedepends=('mingw-w64-cmake<%== $static_suffix %>' 'mingw-w64-vulkan-headers' 'mingw-w64-vulkan-icd-loader' 'qt6-declarative' 'ninja')
--- a/qt6-charts/mingw-w64/qtcharts-sha256.txt
+++ b/qt6-charts/mingw-w64/qtcharts-sha256.txt
@ -0,0 +1 @@
+8f70dc54b3f29eed91cf207db4185cef25f3d0bbc479059725c75c1895cddfcd
--- a/qt6-datavis3d/android-aarch64/PKGBUILD
+++ b/qt6-datavis3d/android-aarch64/PKGBUILD
@ -0,0 +1,52 @@
+# Maintainer: Martchus <martchus@gmx.net>
+
+# All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
+# you also find the URL of a binary repository.
+
+_android_arch=aarch64
+pkgname=android-$_android_arch-qt6-datavis3d
+_qtver=6.1.0
+pkgver=${_qtver/-/}
+pkgrel=1
+arch=(any)
+url='https://www.qt.io'
+license=(GPL3 LGPL3 FDL custom)
+pkgdesc='Qt6 Data Visualization module (android)'
+depends=('android-aarch64-qt6-base')
+optdepends=('android-aarch64-qt6-declarative: QML bindings')
+makedepends=('android-cmake' 'android-aarch64-qt6-declarative' 'qt6-declarative' 'ninja' 'java-environment-openjdk=8')
+options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
+groups=(android-${_android_arch}-qt6)
+_pkgfqn="qtdatavis3d-everywhere-src-${_qtver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('068f646d29ac3b19edd89da5ec2ed9f1bed19dc80fe27dfb1b83e6b7c08b398b')
+
+build() {
+  source android-env ${_android_arch}
+  android-${_android_arch}-cmake -G Ninja -B build-$_android_arch -S $_pkgfqn \
+    -DCMAKE_FIND_ROOT_PATH="${ANDROID_PREFIX}" \
+    -DQT_BINARY_DIR=${ANDROID_PREFIX_BIN} \
+    -DQT_INCLUDE_DIRS_NO_SYSTEM=ON \
+    -DQT_HOST_PATH=/usr \
+    -DANDROID_SDK_ROOT=${ANDROID_HOME} \
+    -DANDROID_NDK_ROOT=${ANDROID_NDK_HOME} \
+    -DANDROID_STL="c++_shared" \
+    -DFEATURE_pkg_config=ON
+  cmake --build build-$_android_arch
+}
+
+package() {
+  DESTDIR="$pkgdir" cmake --install build-$_android_arch
+
+  # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
+  find "$pkgdir/${ANDROID_PREFIX}" -type f -name '*.prl' \
+    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
+
+  find ${pkgdir}/${ANDROID_PREFIX} -type f -name 'lib*.so' -exec ${ANDROID_STRIP} -g --strip-unneeded {} \;
+  find ${pkgdir}/${ANDROID_PREFIX} -type f -name 'lib*.a' -exec ${ANDROID_STRIP} -g {} \;
+  [[ -d "${pkgdir}/${ANDROID_PREFIX}/share/doc" ]] && rm -r "${pkgdir}/${ANDROID_PREFIX}/share/doc" || true
+
+  install -d "$pkgdir"/usr/share/licenses
+  ln -s /usr/share/licenses/android-$_android_arch-qt6-base "$pkgdir"/usr/share/licenses/$pkgname
+
+}
--- a/qt6-datavis3d/android-aarch64/PKGBUILD.sh.ep
+++ b/qt6-datavis3d/android-aarch64/PKGBUILD.sh.ep
@ -0,0 +1,12 @@
+% layout 'android-qt6-module';
+\
+_qtver=6.1.0
+pkgver=${_qtver/-/}
+pkgrel=1
+arch=(any)
+url='https://www.qt.io'
+license=(GPL3 LGPL3 FDL custom)
+pkgdesc='Qt6 Data Visualization module (android)'
+depends=(<%== qt6deps qw(base) %>)
+optdepends=(<%== qt6optdeps declarative => 'QML bindings' %>)
+makedepends=('android-cmake<%== $static_suffix %>' <%== qt6deps qw(declarative) %> 'qt6-declarative' 'ninja' 'java-environment-openjdk=8')
--- a/qt6-datavis3d/android-aarch64/qtdatavis3d-sha256.txt
+++ b/qt6-datavis3d/android-aarch64/qtdatavis3d-sha256.txt
@ -0,0 +1 @@
+068f646d29ac3b19edd89da5ec2ed9f1bed19dc80fe27dfb1b83e6b7c08b398b
--- a/qt6-datavis3d/mingw-w64-static/PKGBUILD
+++ b/qt6-datavis3d/mingw-w64-static/PKGBUILD
@ -0,0 +1,50 @@
+# Maintainer: Martchus <martchus@gmx.net>
+
+# All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
+# you also find the URL of a binary repository.
+
+pkgname=mingw-w64-qt6-datavis3d-static
+_qtver=6.1.0
+pkgver=${_qtver/-/}
+pkgrel=1
+arch=(any)
+url='https://www.qt.io'
+license=(GPL3 LGPL3 FDL custom)
+pkgdesc='Qt6 Data Visualization module (mingw-w64)'
+depends=('mingw-w64-qt6-base-static')
+optdepends=('mingw-w64-qt6-declarative-static: QML bindings')
+makedepends=('mingw-w64-cmake-static' 'mingw-w64-qt6-declarative-static' 'mingw-w64-vulkan-headers' 'mingw-w64-vulkan-icd-loader' 'qt6-declarative' 'ninja')
+options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
+groups=(mingw-w64-qt6)
+_pkgfqn="qtdatavis3d-everywhere-src-${_qtver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('068f646d29ac3b19edd89da5ec2ed9f1bed19dc80fe27dfb1b83e6b7c08b398b')
+
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
+
+build() {
+  for _arch in ${_architectures}; do
+    export PKG_CONFIG=/usr/bin/$_arch-pkg-config
+    $_arch-cmake-static -G Ninja -B build-$_arch -S $_pkgfqn \
+      -DCMAKE_INSTALL_PREFIX:PATH="/usr/$_arch/static" \
+      -DFEATURE_static_runtime=ON \
+      -DFEATURE_pkg_config=ON
+    cmake --build build-$_arch
+  done
+}
+
+package() {
+  for _arch in ${_architectures}; do
+    DESTDIR="$pkgdir" cmake --install build-$_arch
+
+    find "$pkgdir/usr/$_arch" -iname '*.exe' -exec $_arch-strip --strip-all {} \;
+    find "$pkgdir/usr/$_arch" -iname '*.dll' -exec $_arch-strip --strip-unneeded {} \;
+    find "$pkgdir/usr/$_arch" -iname '*.a'   -exec $_arch-strip -g {} \;
+    [[ -d "$pkgdir/usr/$_arch/static/share/doc" ]] && rm -r "$pkgdir/usr/$_arch/static/share/doc"
+  done
+
+  install -d "$pkgdir"/usr/share/licenses
+  ln -s /usr/share/licenses/mingw-w64-qt6-base-static "$pkgdir"/usr/share/licenses/$pkgname
+
+}
+
--- a/qt6-datavis3d/mingw-w64-static/PKGBUILD.sh.ep
+++ b/qt6-datavis3d/mingw-w64-static/PKGBUILD.sh.ep
@ -0,0 +1 @@
+%= include "$default_package_name/mingw-w64/PKGBUILD";
--- a/qt6-datavis3d/mingw-w64-static/qtdatavis3d-sha256.txt
+++ b/qt6-datavis3d/mingw-w64-static/qtdatavis3d-sha256.txt
@ -0,0 +1 @@
+068f646d29ac3b19edd89da5ec2ed9f1bed19dc80fe27dfb1b83e6b7c08b398b
--- a/qt6-datavis3d/mingw-w64/PKGBUILD
+++ b/qt6-datavis3d/mingw-w64/PKGBUILD
@ -0,0 +1,57 @@
+# Maintainer: Martchus <martchus@gmx.net>
+
+# All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
+# you also find the URL of a binary repository.
+
+pkgname=mingw-w64-qt6-datavis3d
+_qtver=6.1.0
+pkgver=${_qtver/-/}
+pkgrel=1
+arch=(any)
+url='https://www.qt.io'
+license=(GPL3 LGPL3 FDL custom)
+pkgdesc='Qt6 Data Visualization module (mingw-w64)'
+depends=('mingw-w64-qt6-base')
+optdepends=('mingw-w64-qt6-declarative: QML bindings')
+makedepends=('mingw-w64-cmake' 'mingw-w64-qt6-declarative' 'mingw-w64-vulkan-headers' 'mingw-w64-vulkan-icd-loader' 'qt6-declarative' 'ninja')
+options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
+groups=(mingw-w64-qt6)
+_pkgfqn="qtdatavis3d-everywhere-src-${_qtver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('068f646d29ac3b19edd89da5ec2ed9f1bed19dc80fe27dfb1b83e6b7c08b398b')
+
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
+
+build() {
+  for _arch in ${_architectures}; do
+    export PKG_CONFIG=/usr/bin/$_arch-pkg-config
+    $_arch-cmake -G Ninja -B build-$_arch -S $_pkgfqn \
+      -DFEATURE_pkg_config=ON
+    cmake --build build-$_arch
+  done
+}
+
+package() {
+  for _arch in ${_architectures}; do
+    DESTDIR="$pkgdir" cmake --install build-$_arch
+
+    # Add symlinks of DLLs in usual bin directory
+    mkdir -p "$pkgdir/usr/bin" "$pkgdir/usr/$_arch/bin"
+    for dll in "$pkgdir"/usr/$_arch/lib/qt6/bin/*.dll; do
+        ln -rs "$dll" "$pkgdir/usr/$_arch/bin/${dll##*/}"
+    done
+
+    # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
+    find "$pkgdir/usr/$_arch/lib" -type f -name '*.prl' \
+      -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
+
+    find "$pkgdir/usr/$_arch" -iname '*.exe' -exec $_arch-strip --strip-all {} \;
+    find "$pkgdir/usr/$_arch" -iname '*.dll' -exec $_arch-strip --strip-unneeded {} \;
+    find "$pkgdir/usr/$_arch" -iname '*.a'   -exec $_arch-strip -g {} \;
+    [[ -d "$pkgdir/usr/$_arch/share/doc" ]] && rm -r "$pkgdir/usr/$_arch/share/doc"
+  done
+
+  install -d "$pkgdir"/usr/share/licenses
+  ln -s /usr/share/licenses/mingw-w64-qt6-base "$pkgdir"/usr/share/licenses/$pkgname
+
+}
--- a/qt6-datavis3d/mingw-w64/PKGBUILD.sh.ep
+++ b/qt6-datavis3d/mingw-w64/PKGBUILD.sh.ep
@ -0,0 +1,12 @@
+% layout 'mingw-w64-qt6-module';
+\
+_qtver=6.1.0
+pkgver=${_qtver/-/}
+pkgrel=1
+arch=(any)
+url='https://www.qt.io'
+license=(GPL3 LGPL3 FDL custom)
+pkgdesc='Qt6 Data Visualization module (mingw-w64)'
+depends=(<%== qt6deps qw(base) %>)
+optdepends=(<%== qt6optdeps declarative => 'QML bindings' %>)
+makedepends=('mingw-w64-cmake<%== $static_suffix %>' <%== qt6deps qw(declarative) %> 'mingw-w64-vulkan-headers' 'mingw-w64-vulkan-icd-loader' 'qt6-declarative' 'ninja')
--- a/qt6-datavis3d/mingw-w64/qtdatavis3d-sha256.txt
+++ b/qt6-datavis3d/mingw-w64/qtdatavis3d-sha256.txt
@ -0,0 +1 @@
+068f646d29ac3b19edd89da5ec2ed9f1bed19dc80fe27dfb1b83e6b7c08b398b
--- a/qt6-declarative/android-aarch64/PKGBUILD
+++ b/qt6-declarative/android-aarch64/PKGBUILD
@ -5,7 +5,7 @@

 _android_arch=aarch64
 pkgname=android-$_android_arch-qt6-declarative
-_qtver=6.0.1
+_qtver=6.1.0
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
@ -19,7 +19,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
 groups=(android-${_android_arch}-qt6)
 _pkgfqn="qtdeclarative-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-sha256sums=('6e234508d3d624bdeb90e67f09f95b7bb9bc712f60f82f64ddd99132eff5f610')
+sha256sums=('e6f64314b8d54d7b541f52827b4e795317b17c3b7f39ad5210b8dbf343b75bda')

 build() {
  source android-env ${_android_arch}
--- a/qt6-declarative/android-aarch64/PKGBUILD.sh.ep
+++ b/qt6-declarative/android-aarch64/PKGBUILD.sh.ep
@ -1,6 +1,6 @@
 % layout 'android-qt6-module', has_binaries => 1;
 \
-_qtver=6.0.1
+_qtver=6.1.0
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
--- a/qt6-declarative/android-aarch64/qtdeclarative-sha256.txt
+++ b/qt6-declarative/android-aarch64/qtdeclarative-sha256.txt
@ -1 +1 @@
-6e234508d3d624bdeb90e67f09f95b7bb9bc712f60f82f64ddd99132eff5f610
+e6f64314b8d54d7b541f52827b4e795317b17c3b7f39ad5210b8dbf343b75bda
--- a/qt6-declarative/mingw-w64-static/PKGBUILD
+++ b/qt6-declarative/mingw-w64-static/PKGBUILD
@ -4,7 +4,7 @@
 # you also find the URL of a binary repository.

 pkgname=mingw-w64-qt6-declarative-static
-_qtver=6.0.1
+_qtver=6.1.0
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
@ -19,8 +19,8 @@ groups=(mingw-w64-qt6)
 _pkgfqn="qtdeclarative-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
        '0001-Exclude-qmltime-when-cross-compiling.patch')
-sha256sums=('6e234508d3d624bdeb90e67f09f95b7bb9bc712f60f82f64ddd99132eff5f610'
-            'c252273963e8508483b1edd09463640fdaee4d4c123dc4f000940f9f237f4e54')
+sha256sums=('e6f64314b8d54d7b541f52827b4e795317b17c3b7f39ad5210b8dbf343b75bda'
+            'ecc7e6c2555a4bb5990decfab7af7b96b3d7ca7e9ef99999e38786113e8e6e1f')

 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'

--- a/qt6-declarative/mingw-w64-static/qtdeclarative-sha256.txt
+++ b/qt6-declarative/mingw-w64-static/qtdeclarative-sha256.txt
@ -1 +1 @@
-6e234508d3d624bdeb90e67f09f95b7bb9bc712f60f82f64ddd99132eff5f610
+e6f64314b8d54d7b541f52827b4e795317b17c3b7f39ad5210b8dbf343b75bda
--- a/qt6-declarative/mingw-w64/0001-Exclude-qmltime-when-cross-compiling.patch
+++ b/qt6-declarative/mingw-w64/0001-Exclude-qmltime-when-cross-compiling.patch
@ -1,4 +1,4 @@
-From 67c5945fa0c3146d2f69c0c71f6ce5abe00edcc0 Mon Sep 17 00:00:00 2001
+From 2f311a387e0a41a7903cd89ba638cc87455f59b2 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 5 Feb 2021 02:22:45 +0100
 Subject: [PATCH] Exclude qmltime when cross compiling
@ -29,5 +29,5 @@ index 8438e8c6fa..23753dd0dc 100644
 if(QT_BUILD_SHARED_LIBS AND QT_FEATURE_process AND QT_FEATURE_regularexpression AND QT_FEATURE_thread AND TARGET Qt::Quick AND NOT ANDROID AND NOT WASM AND NOT rtems)
     add_subdirectory(qmlplugindump)
 -- 
-2.30.0
+2.31.1

--- a/qt6-declarative/mingw-w64/PKGBUILD
+++ b/qt6-declarative/mingw-w64/PKGBUILD
@ -4,7 +4,7 @@
 # you also find the URL of a binary repository.

 pkgname=mingw-w64-qt6-declarative
-_qtver=6.0.1
+_qtver=6.1.0
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
@ -19,8 +19,8 @@ groups=(mingw-w64-qt6)
 _pkgfqn="qtdeclarative-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
        '0001-Exclude-qmltime-when-cross-compiling.patch')
-sha256sums=('6e234508d3d624bdeb90e67f09f95b7bb9bc712f60f82f64ddd99132eff5f610'
-            'c252273963e8508483b1edd09463640fdaee4d4c123dc4f000940f9f237f4e54')
+sha256sums=('e6f64314b8d54d7b541f52827b4e795317b17c3b7f39ad5210b8dbf343b75bda'
+            'ecc7e6c2555a4bb5990decfab7af7b96b3d7ca7e9ef99999e38786113e8e6e1f')

 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'

--- a/qt6-declarative/mingw-w64/PKGBUILD.sh.ep
+++ b/qt6-declarative/mingw-w64/PKGBUILD.sh.ep
@ -1,6 +1,6 @@
 % layout 'mingw-w64-qt6-module', has_binaries => 1;
 \
-_qtver=6.0.1
+_qtver=6.1.0
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
--- a/qt6-declarative/mingw-w64/qtdeclarative-sha256.txt
+++ b/qt6-declarative/mingw-w64/qtdeclarative-sha256.txt
@ -1 +1 @@
-6e234508d3d624bdeb90e67f09f95b7bb9bc712f60f82f64ddd99132eff5f610
+e6f64314b8d54d7b541f52827b4e795317b17c3b7f39ad5210b8dbf343b75bda
--- a/qt6-imageformats/android-aarch64/PKGBUILD
+++ b/qt6-imageformats/android-aarch64/PKGBUILD
@ -5,7 +5,7 @@

 _android_arch=aarch64
 pkgname=android-$_android_arch-qt6-imageformats
-_qtver=6.0.1
+_qtver=6.1.0
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
@ -17,8 +17,8 @@ makedepends=('android-cmake' 'qt6-base' 'ninja' 'java-environment-openjdk=8')
 options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
 groups=(android-${_android_arch}-qt6)
 _pkgfqn="qtimageformats-everywhere-src-${_qtver}"
-source=("https://download.qt.io/official_releases/additional_libraries/qtimageformats/${pkgver%.*}/${_qtver}/${_pkgfqn}.tar.xz")
-sha256sums=('27a9d6e85dcd56ad981ef2aac27844e782f8cce0598f83283e6fbbd2a3810105')
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('34e63786d31d0c5dcc13a4b37d31002efb53244e48a8c2f0fafdd81e8d28575a')

 build() {
  source android-env ${_android_arch}
--- a/qt6-imageformats/android-aarch64/PKGBUILD.sh.ep
+++ b/qt6-imageformats/android-aarch64/PKGBUILD.sh.ep
@ -1,6 +1,6 @@
-% layout 'android-qt6-module', additional_library => 1;
+% layout 'android-qt6-module';
 \
-_qtver=6.0.1
+_qtver=6.1.0
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
--- a/qt6-imageformats/android-aarch64/qtimageformats-sha256.txt
+++ b/qt6-imageformats/android-aarch64/qtimageformats-sha256.txt
@ -1 +1 @@
-27a9d6e85dcd56ad981ef2aac27844e782f8cce0598f83283e6fbbd2a3810105
+34e63786d31d0c5dcc13a4b37d31002efb53244e48a8c2f0fafdd81e8d28575a
--- a/qt6-imageformats/mingw-w64-static/PKGBUILD
+++ b/qt6-imageformats/mingw-w64-static/PKGBUILD
@ -4,7 +4,7 @@
 # you also find the URL of a binary repository.

 pkgname=mingw-w64-qt6-imageformats-static
-_qtver=6.0.1
+_qtver=6.1.0
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
@ -19,8 +19,8 @@ makedepends=('mingw-w64-cmake-static' 'qt6-base' 'ninja' 'git')
 options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
 groups=(mingw-w64-qt6)
 _pkgfqn="qtimageformats-everywhere-src-${_qtver}"
-source=("https://download.qt.io/official_releases/additional_libraries/qtimageformats/${pkgver%.*}/${_qtver}/${_pkgfqn}.tar.xz")
-sha256sums=('27a9d6e85dcd56ad981ef2aac27844e782f8cce0598f83283e6fbbd2a3810105')
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('34e63786d31d0c5dcc13a4b37d31002efb53244e48a8c2f0fafdd81e8d28575a')

 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'

--- a/qt6-imageformats/mingw-w64-static/qtimageformats-sha256.txt
+++ b/qt6-imageformats/mingw-w64-static/qtimageformats-sha256.txt
@ -1 +1 @@
-27a9d6e85dcd56ad981ef2aac27844e782f8cce0598f83283e6fbbd2a3810105
+34e63786d31d0c5dcc13a4b37d31002efb53244e48a8c2f0fafdd81e8d28575a
--- a/qt6-imageformats/mingw-w64/PKGBUILD
+++ b/qt6-imageformats/mingw-w64/PKGBUILD
@ -4,7 +4,7 @@
 # you also find the URL of a binary repository.

 pkgname=mingw-w64-qt6-imageformats
-_qtver=6.0.1
+_qtver=6.1.0
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
@ -19,8 +19,8 @@ makedepends=('mingw-w64-cmake' 'qt6-base' 'ninja' 'git')
 options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
 groups=(mingw-w64-qt6)
 _pkgfqn="qtimageformats-everywhere-src-${_qtver}"
-source=("https://download.qt.io/official_releases/additional_libraries/qtimageformats/${pkgver%.*}/${_qtver}/${_pkgfqn}.tar.xz")
-sha256sums=('27a9d6e85dcd56ad981ef2aac27844e782f8cce0598f83283e6fbbd2a3810105')
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('34e63786d31d0c5dcc13a4b37d31002efb53244e48a8c2f0fafdd81e8d28575a')

 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'

--- a/qt6-imageformats/mingw-w64/PKGBUILD.sh.ep
+++ b/qt6-imageformats/mingw-w64/PKGBUILD.sh.ep
@ -1,6 +1,6 @@
-% layout 'mingw-w64-qt6-module', additional_library => 1;
+% layout 'mingw-w64-qt6-module';
 \
-_qtver=6.0.1
+_qtver=6.1.0
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
--- a/qt6-imageformats/mingw-w64/qtimageformats-sha256.txt
+++ b/qt6-imageformats/mingw-w64/qtimageformats-sha256.txt
@ -1 +1 @@
-27a9d6e85dcd56ad981ef2aac27844e782f8cce0598f83283e6fbbd2a3810105
+34e63786d31d0c5dcc13a4b37d31002efb53244e48a8c2f0fafdd81e8d28575a
--- a/qt6-lottie/android-aarch64/PKGBUILD
+++ b/qt6-lottie/android-aarch64/PKGBUILD
@ -0,0 +1,52 @@
+# Maintainer: Martchus <martchus@gmx.net>
+
+# All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
+# you also find the URL of a binary repository.
+
+_android_arch=aarch64
+pkgname=android-$_android_arch-qt6-lottie
+_qtver=6.1.0
+pkgver=${_qtver/-/}
+pkgrel=1
+arch=(any)
+url='https://www.qt.io'
+license=(GPL3 LGPL3 FDL custom)
+pkgdesc='A family of player software for a certain json-based file format for describing 2d vector graphics animations (android)'
+depends=('android-aarch64-qt6-base')
+optdepends=('android-aarch64-qt6-declarative: QML bindings')
+makedepends=('android-cmake' 'android-aarch64-qt6-declarative' 'qt6-declarative' 'ninja' 'java-environment-openjdk=8')
+options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
+groups=(android-${_android_arch}-qt6)
+_pkgfqn="qtlottie-everywhere-src-${_qtver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('3c2478f1064574939cfc151d7df0743d6bb1119d8cee6ed3ca3bc1cdfb8fece8')
+
+build() {
+  source android-env ${_android_arch}
+  android-${_android_arch}-cmake -G Ninja -B build-$_android_arch -S $_pkgfqn \
+    -DCMAKE_FIND_ROOT_PATH="${ANDROID_PREFIX}" \
+    -DQT_BINARY_DIR=${ANDROID_PREFIX_BIN} \
+    -DQT_INCLUDE_DIRS_NO_SYSTEM=ON \
+    -DQT_HOST_PATH=/usr \
+    -DANDROID_SDK_ROOT=${ANDROID_HOME} \
+    -DANDROID_NDK_ROOT=${ANDROID_NDK_HOME} \
+    -DANDROID_STL="c++_shared" \
+    -DFEATURE_pkg_config=ON
+  cmake --build build-$_android_arch
+}
+
+package() {
+  DESTDIR="$pkgdir" cmake --install build-$_android_arch
+
+  # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
+  find "$pkgdir/${ANDROID_PREFIX}" -type f -name '*.prl' \
+    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
+
+  find ${pkgdir}/${ANDROID_PREFIX} -type f -name 'lib*.so' -exec ${ANDROID_STRIP} -g --strip-unneeded {} \;
+  find ${pkgdir}/${ANDROID_PREFIX} -type f -name 'lib*.a' -exec ${ANDROID_STRIP} -g {} \;
+  [[ -d "${pkgdir}/${ANDROID_PREFIX}/share/doc" ]] && rm -r "${pkgdir}/${ANDROID_PREFIX}/share/doc" || true
+
+  install -d "$pkgdir"/usr/share/licenses
+  ln -s /usr/share/licenses/android-$_android_arch-qt6-base "$pkgdir"/usr/share/licenses/$pkgname
+
+}
--- a/qt6-lottie/android-aarch64/PKGBUILD.sh.ep
+++ b/qt6-lottie/android-aarch64/PKGBUILD.sh.ep
@ -0,0 +1,12 @@
+% layout 'android-qt6-module';
+\
+_qtver=6.1.0
+pkgver=${_qtver/-/}
+pkgrel=1
+arch=(any)
+url='https://www.qt.io'
+license=(GPL3 LGPL3 FDL custom)
+pkgdesc='A family of player software for a certain json-based file format for describing 2d vector graphics animations (android)'
+depends=(<%== qt6deps qw(base) %>)
+optdepends=(<%== qt6optdeps declarative => 'QML bindings' %>)
+makedepends=('android-cmake<%== $static_suffix %>' <%== qt6deps qw(declarative) %> 'qt6-declarative' 'ninja' 'java-environment-openjdk=8')
--- a/qt6-lottie/android-aarch64/qtlottie-sha256.txt
+++ b/qt6-lottie/android-aarch64/qtlottie-sha256.txt
@ -0,0 +1 @@
+3c2478f1064574939cfc151d7df0743d6bb1119d8cee6ed3ca3bc1cdfb8fece8
--- a/qt6-lottie/mingw-w64-static/PKGBUILD
+++ b/qt6-lottie/mingw-w64-static/PKGBUILD
@ -0,0 +1,50 @@
+# Maintainer: Martchus <martchus@gmx.net>
+
+# All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
+# you also find the URL of a binary repository.
+
+pkgname=mingw-w64-qt6-lottie-static
+_qtver=6.1.0
+pkgver=${_qtver/-/}
+pkgrel=1
+arch=(any)
+url='https://www.qt.io'
+license=(GPL3 LGPL3 FDL custom)
+pkgdesc='A family of player software for a certain json-based file format for describing 2d vector graphics animations (mingw-w64)'
+depends=('mingw-w64-qt6-base-static')
+optdepends=('mingw-w64-qt6-declarative-static: QML bindings')
+makedepends=('mingw-w64-cmake-static' 'mingw-w64-qt6-declarative-static' 'mingw-w64-vulkan-headers' 'mingw-w64-vulkan-icd-loader' 'qt6-declarative' 'ninja')
+options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
+groups=(mingw-w64-qt6)
+_pkgfqn="qtlottie-everywhere-src-${_qtver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('3c2478f1064574939cfc151d7df0743d6bb1119d8cee6ed3ca3bc1cdfb8fece8')
+
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
+
+build() {
+  for _arch in ${_architectures}; do
+    export PKG_CONFIG=/usr/bin/$_arch-pkg-config
+    $_arch-cmake-static -G Ninja -B build-$_arch -S $_pkgfqn \
+      -DCMAKE_INSTALL_PREFIX:PATH="/usr/$_arch/static" \
+      -DFEATURE_static_runtime=ON \
+      -DFEATURE_pkg_config=ON
+    cmake --build build-$_arch
+  done
+}
+
+package() {
+  for _arch in ${_architectures}; do
+    DESTDIR="$pkgdir" cmake --install build-$_arch
+
+    find "$pkgdir/usr/$_arch" -iname '*.exe' -exec $_arch-strip --strip-all {} \;
+    find "$pkgdir/usr/$_arch" -iname '*.dll' -exec $_arch-strip --strip-unneeded {} \;
+    find "$pkgdir/usr/$_arch" -iname '*.a'   -exec $_arch-strip -g {} \;
+    [[ -d "$pkgdir/usr/$_arch/static/share/doc" ]] && rm -r "$pkgdir/usr/$_arch/static/share/doc"
+  done
+
+  install -d "$pkgdir"/usr/share/licenses
+  ln -s /usr/share/licenses/mingw-w64-qt6-base-static "$pkgdir"/usr/share/licenses/$pkgname
+
+}
+
--- a/qt6-lottie/mingw-w64-static/PKGBUILD.sh.ep
+++ b/qt6-lottie/mingw-w64-static/PKGBUILD.sh.ep
@ -0,0 +1 @@
+%= include "$default_package_name/mingw-w64/PKGBUILD";
--- a/qt6-lottie/mingw-w64-static/qtlottie-sha256.txt
+++ b/qt6-lottie/mingw-w64-static/qtlottie-sha256.txt
@ -0,0 +1 @@
+3c2478f1064574939cfc151d7df0743d6bb1119d8cee6ed3ca3bc1cdfb8fece8
--- a/qt6-lottie/mingw-w64/PKGBUILD
+++ b/qt6-lottie/mingw-w64/PKGBUILD
@ -0,0 +1,57 @@
+# Maintainer: Martchus <martchus@gmx.net>
+
+# All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
+# you also find the URL of a binary repository.
+
+pkgname=mingw-w64-qt6-lottie
+_qtver=6.1.0
+pkgver=${_qtver/-/}
+pkgrel=1
+arch=(any)
+url='https://www.qt.io'
+license=(GPL3 LGPL3 FDL custom)
+pkgdesc='A family of player software for a certain json-based file format for describing 2d vector graphics animations (mingw-w64)'
+depends=('mingw-w64-qt6-base')
+optdepends=('mingw-w64-qt6-declarative: QML bindings')
+makedepends=('mingw-w64-cmake' 'mingw-w64-qt6-declarative' 'mingw-w64-vulkan-headers' 'mingw-w64-vulkan-icd-loader' 'qt6-declarative' 'ninja')
+options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
+groups=(mingw-w64-qt6)
+_pkgfqn="qtlottie-everywhere-src-${_qtver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('3c2478f1064574939cfc151d7df0743d6bb1119d8cee6ed3ca3bc1cdfb8fece8')
+
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
+
+build() {
+  for _arch in ${_architectures}; do
+    export PKG_CONFIG=/usr/bin/$_arch-pkg-config
+    $_arch-cmake -G Ninja -B build-$_arch -S $_pkgfqn \
+      -DFEATURE_pkg_config=ON
+    cmake --build build-$_arch
+  done
+}
+
+package() {
+  for _arch in ${_architectures}; do
+    DESTDIR="$pkgdir" cmake --install build-$_arch
+
+    # Add symlinks of DLLs in usual bin directory
+    mkdir -p "$pkgdir/usr/bin" "$pkgdir/usr/$_arch/bin"
+    for dll in "$pkgdir"/usr/$_arch/lib/qt6/bin/*.dll; do
+        ln -rs "$dll" "$pkgdir/usr/$_arch/bin/${dll##*/}"
+    done
+
+    # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
+    find "$pkgdir/usr/$_arch/lib" -type f -name '*.prl' \
+      -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
+
+    find "$pkgdir/usr/$_arch" -iname '*.exe' -exec $_arch-strip --strip-all {} \;
+    find "$pkgdir/usr/$_arch" -iname '*.dll' -exec $_arch-strip --strip-unneeded {} \;
+    find "$pkgdir/usr/$_arch" -iname '*.a'   -exec $_arch-strip -g {} \;
+    [[ -d "$pkgdir/usr/$_arch/share/doc" ]] && rm -r "$pkgdir/usr/$_arch/share/doc"
+  done
+
+  install -d "$pkgdir"/usr/share/licenses
+  ln -s /usr/share/licenses/mingw-w64-qt6-base "$pkgdir"/usr/share/licenses/$pkgname
+
+}
--- a/qt6-lottie/mingw-w64/PKGBUILD.sh.ep
+++ b/qt6-lottie/mingw-w64/PKGBUILD.sh.ep
@ -0,0 +1,12 @@
+% layout 'mingw-w64-qt6-module';
+\
+_qtver=6.1.0
+pkgver=${_qtver/-/}
+pkgrel=1
+arch=(any)
+url='https://www.qt.io'
+license=(GPL3 LGPL3 FDL custom)
+pkgdesc='A family of player software for a certain json-based file format for describing 2d vector graphics animations (mingw-w64)'
+depends=(<%== qt6deps qw(base) %>)
+optdepends=(<%== qt6optdeps declarative => 'QML bindings' %>)
+makedepends=('mingw-w64-cmake<%== $static_suffix %>' <%== qt6deps qw(declarative) %> 'mingw-w64-vulkan-headers' 'mingw-w64-vulkan-icd-loader' 'qt6-declarative' 'ninja')
--- a/qt6-lottie/mingw-w64/qtlottie-sha256.txt
+++ b/qt6-lottie/mingw-w64/qtlottie-sha256.txt
@ -0,0 +1 @@
+3c2478f1064574939cfc151d7df0743d6bb1119d8cee6ed3ca3bc1cdfb8fece8
--- a/qt6-networkauth/android-aarch64/PKGBUILD
+++ b/qt6-networkauth/android-aarch64/PKGBUILD
@ -5,7 +5,7 @@

 _android_arch=aarch64
 pkgname=android-$_android_arch-qt6-networkauth
-_qtver=6.0.1
+_qtver=6.1.0
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
@ -17,8 +17,8 @@ makedepends=('android-cmake' 'qt6-base' 'ninja' 'java-environment-openjdk=8')
 options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
 groups=(android-${_android_arch}-qt6)
 _pkgfqn="qtnetworkauth-everywhere-src-${_qtver}"
-source=("https://download.qt.io/official_releases/additional_libraries/qtnetworkauth/${pkgver%.*}/${_qtver}/${_pkgfqn}.tar.xz")
-sha256sums=('7f348acedb24e7c33927bd475b87b3c0c9901122f2e11f8c8209de4497e36122')
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('bae8a941e4b635a364bdc65ea814adfe75b20b06fce0888612f72fc1e81ebdd3')

 build() {
  source android-env ${_android_arch}
--- a/qt6-networkauth/android-aarch64/PKGBUILD.sh.ep
+++ b/qt6-networkauth/android-aarch64/PKGBUILD.sh.ep
@ -1,6 +1,6 @@
-% layout 'android-qt6-module', additional_library => 1;
+% layout 'android-qt6-module';
 \
-_qtver=6.0.1
+_qtver=6.1.0
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
--- a/qt6-networkauth/android-aarch64/qtnetworkauth-sha256.txt
+++ b/qt6-networkauth/android-aarch64/qtnetworkauth-sha256.txt
@ -1 +1 @@
-7f348acedb24e7c33927bd475b87b3c0c9901122f2e11f8c8209de4497e36122
+bae8a941e4b635a364bdc65ea814adfe75b20b06fce0888612f72fc1e81ebdd3
--- a/qt6-networkauth/mingw-w64-static/PKGBUILD
+++ b/qt6-networkauth/mingw-w64-static/PKGBUILD
@ -4,7 +4,7 @@
 # you also find the URL of a binary repository.

 pkgname=mingw-w64-qt6-networkauth-static
-_qtver=6.0.1
+_qtver=6.1.0
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
@ -16,8 +16,8 @@ makedepends=('mingw-w64-cmake-static' 'qt6-base' 'ninja')
 options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
 groups=(mingw-w64-qt6)
 _pkgfqn="qtnetworkauth-everywhere-src-${_qtver}"
-source=("https://download.qt.io/official_releases/additional_libraries/qtnetworkauth/${pkgver%.*}/${_qtver}/${_pkgfqn}.tar.xz")
-sha256sums=('7f348acedb24e7c33927bd475b87b3c0c9901122f2e11f8c8209de4497e36122')
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('bae8a941e4b635a364bdc65ea814adfe75b20b06fce0888612f72fc1e81ebdd3')

 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'

--- a/qt6-networkauth/mingw-w64-static/qtnetworkauth-sha256.txt
+++ b/qt6-networkauth/mingw-w64-static/qtnetworkauth-sha256.txt
@ -1 +1 @@
-7f348acedb24e7c33927bd475b87b3c0c9901122f2e11f8c8209de4497e36122
+bae8a941e4b635a364bdc65ea814adfe75b20b06fce0888612f72fc1e81ebdd3
--- a/qt6-networkauth/mingw-w64/PKGBUILD
+++ b/qt6-networkauth/mingw-w64/PKGBUILD
@ -4,7 +4,7 @@
 # you also find the URL of a binary repository.

 pkgname=mingw-w64-qt6-networkauth
-_qtver=6.0.1
+_qtver=6.1.0
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
@ -16,8 +16,8 @@ makedepends=('mingw-w64-cmake' 'qt6-base' 'ninja')
 options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
 groups=(mingw-w64-qt6)
 _pkgfqn="qtnetworkauth-everywhere-src-${_qtver}"
-source=("https://download.qt.io/official_releases/additional_libraries/qtnetworkauth/${pkgver%.*}/${_qtver}/${_pkgfqn}.tar.xz")
-sha256sums=('7f348acedb24e7c33927bd475b87b3c0c9901122f2e11f8c8209de4497e36122')
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('bae8a941e4b635a364bdc65ea814adfe75b20b06fce0888612f72fc1e81ebdd3')

 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'

--- a/qt6-networkauth/mingw-w64/PKGBUILD.sh.ep
+++ b/qt6-networkauth/mingw-w64/PKGBUILD.sh.ep
@ -1,6 +1,6 @@
-% layout 'mingw-w64-qt6-module', additional_library => 1;
+% layout 'mingw-w64-qt6-module';
 \
-_qtver=6.0.1
+_qtver=6.1.0
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
--- a/qt6-networkauth/mingw-w64/qtnetworkauth-sha256.txt
+++ b/qt6-networkauth/mingw-w64/qtnetworkauth-sha256.txt
@ -1 +1 @@
-7f348acedb24e7c33927bd475b87b3c0c9901122f2e11f8c8209de4497e36122
+bae8a941e4b635a364bdc65ea814adfe75b20b06fce0888612f72fc1e81ebdd3
--- a/qt6-quick3d/android-aarch64/PKGBUILD
+++ b/qt6-quick3d/android-aarch64/PKGBUILD
@ -5,7 +5,7 @@

 _android_arch=aarch64
 pkgname=android-$_android_arch-qt6-quick3d
-_qtver=6.0.1
+_qtver=6.1.0
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
@ -18,7 +18,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
 groups=(android-${_android_arch}-qt6)
 _pkgfqn="qtquick3d-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-sha256sums=('26194ff27247bed5b21f253ade062da60e2dd9395a8ad29de388d41ab8548388')
+sha256sums=('ead155359cf7fb8b2c1a69d00847196c4011433a4839938cc5f87f65a9d5d268')

 build() {
  source android-env ${_android_arch}
--- a/qt6-quick3d/android-aarch64/PKGBUILD.sh.ep
+++ b/qt6-quick3d/android-aarch64/PKGBUILD.sh.ep
@ -1,6 +1,6 @@
 % layout 'android-qt6-module', has_binaries => 1;
 \
-_qtver=6.0.1
+_qtver=6.1.0
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
--- a/qt6-quick3d/android-aarch64/qtquick3d-sha256.txt
+++ b/qt6-quick3d/android-aarch64/qtquick3d-sha256.txt
@ -1 +1 @@
-26194ff27247bed5b21f253ade062da60e2dd9395a8ad29de388d41ab8548388
+ead155359cf7fb8b2c1a69d00847196c4011433a4839938cc5f87f65a9d5d268
--- a/qt6-quick3d/mingw-w64-static/PKGBUILD
+++ b/qt6-quick3d/mingw-w64-static/PKGBUILD
@ -4,7 +4,7 @@
 # you also find the URL of a binary repository.

 pkgname=mingw-w64-qt6-quick3d-static
-_qtver=6.0.1
+_qtver=6.1.0
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
@ -18,7 +18,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
 groups=(mingw-w64-qt6)
 _pkgfqn="qtquick3d-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-sha256sums=('26194ff27247bed5b21f253ade062da60e2dd9395a8ad29de388d41ab8548388')
+sha256sums=('ead155359cf7fb8b2c1a69d00847196c4011433a4839938cc5f87f65a9d5d268')

 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'

--- a/qt6-quick3d/mingw-w64-static/qtquick3d-sha256.txt
+++ b/qt6-quick3d/mingw-w64-static/qtquick3d-sha256.txt
@ -1 +1 @@
-26194ff27247bed5b21f253ade062da60e2dd9395a8ad29de388d41ab8548388
+ead155359cf7fb8b2c1a69d00847196c4011433a4839938cc5f87f65a9d5d268
--- a/qt6-quick3d/mingw-w64/PKGBUILD
+++ b/qt6-quick3d/mingw-w64/PKGBUILD
@ -4,7 +4,7 @@
 # you also find the URL of a binary repository.

 pkgname=mingw-w64-qt6-quick3d
-_qtver=6.0.1
+_qtver=6.1.0
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
@ -18,7 +18,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
 groups=(mingw-w64-qt6)
 _pkgfqn="qtquick3d-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-sha256sums=('26194ff27247bed5b21f253ade062da60e2dd9395a8ad29de388d41ab8548388')
+sha256sums=('ead155359cf7fb8b2c1a69d00847196c4011433a4839938cc5f87f65a9d5d268')

 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'

--- a/qt6-quick3d/mingw-w64/PKGBUILD.sh.ep
+++ b/qt6-quick3d/mingw-w64/PKGBUILD.sh.ep
@ -1,6 +1,6 @@
 % layout 'mingw-w64-qt6-module', has_binaries => 1;
 \
-_qtver=6.0.1
+_qtver=6.1.0
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
--- a/qt6-quick3d/mingw-w64/qtquick3d-sha256.txt
+++ b/qt6-quick3d/mingw-w64/qtquick3d-sha256.txt
@ -1 +1 @@
-26194ff27247bed5b21f253ade062da60e2dd9395a8ad29de388d41ab8548388
+ead155359cf7fb8b2c1a69d00847196c4011433a4839938cc5f87f65a9d5d268
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`../mingw-w64/0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch`
				`@ -0,0 +1 @@`
				`../mingw-w64/0002-Build-tools-for-the-target-platform.patch`
				`@ -0,0 +1 @@`
				`%= include "$default_package_name/mingw-w64/PKGBUILD";`
				`@ -0,0 +1 @@`
				`d79f964054a98b7edcfcb3f3590a58d599bcb2f9569ec10f5f5d9c0070701b4a`
				`@ -0,0 +1 @@`
				`../mingw-w64/0008-Fix-passing-QJniEnvironment-to-ANativeWindow_fromSur.patch`
				`@ -0,0 +1 @@`
				`8f70dc54b3f29eed91cf207db4185cef25f3d0bbc479059725c75c1895cddfcd`
				`@ -0,0 +1 @@`
				`068f646d29ac3b19edd89da5ec2ed9f1bed19dc80fe27dfb1b83e6b7c08b398b`
				`@ -0,0 +1 @@`
				`3c2478f1064574939cfc151d7df0743d6bb1119d8cee6ed3ca3bc1cdfb8fece8`