Update Qt 6 packages to 6.3.2

This commit is contained in:
Martchus 2022-09-11 12:19:18 +02:00
parent a9441237ee
commit 10a80dfb5e
230 changed files with 429 additions and 387 deletions

View File

@ -14,7 +14,7 @@
_android_arch=<%= $variant_prefix_part =~ s/android-// && $variant_prefix_part %>
pkgname=<%= $package_name %>
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)

View File

@ -14,7 +14,7 @@
% }
pkgname=<%= $package_name %>
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)

View File

@ -13,7 +13,7 @@
% }
pkgname=<%= $package_name %>
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(x86_64)

View File

@ -14,7 +14,7 @@ declare -A versions=(
[dbus-soundrecorder]=1.2.3
[geocoordinatecalculator]=1.1.3
[qt5]=5.15.6
[qt6]=6.3.1
[qt6]=6.3.2
)
declare -A github_names=(
[c++utilities]=cpp-utilities

View File

@ -5,7 +5,7 @@
_android_arch=aarch64
pkgname=android-$_android_arch-qt6-5compat
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)

View File

@ -1,6 +1,6 @@
% layout 'android-qt6-module';
\
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-5compat-static
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@ -17,7 +17,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
groups=(mingw-w64-qt6)
_pkgfqn="qt5compat-everywhere-src-${_qtver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('a43ec62bd778eaecf88ad7847118d1c2a471b0fcb820f93beb311d7ab9566cfd')
sha256sums=('91a3ac0f3f87e4103afa5834ccbecff9374daf716fab362d0c5e2d6ab98560cc')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

View File

@ -1 +1 @@
a43ec62bd778eaecf88ad7847118d1c2a471b0fcb820f93beb311d7ab9566cfd
91a3ac0f3f87e4103afa5834ccbecff9374daf716fab362d0c5e2d6ab98560cc

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-5compat
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@ -17,7 +17,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
groups=(mingw-w64-qt6)
_pkgfqn="qt5compat-everywhere-src-${_qtver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('a43ec62bd778eaecf88ad7847118d1c2a471b0fcb820f93beb311d7ab9566cfd')
sha256sums=('91a3ac0f3f87e4103afa5834ccbecff9374daf716fab362d0c5e2d6ab98560cc')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

View File

@ -1,6 +1,6 @@
% layout 'mingw-w64-qt6-module';
\
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)

View File

@ -1 +1 @@
a43ec62bd778eaecf88ad7847118d1c2a471b0fcb820f93beb311d7ab9566cfd
91a3ac0f3f87e4103afa5834ccbecff9374daf716fab362d0c5e2d6ab98560cc

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository.
pkgname=static-compat-qt6-5compat
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(x86_64)
@ -17,7 +17,7 @@ makedepends=(static-compat-cmake static-compat-qt6-declarative ninja)
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
_pkgfqn="qt5compat-everywhere-src-${_qtver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('a43ec62bd778eaecf88ad7847118d1c2a471b0fcb820f93beb311d7ab9566cfd')
sha256sums=('91a3ac0f3f87e4103afa5834ccbecff9374daf716fab362d0c5e2d6ab98560cc')
build() {
check_buildoption ccache y && ccache_args='

View File

@ -1,6 +1,6 @@
% layout 'static-compat-qt6-module';
\
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(x86_64)

View File

@ -1 +1 @@
a43ec62bd778eaecf88ad7847118d1c2a471b0fcb820f93beb311d7ab9566cfd
91a3ac0f3f87e4103afa5834ccbecff9374daf716fab362d0c5e2d6ab98560cc

View File

@ -0,0 +1 @@
../mingw-w64/0003-Fix-compile-error-about-missing-QStringView-overload.patch

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-activeqt-static
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@ -19,10 +19,12 @@ groups=(mingw-w64-qt6)
_pkgfqn="qtactiveqt-everywhere-src-${_qtver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
'0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch'
'0002-Build-tools-for-the-target-platform.patch')
sha256sums=('64b54e93bd3deb325c404ff7c7255b2769963b4096ebc22a97db788b257ebe2b'
'b2f1cc5963db2b9d57911dec5b916365586239832733d103afcfa5c989502e61'
'9560597e94dc85c341f745db64d1bdbf3da295c5c0eb1c7c6594334311fda26c')
'0002-Build-tools-for-the-target-platform.patch'
'0003-Fix-compile-error-about-missing-QStringView-overload.patch')
sha256sums=('fc70894425fa064bb486b6323c3ae9f405e462ed32b7494ab830a16429675514'
'7d7377d77790a8dbb9f80d1b2539ddb848db59782911ba842d4ce4dfa64b8d55'
'68473136a589f73c4b04455196ee8b9ca627d368a8f7e19a18864c0cc563a7d7'
'8c94ab1a21a98fca5912f94eb70fbc64cfa4faa55a165bc01276b4c83e2bb3fd')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

View File

@ -1 +1 @@
64b54e93bd3deb325c404ff7c7255b2769963b4096ebc22a97db788b257ebe2b
fc70894425fa064bb486b6323c3ae9f405e462ed32b7494ab830a16429675514

View File

@ -1,7 +1,7 @@
From 11bf98cd89b7169d81352ba7f652661964531751 Mon Sep 17 00:00:00 2001
From 99ecce1582c58af2c9b100c8e33ab1b531307c0a Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 2 Jun 2017 17:21:08 +0200
Subject: [PATCH 1/2] Handle win64 in dumpcpp and
Subject: [PATCH 1/3] Handle win64 in dumpcpp and
MetaObjectGenerator::readClassInfo
See https://bugreports.qt.io/browse/QTBUG-46827
@ -11,10 +11,10 @@ See https://bugreports.qt.io/browse/QTBUG-46827
2 files changed, 12 insertions(+)
diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp
index c97ad9a..37f9f94 100644
index 29d1ae9..dc871c5 100644
--- a/src/activeqt/container/qaxbase.cpp
+++ b/src/activeqt/container/qaxbase.cpp
@@ -2104,6 +2104,10 @@ void MetaObjectGenerator::readClassInfo()
@@ -2164,6 +2164,10 @@ void MetaObjectGenerator::readClassInfo()
const QStringList versions = controls.childGroups();
for (const QString &version : versions) {
tlfile = controls.value(QLatin1Char('/') + version + QLatin1String("/0/win32/.")).toString();
@ -26,10 +26,10 @@ index c97ad9a..37f9f94 100644
break;
}
diff --git a/tools/dumpcpp/main.cpp b/tools/dumpcpp/main.cpp
index 3142265..8188657 100644
index 400ecce..ef44327 100644
--- a/tools/dumpcpp/main.cpp
+++ b/tools/dumpcpp/main.cpp
@@ -1106,6 +1106,10 @@ int main(int argc, char **argv)
@@ -1136,6 +1136,10 @@ int main(int argc, char **argv)
typeLib = settings.value(keyPrefix + QLatin1String("win32/.")).toString();
if (QFile::exists(typeLib))
break;
@ -40,7 +40,7 @@ index 3142265..8188657 100644
}
if (!typeLib.isEmpty())
@@ -1170,6 +1174,10 @@ int main(int argc, char **argv)
@@ -1200,6 +1204,10 @@ int main(int argc, char **argv)
typeLib = settings.value(keyPrefix + QLatin1String("win32/.")).toString();
if (QFile::exists(typeLib))
break;
@ -52,5 +52,5 @@ index 3142265..8188657 100644
}
--
2.36.1
2.37.3

