diff --git a/mingw-w64-qt6-static/002-qt-6.2.0-win32-g-Add-QMAKE_EXTENSION_IMPORTLIB-defaulting-to-.patch b/mingw-w64-qt6-static/002-qt-6.2.0-win32-g-Add-QMAKE_EXTENSION_IMPORTLIB-defaulting-to-.patch index e4122d63706ea..3fd88042d92d4 100644 --- a/mingw-w64-qt6-static/002-qt-6.2.0-win32-g-Add-QMAKE_EXTENSION_IMPORTLIB-defaulting-to-.patch +++ b/mingw-w64-qt6-static/002-qt-6.2.0-win32-g-Add-QMAKE_EXTENSION_IMPORTLIB-defaulting-to-.patch @@ -164,4 +164,3 @@ index 51fa960c5b..8ccb7dc9c4 100644 get_target_property(target_type ${target} TYPE) if(target_type STREQUAL "STATIC_LIBRARY") - diff --git a/mingw-w64-qt6-static/014-imageformats-transitive-dependencies.patch b/mingw-w64-qt6-static/014-imageformats-transitive-dependencies.patch index a90da6f98d382..2645069958b31 100644 --- a/mingw-w64-qt6-static/014-imageformats-transitive-dependencies.patch +++ b/mingw-w64-qt6-static/014-imageformats-transitive-dependencies.patch @@ -1,3 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1111111..2222222 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -4,6 +4,9 @@ + + # set QT_SUPERBUILD early, so that qtbase/.cmake.conf can check it + set(QT_SUPERBUILD TRUE) ++ ++find_package(PkgConfig QUIET) ++list(APPEND PKG_CONFIG_EXECUTABLE "--static") + + # Include qtbase's .cmake.conf for access to QT_REPO_MODULE_VERSION + set(__qt6_qtbase_src_path "${CMAKE_CURRENT_SOURCE_DIR}/qtbase") diff --git a/qtimageformats/src/imageformats/configure.cmake b/qtimageformats/src/imageformats/configure.cmake index 1111111..2222222 100644 --- a/qtimageformats/src/imageformats/configure.cmake @@ -15,15 +29,14 @@ diff --git a/qtimageformats/cmake/FindLibMng.cmake b/qtimageformats/cmake/FindLi index 1111111..2222222 100644 --- a/qtimageformats/cmake/FindLibMng.cmake +++ b/qtimageformats/cmake/FindLibMng.cmake -@@ -9,7 +9,7 @@ +@@ -7,6 +7,7 @@ + endif() + find_package(PkgConfig QUIET) ++#list(APPEND PKG_CONFIG_EXECUTABLE "--static") if(PkgConfig_FOUND) -- pkg_check_modules(Libmng IMPORTED_TARGET libmng) -+ pkg_check_modules(Libmng IMPORTED_TARGET libmng-static) - - if(TARGET PkgConfig::Libmng) - add_library(Libmng::Libmng INTERFACE IMPORTED) + pkg_check_modules(Libmng IMPORTED_TARGET libmng) diff --git a/qtimageformats/cmake/FindWrapWebP.cmake b/qtimageformats/cmake/FindWrapWebP.cmake index 1111111..2222222 100644 --- a/qtimageformats/cmake/FindWrapWebP.cmake diff --git a/mingw-w64-qt6-static/PKGBUILD b/mingw-w64-qt6-static/PKGBUILD index 1ec779bf62257..f775f0209d860 100644 --- a/mingw-w64-qt6-static/PKGBUILD +++ b/mingw-w64-qt6-static/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname}-static pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}-static") _qtver=6.6.2 pkgver=${_qtver/-/} -pkgrel=2 +pkgrel=3 arch=(any) mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') msys2_references=( @@ -61,7 +61,7 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/sing 015-qt6-windeployqt-fixes.patch) sha256sums=('3c1e42b3073ade1f7adbf06863c01e2c59521b7cc2349df2f74ecd7ebfcb922d' '26f3bcc3729520a5ba648a9ce92a9293c8fb1cf16d81af612587ce10d501dcb6' - '48bcf7e4d5c6101d653d7bb0c1beae53ddc393d56a756cb3f246848ef0fabcc1' + '817ce7a15eafb945da5f03706cd7196198c9a903c0372cb7023d1e27634355a4' 'af3f4c6491942ee6a7681eecef2d999897e38fcef7a5edcf3774589f137dac73' '9b64d5a03ba6155d16c8105b8dd4bdc7d687170df8e0d5404b4b10292549bde2' '554e979085f5deabd9f83637168c79f4929781434164d42dd14a8335a61d3cfc' @@ -73,7 +73,7 @@ sha256sums=('3c1e42b3073ade1f7adbf06863c01e2c59521b7cc2349df2f74ecd7ebfcb922d' '474eb6643ae8139c41e90363c8846c52162cd858d863c195c0431594d351896d' '39d57493b0edc1317729b88dad6a07b86936072f0fbbd2aae7b01e2211ce29ed' 'ce0023e8b72fe4b5840ca892bd5ad52120b6b484161bf2ffe0b6da9404625641' - 'a20db5893693573e4446f8678bf8393e2c0e0cf905ce6c5844b73739eb919b1c' + '1d640ce887bbaaa847b8dd30a1a655f273c9907de06ad9d91580c02215e3e8c8' '605ad15bc71a7b2d5b1c7a197a44e6251a0098f702f5411bf3e82a4966528132') # Use the right mkspecs file