summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartchus2021-02-05 22:20:31 +0100
committerMartchus2021-02-05 22:20:31 +0100
commitd44321efdabde9b77a3f745f7cf11974003bed70 (patch)
tree240ba1502a8757f0b75872153788b5b91fb2bac2
parente605c26e07d8eaab3715ac2c15f9fa9a0aed0861 (diff)
downloadaur-d44321efdabde9b77a3f745f7cf11974003bed70.tar.gz
Update to 6.0.1
Diffstat
-rw-r--r--.SRCINFO22
-rw-r--r--0001-Use-CMake-s-default-import-library-suffix.patch14
-rw-r--r--0002-Fix-finding-D-Bus.patch17
-rw-r--r--0003-Fix-using-static-PCRE2-and-DBus-1.patch6
-rw-r--r--0004-Fix-transitive-dependencies-of-static-libraries.patch52
-rw-r--r--0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch4
-rw-r--r--0006-Support-finding-MariaDB.patch30
-rw-r--r--0006-Support-finding-static-MariaDB-client-library.patch31
-rw-r--r--0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch12
-rw-r--r--PKGBUILD23
-rw-r--r--qtbase-sha256.txt2
11 files changed, 107 insertions, 106 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0708944696b6..03de0447f536 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mingw-w64-qt6-base
pkgdesc = A cross-platform application and UI framework (mingw-w64)
- pkgver = 6.0.0
+ pkgver = 6.0.1
pkgrel = 1
url = https://www.qt.io
arch = any
@@ -35,22 +35,22 @@ pkgbase = mingw-w64-qt6-base
options = !buildflags
options = staticlibs
options = !emptydirs
- source = https://download.qt.io/official_releases/qt/6.0/6.0.0/submodules/qtbase-everywhere-src-6.0.0.tar.xz
+ source = https://download.qt.io/official_releases/qt/6.0/6.0.1/submodules/qtbase-everywhere-src-6.0.1.tar.xz
source = 0001-Use-CMake-s-default-import-library-suffix.patch
source = 0002-Fix-finding-D-Bus.patch
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
- source = 0006-Support-finding-MariaDB.patch
+ source = 0006-Support-finding-static-MariaDB-client-library.patch
source = 0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch
- sha256sums = ae227180272d199cbb15318e3353716afada5c57fd5185b812ae26912c958656
- sha256sums = ea0d7432318261cfd13dadd39ecef5bb98d6ff3017c9e170209c9227bfddaed7
- sha256sums = 42e06c8f4261adf434d3f570c22156dec8164745bcb25fd1a93c54a0a5f2277a
- sha256sums = 01e52d9a60f6b31561c95798bc1fe0f3e0b6361c9e22307a8db47af789bd8544
- sha256sums = c7a416a2bb61f938a81c7ddc82257776e6752f5372ee57f2cc08cba8761e2211
- sha256sums = e11565af9b05b7714248324b5afecda78caa9be03e9c4872f80ea07636bfa1a7
- sha256sums = 8fa423062a850d68341b80aade231cfec865f9a750324ff3819faecf77ff9347
- sha256sums = c9c0289e08106dcc18973d1625526f2a90271452d375171d97a9793199549cea
+ sha256sums = 8d2bc1829c1479e539f66c2f51a7e11c38a595c9e8b8e45a3b45f3cb41c6d6aa
+ sha256sums = 82bfcddb91097e761c5c3cfe66a2153e28446a11e20638c519589dab59bf891b
+ sha256sums = 06a54156c5f3145783ee41d5e2dec651f23e207faeb113b9c59ed11b8201bb53
+ sha256sums = aba65a351d26cfe2536c1115cce6448e4779998f663b71e5c4dc3fa7c3137f5d
+ sha256sums = 820447581d2beda6f383ce8c7a18299b38273d162e62d5820c88dc24f2568a06
+ sha256sums = 37af48d96b4265b442eac016928f0be5236f82ed7c5fa8670a389993556ffdee
+ sha256sums = 074341ec2aebf7c9100022b9fedb919a426ec58c0456515cffd6131b205a11cd
+ sha256sums = fa1ae6268c7b9f773dda4950dce834adf8d5a15ebc672f096e47b554192758c2
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 394e2e9deabe..8590e0296c93 100644
--- a/0001-Use-CMake-s-default-import-library-suffix.patch
+++ b/0001-Use-CMake-s-default-import-library-suffix.patch
@@ -1,4 +1,4 @@
-From b3a78b8672134e97f6a6b511dd1c6822fe9811e8 Mon Sep 17 00:00:00 2001
+From 450fa18bf971462b62ddcf4d2166b4b4d8b821e3 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
@@ -13,10 +13,10 @@ Change-Id: Iedc6a7ee8982a62ddd56ad0bf25ba0b8752a666a
5 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake
-index e0f10d19bb..ae2fe6e8f3 100644
+index e77e98fe76..35639684a4 100644
--- a/cmake/QtPriHelpers.cmake
+++ b/cmake/QtPriHelpers.cmake
-@@ -342,9 +342,13 @@ QT.${config_module_name}_private.disabled_features = ${disabled_private_features
+@@ -368,9 +368,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 e0f10d19bb..ae2fe6e8f3 100644
${CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES}
${CMAKE_STATIC_LIBRARY_SUFFIX})
add_custom_command(
-@@ -749,9 +753,13 @@ CONFIG += ${private_config_joined}
+@@ -775,9 +779,13 @@ CONFIG += ${private_config_joined}
list(APPEND inputs "${preliminary_pri_root}/${cfg}/${pri_data_cmake_file}")
endforeach()
@@ -47,7 +47,7 @@ index e0f10d19bb..ae2fe6e8f3 100644
${CMAKE_STATIC_LIBRARY_SUFFIX})
add_custom_command(
diff --git a/cmake/QtPrlHelpers.cmake b/cmake/QtPrlHelpers.cmake
-index 0ad1747961..fcb520f2ad 100644
+index 0c0b7a2aec..d408245ffc 100644
--- a/cmake/QtPrlHelpers.cmake
+++ b/cmake/QtPrlHelpers.cmake
@@ -348,11 +348,17 @@ ${prl_step1_content_libs}
@@ -70,7 +70,7 @@ index 0ad1747961..fcb520f2ad 100644
if(QT_GENERATOR_IS_MULTI_CONFIG)
set(configs ${CMAKE_CONFIGURATION_TYPES})
diff --git a/cmake/QtTargetHelpers.cmake b/cmake/QtTargetHelpers.cmake
-index fe8d461856..74dfefcedc 100644
+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)
@@ -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
diff --git a/0002-Fix-finding-D-Bus.patch b/0002-Fix-finding-D-Bus.patch
index 16708512aae0..a8f56f0e553d 100644
--- a/0002-Fix-finding-D-Bus.patch
+++ b/0002-Fix-finding-D-Bus.patch
@@ -1,23 +1,24 @@
-From cd942ac25b912c5a8ddf807d09124cb920327e66 Mon Sep 17 00:00:00 2001
+From 4e3120dee97c10cf61c3b796b5d353e172c33c75 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
diff --git a/0003-Fix-using-static-PCRE2-and-DBus-1.patch b/0003-Fix-using-static-PCRE2-and-DBus-1.patch
index f0a87b0be523..57236e5e42d3 100644
--- a/0003-Fix-using-static-PCRE2-and-DBus-1.patch
+++ b/0003-Fix-using-static-PCRE2-and-DBus-1.patch
@@ -1,4 +1,4 @@
-From a0f488c28adfd04e3eb47e1d33d13f7112c4baa7 Mon Sep 17 00:00:00 2001
+From e97b19b49e4eaaf696b7a57cfa02ae7b07080917 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
@@ -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 827884d709..be5159186c 100644
+index 6cc9011822..76041849b4 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.29.2
+2.30.0
diff --git a/0004-Fix-transitive-dependencies-of-static-libraries.patch b/0004-Fix-transitive-dependencies-of-static-libraries.patch
index f149c1cb73d5..42596efe94dc 100644
--- a/0004-Fix-transitive-dependencies-of-static-libraries.patch
+++ b/0004-Fix-transitive-dependencies-of-static-libraries.patch
@@ -1,4 +1,4 @@
-From f0176a1ae2e36b4ea89bda4a927bf387a4e20ead Mon Sep 17 00:00:00 2001
+From c037501e09603ef9ab645b0f9c909acb693ac096 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)
@@ -7,17 +7,17 @@ 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
+Change-Id: I81dbe9eebf1529116417c5bf5332b3f135e854bd
---
- .../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
@@ -33,29 +33,27 @@ index 8f873c1b45..831ca8e624 100644
endif()
diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
-index 54c94b8a2f..7575386338 100644
+index f6c77d2be1..c20e7c9fa5 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}")
+@@ -37,6 +37,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
+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
diff --git a/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch b/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch
index ee82e8e225c7..47819a3ed40f 100644
--- a/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch
+++ b/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch
@@ -1,4 +1,4 @@
-From 042b2c86c9f895980f400fdd1d4e6ab8ce8022d8 Mon Sep 17 00:00:00 2001
+From f1bb9a297c8df01081b073ad302c949488a7dc81 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
diff --git a/0006-Support-finding-MariaDB.patch b/0006-Support-finding-MariaDB.patch
deleted file mode 100644
index d77c2f044b42..000000000000
--- a/0006-Support-finding-MariaDB.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From baf1e987e55c90a32e6e32438f770f7aab4c4a3c 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
-
-Change-Id: I3f95a7c3aabc734e1c6c5ce00957ab9814200232
----
- cmake/FindMySQL.cmake | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
-index 7575386338..df1d848cf6 100644
---- a/cmake/FindMySQL.cmake
-+++ b/cmake/FindMySQL.cmake
-@@ -24,10 +24,10 @@ pkg_check_modules(PC_MySQL QUIET mysqlclient)
- find_path(MySQL_INCLUDE_DIRS
- NAMES mysql.h
- HINTS ${PC_MySQL_INCLUDEDIR}
-- PATH_SUFFIXES mysql)
-+ PATH_SUFFIXES mariadb mysql)
-
- find_library(MySQL_LIBRARIES
-- NAMES mysqlclient
-+ NAMES mariadb mariadbclient mysqlclient
- HINTS ${PC_MySQL_LIBDIR}
- )
-
---
-2.29.2
-
diff --git a/0006-Support-finding-static-MariaDB-client-library.patch b/0006-Support-finding-static-MariaDB-client-library.patch
new file mode 100644
index 000000000000..042cdd64d010
--- /dev/null
+++ b/0006-Support-finding-static-MariaDB-client-library.patch
@@ -0,0 +1,31 @@
+From f209ca4e8726ae7502e06eaea09b5590b9050804 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
+
+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
+---
+ 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
+--- a/cmake/FindMySQL.cmake
++++ b/cmake/FindMySQL.cmake
+@@ -27,7 +27,7 @@ find_path(MySQL_INCLUDE_DIRS
+ PATH_SUFFIXES mysql mariadb)
+
+ find_library(MySQL_LIBRARIES
+- NAMES libmysql mysql mysqlclient libmariadb mariadb
++ NAMES libmariadb mariadb mariadbclient libmysql mysql mysqlclient
+ HINTS ${PC_MySQL_LIBDIR})
+
+ include(FindPackageHandleStandardArgs)
+--
+2.30.0
+
diff --git a/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch b/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch
index a462075c256e..70155e68f7cb 100644
--- a/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch
+++ b/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch
@@ -1,4 +1,4 @@
-From 28e6e716d2a09f40720f3d213e82c1ff6e61a860 Mon Sep 17 00:00:00 2001
+From 77ef8904f307f78613f799ad4b9946e23c7910e3 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
@@ -10,12 +10,12 @@ Change-Id: Ic29b64b999ed9b5888a8dc1b0961a76009c5e75c
1 file changed, 5 insertions(+)
diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
-index bb2de0a0c2..a2e8b37ba7 100644
+index 477f5d21e9..fa394cd895 100644
--- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
+++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
-@@ -2,6 +2,10 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0)
- message(FATAL_ERROR "Qt requires at least CMake version 3.1.0")
- endif()
+@@ -1,6 +1,10 @@
+ # These values should be kept in sync with those in qtbase/.cmake.conf
+ cmake_minimum_required(VERSION 3.14...3.19)
+if (CMAKE_FIND_LIBRARY_SUFFIXES_OVERRIDE)
+ set(CMAKE_FIND_LIBRARY_SUFFIXES "${CMAKE_FIND_LIBRARY_SUFFIXES_OVERRIDE}")
@@ -33,5 +33,5 @@ index bb2de0a0c2..a2e8b37ba7 100644
qt_enable_cmake_languages()
--
-2.29.2
+2.30.0
diff --git a/PKGBUILD b/PKGBUILD
index 7b5eca7073c3..00533236b4f4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@
# All patches are managed at https://github.com/Martchus/qtbase
pkgname=mingw-w64-qt6-base
-_qtver=6.0.0
+_qtver=6.0.1
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@@ -36,16 +36,16 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
'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'
- '0006-Support-finding-MariaDB.patch'
+ '0006-Support-finding-static-MariaDB-client-library.patch'
'0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch')
-sha256sums=('ae227180272d199cbb15318e3353716afada5c57fd5185b812ae26912c958656'
- 'ea0d7432318261cfd13dadd39ecef5bb98d6ff3017c9e170209c9227bfddaed7'
- '42e06c8f4261adf434d3f570c22156dec8164745bcb25fd1a93c54a0a5f2277a'
- '01e52d9a60f6b31561c95798bc1fe0f3e0b6361c9e22307a8db47af789bd8544'
- 'c7a416a2bb61f938a81c7ddc82257776e6752f5372ee57f2cc08cba8761e2211'
- 'e11565af9b05b7714248324b5afecda78caa9be03e9c4872f80ea07636bfa1a7'
- '8fa423062a850d68341b80aade231cfec865f9a750324ff3819faecf77ff9347'
- 'c9c0289e08106dcc18973d1625526f2a90271452d375171d97a9793199549cea')
+sha256sums=('8d2bc1829c1479e539f66c2f51a7e11c38a595c9e8b8e45a3b45f3cb41c6d6aa'
+ '82bfcddb91097e761c5c3cfe66a2153e28446a11e20638c519589dab59bf891b'
+ '06a54156c5f3145783ee41d5e2dec651f23e207faeb113b9c59ed11b8201bb53'
+ 'aba65a351d26cfe2536c1115cce6448e4779998f663b71e5c4dc3fa7c3137f5d'
+ '820447581d2beda6f383ce8c7a18299b38273d162e62d5820c88dc24f2568a06'
+ '37af48d96b4265b442eac016928f0be5236f82ed7c5fa8670a389993556ffdee'
+ '074341ec2aebf7c9100022b9fedb919a426ec58c0456515cffd6131b205a11cd'
+ 'fa1ae6268c7b9f773dda4950dce834adf8d5a15ebc672f096e47b554192758c2')
_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
}
diff --git a/qtbase-sha256.txt b/qtbase-sha256.txt
index c441384ff6c1..d7b393f268c0 100644
--- a/qtbase-sha256.txt
+++ b/qtbase-sha256.txt
@@ -1 +1 @@
-ae227180272d199cbb15318e3353716afada5c57fd5185b812ae26912c958656
+8d2bc1829c1479e539f66c2f51a7e11c38a595c9e8b8e45a3b45f3cb41c6d6aa