View File

@ -1,7 +1,7 @@
From 108c018eb1669292c88430a1639d982eb269e31a Mon Sep 17 00:00:00 2001
From 474401fa162c3d7497e587d21c7ed296c840ec04 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 7 May 2021 16:10:47 +0200
Subject: [PATCH 2/2] Build tools for the target platform
Subject: [PATCH 2/3] Build tools for the target platform
These tools seem to be not portable so they should not be built for the
host platform. If they need to be executed on the host they could be
@ -63,5 +63,5 @@ index 515a5fc..86369ae 100644
main.cpp
PUBLIC_LIBRARIES
--
2.36.1
2.37.3

View File

@ -0,0 +1,37 @@
From e7b3391c2b5f568ad03282ee0f242e42170b22d0 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Mon, 12 Sep 2022 17:38:47 +0200
Subject: [PATCH 3/3] Fix compile error about missing QStringView overload
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Prevents the following compiler error:
```
/build/mingw-w64-qt6-activeqt/src/qtactiveqt-everywhere-src-6.3.2/tools/dumpcpp/main.cpp:599:41: error: no match for operator+ (operand types are const QString and QStringView)
599 | moCode.insert(startType, ns + QStringView(u"::"));
| ~~ ^ ~~~~~~~~~~~~~~~~~~
| | |
| | QStringView
| const QString
```
---
tools/dumpcpp/main.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/dumpcpp/main.cpp b/tools/dumpcpp/main.cpp
index ef44327..997fa24 100644
--- a/tools/dumpcpp/main.cpp
+++ b/tools/dumpcpp/main.cpp
@@ -595,7 +595,7 @@ bool generateClassImpl(QTextStream &out, const QMetaObject *mo, const QByteArray
const auto namespaceForTypeEntry = namespaceForType.constFind(type.toUtf8());
if (namespaceForTypeEntry != namespaceForType.constEnd()) {
const auto ns = QString::fromUtf8(namespaceForTypeEntry.value());
- moCode.insert(startType, ns + QStringView(u"::"));
+ moCode.insert(startType, ns + QStringLiteral("::"));
}
nextTypeAndForceComplete = startType + lengthType;
} while (true);
--
2.37.3

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-activeqt
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@ -19,10 +19,12 @@ groups=(mingw-w64-qt6)
_pkgfqn="qtactiveqt-everywhere-src-${_qtver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
'0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch'
'0002-Build-tools-for-the-target-platform.patch')
sha256sums=('64b54e93bd3deb325c404ff7c7255b2769963b4096ebc22a97db788b257ebe2b'
'b2f1cc5963db2b9d57911dec5b916365586239832733d103afcfa5c989502e61'
'9560597e94dc85c341f745db64d1bdbf3da295c5c0eb1c7c6594334311fda26c')
'0002-Build-tools-for-the-target-platform.patch'
'0003-Fix-compile-error-about-missing-QStringView-overload.patch')
sha256sums=('fc70894425fa064bb486b6323c3ae9f405e462ed32b7494ab830a16429675514'
'7d7377d77790a8dbb9f80d1b2539ddb848db59782911ba842d4ce4dfa64b8d55'
'68473136a589f73c4b04455196ee8b9ca627d368a8f7e19a18864c0cc563a7d7'
'8c94ab1a21a98fca5912f94eb70fbc64cfa4faa55a165bc01276b4c83e2bb3fd')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

View File

@ -1,6 +1,6 @@
% layout 'mingw-w64-qt6-module';
\
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)

View File

@ -1 +1 @@
64b54e93bd3deb325c404ff7c7255b2769963b4096ebc22a97db788b257ebe2b
fc70894425fa064bb486b6323c3ae9f405e462ed32b7494ab830a16429675514

View File

