summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO23
-rw-r--r--0001-Use-CMake-s-default-import-library-suffix.patch12
-rw-r--r--0002-Fix-finding-D-Bus.patch6
-rw-r--r--0003-Fix-using-static-PCRE2-and-DBus-1.patch6
-rw-r--r--0004-Fix-transitive-dependencies-of-static-libraries.patch6
-rw-r--r--0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch6
-rw-r--r--0006-Support-finding-static-MariaDB-client-library.patch6
-rw-r--r--0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch26
-rw-r--r--0008-Fix-passing-QJniEnvironment-to-ANativeWindow_fromSur.patch44
-rw-r--r--PKGBUILD22
-rw-r--r--qtbase-sha256.txt2
11 files changed, 51 insertions, 108 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 014b13a22135..2f10d5e289de 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.1.0
+ pkgver = 6.1.1
pkgrel = 1
url = https://www.qt.io
arch = any
@@ -35,7 +35,7 @@ pkgbase = mingw-w64-qt6-base
options = !buildflags
options = staticlibs
options = !emptydirs
- source = https://download.qt.io/official_releases/qt/6.1/6.1.0/submodules/qtbase-everywhere-src-6.1.0.tar.xz
+ source = https://download.qt.io/official_releases/qt/6.1/6.1.1/submodules/qtbase-everywhere-src-6.1.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
@@ -43,16 +43,13 @@ pkgbase = mingw-w64-qt6-base
source = 0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch
source = 0006-Support-finding-static-MariaDB-client-library.patch
source = 0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch
- source = 0008-Fix-passing-QJniEnvironment-to-ANativeWindow_fromSur.patch
- sha256sums = f7af3c87e96051d09b5abce6c88277c33031bef241ebfe1db4106d33ed0814c4
- sha256sums = fe716b7d966cf40fafbed2fd67b663c205bb09e3fc1ad607163be187cb5f83c6
- sha256sums = cb28dfdf82d332fa86e67106cea41ebf7f57ac49a5a7707be25348350b9c0f6e
- sha256sums = 11a7e4939d171c3e7e8ecb8374fe0caebab2e55c8fd2a1122763caba56414358
- sha256sums = 8081cf89e48a504a39bb18ea4c5cca92869fb0f1df45e6eda1559b2a0b38ba79
- sha256sums = b97e12f46baebeea6d9a36f23e856783c6988b92965946e881dfb5e9749739ae
- sha256sums = 9f2f542a7739024615b690fd5c2265c2ab63e5442eeb712b4df63220945a413e
- sha256sums = 6990a3d6d8fa771b88092aa02010170d56fd86771e18096f120af16fce0ab691
- sha256sums = 6498da7e772895ed58289a836c1b79a73750ffc5288fa0c6a03e4853879f00e7
+ sha256sums = 21a8aa9f07170e047270c668c8b037536f40226db7adbc529a0b41c3a3cb3ff2
+ sha256sums = 1b699b33d303275a21f15eeabf7929eb4bb6c0ffc50dc04b818125be9c459f13
+ sha256sums = 97ffcc7197b74e3cc5492531249c442cdbf02d231dc55af8f10fb688e383105c
+ sha256sums = 9ad76422d221510074241ccabf3880c19c493aaa1f99a222e34ecade0b64a254
+ sha256sums = ea567893e43a23143ec31ff2206a1f221c24588733d55f1d918e9d1dd6746a47
+ sha256sums = a42c48bceb8c80eaa870e362cdf5f92634ca8b54cbbf1f58ed3a72d8be8517f7
+ sha256sums = 5361c88bdf85a54b7438c3aea9a12f9d94822b9cd396da2d15741de8acae5a3a
+ sha256sums = dce66f9a271586a46be73689ff64f0d668dfe3f526a3558b3e8ca1169aa711f8
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 928c832d23f9..7c182e7d6625 100644
--- a/0001-Use-CMake-s-default-import-library-suffix.patch
+++ b/0001-Use-CMake-s-default-import-library-suffix.patch
@@ -1,7 +1,7 @@
-From 4bc7d8f91f0f3695ff167bf9617510942097c82a Mon Sep 17 00:00:00 2001
+From df9364458a82e26c51c37e8f3cad6a2ca6b828a3 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Thu, 5 Nov 2020 22:08:10 +0100
-Subject: [PATCH 1/8] Use CMake's default import library suffix
+Subject: [PATCH 1/7] Use CMake's default import library suffix
Change-Id: I3dbedaec74683e5bfd008f7f2fd1e046dfb921b2
---
@@ -47,7 +47,7 @@ index 5498b8a904..59c905eac2 100644
${CMAKE_STATIC_LIBRARY_SUFFIX})
add_custom_command(
diff --git a/cmake/QtPrlHelpers.cmake b/cmake/QtPrlHelpers.cmake
-index 0c0b7a2aec..d408245ffc 100644
+index 0aab301053..f2e39b63e0 100644
--- a/cmake/QtPrlHelpers.cmake
+++ b/cmake/QtPrlHelpers.cmake
@@ -348,11 +348,17 @@ ${prl_step1_content_libs}
@@ -98,10 +98,10 @@ index 24ed125f12..73ebe453d3 100644
CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}$${debug_suffix}.lib
CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qtmain$${QT_LIBINFIX}.lib
diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake
-index 3d1a10ff0a..a6935875c7 100644
+index fc4c745c90..939ea2b212 100644
--- a/src/corelib/Qt6CoreMacros.cmake
+++ b/src/corelib/Qt6CoreMacros.cmake
-@@ -447,7 +447,6 @@ function(_qt_internal_apply_win_prefix_and_suffix target)
+@@ -460,7 +460,6 @@ function(_qt_internal_apply_win_prefix_and_suffix target)
# This should cover both MINGW with GCC and CLANG.
if(NOT MSVC)
@@ -110,5 +110,5 @@ index 3d1a10ff0a..a6935875c7 100644
get_target_property(target_type ${target} TYPE)
if(target_type STREQUAL "STATIC_LIBRARY")
--
-2.31.1
+2.32.0
diff --git a/0002-Fix-finding-D-Bus.patch b/0002-Fix-finding-D-Bus.patch
index 0294ddf13c16..627dd0b5fbf1 100644
--- a/0002-Fix-finding-D-Bus.patch
+++ b/0002-Fix-finding-D-Bus.patch
@@ -1,7 +1,7 @@
-From c1ed43ebc4f0cb63832b878f8666f0b8f5366906 Mon Sep 17 00:00:00 2001
+From dbdccd3fb77932e284848b0a8543133497a3e391 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 7 Oct 2020 12:13:37 +0200
-Subject: [PATCH 2/8] Fix finding D-Bus
+Subject: [PATCH 2/7] Fix finding D-Bus
Change-Id: Ie21eb9cbc6b1b5d9c8b34eea46f54718e5926986
---
@@ -20,5 +20,5 @@ index e227d224e0..bdbcab9eb3 100644
+ set_property(TARGET dbus-1 PROPERTY IMPORTED_IMPLIB ${DBus1_LIBRARY})
+endif()
--
-2.31.1
+2.32.0
diff --git a/0003-Fix-using-static-PCRE2-and-DBus-1.patch b/0003-Fix-using-static-PCRE2-and-DBus-1.patch
index 852b0edc1a17..8d30d4ac4428 100644
--- a/0003-Fix-using-static-PCRE2-and-DBus-1.patch
+++ b/0003-Fix-using-static-PCRE2-and-DBus-1.patch
@@ -1,7 +1,7 @@
-From 927935b0f0783760a6bfa20784354bd3b590d9f0 Mon Sep 17 00:00:00 2001
+From 2c85dbecb544e4550587a11df9465c0c662ceaf0 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Thu, 5 Nov 2020 21:13:19 +0100
-Subject: [PATCH 3/8] Fix using static PCRE2 and DBus-1
+Subject: [PATCH 3/7] 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.
@@ -44,5 +44,5 @@ index accaa4f5ed..4b11c74caa 100644
# include <dbus/dbus.h>
#else
--
-2.31.1
+2.32.0
diff --git a/0004-Fix-transitive-dependencies-of-static-libraries.patch b/0004-Fix-transitive-dependencies-of-static-libraries.patch
index 1b82dd4c5012..128786843c3d 100644
--- a/0004-Fix-transitive-dependencies-of-static-libraries.patch
+++ b/0004-Fix-transitive-dependencies-of-static-libraries.patch
@@ -1,7 +1,7 @@
-From 86a27658437d4d79cd010d1dd92f300f48616e45 Mon Sep 17 00:00:00 2001
+From d218fae4376bf0a3b801570164ee6c02e5e94cc0 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Thu, 5 Nov 2020 21:59:33 +0100
-Subject: [PATCH 4/8] Fix transitive dependencies (of static libraries)
+Subject: [PATCH 4/7] 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
@@ -133,5 +133,5 @@ index b151932da7..7e6b38acd1 100644
Qt::CorePrivate
Qt::SqlPrivate
--
-2.31.1
+2.32.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 acde0a0acbe2..76a5a43990a9 100644
--- a/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch
+++ b/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch
@@ -1,7 +1,7 @@
-From f3ca9d271a0919b086ca6864d9682ae11f05543e Mon Sep 17 00:00:00 2001
+From 187e32fa4e8f92796d75f2bd47efb464e4638aec Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Mon, 2 Nov 2020 13:47:45 +0100
-Subject: [PATCH 5/8] Fix libjpeg workaround for conflict with rpcndr.h
+Subject: [PATCH 5/7] 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
@@ -33,5 +33,5 @@ index beef18f260..72708145f4 100644
#ifdef const
# undef const // remove crazy C hackery in jconfig.h
--
-2.31.1
+2.32.0
diff --git a/0006-Support-finding-static-MariaDB-client-library.patch b/0006-Support-finding-static-MariaDB-client-library.patch
index 0e387118614e..b7d0464ea721 100644
--- a/0006-Support-finding-static-MariaDB-client-library.patch
+++ b/0006-Support-finding-static-MariaDB-client-library.patch
@@ -1,7 +1,7 @@
-From c0e504e5d21cbf6b708dbc34d9e52e9bf56f07b3 Mon Sep 17 00:00:00 2001
+From b95bfa5f73b66f31073644a60f04e5740e5a4dec Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 8 Nov 2020 00:33:12 +0100
-Subject: [PATCH 6/8] Support finding static MariaDB client library
+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
@@ -27,5 +27,5 @@ index 0fcba2148e..ab4f6fdc9e 100644
include(FindPackageHandleStandardArgs)
--
-2.31.1
+2.32.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 6327f1f2d232..d8f535585fea 100644
--- a/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch
+++ b/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch
@@ -1,16 +1,16 @@
-From e682df25245fd2731bfe0572b2668e47f7ea3e99 Mon Sep 17 00:00:00 2001
+From 8507a185bd7614aa5250495904348ac25ad1b8ac Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 8 Nov 2020 00:34:09 +0100
-Subject: [PATCH 7/8] Allow overriding CMAKE_FIND_LIBRARY_SUFFIXES to prefer
+Subject: [PATCH 7/7] Allow overriding CMAKE_FIND_LIBRARY_SUFFIXES to prefer
static libraries
-Change-Id: Ic29b64b999ed9b5888a8dc1b0961a76009c5e75c
+Change-Id: I4c617e0706044d31da1bd56ae51615dc8ed37099
---
- cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 5 +++++
- 1 file changed, 5 insertions(+)
+ cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 4 ++++
+ 1 file changed, 4 insertions(+)
diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
-index 934c34b01c..bada2aff0c 100644
+index af8c3d18c4..eb1f47c6e1 100644
--- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
+++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
@@ -1,6 +1,10 @@
@@ -21,17 +21,9 @@ index 934c34b01c..bada2aff0c 100644
+ set(CMAKE_FIND_LIBRARY_SUFFIXES "${CMAKE_FIND_LIBRARY_SUFFIXES_OVERRIDE}")
+endif ()
+
- ######################################
+ ###############################################
#
- # Macros for building Qt modules
-@@ -285,6 +289,7 @@ macro(qt_prepare_standalone_project)
- endmacro()
-
- macro(qt_build_repo_begin)
-+
- qt_build_internals_set_up_private_api()
- qt_enable_cmake_languages()
-
+ # Macros and functions for building Qt modules
--
-2.31.1
+2.32.0
diff --git a/0008-Fix-passing-QJniEnvironment-to-ANativeWindow_fromSur.patch b/0008-Fix-passing-QJniEnvironment-to-ANativeWindow_fromSur.patch
deleted file mode 100644
index 09fc8b8c6322..000000000000
--- a/0008-Fix-passing-QJniEnvironment-to-ANativeWindow_fromSur.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From e668956ba71426d495ca9e117638b8d738fd148f Mon Sep 17 00:00:00 2001
-From: Martchus <martchus@gmx.net>
-Date: Sat, 8 May 2021 01:55:19 +0200
-Subject: [PATCH 8/8] Fix passing QJniEnvironment to ANativeWindow_fromSurface
-
-The function ANativeWindow_fromSurface (as declared by
-`$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/android/native_window_jni.h`
-from version r22.b of the Android NDK) takes a `JNIEnv*` so `.jniEnv()` must be used.
-
-This prevents the following compilation error:
-
-```
-error: no matching function for call to 'ANativeWindow_f
-romSurface'
- m_nativeWindow = ANativeWindow_fromSurface(env, m_androidSurfaceObject.object());
- ^~~~~~~~~~~~~~~~~~~~~~~~~
-/opt/android-ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/android/native_window_jni.h:45:16: note: candidate function not viable: no known conversion from 'QJniEnvironment' t
-o 'JNIEnv *' (aka '_JNIEnv *') for 1st argument
-ANativeWindow* ANativeWindow_fromSurface(JNIEnv* env, jobject surface);
- ^
-1 error generated.
-```
-
-Change-Id: I70d75cb7edc5875314fcb8a70d51d0ef40442101
----
- src/plugins/platforms/android/qandroidplatformvulkanwindow.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/plugins/platforms/android/qandroidplatformvulkanwindow.cpp b/src/plugins/platforms/android/qandroidplatformvulkanwindow.cpp
-index 8f2a37626a..9d4688b52d 100644
---- a/src/plugins/platforms/android/qandroidplatformvulkanwindow.cpp
-+++ b/src/plugins/platforms/android/qandroidplatformvulkanwindow.cpp
-@@ -173,7 +173,7 @@ VkSurfaceKHR *QAndroidPlatformVulkanWindow::vkSurface()
- return &m_vkSurface;
-
- QJniEnvironment env;
-- m_nativeWindow = ANativeWindow_fromSurface(env, m_androidSurfaceObject.object());
-+ m_nativeWindow = ANativeWindow_fromSurface(env.jniEnv(), m_androidSurfaceObject.object());
-
- VkAndroidSurfaceCreateInfoKHR surfaceInfo;
- memset(&surfaceInfo, 0, sizeof(surfaceInfo));
---
-2.31.1
-
diff --git a/PKGBUILD b/PKGBUILD
index 373f88509060..247cabfe4948 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.1.0
+_qtver=6.1.1
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@@ -37,17 +37,15 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
'0004-Fix-transitive-dependencies-of-static-libraries.patch'
'0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch'
'0006-Support-finding-static-MariaDB-client-library.patch'
- '0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch'
- '0008-Fix-passing-QJniEnvironment-to-ANativeWindow_fromSur.patch')
-sha256sums=('f7af3c87e96051d09b5abce6c88277c33031bef241ebfe1db4106d33ed0814c4'
- 'fe716b7d966cf40fafbed2fd67b663c205bb09e3fc1ad607163be187cb5f83c6'
- 'cb28dfdf82d332fa86e67106cea41ebf7f57ac49a5a7707be25348350b9c0f6e'
- '11a7e4939d171c3e7e8ecb8374fe0caebab2e55c8fd2a1122763caba56414358'
- '8081cf89e48a504a39bb18ea4c5cca92869fb0f1df45e6eda1559b2a0b38ba79'
- 'b97e12f46baebeea6d9a36f23e856783c6988b92965946e881dfb5e9749739ae'
- '9f2f542a7739024615b690fd5c2265c2ab63e5442eeb712b4df63220945a413e'
- '6990a3d6d8fa771b88092aa02010170d56fd86771e18096f120af16fce0ab691'
- '6498da7e772895ed58289a836c1b79a73750ffc5288fa0c6a03e4853879f00e7')
+ '0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch')
+sha256sums=('21a8aa9f07170e047270c668c8b037536f40226db7adbc529a0b41c3a3cb3ff2'
+ '1b699b33d303275a21f15eeabf7929eb4bb6c0ffc50dc04b818125be9c459f13'
+ '97ffcc7197b74e3cc5492531249c442cdbf02d231dc55af8f10fb688e383105c'
+ '9ad76422d221510074241ccabf3880c19c493aaa1f99a222e34ecade0b64a254'
+ 'ea567893e43a23143ec31ff2206a1f221c24588733d55f1d918e9d1dd6746a47'
+ 'a42c48bceb8c80eaa870e362cdf5f92634ca8b54cbbf1f58ed3a72d8be8517f7'
+ '5361c88bdf85a54b7438c3aea9a12f9d94822b9cd396da2d15741de8acae5a3a'
+ 'dce66f9a271586a46be73689ff64f0d668dfe3f526a3558b3e8ca1169aa711f8')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
diff --git a/qtbase-sha256.txt b/qtbase-sha256.txt
index 0232cc39e5e0..3ace0e914631 100644
--- a/qtbase-sha256.txt
+++ b/qtbase-sha256.txt
@@ -1 +1 @@
-f7af3c87e96051d09b5abce6c88277c33031bef241ebfe1db4106d33ed0814c4
+21a8aa9f07170e047270c668c8b037536f40226db7adbc529a0b41c3a3cb3ff2