Update Qt 6 packages to 6.1.1

This commit is contained in:
Martchus 2021-06-08 13:12:14 +02:00
parent 2d812fe649
commit ac4599b7da
162 changed files with 371 additions and 346 deletions

View File

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

View File

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

View File

@ -13,7 +13,7 @@ declare -A versions=(
[dbus-soundrecorder]=1.2.3
[geocoordinatecalculator]=1.1.3
[qt5]=5.15.2
[qt6]=6.1.0
[qt6]=6.1.1
)
declare -A github_names=(
[c++utilities]=cpp-utilities

View File

@ -12,9 +12,8 @@ url='https://www.qt.io'
license=(GPL3 LGPL3 FDL custom)
pkgdesc='C++ and QML APIs for easy inclusion of 3D graphics'
depends=(qt6-declarative)
makedepends=(cmake vulkan-headers assimp qt6-shadertools ninja)
optdepends=('assimp: assimp importer'
'qt6-shadertools: RHI renderer')
makedepends=(cmake vulkan-headers qt6-shadertools ninja)
optdepends=('qt6-shadertools: RHI renderer')
groups=(qt6)
_pkgfqn="${pkgname/6-/}-everywhere-src-${_qtver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")

View File

@ -8,6 +8,5 @@ url='https://www.qt.io'
license=(GPL3 LGPL3 FDL custom)
pkgdesc='C++ and QML APIs for easy inclusion of 3D graphics'
depends=(qt6-declarative)
makedepends=(cmake vulkan-headers assimp qt6-shadertools ninja)
optdepends=('assimp: assimp importer'
'qt6-shadertools: RHI renderer')
makedepends=(cmake vulkan-headers qt6-shadertools ninja)
optdepends=('qt6-shadertools: RHI renderer')

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-3d-static
_qtver=6.1.0
_qtver=6.1.1
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@ -12,10 +12,9 @@ url='https://www.qt.io'
license=(GPL3 LGPL3 FDL custom)
pkgdesc='C++ and QML APIs for easy inclusion of 3D graphics (mingw-w64)'
depends=('mingw-w64-qt6-declarative-static')
makedepends=('mingw-w64-cmake-static' 'mingw-w64-vulkan-headers' 'mingw-w64-vulkan-icd-loader' 'mingw-w64-assimp'
makedepends=('mingw-w64-cmake-static' 'mingw-w64-vulkan-headers' 'mingw-w64-vulkan-icd-loader'
'qt6-shadertools' 'qt6-declarative' 'ninja')
optdepends=('mingw-w64-assimp: Import from assimp'
'mingw-w64-qt6-shadertools-static: RHI renderer')
optdepends=('mingw-w64-qt6-shadertools-static: RHI renderer')
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
groups=(mingw-w64-qt6)
_pkgfqn="qt3d-everywhere-src-${_qtver}"

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-3d
_qtver=6.1.0
_qtver=6.1.1
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@ -12,10 +12,9 @@ url='https://www.qt.io'
license=(GPL3 LGPL3 FDL custom)
pkgdesc='C++ and QML APIs for easy inclusion of 3D graphics (mingw-w64)'
depends=('mingw-w64-qt6-declarative')
makedepends=('mingw-w64-cmake' 'mingw-w64-vulkan-headers' 'mingw-w64-vulkan-icd-loader' 'mingw-w64-assimp'
makedepends=('mingw-w64-cmake' 'mingw-w64-vulkan-headers' 'mingw-w64-vulkan-icd-loader'
'qt6-shadertools' 'qt6-declarative' 'ninja')
optdepends=('mingw-w64-assimp: Import from assimp'
'mingw-w64-qt6-shadertools: RHI renderer')
optdepends=('mingw-w64-qt6-shadertools: RHI renderer')
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
groups=(mingw-w64-qt6)
_pkgfqn="qt3d-everywhere-src-${_qtver}"

View File

@ -1,6 +1,6 @@
% layout 'mingw-w64-qt6-module', additional_library => 1, has_binaries => 1;
\
_qtver=6.1.0
_qtver=6.1.1
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@ -8,7 +8,6 @@ url='https://www.qt.io'
license=(GPL3 LGPL3 FDL custom)
pkgdesc='C++ and QML APIs for easy inclusion of 3D graphics (mingw-w64)'
depends=(<%== qt6deps qw(declarative) %>)
makedepends=('mingw-w64-cmake<%== $static_suffix %>' 'mingw-w64-vulkan-headers' 'mingw-w64-vulkan-icd-loader' 'mingw-w64-assimp'
makedepends=('mingw-w64-cmake<%== $static_suffix %>' 'mingw-w64-vulkan-headers' 'mingw-w64-vulkan-icd-loader'
'qt6-shadertools' 'qt6-declarative' 'ninja')
optdepends=('mingw-w64-assimp: Import from assimp'
<%== qt6optdeps shadertools => 'RHI renderer' %>)
optdepends=(<%== qt6optdeps shadertools => 'RHI renderer' %>)

View File

@ -5,7 +5,7 @@
_android_arch=aarch64
pkgname=android-$_android_arch-qt6-5compat
_qtver=6.1.0
_qtver=6.1.1
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@ -18,7 +18,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
groups=(android-${_android_arch}-qt6)
_pkgfqn="qt5compat-everywhere-src-${_qtver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('c7d7e6ca2702b8b8b8b251bd271771ec319e5d107bb65f4dba024c200c8fd23c')
sha256sums=('7d08f1044cb09f8b3ee31af0de25771bae72936a6f9a699134d9b8d29dfaa5a7')
build() {
source android-env ${_android_arch}

View File

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

View File

@ -1 +1 @@
c7d7e6ca2702b8b8b8b251bd271771ec319e5d107bb65f4dba024c200c8fd23c
7d08f1044cb09f8b3ee31af0de25771bae72936a6f9a699134d9b8d29dfaa5a7

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-5compat-static
_qtver=6.1.0
_qtver=6.1.1
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=('c7d7e6ca2702b8b8b8b251bd271771ec319e5d107bb65f4dba024c200c8fd23c')
sha256sums=('7d08f1044cb09f8b3ee31af0de25771bae72936a6f9a699134d9b8d29dfaa5a7')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

View File

@ -1 +1 @@
c7d7e6ca2702b8b8b8b251bd271771ec319e5d107bb65f4dba024c200c8fd23c
7d08f1044cb09f8b3ee31af0de25771bae72936a6f9a699134d9b8d29dfaa5a7

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-5compat
_qtver=6.1.0
_qtver=6.1.1
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=('c7d7e6ca2702b8b8b8b251bd271771ec319e5d107bb65f4dba024c200c8fd23c')
sha256sums=('7d08f1044cb09f8b3ee31af0de25771bae72936a6f9a699134d9b8d29dfaa5a7')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

View File

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

View File

@ -1 +1 @@
c7d7e6ca2702b8b8b8b251bd271771ec319e5d107bb65f4dba024c200c8fd23c
7d08f1044cb09f8b3ee31af0de25771bae72936a6f9a699134d9b8d29dfaa5a7

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-activeqt-static
_qtver=6.1.0
_qtver=6.1.1
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@ -20,9 +20,9 @@ _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=('d79f964054a98b7edcfcb3f3590a58d599bcb2f9569ec10f5f5d9c0070701b4a'
'dc557cc9fed6f542ad8123a0bc3c384a065c019f630c8d80a8c2ff33843d7516'
'e0dfaee2453e03f97c784bdd934ba9f58c21fe0f16a8727154d515191a93f0fa')
sha256sums=('ee853e96784f56ccb98f92212010cba7f04a1ef5e7f7da65c93a0d15c24a6cab'
'065d3fdc1acd2ebe152f2f56f3480c936d923b7ebd50b07f7c33f664574637d8'
'bde9677fa74577b688e60be47b509c2ba4887e5d5f81f2edeebe8e924bdc6545')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

View File

@ -1 +1 @@
d79f964054a98b7edcfcb3f3590a58d599bcb2f9569ec10f5f5d9c0070701b4a
ee853e96784f56ccb98f92212010cba7f04a1ef5e7f7da65c93a0d15c24a6cab

View File

@ -1,4 +1,4 @@
From 52bafd8ad71ac730ee03a2827b1bda32527c0780 Mon Sep 17 00:00:00 2001
From 7002b344e8fb6b625917c1ef92402b7909905f1b 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
@ -11,7 +11,7 @@ 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 e97dd91..e0d9dbd 100644
index 4944c3b..f92d18b 100644
--- a/src/activeqt/container/qaxbase.cpp
+++ b/src/activeqt/container/qaxbase.cpp
@@ -2104,6 +2104,10 @@ void MetaObjectGenerator::readClassInfo()
@ -52,5 +52,5 @@ index 092a3c0..c597942 100644
}
--
2.31.1
2.32.0

View File

@ -1,4 +1,4 @@
From 58ecfedd3e4868c7ac9bb3402e6b44c5e0a1091f Mon Sep 17 00:00:00 2001
From d254521e709f26b0a77c4d0f98f45dcf716dbf06 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
@ -63,5 +63,5 @@ index 073ce62..a646314 100644
main.cpp
PUBLIC_LIBRARIES
--
2.31.1
2.32.0

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-activeqt
_qtver=6.1.0
_qtver=6.1.1
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@ -20,9 +20,9 @@ _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=('d79f964054a98b7edcfcb3f3590a58d599bcb2f9569ec10f5f5d9c0070701b4a'
'dc557cc9fed6f542ad8123a0bc3c384a065c019f630c8d80a8c2ff33843d7516'
'e0dfaee2453e03f97c784bdd934ba9f58c21fe0f16a8727154d515191a93f0fa')
sha256sums=('ee853e96784f56ccb98f92212010cba7f04a1ef5e7f7da65c93a0d15c24a6cab'
'065d3fdc1acd2ebe152f2f56f3480c936d923b7ebd50b07f7c33f664574637d8'
'bde9677fa74577b688e60be47b509c2ba4887e5d5f81f2edeebe8e924bdc6545')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

View File

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

View File

@ -1 +1 @@
d79f964054a98b7edcfcb3f3590a58d599bcb2f9569ec10f5f5d9c0070701b4a
ee853e96784f56ccb98f92212010cba7f04a1ef5e7f7da65c93a0d15c24a6cab

View File

@ -1 +0,0 @@
../mingw-w64/0008-Fix-passing-QJniEnvironment-to-ANativeWindow_fromSur.patch

View File

@ -11,7 +11,7 @@
_android_arch=aarch64
pkgname=android-aarch64-qt6-base
_qtver=6.1.0
_qtver=6.1.1
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@ -34,17 +34,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')
prepare () {
cd $_pkgfqn

View File

@ -1 +1 @@
f7af3c87e96051d09b5abce6c88277c33031bef241ebfe1db4106d33ed0814c4
21a8aa9f07170e047270c668c8b037536f40226db7adbc529a0b41c3a3cb3ff2

View File

@ -1 +0,0 @@
../mingw-w64/0008-Fix-passing-QJniEnvironment-to-ANativeWindow_fromSur.patch

View File

@ -11,7 +11,7 @@
# All patches are managed at https://github.com/Martchus/qtbase
pkgname=mingw-w64-qt6-base-static
_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'

View File

@ -1 +1 @@
f7af3c87e96051d09b5abce6c88277c33031bef241ebfe1db4106d33ed0814c4
21a8aa9f07170e047270c668c8b037536f40226db7adbc529a0b41c3a3cb3ff2

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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'

View File

@ -1 +1 @@
f7af3c87e96051d09b5abce6c88277c33031bef241ebfe1db4106d33ed0814c4
21a8aa9f07170e047270c668c8b037536f40226db7adbc529a0b41c3a3cb3ff2

View File

@ -5,7 +5,7 @@
_android_arch=aarch64
pkgname=android-$_android_arch-qt6-charts
_qtver=6.1.0
_qtver=6.1.1
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@ -18,7 +18,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
groups=(android-${_android_arch}-qt6)
_pkgfqn="qtcharts-everywhere-src-${_qtver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('8f70dc54b3f29eed91cf207db4185cef25f3d0bbc479059725c75c1895cddfcd')
sha256sums=('a245b8e1b3edd22c5319d8cf0ee18f95901cfc39e4f94b34b59befffc17af60a')
build() {
source android-env ${_android_arch}

View File

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

View File

@ -1 +1 @@
8f70dc54b3f29eed91cf207db4185cef25f3d0bbc479059725c75c1895cddfcd
a245b8e1b3edd22c5319d8cf0ee18f95901cfc39e4f94b34b59befffc17af60a

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-charts-static
_qtver=6.1.0
_qtver=6.1.1
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=('8f70dc54b3f29eed91cf207db4185cef25f3d0bbc479059725c75c1895cddfcd')
sha256sums=('a245b8e1b3edd22c5319d8cf0ee18f95901cfc39e4f94b34b59befffc17af60a')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

View File

@ -1 +1 @@
8f70dc54b3f29eed91cf207db4185cef25f3d0bbc479059725c75c1895cddfcd
a245b8e1b3edd22c5319d8cf0ee18f95901cfc39e4f94b34b59befffc17af60a

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-charts
_qtver=6.1.0
_qtver=6.1.1
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=('8f70dc54b3f29eed91cf207db4185cef25f3d0bbc479059725c75c1895cddfcd')
sha256sums=('a245b8e1b3edd22c5319d8cf0ee18f95901cfc39e4f94b34b59befffc17af60a')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

View File

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

View File

@ -1 +1 @@
8f70dc54b3f29eed91cf207db4185cef25f3d0bbc479059725c75c1895cddfcd
a245b8e1b3edd22c5319d8cf0ee18f95901cfc39e4f94b34b59befffc17af60a

View File

@ -5,7 +5,7 @@
_android_arch=aarch64
pkgname=android-$_android_arch-qt6-datavis3d
_qtver=6.1.0
_qtver=6.1.1
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@ -19,7 +19,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
groups=(android-${_android_arch}-qt6)
_pkgfqn="qtdatavis3d-everywhere-src-${_qtver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('068f646d29ac3b19edd89da5ec2ed9f1bed19dc80fe27dfb1b83e6b7c08b398b')
sha256sums=('545a4d7c51f3b0be1446b0f8cd1eebba854018e635dba99b1765daed50322712')
build() {
source android-env ${_android_arch}

View File

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

View File

@ -1 +1 @@
068f646d29ac3b19edd89da5ec2ed9f1bed19dc80fe27dfb1b83e6b7c08b398b
545a4d7c51f3b0be1446b0f8cd1eebba854018e635dba99b1765daed50322712

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-datavis3d-static
_qtver=6.1.0
_qtver=6.1.1
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=('068f646d29ac3b19edd89da5ec2ed9f1bed19dc80fe27dfb1b83e6b7c08b398b')
sha256sums=('545a4d7c51f3b0be1446b0f8cd1eebba854018e635dba99b1765daed50322712')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

View File

@ -1 +1 @@
068f646d29ac3b19edd89da5ec2ed9f1bed19dc80fe27dfb1b83e6b7c08b398b
545a4d7c51f3b0be1446b0f8cd1eebba854018e635dba99b1765daed50322712

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-datavis3d
_qtver=6.1.0
_qtver=6.1.1
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=('068f646d29ac3b19edd89da5ec2ed9f1bed19dc80fe27dfb1b83e6b7c08b398b')
sha256sums=('545a4d7c51f3b0be1446b0f8cd1eebba854018e635dba99b1765daed50322712')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

View File

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

View File

@ -1 +1 @@
068f646d29ac3b19edd89da5ec2ed9f1bed19dc80fe27dfb1b83e6b7c08b398b
545a4d7c51f3b0be1446b0f8cd1eebba854018e635dba99b1765daed50322712

View File

@ -0,0 +1 @@
../mingw-w64/0001-Exclude-qmltime-when-cross-compiling.patch

View File

@ -5,7 +5,7 @@
_android_arch=aarch64
pkgname=android-$_android_arch-qt6-declarative
_qtver=6.1.0
_qtver=6.1.1
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@ -18,8 +18,20 @@ optdepends=('qt6-declarative: development tools')
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
groups=(android-${_android_arch}-qt6)
_pkgfqn="qtdeclarative-everywhere-src-${_qtver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('e6f64314b8d54d7b541f52827b4e795317b17c3b7f39ad5210b8dbf343b75bda')
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
'0001-Exclude-qmltime-when-cross-compiling.patch')
sha256sums=('805394307479ebca9899996af8357037c4f1ff8b783162ade0c5a05cea7ee2d2'
'ea1049987eb2c00190e794c678781e20c95cbff03eba698875de35258894a3a7')
prepare () {
cd $_pkgfqn
# apply patches; further descriptions can be found in patch files itself
for patch in "$srcdir/"*.patch; do
msg2 "Applying patch $patch"
patch -p1 -i "$patch"
done
}
build() {
source android-env ${_android_arch}

View File

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

View File

@ -1 +1 @@
e6f64314b8d54d7b541f52827b4e795317b17c3b7f39ad5210b8dbf343b75bda
805394307479ebca9899996af8357037c4f1ff8b783162ade0c5a05cea7ee2d2

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-declarative-static
_qtver=6.1.0
_qtver=6.1.1
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@ -19,8 +19,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=('e6f64314b8d54d7b541f52827b4e795317b17c3b7f39ad5210b8dbf343b75bda'
'ecc7e6c2555a4bb5990decfab7af7b96b3d7ca7e9ef99999e38786113e8e6e1f')
sha256sums=('805394307479ebca9899996af8357037c4f1ff8b783162ade0c5a05cea7ee2d2'
'ea1049987eb2c00190e794c678781e20c95cbff03eba698875de35258894a3a7')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

View File

@ -1 +1 @@
e6f64314b8d54d7b541f52827b4e795317b17c3b7f39ad5210b8dbf343b75bda
805394307479ebca9899996af8357037c4f1ff8b783162ade0c5a05cea7ee2d2

View File

@ -1,4 +1,4 @@
From 2f311a387e0a41a7903cd89ba638cc87455f59b2 Mon Sep 17 00:00:00 2001
From 09f7c0b03aa26e1e7862f57bf9cc4105665ce879 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
@ -29,5 +29,5 @@ index 8438e8c6fa..23753dd0dc 100644
if(QT_BUILD_SHARED_LIBS AND QT_FEATURE_process AND QT_FEATURE_regularexpression AND QT_FEATURE_thread AND TARGET Qt::Quick AND NOT ANDROID AND NOT WASM AND NOT rtems)
add_subdirectory(qmlplugindump)
--
2.31.1
2.32.0

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-declarative
_qtver=6.1.0
_qtver=6.1.1
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@ -19,8 +19,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=('e6f64314b8d54d7b541f52827b4e795317b17c3b7f39ad5210b8dbf343b75bda'
'ecc7e6c2555a4bb5990decfab7af7b96b3d7ca7e9ef99999e38786113e8e6e1f')
sha256sums=('805394307479ebca9899996af8357037c4f1ff8b783162ade0c5a05cea7ee2d2'
'ea1049987eb2c00190e794c678781e20c95cbff03eba698875de35258894a3a7')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

View File

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

View File

@ -1 +1 @@
e6f64314b8d54d7b541f52827b4e795317b17c3b7f39ad5210b8dbf343b75bda
805394307479ebca9899996af8357037c4f1ff8b783162ade0c5a05cea7ee2d2

View File

@ -5,7 +5,7 @@
_android_arch=aarch64
pkgname=android-$_android_arch-qt6-imageformats
_qtver=6.1.0
_qtver=6.1.1
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@ -18,7 +18,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
groups=(android-${_android_arch}-qt6)
_pkgfqn="qtimageformats-everywhere-src-${_qtver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('34e63786d31d0c5dcc13a4b37d31002efb53244e48a8c2f0fafdd81e8d28575a')
sha256sums=('d7ee9d96ed6958241acde2b5d505f89d7dcfd710d0944b100ac6de203b0e107d')
build() {
source android-env ${_android_arch}

View File

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

View File

@ -1 +1 @@
34e63786d31d0c5dcc13a4b37d31002efb53244e48a8c2f0fafdd81e8d28575a
d7ee9d96ed6958241acde2b5d505f89d7dcfd710d0944b100ac6de203b0e107d

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-imageformats-static
_qtver=6.1.0
_qtver=6.1.1
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=('34e63786d31d0c5dcc13a4b37d31002efb53244e48a8c2f0fafdd81e8d28575a')
sha256sums=('d7ee9d96ed6958241acde2b5d505f89d7dcfd710d0944b100ac6de203b0e107d')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

View File

@ -1 +1 @@
34e63786d31d0c5dcc13a4b37d31002efb53244e48a8c2f0fafdd81e8d28575a
d7ee9d96ed6958241acde2b5d505f89d7dcfd710d0944b100ac6de203b0e107d

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-imageformats
_qtver=6.1.0
_qtver=6.1.1
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=('34e63786d31d0c5dcc13a4b37d31002efb53244e48a8c2f0fafdd81e8d28575a')
sha256sums=('d7ee9d96ed6958241acde2b5d505f89d7dcfd710d0944b100ac6de203b0e107d')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

View File

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

View File

@ -1 +1 @@
34e63786d31d0c5dcc13a4b37d31002efb53244e48a8c2f0fafdd81e8d28575a
d7ee9d96ed6958241acde2b5d505f89d7dcfd710d0944b100ac6de203b0e107d

View File

@ -5,7 +5,7 @@
_android_arch=aarch64
pkgname=android-$_android_arch-qt6-lottie
_qtver=6.1.0
_qtver=6.1.1
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@ -19,7 +19,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
groups=(android-${_android_arch}-qt6)
_pkgfqn="qtlottie-everywhere-src-${_qtver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('3c2478f1064574939cfc151d7df0743d6bb1119d8cee6ed3ca3bc1cdfb8fece8')
sha256sums=('df8ee26ea3aa4524f82703f602449d990724ca232cb98498746e8f49e23037ed')
build() {
source android-env ${_android_arch}

View File

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

View File

@ -1 +1 @@
3c2478f1064574939cfc151d7df0743d6bb1119d8cee6ed3ca3bc1cdfb8fece8
df8ee26ea3aa4524f82703f602449d990724ca232cb98498746e8f49e23037ed

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-lottie-static
_qtver=6.1.0
_qtver=6.1.1
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=('3c2478f1064574939cfc151d7df0743d6bb1119d8cee6ed3ca3bc1cdfb8fece8')
sha256sums=('df8ee26ea3aa4524f82703f602449d990724ca232cb98498746e8f49e23037ed')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

View File

@ -1 +1 @@
3c2478f1064574939cfc151d7df0743d6bb1119d8cee6ed3ca3bc1cdfb8fece8
df8ee26ea3aa4524f82703f602449d990724ca232cb98498746e8f49e23037ed

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-lottie
_qtver=6.1.0
_qtver=6.1.1
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=('3c2478f1064574939cfc151d7df0743d6bb1119d8cee6ed3ca3bc1cdfb8fece8')
sha256sums=('df8ee26ea3aa4524f82703f602449d990724ca232cb98498746e8f49e23037ed')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

View File

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

View File

@ -1 +1 @@
3c2478f1064574939cfc151d7df0743d6bb1119d8cee6ed3ca3bc1cdfb8fece8
df8ee26ea3aa4524f82703f602449d990724ca232cb98498746e8f49e23037ed

View File

@ -5,7 +5,7 @@
_android_arch=aarch64
pkgname=android-$_android_arch-qt6-networkauth
_qtver=6.1.0
_qtver=6.1.1
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@ -18,7 +18,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
groups=(android-${_android_arch}-qt6)
_pkgfqn="qtnetworkauth-everywhere-src-${_qtver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('bae8a941e4b635a364bdc65ea814adfe75b20b06fce0888612f72fc1e81ebdd3')
sha256sums=('4e1b7f6584fe21e8a04ee6d9c5761e5858587e8bab01a522ee53f82dfd1efdd7')
build() {
source android-env ${_android_arch}

View File

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

View File

@ -1 +1 @@
bae8a941e4b635a364bdc65ea814adfe75b20b06fce0888612f72fc1e81ebdd3
4e1b7f6584fe21e8a04ee6d9c5761e5858587e8bab01a522ee53f82dfd1efdd7

View File

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

View File

@ -1 +1 @@
bae8a941e4b635a364bdc65ea814adfe75b20b06fce0888612f72fc1e81ebdd3
4e1b7f6584fe21e8a04ee6d9c5761e5858587e8bab01a522ee53f82dfd1efdd7

View File

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

View File

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

View File

@ -1 +1 @@
bae8a941e4b635a364bdc65ea814adfe75b20b06fce0888612f72fc1e81ebdd3
4e1b7f6584fe21e8a04ee6d9c5761e5858587e8bab01a522ee53f82dfd1efdd7

View File

@ -5,7 +5,7 @@
_android_arch=aarch64
pkgname=android-$_android_arch-qt6-quick3d
_qtver=6.1.0
_qtver=6.1.1
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@ -18,7 +18,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
groups=(android-${_android_arch}-qt6)
_pkgfqn="qtquick3d-everywhere-src-${_qtver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('ead155359cf7fb8b2c1a69d00847196c4011433a4839938cc5f87f65a9d5d268')
sha256sums=('94b45ae9d08495d701cfb586f1f85b12a1a10f8c29865de0d427a2366ae4507c')
build() {
source android-env ${_android_arch}

View File

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

View File

@ -1 +1 @@
ead155359cf7fb8b2c1a69d00847196c4011433a4839938cc5f87f65a9d5d268
94b45ae9d08495d701cfb586f1f85b12a1a10f8c29865de0d427a2366ae4507c

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-quick3d-static
_qtver=6.1.0
_qtver=6.1.1
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@ -12,13 +12,13 @@ url='https://www.qt.io'
license=(GPL3 LGPL3 FDL custom)
pkgdesc='Qt module and API for defining 3D content in Qt Quick (mingw-w64)'
depends=('mingw-w64-qt6-declarative-static')
makedepends=('mingw-w64-cmake-static' 'mingw-w64-vulkan-headers' 'mingw-w64-vulkan-icd-loader' 'mingw-w64-assimp'
makedepends=('mingw-w64-cmake-static' 'mingw-w64-vulkan-headers' 'mingw-w64-vulkan-icd-loader'
'mingw-w64-qt6-shadertools-static' 'qt6-quick3d' 'qt6-shadertools' 'ninja')
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
groups=(mingw-w64-qt6)
_pkgfqn="qtquick3d-everywhere-src-${_qtver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('ead155359cf7fb8b2c1a69d00847196c4011433a4839938cc5f87f65a9d5d268')
sha256sums=('94b45ae9d08495d701cfb586f1f85b12a1a10f8c29865de0d427a2366ae4507c')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
@ -28,7 +28,8 @@ build() {
$_arch-cmake-static -G Ninja -B build-$_arch -S $_pkgfqn \
-DCMAKE_INSTALL_PREFIX:PATH="/usr/$_arch/static" \
-DFEATURE_static_runtime=ON \
-DFEATURE_pkg_config=ON
-DFEATURE_pkg_config=ON \
-DFEATURE_quick3d_assimp=OFF
cmake --build build-$_arch
done
}

View File

@ -1 +1 @@
ead155359cf7fb8b2c1a69d00847196c4011433a4839938cc5f87f65a9d5d268
94b45ae9d08495d701cfb586f1f85b12a1a10f8c29865de0d427a2366ae4507c

View File

@ -4,7 +4,7 @@
# you also find the URL of a binary repository.
pkgname=mingw-w64-qt6-quick3d
_qtver=6.1.0
_qtver=6.1.1
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@ -12,13 +12,13 @@ url='https://www.qt.io'
license=(GPL3 LGPL3 FDL custom)
pkgdesc='Qt module and API for defining 3D content in Qt Quick (mingw-w64)'
depends=('mingw-w64-qt6-declarative')
makedepends=('mingw-w64-cmake' 'mingw-w64-vulkan-headers' 'mingw-w64-vulkan-icd-loader' 'mingw-w64-assimp'
makedepends=('mingw-w64-cmake' 'mingw-w64-vulkan-headers' 'mingw-w64-vulkan-icd-loader'
'mingw-w64-qt6-shadertools' 'qt6-quick3d' 'qt6-shadertools' 'ninja')
options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
groups=(mingw-w64-qt6)
_pkgfqn="qtquick3d-everywhere-src-${_qtver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('ead155359cf7fb8b2c1a69d00847196c4011433a4839938cc5f87f65a9d5d268')
sha256sums=('94b45ae9d08495d701cfb586f1f85b12a1a10f8c29865de0d427a2366ae4507c')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
@ -26,7 +26,8 @@ build() {
for _arch in ${_architectures}; do
export PKG_CONFIG=/usr/bin/$_arch-pkg-config
$_arch-cmake -G Ninja -B build-$_arch -S $_pkgfqn \
-DFEATURE_pkg_config=ON
-DFEATURE_pkg_config=ON \
-DFEATURE_quick3d_assimp=OFF
cmake --build build-$_arch
done
}

View File

@ -1,6 +1,6 @@
% layout 'mingw-w64-qt6-module', has_binaries => 1;
\
_qtver=6.1.0
_qtver=6.1.1
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@ -8,5 +8,10 @@ url='https://www.qt.io'
license=(GPL3 LGPL3 FDL custom)
pkgdesc='Qt module and API for defining 3D content in Qt Quick (mingw-w64)'
depends=(<%== qt6deps qw(declarative) %>)
makedepends=('mingw-w64-cmake<%== $static_suffix %>' 'mingw-w64-vulkan-headers' 'mingw-w64-vulkan-icd-loader' 'mingw-w64-assimp'
makedepends=('mingw-w64-cmake<%== $static_suffix %>' 'mingw-w64-vulkan-headers' 'mingw-w64-vulkan-icd-loader'
<%== qt6deps qw(shadertools) %> 'qt6-quick3d' 'qt6-shadertools' 'ninja')
% \
% content_for additional_cmake_args => begin
\\
-DFEATURE_quick3d_assimp=OFF\
% end

View File

@ -1 +1 @@
ead155359cf7fb8b2c1a69d00847196c4011433a4839938cc5f87f65a9d5d268
94b45ae9d08495d701cfb586f1f85b12a1a10f8c29865de0d427a2366ae4507c

View File

@ -5,7 +5,7 @@
_android_arch=aarch64
pkgname=android-$_android_arch-qt6-quickcontrols2
_qtver=6.1.0
_qtver=6.1.1
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@ -18,7 +18,7 @@ options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
groups=(android-${_android_arch}-qt6)
_pkgfqn="qtquickcontrols2-everywhere-src-${_qtver}"
source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
sha256sums=('784f1d79e74df59f095b126a116d85e72801bd357f5666d6bad8407ac3957d59')
sha256sums=('7ebc99724bedd97a2c6a606ba2726feb66bb76eb9f30262ae13cd246f5665ea4')
build() {
source android-env ${_android_arch}

View File

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

View File

@ -1 +1 @@
784f1d79e74df59f095b126a116d85e72801bd357f5666d6bad8407ac3957d59
7ebc99724bedd97a2c6a606ba2726feb66bb76eb9f30262ae13cd246f5665ea4

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