@ -11,7 +11,7 @@
_android_arch=aarch64
pkgname=android-aarch64-qt6-base
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@ -41,18 +41,18 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
'0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch'
'0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch')
sha256sums=('0a64421d9c2469c2c48490a032ab91d547017c9cc171f3f8070bc31888f24e03'
'b50847b70210657d5579bbc6fe88c5343f675d63e0059183705777a2d0c0fcf6'
'c2e2499413b281be496de2b62385ff947c38b92f98028336b4c1a06230f5a180'
'16cd13db60b669f1b84bc98910b40a50b28e75b00b839883c0dd69e457a997b0'
'e6d6b86b2a4a9f30ce361b6baa6e5d32d1567828581d6bc65f6986a15a4ae0ab'
'34d6083183e58e02d8bc53db6fbeb2059766a23b3fe9ccdc0b53c861eefbfdb0'
'53e83363b0508d8005987fea8f752d2f0d804f07d434c0a7a1a39ebf9668d433'
'b90c472eda3caa44981d14b8081039c56653a0c85bd60175ff37d0d48ed43078'
'8ee1b3c4554be7d4f2ec5ac24727887ea4c47704e1ddcf80aacece93b9e54dda'
'0d8f78df6da2dd3bf7610fdc7b3018cb2698bbe6f523925ad4c3565e7ecb03c9'
'ae0d2140f3be5fa16ff32cb9715144de72139e509dacd937ad643c14177c14ce'
'c811240dc3f6e95a636bfbb8f05f5a074b6d82ac2bf623cdc32bf74cd9f39548'
'87e00cc7c4e47494f3eb117f930432cb2385ee5016280e22a719e775664512c7')
'44447564d76f656f78dcebbd9015f87cc5ab89caf1984909f32c8a57168ebfc6'
'62efb1cbd52b852115df5887c4653c39dce9e695470c3577f58388a8493964dc'
'ac185df12dafaa5b2a35b05ae0fa5ff05b6e885525c6159c89589028081b1285'
'454f758469ed0dc03278e851cc6dc19424fc8147396b3a54640c284e7085277c'
'7ceaa7fa65a73d2ae60a93cce1cb68e85bd486ac5529e3456c696fc2a3098749'
'b493577b3b524383312d6f093c7d41b621daea7e82f6efb7d219b2796e217a81'
'fc29185f66f3b9a288bdd7e36a363d3f573d9602d7b01588f58c352a54dfed8f'
'7b00f18dc4ebd42194f853acd1bee4fb4fcb586086ce6c2be7996df058c6dbb6'
'4e29919b6692be949164f47a929178dcff0e0075f51f3aa54d617795291cd31f'
'37a0951bec45840157275c0e79fc1882143b6152069cde93be193128c22e5d2d'
'9969dd32b3f8e5f6f67396a98a676a1d50a7beaf9fb150aa3c3127c8835086cd'
'0d1b83a7ab41a6f4d52c48c215949b7204e880531df0f1dd395a08f615b43faa')
prepare () {
cd $_pkgfqn

View File

@ -11,7 +11,7 @@
# All patches are managed at https://github.com/Martchus/qtbase
pkgname=mingw-w64-qt6-base-static
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@ -43,19 +43,19 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
'0010-Fix-dependency-of-xcb-image-on-xcb-util.patch'
'0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch'
'0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch')
sha256sums=('0a64421d9c2469c2c48490a032ab91d547017c9cc171f3f8070bc31888f24e03'
'b50847b70210657d5579bbc6fe88c5343f675d63e0059183705777a2d0c0fcf6'
'c2e2499413b281be496de2b62385ff947c38b92f98028336b4c1a06230f5a180'
'16cd13db60b669f1b84bc98910b40a50b28e75b00b839883c0dd69e457a997b0'
'e6d6b86b2a4a9f30ce361b6baa6e5d32d1567828581d6bc65f6986a15a4ae0ab'
'34d6083183e58e02d8bc53db6fbeb2059766a23b3fe9ccdc0b53c861eefbfdb0'
'53e83363b0508d8005987fea8f752d2f0d804f07d434c0a7a1a39ebf9668d433'
'b90c472eda3caa44981d14b8081039c56653a0c85bd60175ff37d0d48ed43078'
'8ee1b3c4554be7d4f2ec5ac24727887ea4c47704e1ddcf80aacece93b9e54dda'
'0d8f78df6da2dd3bf7610fdc7b3018cb2698bbe6f523925ad4c3565e7ecb03c9'
'ae0d2140f3be5fa16ff32cb9715144de72139e509dacd937ad643c14177c14ce'
'c811240dc3f6e95a636bfbb8f05f5a074b6d82ac2bf623cdc32bf74cd9f39548'
'87e00cc7c4e47494f3eb117f930432cb2385ee5016280e22a719e775664512c7')
sha256sums=('7929ba4df870b6b30870bc0aed2525cfc606ed7091107b23cf7ed7e434caa9a6'
'44447564d76f656f78dcebbd9015f87cc5ab89caf1984909f32c8a57168ebfc6'
'62efb1cbd52b852115df5887c4653c39dce9e695470c3577f58388a8493964dc'
'ac185df12dafaa5b2a35b05ae0fa5ff05b6e885525c6159c89589028081b1285'
'454f758469ed0dc03278e851cc6dc19424fc8147396b3a54640c284e7085277c'
'7ceaa7fa65a73d2ae60a93cce1cb68e85bd486ac5529e3456c696fc2a3098749'
'b493577b3b524383312d6f093c7d41b621daea7e82f6efb7d219b2796e217a81'
'fc29185f66f3b9a288bdd7e36a363d3f573d9602d7b01588f58c352a54dfed8f'
'7b00f18dc4ebd42194f853acd1bee4fb4fcb586086ce6c2be7996df058c6dbb6'
'4e29919b6692be949164f47a929178dcff0e0075f51f3aa54d617795291cd31f'
'37a0951bec45840157275c0e79fc1882143b6152069cde93be193128c22e5d2d'
'9969dd32b3f8e5f6f67396a98a676a1d50a7beaf9fb150aa3c3127c8835086cd'
'0d1b83a7ab41a6f4d52c48c215949b7204e880531df0f1dd395a08f615b43faa')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

View File

@ -1 +1 @@
0a64421d9c2469c2c48490a032ab91d547017c9cc171f3f8070bc31888f24e03
7929ba4df870b6b30870bc0aed2525cfc606ed7091107b23cf7ed7e434caa9a6

View File

@ -1,4 +1,4 @@
From c5188956b46429172946dcfebbe4878048579c6f Mon Sep 17 00:00:00 2001
From d497d34c8ee77ae39c05fdb8726751f604f191a0 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Thu, 5 Nov 2020 22:08:10 +0100
Subject: [PATCH 01/12] Use CMake's default import library suffix
@ -47,7 +47,7 @@ index 61080da7ef..173c6743ba 100644
${CMAKE_STATIC_LIBRARY_SUFFIX})
if(MSVC)
diff --git a/cmake/QtPrlHelpers.cmake b/cmake/QtPrlHelpers.cmake
index c467e9a634..dda5c41266 100644
index 298bc44c9b..6978fe25fc 100644
--- a/cmake/QtPrlHelpers.cmake
+++ b/cmake/QtPrlHelpers.cmake
@@ -121,11 +121,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 d9219ee529..b47190f5e6 100644
index 9e0cd1fc66..56ca69a911 100644
--- a/src/corelib/Qt6CoreMacros.cmake
+++ b/src/corelib/Qt6CoreMacros.cmake
@@ -497,7 +497,6 @@ function(_qt_internal_apply_win_prefix_and_suffix target)
@@ -509,7 +509,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 d9219ee529..b47190f5e6 100644
get_target_property(target_type ${target} TYPE)
if(target_type STREQUAL "STATIC_LIBRARY")
--
2.36.1
2.37.3

View File

@ -1,4 +1,4 @@
From 5bfae9c0756e130300eb18d2e0e99ec4f5a9e3fa Mon Sep 17 00:00:00 2001
From 28ed7e6f52866424988bcce0fc520f33c96f18d4 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 7 Oct 2020 12:13:37 +0200
Subject: [PATCH 02/12] Fix finding D-Bus
@ -20,5 +20,5 @@ index e227d224e0..bdbcab9eb3 100644
+ set_property(TARGET dbus-1 PROPERTY IMPORTED_IMPLIB ${DBus1_LIBRARY})
+endif()
--
2.36.1
2.37.3

