diff options
| author | Martchus | 2020-11-07 22:32:24 +0100 |
|---|---|---|
| committer | Martchus | 2020-11-07 22:32:24 +0100 |
| commit | 6f79193e004470e3251ccc6cb70d50995dfaacb5 (patch) | |
| tree | 4c3d8fccdf93f0aa53cc66037f79d8fc53c4dd9b | |
| parent | d5fc9b0d53496e209bc12bd0f547f62abdb213a7 (diff) | |
| download | aur-6f79193e004470e3251ccc6cb70d50995dfaacb5.tar.gz | |
Update to beta3
| -rw-r--r-- | .SRCINFO | 18 | ||||
| -rw-r--r-- | 0001-Use-CMake-s-default-import-library-suffix.patch | 51 | ||||
| -rw-r--r-- | 0002-Fix-finding-D-Bus.patch | 6 | ||||
| -rw-r--r-- | 0003-Fix-using-static-PCRE2-and-DBus-1.patch | 48 | ||||
| -rw-r--r-- | 0004-Fix-transitive-dependencies-of-static-libraries.patch | 126 | ||||
| -rw-r--r-- | 0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch | 37 | ||||
| -rw-r--r-- | PKGBUILD | 25 | ||||
| -rw-r--r-- | qtbase-sha256.txt | 2 |
8 files changed, 271 insertions, 42 deletions
@@ -1,6 +1,6 @@ pkgbase = mingw-w64-qt6-base pkgdesc = A cross-platform application and UI framework (mingw-w64) - pkgver = 6.0.0beta2 + pkgver = 6.0.0beta3 pkgrel = 1 url = https://www.qt.io arch = any @@ -9,7 +9,7 @@ pkgbase = mingw-w64-qt6-base license = LGPL3 license = FDL license = custom - makedepends = mingw-w64-cmake + makedepends = mingw-w64-cmake>=1-35 makedepends = mingw-w64-postgresql makedepends = mingw-w64-mariadb-connector-c makedepends = mingw-w64-vulkan-headers @@ -35,12 +35,18 @@ pkgbase = mingw-w64-qt6-base options = !buildflags options = staticlibs options = !emptydirs - source = https://download.qt.io/development_releases/qt/6.0/6.0.0-beta2/submodules/qtbase-everywhere-src-6.0.0-beta2.tar.xz + source = https://download.qt.io/development_releases/qt/6.0/6.0.0-beta3/submodules/qtbase-everywhere-src-6.0.0-beta3.tar.xz source = 0001-Use-CMake-s-default-import-library-suffix.patch source = 0002-Fix-finding-D-Bus.patch - sha256sums = 1207a5ceb001d164f3cf6646fbd483a055440400c20a315f98f36e23c73f204e - sha256sums = 10ea48221878769b7bd50328f31f16effc6789d92dd91e9cb22c0acb77ca6095 - sha256sums = 35ef8ed4f01727ef4a56b856fd91e33fd7f93e5f2813b308872231d182c5df8f + source = 0003-Fix-using-static-PCRE2-and-DBus-1.patch + source = 0004-Fix-transitive-dependencies-of-static-libraries.patch + source = 0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch + sha256sums = 37a97e30cf769b8deaa65aff585968ffb78bda20409177fe46959cb591a53268 + sha256sums = 7efec2be97836e6b6a2566e297650765db36af4812f10d98702b97f29e40de91 + sha256sums = 4135f261ee759744549c2c6dc42180a8394235f96b750cca82d98a0d5884d6c7 + sha256sums = 0d6ea42b1c302fb3b219dbd9be854045070cf9c67e039a7d248c6e632750e446 + sha256sums = fb2a34d4557abb4dae23f2926914322d1fddecc2668ed970aad461b5ead01ab6 + sha256sums = 875c6065b1b53753d8e481a972b07027c093e8e84ed550fe34df8d6fd91c4643 pkgname = mingw-w64-qt6-base diff --git a/0001-Use-CMake-s-default-import-library-suffix.patch b/0001-Use-CMake-s-default-import-library-suffix.patch index 77356be11aee..e00b80b2fc55 100644 --- a/0001-Use-CMake-s-default-import-library-suffix.patch +++ b/0001-Use-CMake-s-default-import-library-suffix.patch @@ -1,24 +1,39 @@ -From b067b34ebd6238a6b4c3c0f9d56e88ef169ef53e Mon Sep 17 00:00:00 2001 +From 8073b269bb69ab091bb29600c1f7a493f3543a83 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> -Date: Mon, 14 Sep 2020 20:39:52 +0200 -Subject: [PATCH 1/2] Use CMake's default import library suffix +Date: Thu, 5 Nov 2020 22:08:10 +0100 +Subject: [PATCH 1/5] Use CMake's default import library suffix -Change-Id: I371abd37c85bd8edf338c16b149dbcaa872a85bd +Change-Id: Iedc6a7ee8982a62ddd56ad0bf25ba0b8752a666a --- - cmake/QtPriHelpers.cmake | 8 +++++++- - cmake/QtPrlHelpers.cmake | 8 +++++++- - cmake/QtTargetHelpers.cmake | 2 -- - mkspecs/common/g++-win32.conf | 1 + - mkspecs/features/create_cmake.prf | 5 +++-- - 5 files changed, 18 insertions(+), 6 deletions(-) + 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(-) diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake -index b79f17243e..a689b2b775 100644 +index 56c60b1b18..18e1aeddb1 100644 --- a/cmake/QtPriHelpers.cmake +++ b/cmake/QtPriHelpers.cmake -@@ -292,11 +292,17 @@ 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}") +@@ -320,9 +320,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}") + +- set(library_prefixes ${CMAKE_SHARED_LIBRARY_PREFIX} ${CMAKE_STATIC_LIBRARY_PREFIX}) ++ set(library_prefixes ++ ${CMAKE_SHARED_LIBRARY_PREFIX} ++ ${CMAKE_IMPORT_LIBRARY_PREFIX} ++ ${CMAKE_STATIC_LIBRARY_PREFIX}) + set(library_suffixes + ${CMAKE_SHARED_LIBRARY_SUFFIX} ++ ${CMAKE_CMAKE_IMPORT_LIBRARY_SUFFIX} + ${CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES} + ${CMAKE_STATIC_LIBRARY_SUFFIX}) + add_custom_command( +@@ -727,9 +731,13 @@ CONFIG += ${private_config_joined} + list(APPEND inputs "${preliminary_pri_root}/${cfg}/${pri_data_cmake_file}") + endforeach() - set(library_prefixes ${CMAKE_SHARED_LIBRARY_PREFIX} ${CMAKE_STATIC_LIBRARY_PREFIX}) + set(library_prefixes @@ -30,13 +45,9 @@ index b79f17243e..a689b2b775 100644 + ${CMAKE_CMAKE_IMPORT_LIBRARY_SUFFIX} ${CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES} ${CMAKE_STATIC_LIBRARY_SUFFIX}) -+ list(REMOVE_DUPLICATES library_prefixes) -+ list(REMOVE_DUPLICATES library_suffixes) add_custom_command( - OUTPUT "${private_pri_file_path}" - DEPENDS ${inputs} diff --git a/cmake/QtPrlHelpers.cmake b/cmake/QtPrlHelpers.cmake -index 932565f318..9729c150a4 100644 +index 35d321420c..40a85e6c73 100644 --- a/cmake/QtPrlHelpers.cmake +++ b/cmake/QtPrlHelpers.cmake @@ -258,11 +258,17 @@ QMAKE_PRL_VERSION = ${PROJECT_VERSION} @@ -100,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.1 +2.29.2 diff --git a/0002-Fix-finding-D-Bus.patch b/0002-Fix-finding-D-Bus.patch index 77688efb1fc4..819d44bead28 100644 --- a/0002-Fix-finding-D-Bus.patch +++ b/0002-Fix-finding-D-Bus.patch @@ -1,7 +1,7 @@ -From 3568ffe90378ce9507ad9403f66adac8cbc31df4 Mon Sep 17 00:00:00 2001 +From 5c192c74f9f5fd7369742a413fe26bdd67ed677f Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Wed, 7 Oct 2020 12:13:37 +0200 -Subject: [PATCH 2/2] Fix finding D-Bus +Subject: [PATCH 2/5] Fix finding D-Bus Change-Id: Ie21eb9cbc6b1b5d9c8b34eea46f54718e5926986 --- @@ -19,5 +19,5 @@ index e227d224e0..4982e7c8ae 100644 +set_property(TARGET dbus-1 PROPERTY IMPORTED_IMPLIB ${DBus1_LIBRARY}) \ No newline at end of file -- -2.29.1 +2.29.2 diff --git a/0003-Fix-using-static-PCRE2-and-DBus-1.patch b/0003-Fix-using-static-PCRE2-and-DBus-1.patch new file mode 100644 index 000000000000..1eafb5f624c6 --- /dev/null +++ b/0003-Fix-using-static-PCRE2-and-DBus-1.patch @@ -0,0 +1,48 @@ +From 084aa1b73f9f33096c4a5f34cba773545da3ae33 Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Thu, 5 Nov 2020 21:13:19 +0100 +Subject: [PATCH 3/5] 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. + +Change-Id: I2387b79462b6d183b71f9433dd937f63fc7ef26e +--- + src/corelib/text/qregularexpression.cpp | 5 +++++ + src/dbus/qdbus_symbols_p.h | 4 ++++ + 2 files changed, 9 insertions(+) + +diff --git a/src/corelib/text/qregularexpression.cpp b/src/corelib/text/qregularexpression.cpp +index 827884d709..be5159186c 100644 +--- a/src/corelib/text/qregularexpression.cpp ++++ b/src/corelib/text/qregularexpression.cpp +@@ -53,6 +53,11 @@ + #include <QtCore/qdatastream.h> + + #define PCRE2_CODE_UNIT_WIDTH 16 ++#ifdef QT_STATIC ++#define PCRE_STATIC ++#define PCRE2_STATIC ++#endif ++#define PCRE2_EXP_DECL Q_CORE_EXPORT + + #include <pcre2.h> + +diff --git a/src/dbus/qdbus_symbols_p.h b/src/dbus/qdbus_symbols_p.h +index accaa4f5ed..4b11c74caa 100644 +--- a/src/dbus/qdbus_symbols_p.h ++++ b/src/dbus/qdbus_symbols_p.h +@@ -57,6 +57,10 @@ + + #ifndef QT_NO_DBUS + ++#ifdef QT_STATIC ++# define DBUS_STATIC_BUILD ++#endif ++ + #ifdef QT_LINKED_LIBDBUS + # include <dbus/dbus.h> + #else +-- +2.29.2 + diff --git a/0004-Fix-transitive-dependencies-of-static-libraries.patch b/0004-Fix-transitive-dependencies-of-static-libraries.patch new file mode 100644 index 000000000000..39fc04a50bf0 --- /dev/null +++ b/0004-Fix-transitive-dependencies-of-static-libraries.patch @@ -0,0 +1,126 @@ +From 4341f7b4267e1287fa6c41ba0a4afddf505408dc Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Thu, 5 Nov 2020 21:59:33 +0100 +Subject: [PATCH 4/5] 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: 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(-) + +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 +--- a/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake ++++ b/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake +@@ -95,7 +95,7 @@ if(GLIB2_FOUND AND NOT TARGET GLIB2::GLIB2) + add_library(GLIB2::GLIB2 UNKNOWN IMPORTED) + set_target_properties(GLIB2::GLIB2 PROPERTIES + IMPORTED_LOCATION "${GLIB2_LIBRARIES}" +- INTERFACE_LINK_LIBRARIES "${GTHREAD2_LIBRARIES}" ++ INTERFACE_LINK_LIBRARIES "${GTHREAD2_LIBRARIES};${GLIB2_DEPENDENCIES}" + INTERFACE_INCLUDE_DIRECTORIES "${GLIB2_INCLUDE_DIRS}") + endif() + +diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake +index 54c94b8a2f..7575386338 100644 +--- a/cmake/FindMySQL.cmake ++++ b/cmake/FindMySQL.cmake +@@ -38,6 +38,7 @@ if(MySQL_FOUND AND NOT TARGET MySQL::MySQL) + 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() + +diff --git a/cmake/FindWrapDBus1.cmake b/cmake/FindWrapDBus1.cmake +index 4982e7c8ae..56d139c538 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 + 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}") +diff --git a/cmake/FindWrapOpenSSL.cmake b/cmake/FindWrapOpenSSL.cmake +index 6e80862258..47bea72aad 100644 +--- a/cmake/FindWrapOpenSSL.cmake ++++ b/cmake/FindWrapOpenSSL.cmake +@@ -14,7 +14,7 @@ if(OpenSSL_FOUND) + set(WrapOpenSSL_FOUND ON) + + add_library(WrapOpenSSL::WrapOpenSSL INTERFACE IMPORTED) +- target_link_libraries(WrapOpenSSL::WrapOpenSSL INTERFACE OpenSSL::SSL) ++ target_link_libraries(WrapOpenSSL::WrapOpenSSL INTERFACE OpenSSL::SSL ${OPENSSL_DEPENDENCIES}) + endif() + + include(FindPackageHandleStandardArgs) +diff --git a/cmake/FindWrapSystemFreetype.cmake b/cmake/FindWrapSystemFreetype.cmake +index 2cf6caca19..23dc161e4c 100644 +--- a/cmake/FindWrapSystemFreetype.cmake ++++ b/cmake/FindWrapSystemFreetype.cmake +@@ -44,7 +44,7 @@ find_package_handle_standard_args(WrapSystemFreetype + if(WrapSystemFreetype_FOUND) + add_library(WrapSystemFreetype::WrapSystemFreetype INTERFACE IMPORTED) + target_link_libraries(WrapSystemFreetype::WrapSystemFreetype +- INTERFACE "${__freetype_target_name}") ++ INTERFACE "${__freetype_target_name}" ${FREETYPE_DEPENDENCIES}) + endif() + unset(__freetype_target_name) + unset(__freetype_found) +diff --git a/cmake/FindWrapSystemHarfbuzz.cmake b/cmake/FindWrapSystemHarfbuzz.cmake +index 3cb44aa766..9dc741b2be 100644 +--- a/cmake/FindWrapSystemHarfbuzz.cmake ++++ b/cmake/FindWrapSystemHarfbuzz.cmake +@@ -54,7 +54,7 @@ find_package_handle_standard_args(WrapSystemHarfbuzz + if(WrapSystemHarfbuzz_FOUND) + add_library(WrapSystemHarfbuzz::WrapSystemHarfbuzz INTERFACE IMPORTED) + target_link_libraries(WrapSystemHarfbuzz::WrapSystemHarfbuzz +- INTERFACE "${__harfbuzz_target_name}") ++ INTERFACE "${__harfbuzz_target_name}" ${HARFBUZZ_DEPENDENCIES}) + endif() + unset(__harfbuzz_target_name) + unset(__harfbuzz_found) +diff --git a/cmake/FindWrapSystemPNG.cmake b/cmake/FindWrapSystemPNG.cmake +index 372a064ff4..a363bfd31b 100644 +--- a/cmake/FindWrapSystemPNG.cmake ++++ b/cmake/FindWrapSystemPNG.cmake +@@ -33,7 +33,7 @@ find_package_handle_standard_args(WrapSystemPNG + if(WrapSystemPNG_FOUND) + add_library(WrapSystemPNG::WrapSystemPNG INTERFACE IMPORTED) + target_link_libraries(WrapSystemPNG::WrapSystemPNG +- INTERFACE "${__png_target_name}") ++ INTERFACE "${__png_target_name}" ${LIBPNG_DEPENDENCIES}) + endif() + 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 +--- a/src/plugins/sqldrivers/psql/CMakeLists.txt ++++ b/src/plugins/sqldrivers/psql/CMakeLists.txt +@@ -19,7 +19,7 @@ qt_internal_add_plugin(QPSQLDriverPlugin + QT_NO_CAST_FROM_ASCII + QT_NO_CAST_TO_ASCII + PUBLIC_LIBRARIES +- PostgreSQL::PostgreSQL ++ PostgreSQL::PostgreSQL ${POSTGRESQL_DEPENDENCIES} + Qt::Core + Qt::CorePrivate + Qt::SqlPrivate +-- +2.29.2 + diff --git a/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch b/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch new file mode 100644 index 000000000000..9b3baf06416f --- /dev/null +++ b/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch @@ -0,0 +1,37 @@ +From 0f92aeca18858e11ddaa25b7cdad7d89303052ea Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Mon, 2 Nov 2020 13:47:45 +0100 +Subject: [PATCH 5/5] 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 +included before jmorecfg.h. + +Change-Id: I011b7735485689c9797cffe2646c8c3d15d0645e +--- + src/plugins/imageformats/jpeg/qjpeghandler.cpp | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +diff --git a/src/plugins/imageformats/jpeg/qjpeghandler.cpp b/src/plugins/imageformats/jpeg/qjpeghandler.cpp +index 29bf5ab589..dc336f156a 100644 +--- a/src/plugins/imageformats/jpeg/qjpeghandler.cpp ++++ b/src/plugins/imageformats/jpeg/qjpeghandler.cpp +@@ -61,14 +61,8 @@ + + // including jpeglib.h seems to be a little messy + extern "C" { +-// jpeglib.h->jmorecfg.h tries to typedef int boolean; but this conflicts with +-// some Windows headers that may or may not have been included +-#ifdef HAVE_BOOLEAN +-# undef HAVE_BOOLEAN +-#endif +-#define boolean jboolean +- + #define XMD_H // shut JPEGlib up ++#include <jconfig.h> // ensure jconfig.h is included before jmorecfg.h + #include <jpeglib.h> + #ifdef const + # undef const // remove crazy C hackery in jconfig.h +-- +2.29.2 + @@ -11,7 +11,7 @@ # All patches are managed at https://github.com/Martchus/qtbase pkgname=mingw-w64-qt6-base -_qtver=6.0.0-beta2 +_qtver=6.0.0-beta3 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -21,7 +21,7 @@ pkgdesc='A cross-platform application and UI framework (mingw-w64)' 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-brotli' 'mingw-w64-pcre2' 'mingw-w64-zstd') -makedepends=('mingw-w64-cmake' 'mingw-w64-postgresql' 'mingw-w64-mariadb-connector-c' +makedepends=('mingw-w64-cmake>=1-35' 'mingw-w64-postgresql' 'mingw-w64-mariadb-connector-c' 'mingw-w64-vulkan-headers' 'mingw-w64-vulkan-icd-loader' 'mingw-w64-pkg-config' 'qt6-base' 'ninja') optdepends=('mingw-w64-postgresql: PostgreSQL driver' @@ -32,10 +32,16 @@ groups=(mingw-w64-qt6) _pkgfqn="qtbase-everywhere-src-${_qtver}" source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz" '0001-Use-CMake-s-default-import-library-suffix.patch' - '0002-Fix-finding-D-Bus.patch') -sha256sums=('1207a5ceb001d164f3cf6646fbd483a055440400c20a315f98f36e23c73f204e' - '10ea48221878769b7bd50328f31f16effc6789d92dd91e9cb22c0acb77ca6095' - '35ef8ed4f01727ef4a56b856fd91e33fd7f93e5f2813b308872231d182c5df8f') + '0002-Fix-finding-D-Bus.patch' + '0003-Fix-using-static-PCRE2-and-DBus-1.patch' + '0004-Fix-transitive-dependencies-of-static-libraries.patch' + '0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch') +sha256sums=('37a97e30cf769b8deaa65aff585968ffb78bda20409177fe46959cb591a53268' + '7efec2be97836e6b6a2566e297650765db36af4812f10d98702b97f29e40de91' + '4135f261ee759744549c2c6dc42180a8394235f96b750cca82d98a0d5884d6c7' + '0d6ea42b1c302fb3b219dbd9be854045070cf9c67e039a7d248c6e632750e446' + 'fb2a34d4557abb4dae23f2926914322d1fddecc2668ed970aad461b5ead01ab6' + '875c6065b1b53753d8e481a972b07027c093e8e84ed550fe34df8d6fd91c4643') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' @@ -53,7 +59,6 @@ build() { for _arch in ${_architectures}; do export PKG_CONFIG=/usr/bin/$_arch-pkg-config $_arch-cmake -G Ninja -B build-$_arch -S $_pkgfqn \ - -DQT_HOST_PATH=/usr \ -DFEATURE_pkg_config=ON \ -DFEATURE_system_pcre2=ON \ -DFEATURE_system_freetype=ON \ @@ -66,11 +71,7 @@ build() { -DINSTALL_INCLUDEDIR=include/qt6 \ -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs \ -DINSTALL_EXAMPLESDIR=share/doc/qt6/examples \ - -DINPUT_openssl=runtime \ - -DVulkan_LIBRARY="/usr/$_arch/lib/libvulkan.dll.a" \ - -DVulkan_INCLUDE_DIR="/usr/$_arch/include" \ - -DMySQL_LIBRARIES="/usr/$_arch/lib/libmariadb.dll.a" \ - -DMySQL_INCLUDE_DIRS="/usr/$_arch/include/mariadb" + -DINPUT_openssl=runtime VERBOSE=1 cmake --build build-$_arch done } diff --git a/qtbase-sha256.txt b/qtbase-sha256.txt index 31da929c0923..5057e6d92c6f 100644 --- a/qtbase-sha256.txt +++ b/qtbase-sha256.txt @@ -1 +1 @@ -1207a5ceb001d164f3cf6646fbd483a055440400c20a315f98f36e23c73f204e +37a97e30cf769b8deaa65aff585968ffb78bda20409177fe46959cb591a53268 |