Rebuild against mariadb-connector-c 3.1.7

1 files changed, 76 insertions, 204 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 4aba328a5ad2..7eb809ae8f57 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,54 +6,36 @@
 # BEFORE COMMENTING OR REPORING ISSUES, PLEASE READ THE FILE `README.md` IN THIS REPOSITORY.
 # ALSO HAVE A LOOK AT THE COMMENTS IN THE AUR.
 
+# DOES NOT WORK YET, see comment in build() function
+
 # All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
 # you also find the URL of a binary repository.
 
 # All patches are managed at https://github.com/Martchus/qtbase
 
-# define helper functions for the split builds
-isDefault() {
-  [[ $pkgname = 'mingw-w64-qt5-base' ]] || [[ $pkgname = 'mingw-w64-qt5-base-static' ]]
-}
-isStatic() {
-  [ "${pkgname##*-}" = 'static' ]
-}
-isOpenGL() {
-  isDefault || [[ $pkgname = 'mingw-w64-qt5-base-opengl' ]] || [[ $pkgname = 'mingw-w64-qt5-base-opengl-static' ]]
-}
-isANGLE() {
-  [[ $pkgname = 'mingw-w64-qt5-base-angle' ]] || [[ $pkgname = 'mingw-w64-qt5-base-angle-static' ]]
-}
-isDynamic() {
-  [[ $pkgname = 'mingw-w64-qt5-base-dynamic' ]] || [[ $pkgname = 'mingw-w64-qt5-base-dynamic-static' ]]
-}
-isNoOpenGL() {
-  [[ $pkgname = 'mingw-w64-qt5-base-noopengl' ]] || [[ $pkgname = 'mingw-w64-qt5-base-noopengl-static' ]]
-}
-
+_qt_module=qtbase
 pkgname=mingw-w64-qt5-base-dynamic
 pkgver=5.14.2
-pkgrel=1
-pkgdesc='A cross-platform application and UI framework (mingw-w64)'
-# The static variant doesn't contain any executables which need to be executed on the build machine
-isStatic && arch=('any') || arch=('i686' 'x86_64')
+pkgrel=2
+pkgdesc='A cross-platform application and UI framework, dynamic OpenGL backend (mingw-w64)'
+arch=('i686' 'x86_64')
 url='https://www.qt.io/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
 depends=('mingw-w64-crt' 'mingw-w64-zlib' 'mingw-w64-libjpeg-turbo' 'mingw-w64-sqlite'
          'mingw-w64-libpng' 'mingw-w64-openssl' 'mingw-w64-dbus' 'mingw-w64-harfbuzz'
          'mingw-w64-pcre2')
-groups=('mingw-w64-qt5')
 optdepends=('mingw-w64-mesa: use LLVMpipe software rasterizer for Qt Quick'
             'mingw-w64-postgresql: PostgreSQL support'
             'mingw-w64-mariadb-connector-c: MySQL support')
 makedepends=('mingw-w64-gcc' 'mingw-w64-postgresql' 'mingw-w64-mariadb-connector-c'
              'mingw-w64-vulkan-headers' 'mingw-w64-pkg-config' 'mingw-w64-environment')
-# For running fxc.exe WINE coulde be used:
-#if isANGLE || isDynamic; then
-#    makedepends+=('mingw-w64-wine')
-#fi
+# makedepends+=('mingw-w64-wine') # the dynamic/ANGLE version needs to run fxc.exe (not implemented yet)
+groups=('mingw-w64-qt5')
+provides+=('mingw-w64-qt5-base')
+conflicts+=('mingw-w64-qt5-base' 'mingw-w64-qt5-base-angle' 'mingw-w64-qt5-base-noopengl'
+            'mingw-w64-qt5-base-dynamic' 'mingw-w64-qt5-base-openql')
 options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
-_pkgfqn="qtbase-everywhere-src-${pkgver}"
+_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
         '0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch'
         '0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch'