View File

@ -1,4 +1,4 @@
From 84ec824d5bb73e85ef383b01859b8ada6e1ff686 Mon Sep 17 00:00:00 2001
From 232614cab51bf6b18b42f37305ab65992d347be6 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Thu, 5 Nov 2020 21:13:19 +0100
Subject: [PATCH 03/12] 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 1657ef1418..cdf8875981 100644
index a39977a34b..1b26a1e00e 100644
--- a/src/corelib/text/qregularexpression.cpp
+++ b/src/corelib/text/qregularexpression.cpp
@@ -57,6 +57,11 @@
@ -44,5 +44,5 @@ index accaa4f5ed..4b11c74caa 100644
# include <dbus/dbus.h>
#else
--
2.36.1
2.37.3

View File

@ -1,4 +1,4 @@
From 0d092aaa1b76d7e6e269fa6a7d005b83c3e159f5 Mon Sep 17 00:00:00 2001
From 53b2a57128ec0c67be3eb865c7a749ddf9d72f76 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Thu, 5 Nov 2020 21:59:33 +0100
Subject: [PATCH 04/12] Fix transitive dependencies (of static libraries)
@ -93,10 +93,10 @@ index 2cf6caca19..23dc161e4c 100644
unset(__freetype_target_name)
unset(__freetype_found)
diff --git a/cmake/FindWrapSystemHarfbuzz.cmake b/cmake/FindWrapSystemHarfbuzz.cmake
index 3cb44aa766..9dc741b2be 100644
index fc6233d942..1e6105a00c 100644
--- a/cmake/FindWrapSystemHarfbuzz.cmake
+++ b/cmake/FindWrapSystemHarfbuzz.cmake
@@ -54,7 +54,7 @@ find_package_handle_standard_args(WrapSystemHarfbuzz
@@ -70,7 +70,7 @@ find_package_handle_standard_args(WrapSystemHarfbuzz
if(WrapSystemHarfbuzz_FOUND)
add_library(WrapSystemHarfbuzz::WrapSystemHarfbuzz INTERFACE IMPORTED)
target_link_libraries(WrapSystemHarfbuzz::WrapSystemHarfbuzz
@ -104,7 +104,7 @@ index 3cb44aa766..9dc741b2be 100644
+ INTERFACE "${__harfbuzz_target_name}" ${HARFBUZZ_DEPENDENCIES})
endif()
unset(__harfbuzz_target_name)
unset(__harfbuzz_found)
unset(__harfbuzz_find_include_dirs_hints)
diff --git a/cmake/FindWrapSystemPNG.cmake b/cmake/FindWrapSystemPNG.cmake
index 372a064ff4..a363bfd31b 100644
--- a/cmake/FindWrapSystemPNG.cmake
@ -132,5 +132,5 @@ index d3a6a8588e..743154fc50 100644
Qt::CorePrivate
Qt::SqlPrivate
--
2.36.1
2.37.3

View File

@ -1,4 +1,4 @@
From a73d029afe6c4df668c2dc620c9a9184e8081e90 Mon Sep 17 00:00:00 2001
From 34aa224d3b4f53b9076e76b29c33fe35890642c7 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Mon, 2 Nov 2020 13:47:45 +0100
Subject: [PATCH 05/12] Fix libjpeg workaround for conflict with rpcndr.h
@ -25,5 +25,5 @@ index 6d88438c47..a16dae28b1 100644
#ifdef const
# undef const // remove crazy C hackery in jconfig.h
--
2.36.1
2.37.3

View File

@ -1,4 +1,4 @@
From 99f9c62fb5836f4783007898cdcb7e4b6bee38d6 Mon Sep 17 00:00:00 2001
From f7173fa91ccb9f2677baa8ab886a64d6aaceb777 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 8 Nov 2020 00:33:12 +0100
Subject: [PATCH 06/12] Support finding static MariaDB client library
@ -27,5 +27,5 @@ index 0fcba2148e..ab4f6fdc9e 100644
include(FindPackageHandleStandardArgs)
--
2.36.1
2.37.3

View File

@ -1,4 +1,4 @@
From 76f5e2a906d00c4661eac3e8bc41ff6daa26af06 Mon Sep 17 00:00:00 2001
From 16e29d2a36fc8784c7ab3041a7e5e4c34be675c4 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 8 Nov 2020 00:34:09 +0100
Subject: [PATCH 07/12] Allow overriding CMAKE_FIND_LIBRARY_SUFFIXES to prefer
@ -10,7 +10,7 @@ Change-Id: I4c617e0706044d31da1bd56ae51615dc8ed37099
1 file changed, 4 insertions(+)
diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
index 5c30cc76dc..0312dff582 100644
index 7416655a3c..4f6d59a6cc 100644
--- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
+++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
@@ -1,6 +1,10 @@
@ -25,5 +25,5 @@ index 5c30cc76dc..0312dff582 100644
#
# Macros and functions for building Qt modules
--
2.36.1
2.37.3

View File

@ -1,4 +1,4 @@
From 3e7c0f23c35895d11f1ebfc76c43f90dc85521a2 Mon Sep 17 00:00:00 2001
From 41659efdf7aefba5212f703c52def4e5ccec871c Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sat, 26 Jun 2021 22:24:12 +0200
Subject: [PATCH 08/12] Fix crashes in rasterization code using setjmp
@ -235,7 +235,7 @@ index c6b9aa679e..8952343922 100644
*araster = 0;
return ErrRaster_Memory_Overflow;
diff --git a/src/gui/painting/qt_attribution.json b/src/gui/painting/qt_attribution.json
index e2326a56c1..7b30969ec8 100644
index 94e748aee7..64c694964d 100644
--- a/src/gui/painting/qt_attribution.json
+++ b/src/gui/painting/qt_attribution.json
@@ -4,7 +4,7 @@
@ -248,5 +248,5 @@ index e2326a56c1..7b30969ec8 100644
"Description": "FreeType is a freely available software library to render fonts.",
"Homepage": "http://www.freetype.org",
--
2.36.1
2.37.3

View File

@ -1,4 +1,4 @@
From 8ac6411a3410f571d784ec3ddeea4fe640938840 Mon Sep 17 00:00:00 2001
From b0f8a6b432e1576774679fbf54dc2d1424590bbe Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 24 Apr 2022 23:00:27 +0200
Subject: [PATCH 09/12] Find fontconfig via pkg-config for correct handling of
@ -59,5 +59,5 @@ index 42ab041f99..044c90a0d1 100644
qt_find_package(gbm PROVIDED_TARGETS gbm::gbm MODULE_NAME gui QMAKE_LIB gbm)
qt_find_package(WrapSystemHarfbuzz 2.6.0 PROVIDED_TARGETS WrapSystemHarfbuzz::WrapSystemHarfbuzz MODULE_NAME gui QMAKE_LIB harfbuzz)
--
2.36.1
2.37.3

View File

@ -1,4 +1,4 @@
From 5f81bd5ed0e8609415aa1bd7ff1857063d38a66d Mon Sep 17 00:00:00 2001
From fdd24c98ad35bd527ee3a435e72c86bfef741dc1 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 24 Apr 2022 23:49:36 +0200
Subject: [PATCH 10/12] Fix dependency of xcb-image on xcb-util
@ -44,5 +44,5 @@ index d530d2d7f4..f5298642ca 100644
set(XCB_XFIXES_component_deps XCB RENDER SHAPE)
set(XCB_XVMC_component_deps XCB XV)
--
2.36.1
2.37.3

View File

@ -1,4 +1,4 @@
From 5f1fd6ea55dda08d201f706565f01e9825fcce5f Mon Sep 17 00:00:00 2001
From 3c62f8d712bdc63818f80f0d70a864e46a8feec9 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Tue, 26 Apr 2022 20:16:31 +0200
Subject: [PATCH 11/12] Allow using properties of PkgConfig targets for glib2
@ -70,5 +70,5 @@ index a6a16b494f..a5da57824c 100644
set_package_properties(GLIB2 PROPERTIES
URL "https://wiki.gnome.org/Projects/GLib"
--
2.36.1
2.37.3

View File

@ -1,4 +1,4 @@
From 9523e0cf6abf56d32da8c44619b9a30e32f18ffb Mon Sep 17 00:00:00 2001
From 9782387b6a2e37bc3ac6e3df6b5b2447f734a706 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 1 May 2022 23:28:26 +0200
Subject: [PATCH 12/12] Allow using properties of PkgConfig targets for Wayland
@ -49,5 +49,5 @@ index 233cc88d02..875c71377c 100644
set_package_properties(Wayland PROPERTIES
URL "http://wayland.freedesktop.org"
--
2.36.1
2.37.3

View File

@ -11,7 +11,7 @@
# All patches are managed at https://github.com/Martchus/qtbase
pkgname=mingw-w64-qt6-base
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@ -43,19 +43,19 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
'0010-Fix-dependency-of-xcb-image-on-xcb-util.patch'
'0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch'
'0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch')
sha256sums=('0a64421d9c2469c2c48490a032ab91d547017c9cc171f3f8070bc31888f24e03'
'b50847b70210657d5579bbc6fe88c5343f675d63e0059183705777a2d0c0fcf6'
'c2e2499413b281be496de2b62385ff947c38b92f98028336b4c1a06230f5a180'
'16cd13db60b669f1b84bc98910b40a50b28e75b00b839883c0dd69e457a997b0'
'e6d6b86b2a4a9f30ce361b6baa6e5d32d1567828581d6bc65f6986a15a4ae0ab'
'34d6083183e58e02d8bc53db6fbeb2059766a23b3fe9ccdc0b53c861eefbfdb0'
'53e83363b0508d8005987fea8f752d2f0d804f07d434c0a7a1a39ebf9668d433'
'b90c472eda3caa44981d14b8081039c56653a0c85bd60175ff37d0d48ed43078'
'8ee1b3c4554be7d4f2ec5ac24727887ea4c47704e1ddcf80aacece93b9e54dda'
'0d8f78df6da2dd3bf7610fdc7b3018cb2698bbe6f523925ad4c3565e7ecb03c9'
'ae0d2140f3be5fa16ff32cb9715144de72139e509dacd937ad643c14177c14ce'
'c811240dc3f6e95a636bfbb8f05f5a074b6d82ac2bf623cdc32bf74cd9f39548'
'87e00cc7c4e47494f3eb117f930432cb2385ee5016280e22a719e775664512c7')
sha256sums=('7929ba4df870b6b30870bc0aed2525cfc606ed7091107b23cf7ed7e434caa9a6'
'44447564d76f656f78dcebbd9015f87cc5ab89caf1984909f32c8a57168ebfc6'
'62efb1cbd52b852115df5887c4653c39dce9e695470c3577f58388a8493964dc'
'ac185df12dafaa5b2a35b05ae0fa5ff05b6e885525c6159c89589028081b1285'
'454f758469ed0dc03278e851cc6dc19424fc8147396b3a54640c284e7085277c'
'7ceaa7fa65a73d2ae60a93cce1cb68e85bd486ac5529e3456c696fc2a3098749'
'b493577b3b524383312d6f093c7d41b621daea7e82f6efb7d219b2796e217a81'
'fc29185f66f3b9a288bdd7e36a363d3f573d9602d7b01588f58c352a54dfed8f'
'7b00f18dc4ebd42194f853acd1bee4fb4fcb586086ce6c2be7996df058c6dbb6'
'4e29919b6692be949164f47a929178dcff0e0075f51f3aa54d617795291cd31f'
'37a0951bec45840157275c0e79fc1882143b6152069cde93be193128c22e5d2d'
'9969dd32b3f8e5f6f67396a98a676a1d50a7beaf9fb150aa3c3127c8835086cd'
'0d1b83a7ab41a6f4d52c48c215949b7204e880531df0f1dd395a08f615b43faa')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

View File

@ -1 +1 @@
0a64421d9c2469c2c48490a032ab91d547017c9cc171f3f8070bc31888f24e03
7929ba4df870b6b30870bc0aed2525cfc606ed7091107b23cf7ed7e434caa9a6

View File

@ -10,7 +10,7 @@
# All patches are managed at https://github.com/Martchus/qtbase
pkgname=static-compat-qt6-base
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(x86_64)
@ -42,19 +42,19 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
'0010-Fix-dependency-of-xcb-image-on-xcb-util.patch'
'0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch'
'0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch')
sha256sums=('0a64421d9c2469c2c48490a032ab91d547017c9cc171f3f8070bc31888f24e03'
'b50847b70210657d5579bbc6fe88c5343f675d63e0059183705777a2d0c0fcf6'
'c2e2499413b281be496de2b62385ff947c38b92f98028336b4c1a06230f5a180'
'16cd13db60b669f1b84bc98910b40a50b28e75b00b839883c0dd69e457a997b0'
'e6d6b86b2a4a9f30ce361b6baa6e5d32d1567828581d6bc65f6986a15a4ae0ab'
'34d6083183e58e02d8bc53db6fbeb2059766a23b3fe9ccdc0b53c861eefbfdb0'
'53e83363b0508d8005987fea8f752d2f0d804f07d434c0a7a1a39ebf9668d433'
'b90c472eda3caa44981d14b8081039c56653a0c85bd60175ff37d0d48ed43078'
'8ee1b3c4554be7d4f2ec5ac24727887ea4c47704e1ddcf80aacece93b9e54dda'
'0d8f78df6da2dd3bf7610fdc7b3018cb2698bbe6f523925ad4c3565e7ecb03c9'
'ae0d2140f3be5fa16ff32cb9715144de72139e509dacd937ad643c14177c14ce'
'c811240dc3f6e95a636bfbb8f05f5a074b6d82ac2bf623cdc32bf74cd9f39548'
'87e00cc7c4e47494f3eb117f930432cb2385ee5016280e22a719e775664512c7')
sha256sums=('7929ba4df870b6b30870bc0aed2525cfc606ed7091107b23cf7ed7e434caa9a6'
'44447564d76f656f78dcebbd9015f87cc5ab89caf1984909f32c8a57168ebfc6'
'62efb1cbd52b852115df5887c4653c39dce9e695470c3577f58388a8493964dc'
'ac185df12dafaa5b2a35b05ae0fa5ff05b6e885525c6159c89589028081b1285'
'454f758469ed0dc03278e851cc6dc19424fc8147396b3a54640c284e7085277c'
'7ceaa7fa65a73d2ae60a93cce1cb68e85bd486ac5529e3456c696fc2a3098749'
'b493577b3b524383312d6f093c7d41b621daea7e82f6efb7d219b2796e217a81'
'fc29185f66f3b9a288bdd7e36a363d3f573d9602d7b01588f58c352a54dfed8f'
'7b00f18dc4ebd42194f853acd1bee4fb4fcb586086ce6c2be7996df058c6dbb6'
'4e29919b6692be949164f47a929178dcff0e0075f51f3aa54d617795291cd31f'
'37a0951bec45840157275c0e79fc1882143b6152069cde93be193128c22e5d2d'
'9969dd32b3f8e5f6f67396a98a676a1d50a7beaf9fb150aa3c3127c8835086cd'
'0d1b83a7ab41a6f4d52c48c215949b7204e880531df0f1dd395a08f615b43faa')
prepare () {
cd $_pkgfqn

View File

@ -5,7 +5,7 @@
_android_arch=aarch64
pkgname=android-$_android_arch-qt6-charts
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)

View File

@ -1,6 +1,6 @@
% layout 'android-qt6-module';
\
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-charts-static
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@ -17,7 +17,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
groups=(mingw-w64-qt6)
_pkgfqn="qtcharts-everywhere-src-${_qtver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('f330cc2328729104d79b2088990ce0840f2da89d9d989360d4c352e797d27cf7')
sha256sums=('aaa84e1386700c1558b9cc871f832c43278ef9617ef1703a8fa15625e33efbf6')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

View File

@ -1 +1 @@
f330cc2328729104d79b2088990ce0840f2da89d9d989360d4c352e797d27cf7
aaa84e1386700c1558b9cc871f832c43278ef9617ef1703a8fa15625e33efbf6

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-charts
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@ -17,7 +17,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
groups=(mingw-w64-qt6)
_pkgfqn="qtcharts-everywhere-src-${_qtver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('f330cc2328729104d79b2088990ce0840f2da89d9d989360d4c352e797d27cf7')
sha256sums=('aaa84e1386700c1558b9cc871f832c43278ef9617ef1703a8fa15625e33efbf6')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

View File

@ -1,6 +1,6 @@
% layout 'mingw-w64-qt6-module';
\
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)

View File

@ -1 +1 @@
f330cc2328729104d79b2088990ce0840f2da89d9d989360d4c352e797d27cf7
aaa84e1386700c1558b9cc871f832c43278ef9617ef1703a8fa15625e33efbf6

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository.
pkgname=static-compat-qt6-charts
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(x86_64)
@ -16,7 +16,7 @@ makedepends=(static-compat-cmake static-compat-vulkan-headers ninja)
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
_pkgfqn="qtcharts-everywhere-src-${_qtver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('f330cc2328729104d79b2088990ce0840f2da89d9d989360d4c352e797d27cf7')
sha256sums=('aaa84e1386700c1558b9cc871f832c43278ef9617ef1703a8fa15625e33efbf6')
build() {
check_buildoption ccache y && ccache_args='

View File

@ -1,6 +1,6 @@
% layout 'static-compat-qt6-module';
\
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(x86_64)

View File

@ -1 +1 @@
f330cc2328729104d79b2088990ce0840f2da89d9d989360d4c352e797d27cf7
aaa84e1386700c1558b9cc871f832c43278ef9617ef1703a8fa15625e33efbf6

View File

@ -5,7 +5,7 @@
_android_arch=aarch64
pkgname=android-$_android_arch-qt6-connectivity
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)

View File

@ -1,6 +1,6 @@
% layout 'android-qt6-module';
\
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-connectivity-static
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@ -18,7 +18,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
groups=(mingw-w64-qt6)
_pkgfqn="qtconnectivity-everywhere-src-${_qtver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('b25ce4710a9c61bc6a5dbaeeb3e2ed907a8bc85478fdb2ab4312297768b695b0')
sha256sums=('e249656c502c9c96c416fffc1cb560ea6d30da3354d798b124ec12d7b6f9a658')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

View File

@ -1 +1 @@
b25ce4710a9c61bc6a5dbaeeb3e2ed907a8bc85478fdb2ab4312297768b695b0
e249656c502c9c96c416fffc1cb560ea6d30da3354d798b124ec12d7b6f9a658

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-connectivity
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@ -18,7 +18,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
groups=(mingw-w64-qt6)
_pkgfqn="qtconnectivity-everywhere-src-${_qtver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('b25ce4710a9c61bc6a5dbaeeb3e2ed907a8bc85478fdb2ab4312297768b695b0')
sha256sums=('e249656c502c9c96c416fffc1cb560ea6d30da3354d798b124ec12d7b6f9a658')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

View File

@ -1,6 +1,6 @@
% layout 'mingw-w64-qt6-module';
\
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)

