Improve mingw-w64-qt6-* packages

* Install licenses correctly under /usr/share/licenses/$pkgname * Remove documentation * Call `set_property` for fixing D-Bus issues only if actually using D-Bus to make the patch more generic
2021-01-04 18:06:29 +01:00 · 2021-01-04 18:06:29 +01:00 · c1fba35883
parent d50a65be3b
commit c1fba35883
32 changed files with 90 additions and 53 deletions
--- a/devel/generator/templates/layouts/mingw-w64-qt6-base.sh.ep
+++ b/devel/generator/templates/layouts/mingw-w64-qt6-base.sh.ep
@ -61,6 +61,7 @@ build() {
    $_arch-cmake<%== $static_suffix %> -G Ninja -B build-$_arch -S $_pkgfqn \\
 % if ($static_variant) {
      -DCMAKE_INSTALL_PREFIX:PATH="/usr/$_arch/static" \\
+      -DFEATURE_static_runtime=ON \\
 % }
      -DFEATURE_pkg_config=ON \\
      -DFEATURE_system_pcre2=ON \\
@ -83,7 +84,7 @@ package() {
  for _arch in ${_architectures}; do
    DESTDIR="$pkgdir" cmake --install build-$_arch

-    install -Dm644 $_pkgfqn/LICENSE* -t "$pkgdir"/usr/$_arch/share/licenses/$pkgname
+    install -Dm644 $_pkgfqn/LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgname

 % unless ($static_variant) {
    # Add symlinks of DLLs in usual bin directory
@ -105,5 +106,6 @@ package() {
    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
 }
--- a/devel/generator/templates/layouts/mingw-w64-qt6-module.sh.ep
+++ b/devel/generator/templates/layouts/mingw-w64-qt6-module.sh.ep
@ -47,6 +47,7 @@ build() {
    $_arch-cmake<%== $static_suffix %> -G Ninja -B build-$_arch -S $_pkgfqn \\
 % if ($static_variant) {
      -DCMAKE_INSTALL_PREFIX:PATH="/usr/$_arch/static" \\
+      -DFEATURE_static_runtime=ON \\
 % }
      -DFEATURE_pkg_config=ON<%== content_for 'additional_cmake_args' %>
    cmake --build build-$_arch
@ -77,6 +78,7 @@ package() {
    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
--- a/qt6-3d/mingw-w64-static/PKGBUILD
+++ b/qt6-3d/mingw-w64-static/PKGBUILD
@ -29,6 +29,7 @@ build() {
    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
@ -41,6 +42,7 @@ package() {
    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
--- a/qt6-3d/mingw-w64/PKGBUILD
+++ b/qt6-3d/mingw-w64/PKGBUILD
@ -50,6 +50,7 @@ package() {
    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
--- a/qt6-5compat/mingw-w64-static/PKGBUILD
+++ b/qt6-5compat/mingw-w64-static/PKGBUILD
@ -26,6 +26,7 @@ build() {
    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
@ -38,6 +39,7 @@ package() {
    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
--- a/qt6-5compat/mingw-w64/PKGBUILD
+++ b/qt6-5compat/mingw-w64/PKGBUILD
@ -47,6 +47,7 @@ package() {
    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
--- a/qt6-base/mingw-w64-static/PKGBUILD
+++ b/qt6-base/mingw-w64-static/PKGBUILD
@ -39,13 +39,13 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
        '0006-Support-finding-MariaDB.patch'
        '0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch')
 sha256sums=('ae227180272d199cbb15318e3353716afada5c57fd5185b812ae26912c958656'
-            'ea0d7432318261cfd13dadd39ecef5bb98d6ff3017c9e170209c9227bfddaed7'
-            '42e06c8f4261adf434d3f570c22156dec8164745bcb25fd1a93c54a0a5f2277a'
-            '01e52d9a60f6b31561c95798bc1fe0f3e0b6361c9e22307a8db47af789bd8544'
-            'c7a416a2bb61f938a81c7ddc82257776e6752f5372ee57f2cc08cba8761e2211'
-            'e11565af9b05b7714248324b5afecda78caa9be03e9c4872f80ea07636bfa1a7'
-            '8fa423062a850d68341b80aade231cfec865f9a750324ff3819faecf77ff9347'
-            'c9c0289e08106dcc18973d1625526f2a90271452d375171d97a9793199549cea')
+            '0907b860c3394efc457304e75ec0282799374a83f411e194250cd20f4f703051'
+            'ba9f624f9393289930b10a1b976d094f4f023009d46ceaf1a05af0ef9981a65f'
+            '7b1b9b3b995e0ade88251bd97ca9b197511ed35657d7ec5643eaee22f7f83993'
+            'aa30dd86403f39cc3de9512de05c86dbb69ca141bdb55ca4dd7578c03de174a9'
+            'dd4db93874ae433a88dde68ebe5bed864c0af4a37cb81778a4154cda8f310b3d'
+            '713d91d944688677c3d56f07f7a9e8b9858a38709daf95cea99e5a87f8e429d2'
+            '56d024b76fa9dde2bcf8720a48bf9c43dc8b48256be6590d3da55fc68c27ad25')

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

@ -64,6 +64,7 @@ build() {
    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 \
      -DFEATURE_system_pcre2=ON \
      -DFEATURE_system_freetype=ON \
@ -85,7 +86,7 @@ package() {
  for _arch in ${_architectures}; do
    DESTDIR="$pkgdir" cmake --install build-$_arch

-    install -Dm644 $_pkgfqn/LICENSE* -t "$pkgdir"/usr/$_arch/share/licenses/$pkgname
+    install -Dm644 $_pkgfqn/LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgname

    # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
    find "$pkgdir/usr/$_arch/static/lib" -type f -name '*.prl' \
@ -94,5 +95,6 @@ package() {
    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
 }
--- 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
@ -111,5 +111,5 @@ index 24ed125f12..73ebe453d3 100644
         CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}$${debug_suffix}.lib
         CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qtmain$${QT_LIBINFIX}.lib
 -- 
-2.29.2
+2.30.0

--- a/qt6-base/mingw-w64/0002-Fix-finding-D-Bus.patch
+++ b/qt6-base/mingw-w64/0002-Fix-finding-D-Bus.patch
@ -1,23 +1,24 @@
-From cd942ac25b912c5a8ddf807d09124cb920327e66 Mon Sep 17 00:00:00 2001
+From afc8756fb3d87149d958df1bcd4c9910dee1a104 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

 Change-Id: Ie21eb9cbc6b1b5d9c8b34eea46f54718e5926986
 ---
- cmake/FindWrapDBus1.cmake | 1 +
- 1 file changed, 1 insertion(+)
+ cmake/FindWrapDBus1.cmake | 3 +++
+ 1 file changed, 3 insertions(+)

 diff --git a/cmake/FindWrapDBus1.cmake b/cmake/FindWrapDBus1.cmake
-index e227d224e0..4982e7c8ae 100644
+index e227d224e0..bdbcab9eb3 100644
 --- a/cmake/FindWrapDBus1.cmake
 +++ b/cmake/FindWrapDBus1.cmake
-@@ -45,3 +45,4 @@ include(FindPackageHandleStandardArgs)
+@@ -45,3 +45,6 @@ include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(WrapDBus1 REQUIRED_VARS
                                             DBus1_LIBRARY DBus1_INCLUDE_DIR WrapDBus1_FOUND
                                             VERSION_VAR DBus1_VERSION)
-+set_property(TARGET dbus-1 PROPERTY IMPORTED_IMPLIB ${DBus1_LIBRARY})
-\ No newline at end of file
+if(TARGET dbus-1)
+    set_property(TARGET dbus-1 PROPERTY IMPORTED_IMPLIB ${DBus1_LIBRARY})
+endif()
 -- 
-2.29.2
+2.30.0

--- 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,4 +1,4 @@
-From a0f488c28adfd04e3eb47e1d33d13f7112c4baa7 Mon Sep 17 00:00:00 2001
+From 95e7cc0c70ebad9da721154cb523db7c214c6996 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
@ -44,5 +44,5 @@ index accaa4f5ed..4b11c74caa 100644
 #  include <dbus/dbus.h>
 #else
 -- 
-2.29.2
+2.30.0

--- 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,4 +1,4 @@
-From f0176a1ae2e36b4ea89bda4a927bf387a4e20ead Mon Sep 17 00:00:00 2001
+From 10cb71bf97fe6f6ebe9aa4e3f7387df675f32471 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)
@ -9,15 +9,15 @@ dependencies by setting certain variables, e.g. within the toolchain file.

 Change-Id: I89da5ef519dd6dd3f86a94a01d3da7208a070bdb
 ---
- .../3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake  | 2 +-
- cmake/FindMySQL.cmake                                          | 1 +
- cmake/FindWrapDBus1.cmake                                      | 3 ++-
- 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, 9 insertions(+), 7 deletions(-)
+ 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(-)

 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
@ -45,17 +45,15 @@ index 54c94b8a2f..7575386338 100644
 endif()
 
 diff --git a/cmake/FindWrapDBus1.cmake b/cmake/FindWrapDBus1.cmake
-index 4982e7c8ae..56d139c538 100644
+index bdbcab9eb3..06e9af49f6 100644
 --- a/cmake/FindWrapDBus1.cmake
 +++ b/cmake/FindWrapDBus1.cmake
-@@ -45,4 +45,5 @@ include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(WrapDBus1 REQUIRED_VARS
-                                             DBus1_LIBRARY DBus1_INCLUDE_DIR WrapDBus1_FOUND
+@@ -47,4 +47,5 @@ find_package_handle_standard_args(WrapDBus1 REQUIRED_VARS
                                             VERSION_VAR DBus1_VERSION)
-set_property(TARGET dbus-1 PROPERTY IMPORTED_IMPLIB ${DBus1_LIBRARY})
-\ No newline at end of file
-+set_property(TARGET dbus-1 PROPERTY IMPORTED_IMPLIB ${DBus1_LIBRARY})
-+set_property(TARGET dbus-1 PROPERTY INTERFACE_LINK_LIBRARIES "${DBUS1_DEPENDENCIES}")
+ if(TARGET dbus-1)
+     set_property(TARGET dbus-1 PROPERTY IMPORTED_IMPLIB ${DBus1_LIBRARY})
+    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
 --- a/cmake/FindWrapOpenSSL.cmake
@ -122,5 +120,5 @@ index 62e9619d16..939163bde7 100644
         Qt::CorePrivate
         Qt::SqlPrivate
 -- 
-2.29.2
+2.30.0

--- 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,4 +1,4 @@
-From 042b2c86c9f895980f400fdd1d4e6ab8ce8022d8 Mon Sep 17 00:00:00 2001
+From 0895ea01a90a5ef93d61971adf4be1d2f3015ce4 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
@ -33,5 +33,5 @@ index beef18f260..72708145f4 100644
 #ifdef const
 #  undef const          // remove crazy C hackery in jconfig.h
 -- 
-2.29.2
+2.30.0

--- a/qt6-base/mingw-w64/0006-Support-finding-MariaDB.patch
+++ b/qt6-base/mingw-w64/0006-Support-finding-MariaDB.patch
@ -1,4 +1,4 @@
-From baf1e987e55c90a32e6e32438f770f7aab4c4a3c Mon Sep 17 00:00:00 2001
+From ea58e477bd07475f2fd9c1b0025732265cf0467c 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 MariaDB
@ -26,5 +26,5 @@ index 7575386338..df1d848cf6 100644
 )
 
 -- 
-2.29.2
+2.30.0

--- 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,4 +1,4 @@
-From 28e6e716d2a09f40720f3d213e82c1ff6e61a860 Mon Sep 17 00:00:00 2001
+From 563b073d12df9982f3ec75b95a6a9eeb2058c6bd 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
@ -33,5 +33,5 @@ index bb2de0a0c2..a2e8b37ba7 100644
     qt_enable_cmake_languages()
 
 -- 
-2.29.2
+2.30.0

--- a/qt6-base/mingw-w64/PKGBUILD
+++ b/qt6-base/mingw-w64/PKGBUILD
@ -39,13 +39,13 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
        '0006-Support-finding-MariaDB.patch'
        '0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch')
 sha256sums=('ae227180272d199cbb15318e3353716afada5c57fd5185b812ae26912c958656'
-            'ea0d7432318261cfd13dadd39ecef5bb98d6ff3017c9e170209c9227bfddaed7'
-            '42e06c8f4261adf434d3f570c22156dec8164745bcb25fd1a93c54a0a5f2277a'
-            '01e52d9a60f6b31561c95798bc1fe0f3e0b6361c9e22307a8db47af789bd8544'
-            'c7a416a2bb61f938a81c7ddc82257776e6752f5372ee57f2cc08cba8761e2211'
-            'e11565af9b05b7714248324b5afecda78caa9be03e9c4872f80ea07636bfa1a7'
-            '8fa423062a850d68341b80aade231cfec865f9a750324ff3819faecf77ff9347'
-            'c9c0289e08106dcc18973d1625526f2a90271452d375171d97a9793199549cea')
+            '0907b860c3394efc457304e75ec0282799374a83f411e194250cd20f4f703051'
+            'ba9f624f9393289930b10a1b976d094f4f023009d46ceaf1a05af0ef9981a65f'
+            '7b1b9b3b995e0ade88251bd97ca9b197511ed35657d7ec5643eaee22f7f83993'
+            'aa30dd86403f39cc3de9512de05c86dbb69ca141bdb55ca4dd7578c03de174a9'
+            'dd4db93874ae433a88dde68ebe5bed864c0af4a37cb81778a4154cda8f310b3d'
+            '713d91d944688677c3d56f07f7a9e8b9858a38709daf95cea99e5a87f8e429d2'
+            '56d024b76fa9dde2bcf8720a48bf9c43dc8b48256be6590d3da55fc68c27ad25')

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

@ -84,7 +84,7 @@ package() {
  for _arch in ${_architectures}; do
    DESTDIR="$pkgdir" cmake --install build-$_arch

-    install -Dm644 $_pkgfqn/LICENSE* -t "$pkgdir"/usr/$_arch/share/licenses/$pkgname
+    install -Dm644 $_pkgfqn/LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgname

    # Add symlinks of DLLs in usual bin directory
    mkdir -p "$pkgdir/usr/bin" "$pkgdir/usr/$_arch/bin"
@ -104,5 +104,6 @@ package() {
    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
 }
--- a/qt6-declarative/mingw-w64-static/PKGBUILD
+++ b/qt6-declarative/mingw-w64-static/PKGBUILD
@ -27,6 +27,7 @@ build() {
    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
@ -39,6 +40,7 @@ package() {
    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
--- a/qt6-declarative/mingw-w64/PKGBUILD
+++ b/qt6-declarative/mingw-w64/PKGBUILD
@ -48,6 +48,7 @@ package() {
    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
--- a/qt6-imageformats/mingw-w64-static/PKGBUILD
+++ b/qt6-imageformats/mingw-w64-static/PKGBUILD
@ -29,6 +29,7 @@ build() {
    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
@ -41,6 +42,7 @@ package() {
    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
--- a/qt6-imageformats/mingw-w64/PKGBUILD
+++ b/qt6-imageformats/mingw-w64/PKGBUILD
@ -50,6 +50,7 @@ package() {
    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
--- a/qt6-quick3d/mingw-w64-static/PKGBUILD
+++ b/qt6-quick3d/mingw-w64-static/PKGBUILD
@ -27,6 +27,7 @@ build() {
    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
@ -39,6 +40,7 @@ package() {
    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
--- a/qt6-quick3d/mingw-w64/PKGBUILD
+++ b/qt6-quick3d/mingw-w64/PKGBUILD
@ -48,6 +48,7 @@ package() {
    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
--- a/qt6-quickcontrols2/mingw-w64-static/PKGBUILD
+++ b/qt6-quickcontrols2/mingw-w64-static/PKGBUILD
@ -26,6 +26,7 @@ build() {
    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
@ -38,6 +39,7 @@ package() {
    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
--- a/qt6-quickcontrols2/mingw-w64/PKGBUILD
+++ b/qt6-quickcontrols2/mingw-w64/PKGBUILD
@ -47,6 +47,7 @@ package() {
    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
--- a/qt6-quicktimeline/mingw-w64-static/PKGBUILD
+++ b/qt6-quicktimeline/mingw-w64-static/PKGBUILD
@ -26,6 +26,7 @@ build() {
    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
@ -38,6 +39,7 @@ package() {
    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
--- a/qt6-quicktimeline/mingw-w64/PKGBUILD
+++ b/qt6-quicktimeline/mingw-w64/PKGBUILD
@ -47,6 +47,7 @@ package() {
    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
--- a/qt6-shadertools/mingw-w64-static/PKGBUILD
+++ b/qt6-shadertools/mingw-w64-static/PKGBUILD
@ -27,6 +27,7 @@ build() {
    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
@ -39,6 +40,7 @@ package() {
    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
--- a/qt6-shadertools/mingw-w64/PKGBUILD
+++ b/qt6-shadertools/mingw-w64/PKGBUILD
@ -48,6 +48,7 @@ package() {
    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
--- a/qt6-svg/mingw-w64-static/PKGBUILD
+++ b/qt6-svg/mingw-w64-static/PKGBUILD
@ -26,6 +26,7 @@ build() {
    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
@ -38,6 +39,7 @@ package() {
    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
--- a/qt6-svg/mingw-w64/PKGBUILD
+++ b/qt6-svg/mingw-w64/PKGBUILD
@ -47,6 +47,7 @@ package() {
    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
--- a/qt6-tools/mingw-w64-static/PKGBUILD
+++ b/qt6-tools/mingw-w64-static/PKGBUILD
@ -38,6 +38,7 @@ build() {
    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 \
      -DFEATURE_windeployqt=OFF
    cmake --build build-$_arch
@ -51,6 +52,7 @@ package() {
    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
--- a/qt6-tools/mingw-w64/PKGBUILD
+++ b/qt6-tools/mingw-w64/PKGBUILD
@ -60,6 +60,7 @@ package() {
    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
--- a/qt6-translations/mingw-w64/PKGBUILD
+++ b/qt6-translations/mingw-w64/PKGBUILD
@ -37,6 +37,7 @@ package() {
    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