@@ -87,54 +69,40 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm
         '0030-Fix-linking-against-static-plugins-with-qmake.patch'
         '0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch')
 sha256sums=('48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a'
-            'c758e9ec290052a3ea029f40e5d5cfaadd2135ad7841366393449a4c71d84a88'
-            'a0280ed9dd31b2cdffa1c7ae25f9a6cb3a4164c76b7fa07c4e2eaa8cc01e6762'
-            '9a3c591e2645997a94d30687adfc08f1ea7f64597fef78c777ed7137071de02f'
-            '1d7fe2ef6be292e9ec84f313e4ba543f1b368a1ee0915f858d54615be93cf794'
-            '3099b7210a873ee12374d452fb98204d046a2d5c6b1a330d32d45ae59c95cd86'
-            'c2a8f4a7536ad0293bdab882d01e0055bc7d4a3e97794f7c304d01d1daa24bf7'
-            '3b7e90637b3a0671fac0f8607d613bf0f3f9a73cc62e43848049125c7a925a52'
-            '2e08efe5160c91899ac549303f888c5872e1d198068c5a00c3a34d7040f5410f'
-            '82764b7047b65a262f7c49305dee6579171a5e179fa85f8801d121e03937576e'
-            '27dd7df0721e8d4d3f4f4c30c8e9ca8793f50a04f983b3489ff1227aae996f43'
-            '4f0754277a14bdd8682b5d3701871f8901d2dd9f00ef8318bf6d62e9d4a26171'
-            'd4b3fb742c973119d1c98a34063fcc29861fa6325481a8baf5dfac13c32db597'
-            'd70ce95ddaa3dac7bdf273c3a8926df6b41771d75f17c68e205a1b9bb80a77e1'
-            '0366353ce1e4da4e800be55b457d649b0c3e6ba83a2d53dc8c6e3e08dd82637f'
-            '4632228567fd25ffb75de6750120c0ceea1d2c4ce2e91ef214a39b54ee7b56fc'
-            'ab79617e34dbc8bcefb63f0ff59a3efc5da2d313284aa3e690f8c6025a9cb090'
-            'b4f68710feda5c11dc2c3b4fdc755bb2186599046a8443c6f61ff9d369357193'
-            'a4656c1d3ec12ad50b2c92382775619d435e49a392bb08be5cbc8a654248f3dd'
-            '36e3520481ef8d58e7595195c0eb230df80034590c27622836a38199abf7721c'
-            '640ac515c0453def45cdaf2d5813d1ae95ce953014aeacb78cb1747fa2c0da3e'
-            '612b95a477b9956e61ac1557c0e885a7dd2ae0aa56ef69e29116cafcbc7b0d50'
-            '2bfb7e8400b0e14b5e8c14413d67b9fa437fe920fa9ffc458f769ea22b2bed29'
-            '26473b4a55ce4b764354ff54b40a6dcc6d93aea41b7175afeb1a030cb118f3a8'
-            '98058d1696ff05af14d10017062d697839736cf8cfef94ac77d6cefb6c46f311'
-            '30d2cf6c309c4922ebc4a5822aab76161950f7036666dc18489da22315ef214d'
-            '692c3e1679aa82c6aa395d75a06f02f0d1a0b05230197ef19fe4ef7c7b3b888e'
-            'c285e9900a63d67a01accd6d7a798c5f2476e90f3d8ea8ffb0f272d90d942141'
-            'fbd28eeed43e451240c52582f675e5f5ba069450ee20488bf993b33e76e8275c'
-            '1709f452c4986f6b7366412bc906b52e4a01d412e20d3fda561b7fa090ed8890'
-            '245af9755b5637200ea1d678e0ac1a493ed0fbcb9c25dc2a79c0a5e3c007a19a'
-            '810255e443f940b57e90f4934e4317c050d3edf3593cd0a30c1e2b5a35cf7f68')
+            '14affce3bf8d6a2d2682e0cc7113a62fe851a62fcd5a76539acfe1f4b0c9ea4b'
+            '96d750723b2e44fdb78520ebb369111391850554b55a4cb1c0a57299b97579fd'
+            '4daa7399d1b8523cdf1446e2e4e3cefeaf8a1b14a467f808c3fda9e8e8516965'
+            'ef4d333e7f0aa5bcfe1b4f67bf687f5ea2c9698189a0d001080783829c1b85bf'
+            '54fcf347fe0355306b7ba122ff461c1153919908f89b1306ea50f4f8cf8c69f0'
+            'e55dc7743472c72e58bf0ae780ca0a029670f075538a5c7c5658fe6742476985'
+            'a5f5a87fc80182aeff9ea463c675243b91da432e02d0ca1e8d3b6f9f77013e4b'
+            '1fbf437012eca9276178180a2cb15b6b0296553ca9304ae258b1cce6aed15bc0'
+            '9a1d2f0f2059beeb70236e2f7ecbb2ef15e50644cb6a909a125306f067b3293f'
+            '701bff16f7ad0809dbb61806c050d0742df10e125c24a841db8712e6146d6235'
+            'dfba051c3fec6a77bcd07ebcd4d5e077d7b6fc7ae5291d0680820ac0cc320f2d'
+            '8cc25ac98e8bff73fc980e4afc9e774569218145d2123808e14fe5d8649fe0d0'
+            '8c0709d32c38a226116126ecf4d7fc71944fe3d6a42b8b5a27351e824ed445eb'
+            'dfd12ab7e72b9721d16f902e97fe1c3379d20ae52633610c56d10bcb5e294395'
+            '66c4cf8d218ee5582d6cf8836ed9916502e6ac5d4b77c46ee122460bb98f515d'
+            'a5667634a5940620ca71cdc77c6e1ab656891c308d5053c25736e994ea4c78e0'
+            'd82a344682f1290dfbc174ccdf35bbdeb4cf9f5418d3bfc664491451bb7a8229'
+            'd10bbf540f58388557e5f39c447cff09ff1ddb733ea18f3d8678a308c478dbec'
+            '8691b0a628c04e624d8d98680cb54814a46cd9af67168155a1c46bc9ecd5eafe'
+            'a75a275232484eb616942731052552764348654b413225a334082635558def39'
+            '4b8ceafdf29b045bcc3633c3b2f5682f925b9c79a73c738336e8c795201cbca0'
+            '065ffac8cc7835f941fbbf355aa1ba63c1203c0491672ce7f99576198c0ee3eb'
+            '567f9e136382f7373fd898d7699acc198767d2d5fa93375391826125aa7f7196'
+            '389697028d0a704caffa06e47d70d9c2c3cd852616d5a4cad6e6482d5e3e7ff2'
+            '90898fd84a95b03298d1eaa136459cd65b50957593e1e02a0c02be660097ddb1'
+            'a4681e107f97cc802c1dc975c3118c492256e7baf398598061c7ae5ed3e1d65e'
+            'e22cb9b06d182145433f4bbf7200273a009d62676570f476268ab8db2c23e36b'
+            'eb409f1146c39f19d43fe71c103f40ec6c37d0760cae333f05146ca7e61b47b2'
+            '8ee993247e7240947e5e8a549407ebbda2fa9e73c8310b41caff7da767012a6c'
+            '03cb0da4cfe2315c4d8fc845e6a758f3ef6fc51883f993b3bf600653ab342579'
+            '745e15a29bea515c0d65ddad01851e06c8ece5f1f18a0df871f09d5db55057fb')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
-isStatic && depends+=(${pkgname%-static})
-
-if ! isDefault; then
-  if isStatic; then
-    provides+=('mingw-w64-qt5-base-static')
-    conflicts+=('mingw-w64-qt5-base-static' 'mingw-w64-qt5-base-angle-static' 'mingw-w64-qt5-base-noopengl-static'
-                'mingw-w64-qt5-base-dynamic-static' 'mingw-w64-qt5-base-openql-static')
-  else
-    provides+=('mingw-w64-qt5-base')
-    conflicts+=('mingw-w64-qt5-base' 'mingw-w64-qt5-base-angle' 'mingw-w64-qt5-base-noopengl'
-                'mingw-w64-qt5-base-dynamic' 'mingw-w64-qt5-base-openql')
-  fi
-fi
-
 prepare() {
   cd "${srcdir}/${_pkgfqn}"
 
@@ -224,30 +192,15 @@ build() {
       || qt_configure_args+=' -release'
 
     # configure usage of ANGLE/OpenGL
-    if isOpenGL; then
-      msg2 'Using native OpenGL backend'
-      qt_configure_args+=' -opengl desktop'
-    elif isNoOpenGL; then
-      msg2 'Building without OpenGL support'
-      qt_configure_args+=' -no-opengl'
-    elif isANGLE; then
-      # FIXME: This is broken because we needed to invoke fxc.exe (Direct3D Shader Compiler)
-      #        during the build. Maybe start it with WINE?
-      msg2 'Using ANGLE as OpenGL backend'
-      qt_configure_args+=' -angle'
-      # enable declarations of GLES functions
-      # FIXME: Still required?
-      qt_configure_args+=' -DGL_GLEXT_PROTOTYPES'
-    elif isDynamic; then
-      # FIXME: This is broken because is requires enabling the (bundled) ANGLE which is
-      #        broken (see comment under isANGLE).
-      msg2 'Using dynamic OpenGL backend'
-      qt_configure_args+=' -opengl dynamic'
-      qt_configure_args+=' -angle'
-      # enable declarations of GLES functions
-      # FIXME: Still required?
-      qt_configure_args+=' -DGL_GLEXT_PROTOTYPES'
-    fi
+    # FIXME: This is broken because is requires enabling the (bundled) ANGLE which is
+    #        broken because we needed to invoke fxc.exe (Direct3D Shader Compiler)
+    #        during the build. Maybe start it with WINE?
+    msg2 'Using dynamic OpenGL backend'
+    qt_configure_args+=' -opengl dynamic'
+    qt_configure_args+=' -angle'
+    # enable declarations of GLES functions
+    # FIXME: Still required?
+    qt_configure_args+=' -DGL_GLEXT_PROTOTYPES'
 
     # add include directory of MariaDB
     qt_configure_args+=" -I/usr/${_arch}/include/mariadb"
@@ -257,25 +210,16 @@ build() {
 
     msg2 'Configure and build qmake'
     mkdir -p ../build-${_arch} && pushd ../build-${_arch}
-    if isStatic; then
-      qt_configure_args+=' -static'
-
-      # configure static version to use linked OpenSSL
-      qt_configure_args+=' -openssl-linked'
-      export OPENSSL_LIBS="/usr/${_arch}/lib/libssl.a /usr/${_arch}/lib/libcrypto.a -lws2_32 -lgdi32 -lcrypt32 -ldnsapi -liphlpapi"
-
-    else
-      qt_configure_args+=' -shared'
+    qt_configure_args+=' -shared'
 
-      # configure shared version to load OpenSSL dynamically
-      qt_configure_args+=' -openssl-runtime'
+    # configure shared version to load OpenSSL dynamically
+    qt_configure_args+=' -openssl-runtime'
 
-      qt_configure_args+=' -device-option CROSS_COMPILE_CUSTOM_CONFIG=actually_a_shared_build'
+    qt_configure_args+=' -device-option CROSS_COMPILE_CUSTOM_CONFIG=actually_a_shared_build'
 
-      # override LD_LIBRARY_PATH so libraries for native build tools like libQt5Bootstrap.so are found
-      #export LD_LIBRARY_PATH="$PWD/lib"
-      #export LDFLAGS="-L$PWD/lib"
-    fi
+    # override LD_LIBRARY_PATH so libraries for native build tools like libQt5Bootstrap.so are found
+    #export LD_LIBRARY_PATH="$PWD/lib"
+    #export LDFLAGS="-L$PWD/lib"
 
     msg2 'Build qmake and configure' && ../${_pkgfqn}/configure $qt_configure_args
     msg2 'Build Qt libraries'        && make
@@ -297,91 +241,21 @@ package() {
     find -iname '*.prl' -exec cp --target-directory "${pkgdir}/usr/${_arch}/lib/qt/plugins" --parents {} +
     popd
 
-    if isStatic; then
-      # The static release contains only the static libs itself but relies on the
-      # shared release for Qt5Bootstrap library and tools (qmake, uic, ...).
-
-      # drop Qt5Bootstrap and libraries which are only provided as static lib
-      # and hence already present in shared build (such as Qt5OpenGLExtensions)
-      rm -f \
-        "${pkgdir}/usr/${_arch}/lib/"{lib,}qt5main* \
-        "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5AccessibilitySupport* \
-        "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5DeviceDiscoverySupport* \
-        "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5EdidSupport* \
-        "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5EventDispatcherSupport* \
-        "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5FbSupport* \
-        "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5FontDatabaseSupport* \
-        "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5PlatformCompositorSupport* \
-        "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5ThemeSupport* \
-        "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5OpenGLExtensions* \
-        "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5PlatformSupport* \
-        "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5WindowsUIAutomationSupport* \
-        "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5VulkanSupport* \
-        "${pkgdir}/usr/${_arch}/lib/"libQt5Bootstrap* \
-      rm -r \
-        "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5AccessibilitySupport" \
-        "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5DeviceDiscoverySupport" \
-        "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5EdidSupport" \
-        "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5EventDispatcherSupport" \
-        "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5FbSupport" \
-        "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5FontDatabaseSupport" \
-        "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5PlatformCompositorSupport" \
-        "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5ThemeSupport" \
-        "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5OpenGLExtensions*" \
-        "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5WindowsUIAutomationSupport" \
-        "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5VulkanSupport" \
-        "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5Bootstrap" \
-        "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5BootstrapDBus"
-
-      # ensure config files don't conflict with shared version
-      pushd "${pkgdir}/usr/${_arch}/lib/cmake"
-      for cmake_dir in $(find . ! -path . -type d ! -name 'Static*'); do
-        mkdir -p "./Static${cmake_dir:2}";
-        mv "${cmake_dir}/"* "./Static${cmake_dir:2}";
-        rm -r "${cmake_dir}"
-      done
-      rm -r "./StaticQt5OpenGLExtensions"
-      popd
-      rm "${pkgdir}/usr/${_arch}/lib/pkgconfig/StaticQt5OpenGLExtensions.pc"
-
-      # create links to static plugins in lib directory
-      pushd "${pkgdir}/usr/${_arch}/lib/" && ln -s "./qt/plugins/"*/*.a . && popd
-
-      # keep a couple pri files not found in base
-      mv "${pkgdir}/usr/${_arch}/lib/qt/mkspecs/qdevice.static.pri" "${pkgdir}/usr/${_arch}"
-      mv "${pkgdir}/usr/${_arch}/lib/qt/mkspecs/modules/qt_plugin_"*.pri "${pkgdir}/usr/${_arch}"
-
-      # fix bad library order for static CMake builds caused by Qt5Gui.static.prl
-      sed -i -e "s|-lfreetype;|-lfreetype;-lharfbuzz;-lfreetype;-lbz2;|" \
-             -e "s| -lz;| |" \
-                "${pkgdir}/usr/${_arch}/lib/Qt5Gui.static.prl"
-
-      # delete duplicate files that are in the base package
-      rm -fR "${pkgdir}/usr/${_arch}/"{include,share}
-      rm -fR "${pkgdir}/usr/${_arch}/lib/"{qt/bin,qt/mkspecs}
-
-      # move pri files back
-      mkdir -p "${pkgdir}/usr/${_arch}/lib/qt/mkspecs/modules"
-      mv "${pkgdir}/usr/${_arch}/qdevice.static.pri" "${pkgdir}/usr/${_arch}/lib/qt/mkspecs"
-      mv "${pkgdir}/usr/${_arch}/"*.pri "${pkgdir}/usr/${_arch}/lib/qt/mkspecs/modules"
-
-    else # shared version
-      # remove DLLs from libdir (DLLs are installed in both bindir and libdir, one copy is sufficient)
-      find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name "*.dll" -exec rm {} \;
-
-      # install missing libQt5BootstrapDBus.a manually
-      cp --target-directory "${pkgdir}/usr/${_arch}/lib" "$srcdir/build-${_arch}/lib/libQt5BootstrapDBus.a"
-
-      # create symlinks for tools
-      mkdir -p "${pkgdir}/usr/bin"
-      for tool in qmake moc rcc uic qdbuscpp2xml qdbusxml2cpp qdoc syncqt.pl; do
-        ln -s "../${_arch}/lib/qt/bin/${tool}" "${pkgdir}/usr/bin/${_arch}-${tool}-qt5"
-      done
+    # remove DLLs from libdir (DLLs are installed in both bindir and libdir, one copy is sufficient)
+    find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name "*.dll" -exec rm {} \;
+
+    # install missing libQt5BootstrapDBus.a manually
+    cp --target-directory "${pkgdir}/usr/${_arch}/lib" "$srcdir/build-${_arch}/lib/libQt5BootstrapDBus.a"
+
+    # create symlinks for tools
+    mkdir -p "${pkgdir}/usr/bin"
+    for tool in qmake moc rcc uic qdbuscpp2xml qdbusxml2cpp qdoc syncqt.pl; do
+      ln -s "../${_arch}/lib/qt/bin/${tool}" "${pkgdir}/usr/bin/${_arch}-${tool}-qt5"
+    done
 
-      # create qt.conf containing plugin path, see https://github.com/Martchus/PKGBUILDs/issues/109
-      echo "[Paths]
+    # create qt.conf containing plugin path, see https://github.com/Martchus/PKGBUILDs/issues/109
+    echo "[Paths]
 Plugins = /usr/${_arch}/lib/qt/plugins" > "${pkgdir}/usr/${_arch}/bin/qt.conf"
-    fi
 
     # 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' {} \;
@@ -403,16 +277,14 @@ Plugins = /usr/${_arch}/lib/qt/plugins" > "${pkgdir}/usr/${_arch}/bin/qt.conf"
     find "${pkgdir}/usr/${_arch}/lib" \( -type f -name '*.prl' -o -name '*.pc' \) -exec sed -i -e "s:${PWD%/*}/build-${_arch}/lib:/usr/${_arch}/lib:g" {} \;
 
     # strip binaries, remove unuseful files
-    if ! isStatic; then
-      strip --strip-all "${pkgdir}/usr/${_arch}/lib/qt/bin/"*[!.pl]
-      strip --strip-debug "${pkgdir}/usr/${_arch}/lib/libQt5Bootstrap"*.a
-      #strip --strip-unneeded "${pkgdir}/usr/${_arch}/lib/libQt5Bootstrap"{,DBus}.so.${pkgver}
-    fi
-    if isStatic || [[ $NO_EXECUTABLES ]]; then
+    strip --strip-all "${pkgdir}/usr/${_arch}/lib/qt/bin/"*[!.pl]
+    strip --strip-debug "${pkgdir}/usr/${_arch}/lib/libQt5Bootstrap"*.a
+    if [[ $NO_EXECUTABLES ]]; then
       find "${pkgdir}/usr/${_arch}" -name '*.exe' -delete
     else
       find "${pkgdir}/usr/${_arch}" -name '*.exe' -exec ${_arch}-strip --strip-all {} \;
     fi
+
     find "${pkgdir}/usr/${_arch}" \( -name '*.bat' -o -name '*.def' -o -name '*.exp' \) -delete
     find "${pkgdir}/usr/${_arch}" -name '*.dll' -exec ${_arch}-strip --strip-unneeded {} \;
     find "${pkgdir}/usr/${_arch}" \( -name '*.a' -not -name 'libQt5QmlDevTools.a' -not -name 'libQt5Bootstrap.a' \) -exec ${_arch}-strip -g {} \;