View File

@ -1 +1 @@
b25ce4710a9c61bc6a5dbaeeb3e2ed907a8bc85478fdb2ab4312297768b695b0
e249656c502c9c96c416fffc1cb560ea6d30da3354d798b124ec12d7b6f9a658

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository.
pkgname=static-compat-qt6-connectivity
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(x86_64)

View File

@ -1,6 +1,6 @@
% layout 'static-compat-qt6-module';
\
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(x86_64)

View File

@ -5,7 +5,7 @@
_android_arch=aarch64
pkgname=android-$_android_arch-qt6-datavis3d
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)

View File

@ -1,6 +1,6 @@
% layout 'android-qt6-module';
\
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-datavis3d-static
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@ -18,7 +18,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
groups=(mingw-w64-qt6)
_pkgfqn="qtdatavis3d-everywhere-src-${_qtver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('83a8d689e0292f1e30776cc214bc605fd708289d62d5c1a7fb04d17a5f8ca8f2')
sha256sums=('ff641277b1c29ff649220e4af2c10323283e5ab6d814b8f87087543ef426af8f')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

View File

@ -1 +1 @@
83a8d689e0292f1e30776cc214bc605fd708289d62d5c1a7fb04d17a5f8ca8f2
ff641277b1c29ff649220e4af2c10323283e5ab6d814b8f87087543ef426af8f

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-datavis3d
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@ -18,7 +18,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
groups=(mingw-w64-qt6)
_pkgfqn="qtdatavis3d-everywhere-src-${_qtver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('83a8d689e0292f1e30776cc214bc605fd708289d62d5c1a7fb04d17a5f8ca8f2')
sha256sums=('ff641277b1c29ff649220e4af2c10323283e5ab6d814b8f87087543ef426af8f')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

View File

@ -1,6 +1,6 @@
% layout 'mingw-w64-qt6-module';
\
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)

View File

@ -1 +1 @@
83a8d689e0292f1e30776cc214bc605fd708289d62d5c1a7fb04d17a5f8ca8f2
ff641277b1c29ff649220e4af2c10323283e5ab6d814b8f87087543ef426af8f

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository.
pkgname=static-compat-qt6-datavis3d
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(x86_64)
@ -17,7 +17,7 @@ makedepends=(static-compat-cmake static-compat-qt6-declarative static-compat-vul
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
_pkgfqn="qtdatavis3d-everywhere-src-${_qtver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('83a8d689e0292f1e30776cc214bc605fd708289d62d5c1a7fb04d17a5f8ca8f2')
sha256sums=('ff641277b1c29ff649220e4af2c10323283e5ab6d814b8f87087543ef426af8f')
build() {
check_buildoption ccache y && ccache_args='

View File

@ -1,6 +1,6 @@
% layout 'static-compat-qt6-module';
\
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(x86_64)

View File

@ -1 +1 @@
83a8d689e0292f1e30776cc214bc605fd708289d62d5c1a7fb04d17a5f8ca8f2
ff641277b1c29ff649220e4af2c10323283e5ab6d814b8f87087543ef426af8f

View File

@ -5,7 +5,7 @@
_android_arch=aarch64
pkgname=android-$_android_arch-qt6-declarative
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@ -24,7 +24,7 @@ _pkgfqn="qtdeclarative-everywhere-src-${_qtver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
'0001-Exclude-qmltime-when-cross-compiling.patch')
sha256sums=('03e7694123820fcca397f95ce312e0b7f3039493c8754c836da098a1a04346e8'
'572cf6af00c733aa7e7c5ec72ce522b5a640e89e27ab3f6c93debcaf335fa31c')
'f9324e0aabe2667b932a5a14a1ae11f08d4a9b1113b68c1fa9ffdeaf726ce48c')
prepare () {
cd $_pkgfqn

View File

@ -1,6 +1,6 @@
% layout 'android-qt6-module', has_binaries => 1;
\
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-declarative-static
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@ -22,8 +22,8 @@ groups=(mingw-w64-qt6)
_pkgfqn="qtdeclarative-everywhere-src-${_qtver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
'0001-Exclude-qmltime-when-cross-compiling.patch')
sha256sums=('03e7694123820fcca397f95ce312e0b7f3039493c8754c836da098a1a04346e8'
'572cf6af00c733aa7e7c5ec72ce522b5a640e89e27ab3f6c93debcaf335fa31c')
sha256sums=('b813111dc0d45dc133bf15d26513ae245fb6d8bc221ab252dde85e24d0307cc1'
'f9324e0aabe2667b932a5a14a1ae11f08d4a9b1113b68c1fa9ffdeaf726ce48c')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

View File

@ -1 +1 @@
03e7694123820fcca397f95ce312e0b7f3039493c8754c836da098a1a04346e8
b813111dc0d45dc133bf15d26513ae245fb6d8bc221ab252dde85e24d0307cc1

View File

@ -1,4 +1,4 @@
From 306826507f0814b1da3e119dde347ca9086a0571 Mon Sep 17 00:00:00 2001
From efdd719c15e6849f9f430bb5bcc9dd180faae2ca Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 5 Feb 2021 02:22:45 +0100
Subject: [PATCH] Exclude qmltime when cross compiling
@ -14,10 +14,10 @@ That's likely also why upstream did not notice this problem so far.
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 48545ff2d2..dafcad8a2e 100644
index 2e7a5273b6..c4202ff9e3 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -33,7 +33,9 @@ if(QT_FEATURE_qml_preview AND QT_FEATURE_thread AND NOT ANDROID AND NOT WASM AND
@@ -34,7 +34,9 @@ if(QT_FEATURE_qml_preview AND QT_FEATURE_thread AND NOT ANDROID AND NOT WASM AND
endif()
if(QT_BUILD_SHARED_LIBS AND QT_FEATURE_thread AND TARGET Qt::Quick AND NOT ANDROID AND NOT WASM AND NOT IOS AND NOT rtems)
add_subdirectory(qmlscene)
@ -29,5 +29,5 @@ index 48545ff2d2..dafcad8a2e 100644
if(QT_BUILD_SHARED_LIBS
AND QT_FEATURE_process
--
2.36.1
2.37.3

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-declarative
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@ -22,8 +22,8 @@ groups=(mingw-w64-qt6)
_pkgfqn="qtdeclarative-everywhere-src-${_qtver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
'0001-Exclude-qmltime-when-cross-compiling.patch')
sha256sums=('03e7694123820fcca397f95ce312e0b7f3039493c8754c836da098a1a04346e8'
'572cf6af00c733aa7e7c5ec72ce522b5a640e89e27ab3f6c93debcaf335fa31c')
sha256sums=('b813111dc0d45dc133bf15d26513ae245fb6d8bc221ab252dde85e24d0307cc1'
'f9324e0aabe2667b932a5a14a1ae11f08d4a9b1113b68c1fa9ffdeaf726ce48c')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

View File

@ -1,6 +1,6 @@
% layout 'mingw-w64-qt6-module', has_binaries => 1;
\
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)

View File

@ -1 +1 @@
03e7694123820fcca397f95ce312e0b7f3039493c8754c836da098a1a04346e8
b813111dc0d45dc133bf15d26513ae245fb6d8bc221ab252dde85e24d0307cc1

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository.
pkgname=static-compat-qt6-declarative
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(x86_64)
@ -17,8 +17,8 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
_pkgfqn="qtdeclarative-everywhere-src-${_qtver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
'0001-Exclude-qmltime-when-cross-compiling.patch')
sha256sums=('03e7694123820fcca397f95ce312e0b7f3039493c8754c836da098a1a04346e8'
'572cf6af00c733aa7e7c5ec72ce522b5a640e89e27ab3f6c93debcaf335fa31c')
sha256sums=('b813111dc0d45dc133bf15d26513ae245fb6d8bc221ab252dde85e24d0307cc1'
'f9324e0aabe2667b932a5a14a1ae11f08d4a9b1113b68c1fa9ffdeaf726ce48c')
prepare () {
cd $_pkgfqn

View File

@ -1,6 +1,6 @@
% layout 'static-compat-qt6-module', has_binaries => 1;
\
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(x86_64)

View File

@ -1 +1 @@
03e7694123820fcca397f95ce312e0b7f3039493c8754c836da098a1a04346e8
b813111dc0d45dc133bf15d26513ae245fb6d8bc221ab252dde85e24d0307cc1

View File

@ -5,7 +5,7 @@
_android_arch=aarch64
pkgname=android-$_android_arch-qt6-imageformats
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)

View File

@ -1,6 +1,6 @@
% layout 'android-qt6-module';
\
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-imageformats-static
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@ -20,7 +20,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
groups=(mingw-w64-qt6)
_pkgfqn="qtimageformats-everywhere-src-${_qtver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('ad0312b8dfbbb67f729bfadbfcd47246ee4a128b717731ba158c41d01fde212f')
sha256sums=('1dcb8a4cae6c779c3db0b170f78705681a5b6786f0971ed07c618bd03685ce3a')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

View File

@ -1 +1 @@
ad0312b8dfbbb67f729bfadbfcd47246ee4a128b717731ba158c41d01fde212f
1dcb8a4cae6c779c3db0b170f78705681a5b6786f0971ed07c618bd03685ce3a

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-imageformats
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@ -20,7 +20,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
groups=(mingw-w64-qt6)
_pkgfqn="qtimageformats-everywhere-src-${_qtver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('ad0312b8dfbbb67f729bfadbfcd47246ee4a128b717731ba158c41d01fde212f')
sha256sums=('1dcb8a4cae6c779c3db0b170f78705681a5b6786f0971ed07c618bd03685ce3a')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

View File

@ -1,6 +1,6 @@
% layout 'mingw-w64-qt6-module';
\
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)

View File

@ -1 +1 @@
ad0312b8dfbbb67f729bfadbfcd47246ee4a128b717731ba158c41d01fde212f
1dcb8a4cae6c779c3db0b170f78705681a5b6786f0971ed07c618bd03685ce3a

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository.
pkgname=static-compat-qt6-imageformats
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(x86_64)
@ -19,7 +19,7 @@ makedepends=(static-compat-cmake ninja)
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
_pkgfqn="qtimageformats-everywhere-src-${_qtver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('ad0312b8dfbbb67f729bfadbfcd47246ee4a128b717731ba158c41d01fde212f')
sha256sums=('1dcb8a4cae6c779c3db0b170f78705681a5b6786f0971ed07c618bd03685ce3a')
build() {
check_buildoption ccache y && ccache_args='

View File

@ -1,6 +1,6 @@
% layout 'static-compat-qt6-module';
\
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(x86_64)

View File

@ -1 +1 @@
ad0312b8dfbbb67f729bfadbfcd47246ee4a128b717731ba158c41d01fde212f
1dcb8a4cae6c779c3db0b170f78705681a5b6786f0971ed07c618bd03685ce3a

View File

@ -5,7 +5,7 @@
_android_arch=aarch64
pkgname=android-$_android_arch-qt6-lottie
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)

View File

@ -1,6 +1,6 @@
% layout 'android-qt6-module';
\
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-lottie-static
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@ -18,7 +18,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
groups=(mingw-w64-qt6)
_pkgfqn="qtlottie-everywhere-src-${_qtver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('740ba76999124d5e1a85ef3d01c69976bb8557862b6b26bf48b357fe0cab1cf5')
sha256sums=('984542d45f35e577c8561ff2315e1d4972bf87b51d4ed89c449984e02a1409b0')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

View File

@ -1 +1 @@
740ba76999124d5e1a85ef3d01c69976bb8557862b6b26bf48b357fe0cab1cf5
984542d45f35e577c8561ff2315e1d4972bf87b51d4ed89c449984e02a1409b0

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-lottie
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@ -18,7 +18,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
groups=(mingw-w64-qt6)
_pkgfqn="qtlottie-everywhere-src-${_qtver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('740ba76999124d5e1a85ef3d01c69976bb8557862b6b26bf48b357fe0cab1cf5')
sha256sums=('984542d45f35e577c8561ff2315e1d4972bf87b51d4ed89c449984e02a1409b0')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

View File

@ -1,6 +1,6 @@
% layout 'mingw-w64-qt6-module';
\
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)

View File

@ -1 +1 @@
740ba76999124d5e1a85ef3d01c69976bb8557862b6b26bf48b357fe0cab1cf5
984542d45f35e577c8561ff2315e1d4972bf87b51d4ed89c449984e02a1409b0

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository.
pkgname=static-compat-qt6-lottie
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(x86_64)

View File

@ -1,6 +1,6 @@
% layout 'static-compat-qt6-module';
\
_qtver=6.3.1
_qtver=6.3.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(x86_64)

Some files were not shown because too many files have changed in this diff Show More