diff --git a/devel/generator/templates/layouts/android-qt6-base.sh.ep b/devel/generator/templates/layouts/android-qt6-base.sh.ep index e2e552c2..9d7558f6 100644 --- a/devel/generator/templates/layouts/android-qt6-base.sh.ep +++ b/devel/generator/templates/layouts/android-qt6-base.sh.ep @@ -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) diff --git a/devel/generator/templates/layouts/mingw-w64-qt6-base.sh.ep b/devel/generator/templates/layouts/mingw-w64-qt6-base.sh.ep index 9bf6962f..14ae8562 100644 --- a/devel/generator/templates/layouts/mingw-w64-qt6-base.sh.ep +++ b/devel/generator/templates/layouts/mingw-w64-qt6-base.sh.ep @@ -14,7 +14,7 @@ % } pkgname=<%= $package_name %> -_qtver=6.1.0 +_qtver=6.1.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/devel/versions.sh b/devel/versions.sh index 724aed2d..078879b8 100755 --- a/devel/versions.sh +++ b/devel/versions.sh @@ -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 diff --git a/qt6-3d/default/PKGBUILD b/qt6-3d/default/PKGBUILD index 4f76ddca..035c0f7e 100644 --- a/qt6-3d/default/PKGBUILD +++ b/qt6-3d/default/PKGBUILD @@ -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") diff --git a/qt6-3d/default/PKGBUILD.sh.ep b/qt6-3d/default/PKGBUILD.sh.ep index d23cfdc0..111760ae 100644 --- a/qt6-3d/default/PKGBUILD.sh.ep +++ b/qt6-3d/default/PKGBUILD.sh.ep @@ -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') diff --git a/qt6-3d/mingw-w64-static/PKGBUILD b/qt6-3d/mingw-w64-static/PKGBUILD index 553ee194..c79badd9 100644 --- a/qt6-3d/mingw-w64-static/PKGBUILD +++ b/qt6-3d/mingw-w64-static/PKGBUILD @@ -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}" diff --git a/qt6-3d/mingw-w64/PKGBUILD b/qt6-3d/mingw-w64/PKGBUILD index 2c8ee2da..993d9de6 100644 --- a/qt6-3d/mingw-w64/PKGBUILD +++ b/qt6-3d/mingw-w64/PKGBUILD @@ -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}" diff --git a/qt6-3d/mingw-w64/PKGBUILD.sh.ep b/qt6-3d/mingw-w64/PKGBUILD.sh.ep index e73fe835..91d1cf87 100644 --- a/qt6-3d/mingw-w64/PKGBUILD.sh.ep +++ b/qt6-3d/mingw-w64/PKGBUILD.sh.ep @@ -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' %>) diff --git a/qt6-5compat/android-aarch64/PKGBUILD b/qt6-5compat/android-aarch64/PKGBUILD index a2f8b05d..cb17b86b 100644 --- a/qt6-5compat/android-aarch64/PKGBUILD +++ b/qt6-5compat/android-aarch64/PKGBUILD @@ -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} diff --git a/qt6-5compat/android-aarch64/PKGBUILD.sh.ep b/qt6-5compat/android-aarch64/PKGBUILD.sh.ep index 454492ba..a0050617 100644 --- a/qt6-5compat/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-5compat/android-aarch64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'android-qt6-module'; \ -_qtver=6.1.0 +_qtver=6.1.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-5compat/android-aarch64/qt5compat-sha256.txt b/qt6-5compat/android-aarch64/qt5compat-sha256.txt index 9863e5ab..a65f715f 100644 --- a/qt6-5compat/android-aarch64/qt5compat-sha256.txt +++ b/qt6-5compat/android-aarch64/qt5compat-sha256.txt @@ -1 +1 @@ -c7d7e6ca2702b8b8b8b251bd271771ec319e5d107bb65f4dba024c200c8fd23c +7d08f1044cb09f8b3ee31af0de25771bae72936a6f9a699134d9b8d29dfaa5a7 diff --git a/qt6-5compat/mingw-w64-static/PKGBUILD b/qt6-5compat/mingw-w64-static/PKGBUILD index 7ccfedb6..8439a4a9 100644 --- a/qt6-5compat/mingw-w64-static/PKGBUILD +++ b/qt6-5compat/mingw-w64-static/PKGBUILD @@ -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' diff --git a/qt6-5compat/mingw-w64-static/qt5compat-sha256.txt b/qt6-5compat/mingw-w64-static/qt5compat-sha256.txt index 9863e5ab..a65f715f 100644 --- a/qt6-5compat/mingw-w64-static/qt5compat-sha256.txt +++ b/qt6-5compat/mingw-w64-static/qt5compat-sha256.txt @@ -1 +1 @@ -c7d7e6ca2702b8b8b8b251bd271771ec319e5d107bb65f4dba024c200c8fd23c +7d08f1044cb09f8b3ee31af0de25771bae72936a6f9a699134d9b8d29dfaa5a7 diff --git a/qt6-5compat/mingw-w64/PKGBUILD b/qt6-5compat/mingw-w64/PKGBUILD index fed90606..6b19861f 100644 --- a/qt6-5compat/mingw-w64/PKGBUILD +++ b/qt6-5compat/mingw-w64/PKGBUILD @@ -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' diff --git a/qt6-5compat/mingw-w64/PKGBUILD.sh.ep b/qt6-5compat/mingw-w64/PKGBUILD.sh.ep index 97750921..c3cda9f1 100644 --- a/qt6-5compat/mingw-w64/PKGBUILD.sh.ep +++ b/qt6-5compat/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt6-module'; \ -_qtver=6.1.0 +_qtver=6.1.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-5compat/mingw-w64/qt5compat-sha256.txt b/qt6-5compat/mingw-w64/qt5compat-sha256.txt index 9863e5ab..a65f715f 100644 --- a/qt6-5compat/mingw-w64/qt5compat-sha256.txt +++ b/qt6-5compat/mingw-w64/qt5compat-sha256.txt @@ -1 +1 @@ -c7d7e6ca2702b8b8b8b251bd271771ec319e5d107bb65f4dba024c200c8fd23c +7d08f1044cb09f8b3ee31af0de25771bae72936a6f9a699134d9b8d29dfaa5a7 diff --git a/qt6-activeqt/mingw-w64-static/PKGBUILD b/qt6-activeqt/mingw-w64-static/PKGBUILD index 0187894b..dedb911b 100644 --- a/qt6-activeqt/mingw-w64-static/PKGBUILD +++ b/qt6-activeqt/mingw-w64-static/PKGBUILD @@ -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' diff --git a/qt6-activeqt/mingw-w64-static/qtactiveqt-sha256.txt b/qt6-activeqt/mingw-w64-static/qtactiveqt-sha256.txt index bdd4eccd..bef02379 100644 --- a/qt6-activeqt/mingw-w64-static/qtactiveqt-sha256.txt +++ b/qt6-activeqt/mingw-w64-static/qtactiveqt-sha256.txt @@ -1 +1 @@ -d79f964054a98b7edcfcb3f3590a58d599bcb2f9569ec10f5f5d9c0070701b4a +ee853e96784f56ccb98f92212010cba7f04a1ef5e7f7da65c93a0d15c24a6cab diff --git a/qt6-activeqt/mingw-w64/0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch b/qt6-activeqt/mingw-w64/0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch index c13d879e..2d17d0e2 100644 --- a/qt6-activeqt/mingw-w64/0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch +++ b/qt6-activeqt/mingw-w64/0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch @@ -1,4 +1,4 @@ -From 52bafd8ad71ac730ee03a2827b1bda32527c0780 Mon Sep 17 00:00:00 2001 +From 7002b344e8fb6b625917c1ef92402b7909905f1b Mon Sep 17 00:00:00 2001 From: Martchus 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 diff --git a/qt6-activeqt/mingw-w64/0002-Build-tools-for-the-target-platform.patch b/qt6-activeqt/mingw-w64/0002-Build-tools-for-the-target-platform.patch index c53282b2..77fc2dc1 100644 --- a/qt6-activeqt/mingw-w64/0002-Build-tools-for-the-target-platform.patch +++ b/qt6-activeqt/mingw-w64/0002-Build-tools-for-the-target-platform.patch @@ -1,4 +1,4 @@ -From 58ecfedd3e4868c7ac9bb3402e6b44c5e0a1091f Mon Sep 17 00:00:00 2001 +From d254521e709f26b0a77c4d0f98f45dcf716dbf06 Mon Sep 17 00:00:00 2001 From: Martchus 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 diff --git a/qt6-activeqt/mingw-w64/PKGBUILD b/qt6-activeqt/mingw-w64/PKGBUILD index 9fe16fbd..037bf41d 100644 --- a/qt6-activeqt/mingw-w64/PKGBUILD +++ b/qt6-activeqt/mingw-w64/PKGBUILD @@ -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' diff --git a/qt6-activeqt/mingw-w64/PKGBUILD.sh.ep b/qt6-activeqt/mingw-w64/PKGBUILD.sh.ep index 997a4668..b36503a9 100644 --- a/qt6-activeqt/mingw-w64/PKGBUILD.sh.ep +++ b/qt6-activeqt/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt6-module'; \ -_qtver=6.1.0 +_qtver=6.1.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-activeqt/mingw-w64/qtactiveqt-sha256.txt b/qt6-activeqt/mingw-w64/qtactiveqt-sha256.txt index bdd4eccd..bef02379 100644 --- a/qt6-activeqt/mingw-w64/qtactiveqt-sha256.txt +++ b/qt6-activeqt/mingw-w64/qtactiveqt-sha256.txt @@ -1 +1 @@ -d79f964054a98b7edcfcb3f3590a58d599bcb2f9569ec10f5f5d9c0070701b4a +ee853e96784f56ccb98f92212010cba7f04a1ef5e7f7da65c93a0d15c24a6cab diff --git a/qt6-base/android-aarch64/0008-Fix-passing-QJniEnvironment-to-ANativeWindow_fromSur.patch b/qt6-base/android-aarch64/0008-Fix-passing-QJniEnvironment-to-ANativeWindow_fromSur.patch deleted file mode 120000 index 36879cde..00000000 --- a/qt6-base/android-aarch64/0008-Fix-passing-QJniEnvironment-to-ANativeWindow_fromSur.patch +++ /dev/null @@ -1 +0,0 @@ -../mingw-w64/0008-Fix-passing-QJniEnvironment-to-ANativeWindow_fromSur.patch \ No newline at end of file diff --git a/qt6-base/android-aarch64/PKGBUILD b/qt6-base/android-aarch64/PKGBUILD index 4f0b8254..b316334e 100644 --- a/qt6-base/android-aarch64/PKGBUILD +++ b/qt6-base/android-aarch64/PKGBUILD @@ -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 diff --git a/qt6-base/android-aarch64/qtbase-sha256.txt b/qt6-base/android-aarch64/qtbase-sha256.txt index 0232cc39..3ace0e91 100644 --- a/qt6-base/android-aarch64/qtbase-sha256.txt +++ b/qt6-base/android-aarch64/qtbase-sha256.txt @@ -1 +1 @@ -f7af3c87e96051d09b5abce6c88277c33031bef241ebfe1db4106d33ed0814c4 +21a8aa9f07170e047270c668c8b037536f40226db7adbc529a0b41c3a3cb3ff2 diff --git a/qt6-base/mingw-w64-static/0008-Fix-passing-QJniEnvironment-to-ANativeWindow_fromSur.patch b/qt6-base/mingw-w64-static/0008-Fix-passing-QJniEnvironment-to-ANativeWindow_fromSur.patch deleted file mode 120000 index 36879cde..00000000 --- a/qt6-base/mingw-w64-static/0008-Fix-passing-QJniEnvironment-to-ANativeWindow_fromSur.patch +++ /dev/null @@ -1 +0,0 @@ -../mingw-w64/0008-Fix-passing-QJniEnvironment-to-ANativeWindow_fromSur.patch \ No newline at end of file diff --git a/qt6-base/mingw-w64-static/PKGBUILD b/qt6-base/mingw-w64-static/PKGBUILD index 3c5e4d90..f72ee880 100644 --- a/qt6-base/mingw-w64-static/PKGBUILD +++ b/qt6-base/mingw-w64-static/PKGBUILD @@ -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' diff --git a/qt6-base/mingw-w64-static/qtbase-sha256.txt b/qt6-base/mingw-w64-static/qtbase-sha256.txt index 0232cc39..3ace0e91 100644 --- a/qt6-base/mingw-w64-static/qtbase-sha256.txt +++ b/qt6-base/mingw-w64-static/qtbase-sha256.txt @@ -1 +1 @@ -f7af3c87e96051d09b5abce6c88277c33031bef241ebfe1db4106d33ed0814c4 +21a8aa9f07170e047270c668c8b037536f40226db7adbc529a0b41c3a3cb3ff2 diff --git a/qt6-base/mingw-w64/0001-Use-CMake-s-default-import-library-suffix.patch b/qt6-base/mingw-w64/0001-Use-CMake-s-default-import-library-suffix.patch index 928c832d..7c182e7d 100644 --- a/qt6-base/mingw-w64/0001-Use-CMake-s-default-import-library-suffix.patch +++ b/qt6-base/mingw-w64/0001-Use-CMake-s-default-import-library-suffix.patch @@ -1,7 +1,7 @@ -From 4bc7d8f91f0f3695ff167bf9617510942097c82a Mon Sep 17 00:00:00 2001 +From df9364458a82e26c51c37e8f3cad6a2ca6b828a3 Mon Sep 17 00:00:00 2001 From: Martchus Date: Thu, 5 Nov 2020 22:08:10 +0100 -Subject: [PATCH 1/8] Use CMake's default import library suffix +Subject: [PATCH 1/7] Use CMake's default import library suffix Change-Id: I3dbedaec74683e5bfd008f7f2fd1e046dfb921b2 --- @@ -47,7 +47,7 @@ index 5498b8a904..59c905eac2 100644 ${CMAKE_STATIC_LIBRARY_SUFFIX}) add_custom_command( diff --git a/cmake/QtPrlHelpers.cmake b/cmake/QtPrlHelpers.cmake -index 0c0b7a2aec..d408245ffc 100644 +index 0aab301053..f2e39b63e0 100644 --- a/cmake/QtPrlHelpers.cmake +++ b/cmake/QtPrlHelpers.cmake @@ -348,11 +348,17 @@ ${prl_step1_content_libs} @@ -98,10 +98,10 @@ index 24ed125f12..73ebe453d3 100644 CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}$${debug_suffix}.lib CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qtmain$${QT_LIBINFIX}.lib diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake -index 3d1a10ff0a..a6935875c7 100644 +index fc4c745c90..939ea2b212 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake -@@ -447,7 +447,6 @@ function(_qt_internal_apply_win_prefix_and_suffix target) +@@ -460,7 +460,6 @@ function(_qt_internal_apply_win_prefix_and_suffix target) # This should cover both MINGW with GCC and CLANG. if(NOT MSVC) @@ -110,5 +110,5 @@ index 3d1a10ff0a..a6935875c7 100644 get_target_property(target_type ${target} TYPE) if(target_type STREQUAL "STATIC_LIBRARY") -- -2.31.1 +2.32.0 diff --git a/qt6-base/mingw-w64/0002-Fix-finding-D-Bus.patch b/qt6-base/mingw-w64/0002-Fix-finding-D-Bus.patch index 0294ddf1..627dd0b5 100644 --- a/qt6-base/mingw-w64/0002-Fix-finding-D-Bus.patch +++ b/qt6-base/mingw-w64/0002-Fix-finding-D-Bus.patch @@ -1,7 +1,7 @@ -From c1ed43ebc4f0cb63832b878f8666f0b8f5366906 Mon Sep 17 00:00:00 2001 +From dbdccd3fb77932e284848b0a8543133497a3e391 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 7 Oct 2020 12:13:37 +0200 -Subject: [PATCH 2/8] Fix finding D-Bus +Subject: [PATCH 2/7] Fix finding D-Bus Change-Id: Ie21eb9cbc6b1b5d9c8b34eea46f54718e5926986 --- @@ -20,5 +20,5 @@ index e227d224e0..bdbcab9eb3 100644 + set_property(TARGET dbus-1 PROPERTY IMPORTED_IMPLIB ${DBus1_LIBRARY}) +endif() -- -2.31.1 +2.32.0 diff --git a/qt6-base/mingw-w64/0003-Fix-using-static-PCRE2-and-DBus-1.patch b/qt6-base/mingw-w64/0003-Fix-using-static-PCRE2-and-DBus-1.patch index 852b0edc..8d30d4ac 100644 --- a/qt6-base/mingw-w64/0003-Fix-using-static-PCRE2-and-DBus-1.patch +++ b/qt6-base/mingw-w64/0003-Fix-using-static-PCRE2-and-DBus-1.patch @@ -1,7 +1,7 @@ -From 927935b0f0783760a6bfa20784354bd3b590d9f0 Mon Sep 17 00:00:00 2001 +From 2c85dbecb544e4550587a11df9465c0c662ceaf0 Mon Sep 17 00:00:00 2001 From: Martchus 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 #else -- -2.31.1 +2.32.0 diff --git a/qt6-base/mingw-w64/0004-Fix-transitive-dependencies-of-static-libraries.patch b/qt6-base/mingw-w64/0004-Fix-transitive-dependencies-of-static-libraries.patch index 1b82dd4c..12878684 100644 --- a/qt6-base/mingw-w64/0004-Fix-transitive-dependencies-of-static-libraries.patch +++ b/qt6-base/mingw-w64/0004-Fix-transitive-dependencies-of-static-libraries.patch @@ -1,7 +1,7 @@ -From 86a27658437d4d79cd010d1dd92f300f48616e45 Mon Sep 17 00:00:00 2001 +From d218fae4376bf0a3b801570164ee6c02e5e94cc0 Mon Sep 17 00:00:00 2001 From: Martchus Date: Thu, 5 Nov 2020 21:59:33 +0100 -Subject: [PATCH 4/8] Fix transitive dependencies (of static libraries) +Subject: [PATCH 4/7] Fix transitive dependencies (of static libraries) The dependencies of these libraries are not reliably picked up by their corresponding find modules. This change allows adding the required @@ -133,5 +133,5 @@ index b151932da7..7e6b38acd1 100644 Qt::CorePrivate Qt::SqlPrivate -- -2.31.1 +2.32.0 diff --git a/qt6-base/mingw-w64/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch b/qt6-base/mingw-w64/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch index acde0a0a..76a5a439 100644 --- a/qt6-base/mingw-w64/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch +++ b/qt6-base/mingw-w64/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch @@ -1,7 +1,7 @@ -From f3ca9d271a0919b086ca6864d9682ae11f05543e Mon Sep 17 00:00:00 2001 +From 187e32fa4e8f92796d75f2bd47efb464e4638aec Mon Sep 17 00:00:00 2001 From: Martchus Date: Mon, 2 Nov 2020 13:47:45 +0100 -Subject: [PATCH 5/8] Fix libjpeg workaround for conflict with rpcndr.h +Subject: [PATCH 5/7] Fix libjpeg workaround for conflict with rpcndr.h Otherwise it won't compile against mingw-w64-libjpeg-turbo. This version of libjpeg seems to take care of the conflict already as long as jconfig.h is @@ -33,5 +33,5 @@ index beef18f260..72708145f4 100644 #ifdef const # undef const // remove crazy C hackery in jconfig.h -- -2.31.1 +2.32.0 diff --git a/qt6-base/mingw-w64/0006-Support-finding-static-MariaDB-client-library.patch b/qt6-base/mingw-w64/0006-Support-finding-static-MariaDB-client-library.patch index 0e387118..b7d0464e 100644 --- a/qt6-base/mingw-w64/0006-Support-finding-static-MariaDB-client-library.patch +++ b/qt6-base/mingw-w64/0006-Support-finding-static-MariaDB-client-library.patch @@ -1,7 +1,7 @@ -From c0e504e5d21cbf6b708dbc34d9e52e9bf56f07b3 Mon Sep 17 00:00:00 2001 +From b95bfa5f73b66f31073644a60f04e5740e5a4dec Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 8 Nov 2020 00:33:12 +0100 -Subject: [PATCH 6/8] Support finding static MariaDB client library +Subject: [PATCH 6/7] Support finding static MariaDB client library We need to reverse the order to look for mariadb first (and only then for mysql) because otherwise it would pick up the static library @@ -27,5 +27,5 @@ index 0fcba2148e..ab4f6fdc9e 100644 include(FindPackageHandleStandardArgs) -- -2.31.1 +2.32.0 diff --git a/qt6-base/mingw-w64/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch b/qt6-base/mingw-w64/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch index 6327f1f2..d8f53558 100644 --- a/qt6-base/mingw-w64/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch +++ b/qt6-base/mingw-w64/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch @@ -1,16 +1,16 @@ -From e682df25245fd2731bfe0572b2668e47f7ea3e99 Mon Sep 17 00:00:00 2001 +From 8507a185bd7614aa5250495904348ac25ad1b8ac Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 8 Nov 2020 00:34:09 +0100 -Subject: [PATCH 7/8] Allow overriding CMAKE_FIND_LIBRARY_SUFFIXES to prefer +Subject: [PATCH 7/7] Allow overriding CMAKE_FIND_LIBRARY_SUFFIXES to prefer static libraries -Change-Id: Ic29b64b999ed9b5888a8dc1b0961a76009c5e75c +Change-Id: I4c617e0706044d31da1bd56ae51615dc8ed37099 --- - cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 5 +++++ - 1 file changed, 5 insertions(+) + cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 4 ++++ + 1 file changed, 4 insertions(+) diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake -index 934c34b01c..bada2aff0c 100644 +index af8c3d18c4..eb1f47c6e1 100644 --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake @@ -1,6 +1,10 @@ @@ -21,17 +21,9 @@ index 934c34b01c..bada2aff0c 100644 + set(CMAKE_FIND_LIBRARY_SUFFIXES "${CMAKE_FIND_LIBRARY_SUFFIXES_OVERRIDE}") +endif () + - ###################################### + ############################################### # - # Macros for building Qt modules -@@ -285,6 +289,7 @@ macro(qt_prepare_standalone_project) - endmacro() - - macro(qt_build_repo_begin) -+ - qt_build_internals_set_up_private_api() - qt_enable_cmake_languages() - + # Macros and functions for building Qt modules -- -2.31.1 +2.32.0 diff --git a/qt6-base/mingw-w64/0008-Fix-passing-QJniEnvironment-to-ANativeWindow_fromSur.patch b/qt6-base/mingw-w64/0008-Fix-passing-QJniEnvironment-to-ANativeWindow_fromSur.patch deleted file mode 100644 index 09fc8b8c..00000000 --- a/qt6-base/mingw-w64/0008-Fix-passing-QJniEnvironment-to-ANativeWindow_fromSur.patch +++ /dev/null @@ -1,44 +0,0 @@ -From e668956ba71426d495ca9e117638b8d738fd148f Mon Sep 17 00:00:00 2001 -From: Martchus -Date: Sat, 8 May 2021 01:55:19 +0200 -Subject: [PATCH 8/8] Fix passing QJniEnvironment to ANativeWindow_fromSurface - -The function ANativeWindow_fromSurface (as declared by -`$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/android/native_window_jni.h` -from version r22.b of the Android NDK) takes a `JNIEnv*` so `.jniEnv()` must be used. - -This prevents the following compilation error: - -``` -error: no matching function for call to 'ANativeWindow_f -romSurface' - m_nativeWindow = ANativeWindow_fromSurface(env, m_androidSurfaceObject.object()); - ^~~~~~~~~~~~~~~~~~~~~~~~~ -/opt/android-ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/android/native_window_jni.h:45:16: note: candidate function not viable: no known conversion from 'QJniEnvironment' t -o 'JNIEnv *' (aka '_JNIEnv *') for 1st argument -ANativeWindow* ANativeWindow_fromSurface(JNIEnv* env, jobject surface); - ^ -1 error generated. -``` - -Change-Id: I70d75cb7edc5875314fcb8a70d51d0ef40442101 ---- - src/plugins/platforms/android/qandroidplatformvulkanwindow.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/plugins/platforms/android/qandroidplatformvulkanwindow.cpp b/src/plugins/platforms/android/qandroidplatformvulkanwindow.cpp -index 8f2a37626a..9d4688b52d 100644 ---- a/src/plugins/platforms/android/qandroidplatformvulkanwindow.cpp -+++ b/src/plugins/platforms/android/qandroidplatformvulkanwindow.cpp -@@ -173,7 +173,7 @@ VkSurfaceKHR *QAndroidPlatformVulkanWindow::vkSurface() - return &m_vkSurface; - - QJniEnvironment env; -- m_nativeWindow = ANativeWindow_fromSurface(env, m_androidSurfaceObject.object()); -+ m_nativeWindow = ANativeWindow_fromSurface(env.jniEnv(), m_androidSurfaceObject.object()); - - VkAndroidSurfaceCreateInfoKHR surfaceInfo; - memset(&surfaceInfo, 0, sizeof(surfaceInfo)); --- -2.31.1 - diff --git a/qt6-base/mingw-w64/PKGBUILD b/qt6-base/mingw-w64/PKGBUILD index 373f8850..247cabfe 100644 --- a/qt6-base/mingw-w64/PKGBUILD +++ b/qt6-base/mingw-w64/PKGBUILD @@ -11,7 +11,7 @@ # All patches are managed at https://github.com/Martchus/qtbase pkgname=mingw-w64-qt6-base -_qtver=6.1.0 +_qtver=6.1.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -37,17 +37,15 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm '0004-Fix-transitive-dependencies-of-static-libraries.patch' '0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch' '0006-Support-finding-static-MariaDB-client-library.patch' - '0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch' - '0008-Fix-passing-QJniEnvironment-to-ANativeWindow_fromSur.patch') -sha256sums=('f7af3c87e96051d09b5abce6c88277c33031bef241ebfe1db4106d33ed0814c4' - 'fe716b7d966cf40fafbed2fd67b663c205bb09e3fc1ad607163be187cb5f83c6' - 'cb28dfdf82d332fa86e67106cea41ebf7f57ac49a5a7707be25348350b9c0f6e' - '11a7e4939d171c3e7e8ecb8374fe0caebab2e55c8fd2a1122763caba56414358' - '8081cf89e48a504a39bb18ea4c5cca92869fb0f1df45e6eda1559b2a0b38ba79' - 'b97e12f46baebeea6d9a36f23e856783c6988b92965946e881dfb5e9749739ae' - '9f2f542a7739024615b690fd5c2265c2ab63e5442eeb712b4df63220945a413e' - '6990a3d6d8fa771b88092aa02010170d56fd86771e18096f120af16fce0ab691' - '6498da7e772895ed58289a836c1b79a73750ffc5288fa0c6a03e4853879f00e7') + '0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch') +sha256sums=('21a8aa9f07170e047270c668c8b037536f40226db7adbc529a0b41c3a3cb3ff2' + '1b699b33d303275a21f15eeabf7929eb4bb6c0ffc50dc04b818125be9c459f13' + '97ffcc7197b74e3cc5492531249c442cdbf02d231dc55af8f10fb688e383105c' + '9ad76422d221510074241ccabf3880c19c493aaa1f99a222e34ecade0b64a254' + 'ea567893e43a23143ec31ff2206a1f221c24588733d55f1d918e9d1dd6746a47' + 'a42c48bceb8c80eaa870e362cdf5f92634ca8b54cbbf1f58ed3a72d8be8517f7' + '5361c88bdf85a54b7438c3aea9a12f9d94822b9cd396da2d15741de8acae5a3a' + 'dce66f9a271586a46be73689ff64f0d668dfe3f526a3558b3e8ca1169aa711f8') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt6-base/mingw-w64/qtbase-sha256.txt b/qt6-base/mingw-w64/qtbase-sha256.txt index 0232cc39..3ace0e91 100644 --- a/qt6-base/mingw-w64/qtbase-sha256.txt +++ b/qt6-base/mingw-w64/qtbase-sha256.txt @@ -1 +1 @@ -f7af3c87e96051d09b5abce6c88277c33031bef241ebfe1db4106d33ed0814c4 +21a8aa9f07170e047270c668c8b037536f40226db7adbc529a0b41c3a3cb3ff2 diff --git a/qt6-charts/android-aarch64/PKGBUILD b/qt6-charts/android-aarch64/PKGBUILD index 73f75ba0..e5526673 100644 --- a/qt6-charts/android-aarch64/PKGBUILD +++ b/qt6-charts/android-aarch64/PKGBUILD @@ -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} diff --git a/qt6-charts/android-aarch64/PKGBUILD.sh.ep b/qt6-charts/android-aarch64/PKGBUILD.sh.ep index 504d64c1..1084d73e 100644 --- a/qt6-charts/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-charts/android-aarch64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'android-qt6-module'; \ -_qtver=6.1.0 +_qtver=6.1.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-charts/android-aarch64/qtcharts-sha256.txt b/qt6-charts/android-aarch64/qtcharts-sha256.txt index f942f21d..e29c6723 100644 --- a/qt6-charts/android-aarch64/qtcharts-sha256.txt +++ b/qt6-charts/android-aarch64/qtcharts-sha256.txt @@ -1 +1 @@ -8f70dc54b3f29eed91cf207db4185cef25f3d0bbc479059725c75c1895cddfcd +a245b8e1b3edd22c5319d8cf0ee18f95901cfc39e4f94b34b59befffc17af60a diff --git a/qt6-charts/mingw-w64-static/PKGBUILD b/qt6-charts/mingw-w64-static/PKGBUILD index 0630efa7..92553a0a 100644 --- a/qt6-charts/mingw-w64-static/PKGBUILD +++ b/qt6-charts/mingw-w64-static/PKGBUILD @@ -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' diff --git a/qt6-charts/mingw-w64-static/qtcharts-sha256.txt b/qt6-charts/mingw-w64-static/qtcharts-sha256.txt index f942f21d..e29c6723 100644 --- a/qt6-charts/mingw-w64-static/qtcharts-sha256.txt +++ b/qt6-charts/mingw-w64-static/qtcharts-sha256.txt @@ -1 +1 @@ -8f70dc54b3f29eed91cf207db4185cef25f3d0bbc479059725c75c1895cddfcd +a245b8e1b3edd22c5319d8cf0ee18f95901cfc39e4f94b34b59befffc17af60a diff --git a/qt6-charts/mingw-w64/PKGBUILD b/qt6-charts/mingw-w64/PKGBUILD index 4e1316ab..1030b4af 100644 --- a/qt6-charts/mingw-w64/PKGBUILD +++ b/qt6-charts/mingw-w64/PKGBUILD @@ -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' diff --git a/qt6-charts/mingw-w64/PKGBUILD.sh.ep b/qt6-charts/mingw-w64/PKGBUILD.sh.ep index 3e3b191b..8fcb8cbe 100644 --- a/qt6-charts/mingw-w64/PKGBUILD.sh.ep +++ b/qt6-charts/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt6-module'; \ -_qtver=6.1.0 +_qtver=6.1.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-charts/mingw-w64/qtcharts-sha256.txt b/qt6-charts/mingw-w64/qtcharts-sha256.txt index f942f21d..e29c6723 100644 --- a/qt6-charts/mingw-w64/qtcharts-sha256.txt +++ b/qt6-charts/mingw-w64/qtcharts-sha256.txt @@ -1 +1 @@ -8f70dc54b3f29eed91cf207db4185cef25f3d0bbc479059725c75c1895cddfcd +a245b8e1b3edd22c5319d8cf0ee18f95901cfc39e4f94b34b59befffc17af60a diff --git a/qt6-datavis3d/android-aarch64/PKGBUILD b/qt6-datavis3d/android-aarch64/PKGBUILD index e62250a5..c6fd328e 100644 --- a/qt6-datavis3d/android-aarch64/PKGBUILD +++ b/qt6-datavis3d/android-aarch64/PKGBUILD @@ -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} diff --git a/qt6-datavis3d/android-aarch64/PKGBUILD.sh.ep b/qt6-datavis3d/android-aarch64/PKGBUILD.sh.ep index 3f4ba65c..f472f3a7 100644 --- a/qt6-datavis3d/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-datavis3d/android-aarch64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'android-qt6-module'; \ -_qtver=6.1.0 +_qtver=6.1.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-datavis3d/android-aarch64/qtdatavis3d-sha256.txt b/qt6-datavis3d/android-aarch64/qtdatavis3d-sha256.txt index 7ecce9f8..2f29c73b 100644 --- a/qt6-datavis3d/android-aarch64/qtdatavis3d-sha256.txt +++ b/qt6-datavis3d/android-aarch64/qtdatavis3d-sha256.txt @@ -1 +1 @@ -068f646d29ac3b19edd89da5ec2ed9f1bed19dc80fe27dfb1b83e6b7c08b398b +545a4d7c51f3b0be1446b0f8cd1eebba854018e635dba99b1765daed50322712 diff --git a/qt6-datavis3d/mingw-w64-static/PKGBUILD b/qt6-datavis3d/mingw-w64-static/PKGBUILD index 1a1c5e14..19ab04cc 100644 --- a/qt6-datavis3d/mingw-w64-static/PKGBUILD +++ b/qt6-datavis3d/mingw-w64-static/PKGBUILD @@ -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' diff --git a/qt6-datavis3d/mingw-w64-static/qtdatavis3d-sha256.txt b/qt6-datavis3d/mingw-w64-static/qtdatavis3d-sha256.txt index 7ecce9f8..2f29c73b 100644 --- a/qt6-datavis3d/mingw-w64-static/qtdatavis3d-sha256.txt +++ b/qt6-datavis3d/mingw-w64-static/qtdatavis3d-sha256.txt @@ -1 +1 @@ -068f646d29ac3b19edd89da5ec2ed9f1bed19dc80fe27dfb1b83e6b7c08b398b +545a4d7c51f3b0be1446b0f8cd1eebba854018e635dba99b1765daed50322712 diff --git a/qt6-datavis3d/mingw-w64/PKGBUILD b/qt6-datavis3d/mingw-w64/PKGBUILD index 8c02c351..264bcebf 100644 --- a/qt6-datavis3d/mingw-w64/PKGBUILD +++ b/qt6-datavis3d/mingw-w64/PKGBUILD @@ -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' diff --git a/qt6-datavis3d/mingw-w64/PKGBUILD.sh.ep b/qt6-datavis3d/mingw-w64/PKGBUILD.sh.ep index 733557b4..130b8eb0 100644 --- a/qt6-datavis3d/mingw-w64/PKGBUILD.sh.ep +++ b/qt6-datavis3d/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt6-module'; \ -_qtver=6.1.0 +_qtver=6.1.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-datavis3d/mingw-w64/qtdatavis3d-sha256.txt b/qt6-datavis3d/mingw-w64/qtdatavis3d-sha256.txt index 7ecce9f8..2f29c73b 100644 --- a/qt6-datavis3d/mingw-w64/qtdatavis3d-sha256.txt +++ b/qt6-datavis3d/mingw-w64/qtdatavis3d-sha256.txt @@ -1 +1 @@ -068f646d29ac3b19edd89da5ec2ed9f1bed19dc80fe27dfb1b83e6b7c08b398b +545a4d7c51f3b0be1446b0f8cd1eebba854018e635dba99b1765daed50322712 diff --git a/qt6-declarative/android-aarch64/0001-Exclude-qmltime-when-cross-compiling.patch b/qt6-declarative/android-aarch64/0001-Exclude-qmltime-when-cross-compiling.patch new file mode 120000 index 00000000..c08dff18 --- /dev/null +++ b/qt6-declarative/android-aarch64/0001-Exclude-qmltime-when-cross-compiling.patch @@ -0,0 +1 @@ +../mingw-w64/0001-Exclude-qmltime-when-cross-compiling.patch \ No newline at end of file diff --git a/qt6-declarative/android-aarch64/PKGBUILD b/qt6-declarative/android-aarch64/PKGBUILD index 89495063..59d3486e 100644 --- a/qt6-declarative/android-aarch64/PKGBUILD +++ b/qt6-declarative/android-aarch64/PKGBUILD @@ -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} diff --git a/qt6-declarative/android-aarch64/PKGBUILD.sh.ep b/qt6-declarative/android-aarch64/PKGBUILD.sh.ep index bcbfe046..bca06351 100644 --- a/qt6-declarative/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-declarative/android-aarch64/PKGBUILD.sh.ep @@ -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) diff --git a/qt6-declarative/android-aarch64/qtdeclarative-sha256.txt b/qt6-declarative/android-aarch64/qtdeclarative-sha256.txt index 7a994d19..7d9ef17a 100644 --- a/qt6-declarative/android-aarch64/qtdeclarative-sha256.txt +++ b/qt6-declarative/android-aarch64/qtdeclarative-sha256.txt @@ -1 +1 @@ -e6f64314b8d54d7b541f52827b4e795317b17c3b7f39ad5210b8dbf343b75bda +805394307479ebca9899996af8357037c4f1ff8b783162ade0c5a05cea7ee2d2 diff --git a/qt6-declarative/mingw-w64-static/PKGBUILD b/qt6-declarative/mingw-w64-static/PKGBUILD index edc22e2e..aa9d252d 100644 --- a/qt6-declarative/mingw-w64-static/PKGBUILD +++ b/qt6-declarative/mingw-w64-static/PKGBUILD @@ -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' diff --git a/qt6-declarative/mingw-w64-static/qtdeclarative-sha256.txt b/qt6-declarative/mingw-w64-static/qtdeclarative-sha256.txt index 7a994d19..7d9ef17a 100644 --- a/qt6-declarative/mingw-w64-static/qtdeclarative-sha256.txt +++ b/qt6-declarative/mingw-w64-static/qtdeclarative-sha256.txt @@ -1 +1 @@ -e6f64314b8d54d7b541f52827b4e795317b17c3b7f39ad5210b8dbf343b75bda +805394307479ebca9899996af8357037c4f1ff8b783162ade0c5a05cea7ee2d2 diff --git a/qt6-declarative/mingw-w64/0001-Exclude-qmltime-when-cross-compiling.patch b/qt6-declarative/mingw-w64/0001-Exclude-qmltime-when-cross-compiling.patch index 5169cc62..4215bd2f 100644 --- a/qt6-declarative/mingw-w64/0001-Exclude-qmltime-when-cross-compiling.patch +++ b/qt6-declarative/mingw-w64/0001-Exclude-qmltime-when-cross-compiling.patch @@ -1,4 +1,4 @@ -From 2f311a387e0a41a7903cd89ba638cc87455f59b2 Mon Sep 17 00:00:00 2001 +From 09f7c0b03aa26e1e7862f57bf9cc4105665ce879 Mon Sep 17 00:00:00 2001 From: Martchus 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 diff --git a/qt6-declarative/mingw-w64/PKGBUILD b/qt6-declarative/mingw-w64/PKGBUILD index 5df30e9c..1bbfc39e 100644 --- a/qt6-declarative/mingw-w64/PKGBUILD +++ b/qt6-declarative/mingw-w64/PKGBUILD @@ -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' diff --git a/qt6-declarative/mingw-w64/PKGBUILD.sh.ep b/qt6-declarative/mingw-w64/PKGBUILD.sh.ep index dd1b7213..501e6253 100644 --- a/qt6-declarative/mingw-w64/PKGBUILD.sh.ep +++ b/qt6-declarative/mingw-w64/PKGBUILD.sh.ep @@ -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) diff --git a/qt6-declarative/mingw-w64/qtdeclarative-sha256.txt b/qt6-declarative/mingw-w64/qtdeclarative-sha256.txt index 7a994d19..7d9ef17a 100644 --- a/qt6-declarative/mingw-w64/qtdeclarative-sha256.txt +++ b/qt6-declarative/mingw-w64/qtdeclarative-sha256.txt @@ -1 +1 @@ -e6f64314b8d54d7b541f52827b4e795317b17c3b7f39ad5210b8dbf343b75bda +805394307479ebca9899996af8357037c4f1ff8b783162ade0c5a05cea7ee2d2 diff --git a/qt6-imageformats/android-aarch64/PKGBUILD b/qt6-imageformats/android-aarch64/PKGBUILD index 5465cc1b..d7c4d268 100644 --- a/qt6-imageformats/android-aarch64/PKGBUILD +++ b/qt6-imageformats/android-aarch64/PKGBUILD @@ -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} diff --git a/qt6-imageformats/android-aarch64/PKGBUILD.sh.ep b/qt6-imageformats/android-aarch64/PKGBUILD.sh.ep index 33944845..e4d82cb4 100644 --- a/qt6-imageformats/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-imageformats/android-aarch64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'android-qt6-module'; \ -_qtver=6.1.0 +_qtver=6.1.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-imageformats/android-aarch64/qtimageformats-sha256.txt b/qt6-imageformats/android-aarch64/qtimageformats-sha256.txt index 76c3b759..318a814b 100644 --- a/qt6-imageformats/android-aarch64/qtimageformats-sha256.txt +++ b/qt6-imageformats/android-aarch64/qtimageformats-sha256.txt @@ -1 +1 @@ -34e63786d31d0c5dcc13a4b37d31002efb53244e48a8c2f0fafdd81e8d28575a +d7ee9d96ed6958241acde2b5d505f89d7dcfd710d0944b100ac6de203b0e107d diff --git a/qt6-imageformats/mingw-w64-static/PKGBUILD b/qt6-imageformats/mingw-w64-static/PKGBUILD index cb66dd01..b719567a 100644 --- a/qt6-imageformats/mingw-w64-static/PKGBUILD +++ b/qt6-imageformats/mingw-w64-static/PKGBUILD @@ -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' diff --git a/qt6-imageformats/mingw-w64-static/qtimageformats-sha256.txt b/qt6-imageformats/mingw-w64-static/qtimageformats-sha256.txt index 76c3b759..318a814b 100644 --- a/qt6-imageformats/mingw-w64-static/qtimageformats-sha256.txt +++ b/qt6-imageformats/mingw-w64-static/qtimageformats-sha256.txt @@ -1 +1 @@ -34e63786d31d0c5dcc13a4b37d31002efb53244e48a8c2f0fafdd81e8d28575a +d7ee9d96ed6958241acde2b5d505f89d7dcfd710d0944b100ac6de203b0e107d diff --git a/qt6-imageformats/mingw-w64/PKGBUILD b/qt6-imageformats/mingw-w64/PKGBUILD index b51267dd..482faa04 100644 --- a/qt6-imageformats/mingw-w64/PKGBUILD +++ b/qt6-imageformats/mingw-w64/PKGBUILD @@ -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' diff --git a/qt6-imageformats/mingw-w64/PKGBUILD.sh.ep b/qt6-imageformats/mingw-w64/PKGBUILD.sh.ep index 3e9a63fb..28e2ac46 100644 --- a/qt6-imageformats/mingw-w64/PKGBUILD.sh.ep +++ b/qt6-imageformats/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt6-module'; \ -_qtver=6.1.0 +_qtver=6.1.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-imageformats/mingw-w64/qtimageformats-sha256.txt b/qt6-imageformats/mingw-w64/qtimageformats-sha256.txt index 76c3b759..318a814b 100644 --- a/qt6-imageformats/mingw-w64/qtimageformats-sha256.txt +++ b/qt6-imageformats/mingw-w64/qtimageformats-sha256.txt @@ -1 +1 @@ -34e63786d31d0c5dcc13a4b37d31002efb53244e48a8c2f0fafdd81e8d28575a +d7ee9d96ed6958241acde2b5d505f89d7dcfd710d0944b100ac6de203b0e107d diff --git a/qt6-lottie/android-aarch64/PKGBUILD b/qt6-lottie/android-aarch64/PKGBUILD index 67c49bad..228d84e3 100644 --- a/qt6-lottie/android-aarch64/PKGBUILD +++ b/qt6-lottie/android-aarch64/PKGBUILD @@ -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} diff --git a/qt6-lottie/android-aarch64/PKGBUILD.sh.ep b/qt6-lottie/android-aarch64/PKGBUILD.sh.ep index 55e31a0b..482e983c 100644 --- a/qt6-lottie/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-lottie/android-aarch64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'android-qt6-module'; \ -_qtver=6.1.0 +_qtver=6.1.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-lottie/android-aarch64/qtlottie-sha256.txt b/qt6-lottie/android-aarch64/qtlottie-sha256.txt index 30f27abf..1e03a170 100644 --- a/qt6-lottie/android-aarch64/qtlottie-sha256.txt +++ b/qt6-lottie/android-aarch64/qtlottie-sha256.txt @@ -1 +1 @@ -3c2478f1064574939cfc151d7df0743d6bb1119d8cee6ed3ca3bc1cdfb8fece8 +df8ee26ea3aa4524f82703f602449d990724ca232cb98498746e8f49e23037ed diff --git a/qt6-lottie/mingw-w64-static/PKGBUILD b/qt6-lottie/mingw-w64-static/PKGBUILD index fe6be274..09581e86 100644 --- a/qt6-lottie/mingw-w64-static/PKGBUILD +++ b/qt6-lottie/mingw-w64-static/PKGBUILD @@ -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' diff --git a/qt6-lottie/mingw-w64-static/qtlottie-sha256.txt b/qt6-lottie/mingw-w64-static/qtlottie-sha256.txt index 30f27abf..1e03a170 100644 --- a/qt6-lottie/mingw-w64-static/qtlottie-sha256.txt +++ b/qt6-lottie/mingw-w64-static/qtlottie-sha256.txt @@ -1 +1 @@ -3c2478f1064574939cfc151d7df0743d6bb1119d8cee6ed3ca3bc1cdfb8fece8 +df8ee26ea3aa4524f82703f602449d990724ca232cb98498746e8f49e23037ed diff --git a/qt6-lottie/mingw-w64/PKGBUILD b/qt6-lottie/mingw-w64/PKGBUILD index 9077bac0..0f9c5312 100644 --- a/qt6-lottie/mingw-w64/PKGBUILD +++ b/qt6-lottie/mingw-w64/PKGBUILD @@ -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' diff --git a/qt6-lottie/mingw-w64/PKGBUILD.sh.ep b/qt6-lottie/mingw-w64/PKGBUILD.sh.ep index a1ef926b..8f8464f8 100644 --- a/qt6-lottie/mingw-w64/PKGBUILD.sh.ep +++ b/qt6-lottie/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt6-module'; \ -_qtver=6.1.0 +_qtver=6.1.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-lottie/mingw-w64/qtlottie-sha256.txt b/qt6-lottie/mingw-w64/qtlottie-sha256.txt index 30f27abf..1e03a170 100644 --- a/qt6-lottie/mingw-w64/qtlottie-sha256.txt +++ b/qt6-lottie/mingw-w64/qtlottie-sha256.txt @@ -1 +1 @@ -3c2478f1064574939cfc151d7df0743d6bb1119d8cee6ed3ca3bc1cdfb8fece8 +df8ee26ea3aa4524f82703f602449d990724ca232cb98498746e8f49e23037ed diff --git a/qt6-networkauth/android-aarch64/PKGBUILD b/qt6-networkauth/android-aarch64/PKGBUILD index b60a969b..0976af12 100644 --- a/qt6-networkauth/android-aarch64/PKGBUILD +++ b/qt6-networkauth/android-aarch64/PKGBUILD @@ -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} diff --git a/qt6-networkauth/android-aarch64/PKGBUILD.sh.ep b/qt6-networkauth/android-aarch64/PKGBUILD.sh.ep index d45b7d2c..1c542afb 100644 --- a/qt6-networkauth/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-networkauth/android-aarch64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'android-qt6-module'; \ -_qtver=6.1.0 +_qtver=6.1.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-networkauth/android-aarch64/qtnetworkauth-sha256.txt b/qt6-networkauth/android-aarch64/qtnetworkauth-sha256.txt index fc0658fe..d5f29fa0 100644 --- a/qt6-networkauth/android-aarch64/qtnetworkauth-sha256.txt +++ b/qt6-networkauth/android-aarch64/qtnetworkauth-sha256.txt @@ -1 +1 @@ -bae8a941e4b635a364bdc65ea814adfe75b20b06fce0888612f72fc1e81ebdd3 +4e1b7f6584fe21e8a04ee6d9c5761e5858587e8bab01a522ee53f82dfd1efdd7 diff --git a/qt6-networkauth/mingw-w64-static/PKGBUILD b/qt6-networkauth/mingw-w64-static/PKGBUILD index 2332de23..8064c4ee 100644 --- a/qt6-networkauth/mingw-w64-static/PKGBUILD +++ b/qt6-networkauth/mingw-w64-static/PKGBUILD @@ -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' diff --git a/qt6-networkauth/mingw-w64-static/qtnetworkauth-sha256.txt b/qt6-networkauth/mingw-w64-static/qtnetworkauth-sha256.txt index fc0658fe..d5f29fa0 100644 --- a/qt6-networkauth/mingw-w64-static/qtnetworkauth-sha256.txt +++ b/qt6-networkauth/mingw-w64-static/qtnetworkauth-sha256.txt @@ -1 +1 @@ -bae8a941e4b635a364bdc65ea814adfe75b20b06fce0888612f72fc1e81ebdd3 +4e1b7f6584fe21e8a04ee6d9c5761e5858587e8bab01a522ee53f82dfd1efdd7 diff --git a/qt6-networkauth/mingw-w64/PKGBUILD b/qt6-networkauth/mingw-w64/PKGBUILD index 84366bf9..b51a51d8 100644 --- a/qt6-networkauth/mingw-w64/PKGBUILD +++ b/qt6-networkauth/mingw-w64/PKGBUILD @@ -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' diff --git a/qt6-networkauth/mingw-w64/PKGBUILD.sh.ep b/qt6-networkauth/mingw-w64/PKGBUILD.sh.ep index ffb4316d..c9b65a9d 100644 --- a/qt6-networkauth/mingw-w64/PKGBUILD.sh.ep +++ b/qt6-networkauth/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt6-module'; \ -_qtver=6.1.0 +_qtver=6.1.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-networkauth/mingw-w64/qtnetworkauth-sha256.txt b/qt6-networkauth/mingw-w64/qtnetworkauth-sha256.txt index fc0658fe..d5f29fa0 100644 --- a/qt6-networkauth/mingw-w64/qtnetworkauth-sha256.txt +++ b/qt6-networkauth/mingw-w64/qtnetworkauth-sha256.txt @@ -1 +1 @@ -bae8a941e4b635a364bdc65ea814adfe75b20b06fce0888612f72fc1e81ebdd3 +4e1b7f6584fe21e8a04ee6d9c5761e5858587e8bab01a522ee53f82dfd1efdd7 diff --git a/qt6-quick3d/android-aarch64/PKGBUILD b/qt6-quick3d/android-aarch64/PKGBUILD index 4498ecc0..7054f032 100644 --- a/qt6-quick3d/android-aarch64/PKGBUILD +++ b/qt6-quick3d/android-aarch64/PKGBUILD @@ -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} diff --git a/qt6-quick3d/android-aarch64/PKGBUILD.sh.ep b/qt6-quick3d/android-aarch64/PKGBUILD.sh.ep index 660bb5d4..63c61da8 100644 --- a/qt6-quick3d/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-quick3d/android-aarch64/PKGBUILD.sh.ep @@ -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) diff --git a/qt6-quick3d/android-aarch64/qtquick3d-sha256.txt b/qt6-quick3d/android-aarch64/qtquick3d-sha256.txt index 773cec48..b510f48f 100644 --- a/qt6-quick3d/android-aarch64/qtquick3d-sha256.txt +++ b/qt6-quick3d/android-aarch64/qtquick3d-sha256.txt @@ -1 +1 @@ -ead155359cf7fb8b2c1a69d00847196c4011433a4839938cc5f87f65a9d5d268 +94b45ae9d08495d701cfb586f1f85b12a1a10f8c29865de0d427a2366ae4507c diff --git a/qt6-quick3d/mingw-w64-static/PKGBUILD b/qt6-quick3d/mingw-w64-static/PKGBUILD index 462341cd..d5b7ebb0 100644 --- a/qt6-quick3d/mingw-w64-static/PKGBUILD +++ b/qt6-quick3d/mingw-w64-static/PKGBUILD @@ -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 } diff --git a/qt6-quick3d/mingw-w64-static/qtquick3d-sha256.txt b/qt6-quick3d/mingw-w64-static/qtquick3d-sha256.txt index 773cec48..b510f48f 100644 --- a/qt6-quick3d/mingw-w64-static/qtquick3d-sha256.txt +++ b/qt6-quick3d/mingw-w64-static/qtquick3d-sha256.txt @@ -1 +1 @@ -ead155359cf7fb8b2c1a69d00847196c4011433a4839938cc5f87f65a9d5d268 +94b45ae9d08495d701cfb586f1f85b12a1a10f8c29865de0d427a2366ae4507c diff --git a/qt6-quick3d/mingw-w64/PKGBUILD b/qt6-quick3d/mingw-w64/PKGBUILD index fa79bb29..1af27313 100644 --- a/qt6-quick3d/mingw-w64/PKGBUILD +++ b/qt6-quick3d/mingw-w64/PKGBUILD @@ -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 } diff --git a/qt6-quick3d/mingw-w64/PKGBUILD.sh.ep b/qt6-quick3d/mingw-w64/PKGBUILD.sh.ep index d596f748..4ed8cef4 100644 --- a/qt6-quick3d/mingw-w64/PKGBUILD.sh.ep +++ b/qt6-quick3d/mingw-w64/PKGBUILD.sh.ep @@ -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 diff --git a/qt6-quick3d/mingw-w64/qtquick3d-sha256.txt b/qt6-quick3d/mingw-w64/qtquick3d-sha256.txt index 773cec48..b510f48f 100644 --- a/qt6-quick3d/mingw-w64/qtquick3d-sha256.txt +++ b/qt6-quick3d/mingw-w64/qtquick3d-sha256.txt @@ -1 +1 @@ -ead155359cf7fb8b2c1a69d00847196c4011433a4839938cc5f87f65a9d5d268 +94b45ae9d08495d701cfb586f1f85b12a1a10f8c29865de0d427a2366ae4507c diff --git a/qt6-quickcontrols2/android-aarch64/PKGBUILD b/qt6-quickcontrols2/android-aarch64/PKGBUILD index 4ac91f0e..2c4af719 100644 --- a/qt6-quickcontrols2/android-aarch64/PKGBUILD +++ b/qt6-quickcontrols2/android-aarch64/PKGBUILD @@ -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} diff --git a/qt6-quickcontrols2/android-aarch64/PKGBUILD.sh.ep b/qt6-quickcontrols2/android-aarch64/PKGBUILD.sh.ep index 94bad36c..67cd0009 100644 --- a/qt6-quickcontrols2/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-quickcontrols2/android-aarch64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'android-qt6-module'; \ -_qtver=6.1.0 +_qtver=6.1.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-quickcontrols2/android-aarch64/qtquickcontrols2-sha256.txt b/qt6-quickcontrols2/android-aarch64/qtquickcontrols2-sha256.txt index 0a8d2ded..3e4da8c4 100644 --- a/qt6-quickcontrols2/android-aarch64/qtquickcontrols2-sha256.txt +++ b/qt6-quickcontrols2/android-aarch64/qtquickcontrols2-sha256.txt @@ -1 +1 @@ -784f1d79e74df59f095b126a116d85e72801bd357f5666d6bad8407ac3957d59 +7ebc99724bedd97a2c6a606ba2726feb66bb76eb9f30262ae13cd246f5665ea4 diff --git a/qt6-quickcontrols2/mingw-w64-static/PKGBUILD b/qt6-quickcontrols2/mingw-w64-static/PKGBUILD index caaada41..39eef420 100644 --- a/qt6-quickcontrols2/mingw-w64-static/PKGBUILD +++ b/qt6-quickcontrols2/mingw-w64-static/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-qt6-quickcontrols2-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="qtquickcontrols2-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('784f1d79e74df59f095b126a116d85e72801bd357f5666d6bad8407ac3957d59') +sha256sums=('7ebc99724bedd97a2c6a606ba2726feb66bb76eb9f30262ae13cd246f5665ea4') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt6-quickcontrols2/mingw-w64-static/qtquickcontrols2-sha256.txt b/qt6-quickcontrols2/mingw-w64-static/qtquickcontrols2-sha256.txt index 0a8d2ded..3e4da8c4 100644 --- a/qt6-quickcontrols2/mingw-w64-static/qtquickcontrols2-sha256.txt +++ b/qt6-quickcontrols2/mingw-w64-static/qtquickcontrols2-sha256.txt @@ -1 +1 @@ -784f1d79e74df59f095b126a116d85e72801bd357f5666d6bad8407ac3957d59 +7ebc99724bedd97a2c6a606ba2726feb66bb76eb9f30262ae13cd246f5665ea4 diff --git a/qt6-quickcontrols2/mingw-w64/PKGBUILD b/qt6-quickcontrols2/mingw-w64/PKGBUILD index 540c5054..f111743f 100644 --- a/qt6-quickcontrols2/mingw-w64/PKGBUILD +++ b/qt6-quickcontrols2/mingw-w64/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-qt6-quickcontrols2 -_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="qtquickcontrols2-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('784f1d79e74df59f095b126a116d85e72801bd357f5666d6bad8407ac3957d59') +sha256sums=('7ebc99724bedd97a2c6a606ba2726feb66bb76eb9f30262ae13cd246f5665ea4') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt6-quickcontrols2/mingw-w64/PKGBUILD.sh.ep b/qt6-quickcontrols2/mingw-w64/PKGBUILD.sh.ep index c6c8d6dc..2f575e42 100644 --- a/qt6-quickcontrols2/mingw-w64/PKGBUILD.sh.ep +++ b/qt6-quickcontrols2/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt6-module'; \ -_qtver=6.1.0 +_qtver=6.1.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-quickcontrols2/mingw-w64/qtquickcontrols2-sha256.txt b/qt6-quickcontrols2/mingw-w64/qtquickcontrols2-sha256.txt index 0a8d2ded..3e4da8c4 100644 --- a/qt6-quickcontrols2/mingw-w64/qtquickcontrols2-sha256.txt +++ b/qt6-quickcontrols2/mingw-w64/qtquickcontrols2-sha256.txt @@ -1 +1 @@ -784f1d79e74df59f095b126a116d85e72801bd357f5666d6bad8407ac3957d59 +7ebc99724bedd97a2c6a606ba2726feb66bb76eb9f30262ae13cd246f5665ea4 diff --git a/qt6-quicktimeline/android-aarch64/PKGBUILD b/qt6-quicktimeline/android-aarch64/PKGBUILD index 28179179..3755fb54 100644 --- a/qt6-quicktimeline/android-aarch64/PKGBUILD +++ b/qt6-quicktimeline/android-aarch64/PKGBUILD @@ -5,7 +5,7 @@ _android_arch=aarch64 pkgname=android-$_android_arch-qt6-quicktimeline -_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="qtquicktimeline-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('ae7421d5ae692ef7fda5a1be88dcb542c7f3531ad6264ceaea9d870605b6953e') +sha256sums=('40fb664eadf295001d2c49c333032406b6f45f14acddee7e72b8d6c5ea26a6a2') build() { source android-env ${_android_arch} diff --git a/qt6-quicktimeline/android-aarch64/PKGBUILD.sh.ep b/qt6-quicktimeline/android-aarch64/PKGBUILD.sh.ep index 7f16892f..490f76a1 100644 --- a/qt6-quicktimeline/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-quicktimeline/android-aarch64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'android-qt6-module'; \ -_qtver=6.1.0 +_qtver=6.1.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-quicktimeline/android-aarch64/qtquicktimeline-sha256.txt b/qt6-quicktimeline/android-aarch64/qtquicktimeline-sha256.txt index 6c33d5c1..2084e3fa 100644 --- a/qt6-quicktimeline/android-aarch64/qtquicktimeline-sha256.txt +++ b/qt6-quicktimeline/android-aarch64/qtquicktimeline-sha256.txt @@ -1 +1 @@ -ae7421d5ae692ef7fda5a1be88dcb542c7f3531ad6264ceaea9d870605b6953e +40fb664eadf295001d2c49c333032406b6f45f14acddee7e72b8d6c5ea26a6a2 diff --git a/qt6-quicktimeline/mingw-w64-static/PKGBUILD b/qt6-quicktimeline/mingw-w64-static/PKGBUILD index f030dcdf..d4cbe69d 100644 --- a/qt6-quicktimeline/mingw-w64-static/PKGBUILD +++ b/qt6-quicktimeline/mingw-w64-static/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-qt6-quicktimeline-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="qtquicktimeline-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('ae7421d5ae692ef7fda5a1be88dcb542c7f3531ad6264ceaea9d870605b6953e') +sha256sums=('40fb664eadf295001d2c49c333032406b6f45f14acddee7e72b8d6c5ea26a6a2') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt6-quicktimeline/mingw-w64-static/qtquicktimeline-sha256.txt b/qt6-quicktimeline/mingw-w64-static/qtquicktimeline-sha256.txt index 6c33d5c1..2084e3fa 100644 --- a/qt6-quicktimeline/mingw-w64-static/qtquicktimeline-sha256.txt +++ b/qt6-quicktimeline/mingw-w64-static/qtquicktimeline-sha256.txt @@ -1 +1 @@ -ae7421d5ae692ef7fda5a1be88dcb542c7f3531ad6264ceaea9d870605b6953e +40fb664eadf295001d2c49c333032406b6f45f14acddee7e72b8d6c5ea26a6a2 diff --git a/qt6-quicktimeline/mingw-w64/PKGBUILD b/qt6-quicktimeline/mingw-w64/PKGBUILD index 01b36284..1e0ba987 100644 --- a/qt6-quicktimeline/mingw-w64/PKGBUILD +++ b/qt6-quicktimeline/mingw-w64/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-qt6-quicktimeline -_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="qtquicktimeline-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('ae7421d5ae692ef7fda5a1be88dcb542c7f3531ad6264ceaea9d870605b6953e') +sha256sums=('40fb664eadf295001d2c49c333032406b6f45f14acddee7e72b8d6c5ea26a6a2') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt6-quicktimeline/mingw-w64/PKGBUILD.sh.ep b/qt6-quicktimeline/mingw-w64/PKGBUILD.sh.ep index cd644033..25c69c06 100644 --- a/qt6-quicktimeline/mingw-w64/PKGBUILD.sh.ep +++ b/qt6-quicktimeline/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt6-module'; \ -_qtver=6.1.0 +_qtver=6.1.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-quicktimeline/mingw-w64/qtquicktimeline-sha256.txt b/qt6-quicktimeline/mingw-w64/qtquicktimeline-sha256.txt index 6c33d5c1..2084e3fa 100644 --- a/qt6-quicktimeline/mingw-w64/qtquicktimeline-sha256.txt +++ b/qt6-quicktimeline/mingw-w64/qtquicktimeline-sha256.txt @@ -1 +1 @@ -ae7421d5ae692ef7fda5a1be88dcb542c7f3531ad6264ceaea9d870605b6953e +40fb664eadf295001d2c49c333032406b6f45f14acddee7e72b8d6c5ea26a6a2 diff --git a/qt6-scxml/android-aarch64/PKGBUILD b/qt6-scxml/android-aarch64/PKGBUILD index 5ece02c1..ddab98b4 100644 --- a/qt6-scxml/android-aarch64/PKGBUILD +++ b/qt6-scxml/android-aarch64/PKGBUILD @@ -5,7 +5,7 @@ _android_arch=aarch64 pkgname=android-$_android_arch-qt6-scxml -_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="qtscxml-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('c835809c2e194171e044464744ee516abce647fb428aa896d9f990e217c363ea') +sha256sums=('ffeb650458bb60bb076ac3460588f77f7c841b4f4b1de706960b9b34984dc528') build() { source android-env ${_android_arch} diff --git a/qt6-scxml/android-aarch64/PKGBUILD.sh.ep b/qt6-scxml/android-aarch64/PKGBUILD.sh.ep index 191cf855..8f87f32c 100644 --- a/qt6-scxml/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-scxml/android-aarch64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'android-qt6-module'; \ -_qtver=6.1.0 +_qtver=6.1.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-scxml/android-aarch64/qtscxml-sha256.txt b/qt6-scxml/android-aarch64/qtscxml-sha256.txt index c250a343..7a39b8da 100644 --- a/qt6-scxml/android-aarch64/qtscxml-sha256.txt +++ b/qt6-scxml/android-aarch64/qtscxml-sha256.txt @@ -1 +1 @@ -c835809c2e194171e044464744ee516abce647fb428aa896d9f990e217c363ea +ffeb650458bb60bb076ac3460588f77f7c841b4f4b1de706960b9b34984dc528 diff --git a/qt6-scxml/mingw-w64-static/PKGBUILD b/qt6-scxml/mingw-w64-static/PKGBUILD index 1f6988ef..a4ae4216 100644 --- a/qt6-scxml/mingw-w64-static/PKGBUILD +++ b/qt6-scxml/mingw-w64-static/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-qt6-scxml-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="qtscxml-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('c835809c2e194171e044464744ee516abce647fb428aa896d9f990e217c363ea') +sha256sums=('ffeb650458bb60bb076ac3460588f77f7c841b4f4b1de706960b9b34984dc528') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt6-scxml/mingw-w64-static/qtscxml-sha256.txt b/qt6-scxml/mingw-w64-static/qtscxml-sha256.txt index c250a343..7a39b8da 100644 --- a/qt6-scxml/mingw-w64-static/qtscxml-sha256.txt +++ b/qt6-scxml/mingw-w64-static/qtscxml-sha256.txt @@ -1 +1 @@ -c835809c2e194171e044464744ee516abce647fb428aa896d9f990e217c363ea +ffeb650458bb60bb076ac3460588f77f7c841b4f4b1de706960b9b34984dc528 diff --git a/qt6-scxml/mingw-w64/PKGBUILD b/qt6-scxml/mingw-w64/PKGBUILD index 1858c026..65adf029 100644 --- a/qt6-scxml/mingw-w64/PKGBUILD +++ b/qt6-scxml/mingw-w64/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-qt6-scxml -_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="qtscxml-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('c835809c2e194171e044464744ee516abce647fb428aa896d9f990e217c363ea') +sha256sums=('ffeb650458bb60bb076ac3460588f77f7c841b4f4b1de706960b9b34984dc528') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt6-scxml/mingw-w64/PKGBUILD.sh.ep b/qt6-scxml/mingw-w64/PKGBUILD.sh.ep index 74a946d3..e3fcfffb 100644 --- a/qt6-scxml/mingw-w64/PKGBUILD.sh.ep +++ b/qt6-scxml/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt6-module'; \ -_qtver=6.1.0 +_qtver=6.1.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-scxml/mingw-w64/qtscxml-sha256.txt b/qt6-scxml/mingw-w64/qtscxml-sha256.txt index c250a343..7a39b8da 100644 --- a/qt6-scxml/mingw-w64/qtscxml-sha256.txt +++ b/qt6-scxml/mingw-w64/qtscxml-sha256.txt @@ -1 +1 @@ -c835809c2e194171e044464744ee516abce647fb428aa896d9f990e217c363ea +ffeb650458bb60bb076ac3460588f77f7c841b4f4b1de706960b9b34984dc528 diff --git a/qt6-shadertools/android-aarch64/PKGBUILD b/qt6-shadertools/android-aarch64/PKGBUILD index 6cdbb251..1208f98d 100644 --- a/qt6-shadertools/android-aarch64/PKGBUILD +++ b/qt6-shadertools/android-aarch64/PKGBUILD @@ -5,7 +5,7 @@ _android_arch=aarch64 pkgname=android-$_android_arch-qt6-shadertools -_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="qtshadertools-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('e391e2fb9dd4bd6b7fec0d6fd55817ca488a49d8e7f56b43655bea26167481e1') +sha256sums=('324a9f6f87d4e82c0b5f80e6301c7dbc47617dbe752f3e3726c141bd85855512') build() { source android-env ${_android_arch} diff --git a/qt6-shadertools/android-aarch64/PKGBUILD.sh.ep b/qt6-shadertools/android-aarch64/PKGBUILD.sh.ep index aef69454..053ff138 100644 --- a/qt6-shadertools/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-shadertools/android-aarch64/PKGBUILD.sh.ep @@ -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) diff --git a/qt6-shadertools/android-aarch64/qtshadertools-sha256.txt b/qt6-shadertools/android-aarch64/qtshadertools-sha256.txt index ed38e5af..75ae2fa5 100644 --- a/qt6-shadertools/android-aarch64/qtshadertools-sha256.txt +++ b/qt6-shadertools/android-aarch64/qtshadertools-sha256.txt @@ -1 +1 @@ -e391e2fb9dd4bd6b7fec0d6fd55817ca488a49d8e7f56b43655bea26167481e1 +324a9f6f87d4e82c0b5f80e6301c7dbc47617dbe752f3e3726c141bd85855512 diff --git a/qt6-shadertools/mingw-w64-static/PKGBUILD b/qt6-shadertools/mingw-w64-static/PKGBUILD index 864fe0f4..d859e2bf 100644 --- a/qt6-shadertools/mingw-w64-static/PKGBUILD +++ b/qt6-shadertools/mingw-w64-static/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-qt6-shadertools-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="qtshadertools-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('e391e2fb9dd4bd6b7fec0d6fd55817ca488a49d8e7f56b43655bea26167481e1') +sha256sums=('324a9f6f87d4e82c0b5f80e6301c7dbc47617dbe752f3e3726c141bd85855512') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt6-shadertools/mingw-w64-static/qtshadertools-sha256.txt b/qt6-shadertools/mingw-w64-static/qtshadertools-sha256.txt index ed38e5af..75ae2fa5 100644 --- a/qt6-shadertools/mingw-w64-static/qtshadertools-sha256.txt +++ b/qt6-shadertools/mingw-w64-static/qtshadertools-sha256.txt @@ -1 +1 @@ -e391e2fb9dd4bd6b7fec0d6fd55817ca488a49d8e7f56b43655bea26167481e1 +324a9f6f87d4e82c0b5f80e6301c7dbc47617dbe752f3e3726c141bd85855512 diff --git a/qt6-shadertools/mingw-w64/PKGBUILD b/qt6-shadertools/mingw-w64/PKGBUILD index 931f7e0c..9101e2c9 100644 --- a/qt6-shadertools/mingw-w64/PKGBUILD +++ b/qt6-shadertools/mingw-w64/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-qt6-shadertools -_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="qtshadertools-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('e391e2fb9dd4bd6b7fec0d6fd55817ca488a49d8e7f56b43655bea26167481e1') +sha256sums=('324a9f6f87d4e82c0b5f80e6301c7dbc47617dbe752f3e3726c141bd85855512') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt6-shadertools/mingw-w64/PKGBUILD.sh.ep b/qt6-shadertools/mingw-w64/PKGBUILD.sh.ep index 030cd430..099f9ef3 100644 --- a/qt6-shadertools/mingw-w64/PKGBUILD.sh.ep +++ b/qt6-shadertools/mingw-w64/PKGBUILD.sh.ep @@ -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) diff --git a/qt6-shadertools/mingw-w64/qtshadertools-sha256.txt b/qt6-shadertools/mingw-w64/qtshadertools-sha256.txt index ed38e5af..75ae2fa5 100644 --- a/qt6-shadertools/mingw-w64/qtshadertools-sha256.txt +++ b/qt6-shadertools/mingw-w64/qtshadertools-sha256.txt @@ -1 +1 @@ -e391e2fb9dd4bd6b7fec0d6fd55817ca488a49d8e7f56b43655bea26167481e1 +324a9f6f87d4e82c0b5f80e6301c7dbc47617dbe752f3e3726c141bd85855512 diff --git a/qt6-svg/android-aarch64/PKGBUILD b/qt6-svg/android-aarch64/PKGBUILD index 7fb912d1..36472a9a 100644 --- a/qt6-svg/android-aarch64/PKGBUILD +++ b/qt6-svg/android-aarch64/PKGBUILD @@ -5,7 +5,7 @@ _android_arch=aarch64 pkgname=android-$_android_arch-qt6-svg -_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="qtsvg-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('5dd3aef98c93073b7a1ab5beadcc8948d1f939c7fd19ea4c2041cc4a3bc8b719') +sha256sums=('e2f62385c940de76dea480a2615c9b11dd2bf0cec2cc778096c0bebfa1ef15ec') build() { source android-env ${_android_arch} diff --git a/qt6-svg/android-aarch64/PKGBUILD.sh.ep b/qt6-svg/android-aarch64/PKGBUILD.sh.ep index 550868dc..aa1a1f65 100644 --- a/qt6-svg/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-svg/android-aarch64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'android-qt6-module'; \ -_qtver=6.1.0 +_qtver=6.1.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-svg/android-aarch64/qtsvg-sha256.txt b/qt6-svg/android-aarch64/qtsvg-sha256.txt index a08c8ef3..22459582 100644 --- a/qt6-svg/android-aarch64/qtsvg-sha256.txt +++ b/qt6-svg/android-aarch64/qtsvg-sha256.txt @@ -1 +1 @@ -5dd3aef98c93073b7a1ab5beadcc8948d1f939c7fd19ea4c2041cc4a3bc8b719 +e2f62385c940de76dea480a2615c9b11dd2bf0cec2cc778096c0bebfa1ef15ec diff --git a/qt6-svg/mingw-w64-static/PKGBUILD b/qt6-svg/mingw-w64-static/PKGBUILD index 78f9e6fa..ae67aa1a 100644 --- a/qt6-svg/mingw-w64-static/PKGBUILD +++ b/qt6-svg/mingw-w64-static/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-qt6-svg-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="qtsvg-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('5dd3aef98c93073b7a1ab5beadcc8948d1f939c7fd19ea4c2041cc4a3bc8b719') +sha256sums=('e2f62385c940de76dea480a2615c9b11dd2bf0cec2cc778096c0bebfa1ef15ec') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt6-svg/mingw-w64-static/qtsvg-sha256.txt b/qt6-svg/mingw-w64-static/qtsvg-sha256.txt index a08c8ef3..22459582 100644 --- a/qt6-svg/mingw-w64-static/qtsvg-sha256.txt +++ b/qt6-svg/mingw-w64-static/qtsvg-sha256.txt @@ -1 +1 @@ -5dd3aef98c93073b7a1ab5beadcc8948d1f939c7fd19ea4c2041cc4a3bc8b719 +e2f62385c940de76dea480a2615c9b11dd2bf0cec2cc778096c0bebfa1ef15ec diff --git a/qt6-svg/mingw-w64/PKGBUILD b/qt6-svg/mingw-w64/PKGBUILD index 89f4bdc9..8d6b691f 100644 --- a/qt6-svg/mingw-w64/PKGBUILD +++ b/qt6-svg/mingw-w64/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-qt6-svg -_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="qtsvg-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('5dd3aef98c93073b7a1ab5beadcc8948d1f939c7fd19ea4c2041cc4a3bc8b719') +sha256sums=('e2f62385c940de76dea480a2615c9b11dd2bf0cec2cc778096c0bebfa1ef15ec') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt6-svg/mingw-w64/PKGBUILD.sh.ep b/qt6-svg/mingw-w64/PKGBUILD.sh.ep index 4a003c29..66962e41 100644 --- a/qt6-svg/mingw-w64/PKGBUILD.sh.ep +++ b/qt6-svg/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt6-module'; \ -_qtver=6.1.0 +_qtver=6.1.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-svg/mingw-w64/qtsvg-sha256.txt b/qt6-svg/mingw-w64/qtsvg-sha256.txt index a08c8ef3..22459582 100644 --- a/qt6-svg/mingw-w64/qtsvg-sha256.txt +++ b/qt6-svg/mingw-w64/qtsvg-sha256.txt @@ -1 +1 @@ -5dd3aef98c93073b7a1ab5beadcc8948d1f939c7fd19ea4c2041cc4a3bc8b719 +e2f62385c940de76dea480a2615c9b11dd2bf0cec2cc778096c0bebfa1ef15ec diff --git a/qt6-tools/android-aarch64/0001-Enable-only-SQL-plugins-which-are-known-to-work.patch b/qt6-tools/android-aarch64/0001-Enable-only-SQL-plugins-which-are-known-to-work.patch new file mode 120000 index 00000000..1bef30be --- /dev/null +++ b/qt6-tools/android-aarch64/0001-Enable-only-SQL-plugins-which-are-known-to-work.patch @@ -0,0 +1 @@ +../mingw-w64/0001-Enable-only-SQL-plugins-which-are-known-to-work.patch \ No newline at end of file diff --git a/qt6-tools/android-aarch64/PKGBUILD b/qt6-tools/android-aarch64/PKGBUILD index a421ac76..1793332a 100644 --- a/qt6-tools/android-aarch64/PKGBUILD +++ b/qt6-tools/android-aarch64/PKGBUILD @@ -5,7 +5,7 @@ _android_arch=aarch64 pkgname=android-$_android_arch-qt6-tools -_qtver=6.1.0 +_qtver=6.1.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -17,8 +17,20 @@ makedepends=('android-cmake' 'android-aarch64-qt6-declarative' 'qt6-declarative' options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(android-${_android_arch}-qt6) _pkgfqn="qttools-everywhere-src-${_qtver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('6263030c1120a30b0541d37b52dc0be0ea04bbb8d1695ec9648f0bd77e421f3e') +source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz" + '0001-Enable-only-SQL-plugins-which-are-known-to-work.patch') +sha256sums=('cba8d9a836e83b7a5e6d068239635b261f7ca4a059992b2b66cd546380091273' + '7254956e64929072ab0dae3aa14ad392eaceb070a7c02da75b3f3c770b1f7cfa') + +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} diff --git a/qt6-tools/android-aarch64/PKGBUILD.sh.ep b/qt6-tools/android-aarch64/PKGBUILD.sh.ep index 3388080d..1e8a40b7 100644 --- a/qt6-tools/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-tools/android-aarch64/PKGBUILD.sh.ep @@ -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) diff --git a/qt6-tools/android-aarch64/qttools-sha256.txt b/qt6-tools/android-aarch64/qttools-sha256.txt index 956a1496..0ceec92b 100644 --- a/qt6-tools/android-aarch64/qttools-sha256.txt +++ b/qt6-tools/android-aarch64/qttools-sha256.txt @@ -1 +1 @@ -6263030c1120a30b0541d37b52dc0be0ea04bbb8d1695ec9648f0bd77e421f3e +cba8d9a836e83b7a5e6d068239635b261f7ca4a059992b2b66cd546380091273 diff --git a/qt6-tools/mingw-w64-static/0001-Enable-only-SQL-plugins-which-are-known-to-work.patch b/qt6-tools/mingw-w64-static/0001-Enable-only-SQL-plugins-which-are-known-to-work.patch new file mode 120000 index 00000000..1bef30be --- /dev/null +++ b/qt6-tools/mingw-w64-static/0001-Enable-only-SQL-plugins-which-are-known-to-work.patch @@ -0,0 +1 @@ +../mingw-w64/0001-Enable-only-SQL-plugins-which-are-known-to-work.patch \ No newline at end of file diff --git a/qt6-tools/mingw-w64-static/PKGBUILD b/qt6-tools/mingw-w64-static/PKGBUILD index 69aa8728..baa78c03 100644 --- a/qt6-tools/mingw-w64-static/PKGBUILD +++ b/qt6-tools/mingw-w64-static/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-qt6-tools-static -_qtver=6.1.0 +_qtver=6.1.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -16,11 +16,23 @@ makedepends=('mingw-w64-cmake-static' 'mingw-w64-vulkan-headers' 'mingw-w64-vulk options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(mingw-w64-qt6) _pkgfqn="qttools-everywhere-src-${_qtver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('6263030c1120a30b0541d37b52dc0be0ea04bbb8d1695ec9648f0bd77e421f3e') +source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz" + '0001-Enable-only-SQL-plugins-which-are-known-to-work.patch') +sha256sums=('cba8d9a836e83b7a5e6d068239635b261f7ca4a059992b2b66cd546380091273' + '7254956e64929072ab0dae3aa14ad392eaceb070a7c02da75b3f3c770b1f7cfa') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' +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() { for _arch in ${_architectures}; do export PKG_CONFIG=/usr/bin/$_arch-pkg-config diff --git a/qt6-tools/mingw-w64-static/qttools-sha256.txt b/qt6-tools/mingw-w64-static/qttools-sha256.txt index 956a1496..0ceec92b 100644 --- a/qt6-tools/mingw-w64-static/qttools-sha256.txt +++ b/qt6-tools/mingw-w64-static/qttools-sha256.txt @@ -1 +1 @@ -6263030c1120a30b0541d37b52dc0be0ea04bbb8d1695ec9648f0bd77e421f3e +cba8d9a836e83b7a5e6d068239635b261f7ca4a059992b2b66cd546380091273 diff --git a/qt6-tools/mingw-w64/0001-Enable-only-SQL-plugins-which-are-known-to-work.patch b/qt6-tools/mingw-w64/0001-Enable-only-SQL-plugins-which-are-known-to-work.patch new file mode 100644 index 00000000..09edac7d --- /dev/null +++ b/qt6-tools/mingw-w64/0001-Enable-only-SQL-plugins-which-are-known-to-work.patch @@ -0,0 +1,32 @@ +From 12f2659035f73cf4a405c4a185978c74291b8e85 Mon Sep 17 00:00:00 2001 +From: Martchus +Date: Wed, 9 Jun 2021 17:25:27 +0200 +Subject: [PATCH] Enable only SQL plugins which are known to work + +Change-Id: I0abc44db77cecbd323edc936529fb557e1664de8 +--- + src/assistant/assistant/CMakeLists.txt | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/assistant/assistant/CMakeLists.txt b/src/assistant/assistant/CMakeLists.txt +index eb5a04a0..5b28ae65 100644 +--- a/src/assistant/assistant/CMakeLists.txt ++++ b/src/assistant/assistant/CMakeLists.txt +@@ -173,6 +173,14 @@ qt_internal_extend_target(assistant CONDITION UNIX + stdinlistener.cpp stdinlistener.h + ) + ++if(MINGW) ++ # enable only SQL plugins which are known to work ++ # note: The static plugins for MySQL/PostgreSQL don't work because these libs come with their ++ # own pthread implementation which has conflicting symbols with the normal pthread library ++ # leading to linker errors. ++ qt_import_plugins(assistant INCLUDE_BY_TYPE sqldrivers Qt6::QSQLiteDriverPlugin Qt6::QODBCDriverPlugin) ++endif() ++ + if(APPLE) + set_target_properties(assistant PROPERTIES + MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Info_mac.plist" +-- +2.32.0 + diff --git a/qt6-tools/mingw-w64/PKGBUILD b/qt6-tools/mingw-w64/PKGBUILD index c6ab422a..585befad 100644 --- a/qt6-tools/mingw-w64/PKGBUILD +++ b/qt6-tools/mingw-w64/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-qt6-tools -_qtver=6.1.0 +_qtver=6.1.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -16,11 +16,23 @@ makedepends=('mingw-w64-cmake' 'mingw-w64-vulkan-headers' 'mingw-w64-vulkan-icd- options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(mingw-w64-qt6) _pkgfqn="qttools-everywhere-src-${_qtver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('6263030c1120a30b0541d37b52dc0be0ea04bbb8d1695ec9648f0bd77e421f3e') +source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz" + '0001-Enable-only-SQL-plugins-which-are-known-to-work.patch') +sha256sums=('cba8d9a836e83b7a5e6d068239635b261f7ca4a059992b2b66cd546380091273' + '7254956e64929072ab0dae3aa14ad392eaceb070a7c02da75b3f3c770b1f7cfa') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' +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() { for _arch in ${_architectures}; do export PKG_CONFIG=/usr/bin/$_arch-pkg-config diff --git a/qt6-tools/mingw-w64/PKGBUILD.sh.ep b/qt6-tools/mingw-w64/PKGBUILD.sh.ep index 54ca499c..23c238f5 100644 --- a/qt6-tools/mingw-w64/PKGBUILD.sh.ep +++ b/qt6-tools/mingw-w64/PKGBUILD.sh.ep @@ -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) diff --git a/qt6-tools/mingw-w64/qttools-sha256.txt b/qt6-tools/mingw-w64/qttools-sha256.txt index 956a1496..0ceec92b 100644 --- a/qt6-tools/mingw-w64/qttools-sha256.txt +++ b/qt6-tools/mingw-w64/qttools-sha256.txt @@ -1 +1 @@ -6263030c1120a30b0541d37b52dc0be0ea04bbb8d1695ec9648f0bd77e421f3e +cba8d9a836e83b7a5e6d068239635b261f7ca4a059992b2b66cd546380091273 diff --git a/qt6-translations/android-aarch64/PKGBUILD b/qt6-translations/android-aarch64/PKGBUILD index 8568976f..0383270d 100644 --- a/qt6-translations/android-aarch64/PKGBUILD +++ b/qt6-translations/android-aarch64/PKGBUILD @@ -5,7 +5,7 @@ _android_arch=aarch64 pkgname=android-$_android_arch-qt6-translations -_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="qttranslations-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('2affef9a0da9b61e8fc64ebbd515136b59c7392b789cd059ad134b26755dd073') +sha256sums=('6cf3d191335a6b3a64864e7ba41819e7be461d1d2861d643babe836f81d4c393') build() { source android-env ${_android_arch} diff --git a/qt6-translations/android-aarch64/PKGBUILD.sh.ep b/qt6-translations/android-aarch64/PKGBUILD.sh.ep index 2b8dcdf8..4cbaf107 100644 --- a/qt6-translations/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-translations/android-aarch64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'android-qt6-module', no_libs => 1; \ -_qtver=6.1.0 +_qtver=6.1.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-translations/android-aarch64/qttranslations-sha256.txt b/qt6-translations/android-aarch64/qttranslations-sha256.txt index 3b7e8a35..3ae922c5 100644 --- a/qt6-translations/android-aarch64/qttranslations-sha256.txt +++ b/qt6-translations/android-aarch64/qttranslations-sha256.txt @@ -1 +1 @@ -2affef9a0da9b61e8fc64ebbd515136b59c7392b789cd059ad134b26755dd073 +6cf3d191335a6b3a64864e7ba41819e7be461d1d2861d643babe836f81d4c393 diff --git a/qt6-translations/mingw-w64/PKGBUILD b/qt6-translations/mingw-w64/PKGBUILD index f62c03cd..6f23fb85 100644 --- a/qt6-translations/mingw-w64/PKGBUILD +++ b/qt6-translations/mingw-w64/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-qt6-translations -_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="qttranslations-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('2affef9a0da9b61e8fc64ebbd515136b59c7392b789cd059ad134b26755dd073') +sha256sums=('6cf3d191335a6b3a64864e7ba41819e7be461d1d2861d643babe836f81d4c393') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt6-translations/mingw-w64/PKGBUILD.sh.ep b/qt6-translations/mingw-w64/PKGBUILD.sh.ep index 93e680ee..fd605ddc 100644 --- a/qt6-translations/mingw-w64/PKGBUILD.sh.ep +++ b/qt6-translations/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt6-module', no_libs => 1; \ -_qtver=6.1.0 +_qtver=6.1.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-translations/mingw-w64/qttranslations-sha256.txt b/qt6-translations/mingw-w64/qttranslations-sha256.txt index 3b7e8a35..3ae922c5 100644 --- a/qt6-translations/mingw-w64/qttranslations-sha256.txt +++ b/qt6-translations/mingw-w64/qttranslations-sha256.txt @@ -1 +1 @@ -2affef9a0da9b61e8fc64ebbd515136b59c7392b789cd059ad134b26755dd073 +6cf3d191335a6b3a64864e7ba41819e7be461d1d2861d643babe836f81d4c393 diff --git a/qt6-virtualkeyboard/android-aarch64/PKGBUILD b/qt6-virtualkeyboard/android-aarch64/PKGBUILD index 89f0eecd..fe3d7c94 100644 --- a/qt6-virtualkeyboard/android-aarch64/PKGBUILD +++ b/qt6-virtualkeyboard/android-aarch64/PKGBUILD @@ -5,7 +5,7 @@ _android_arch=aarch64 pkgname=android-$_android_arch-qt6-virtualkeyboard -_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="qtvirtualkeyboard-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('595d69dbfd43a87b4d3a270afed6dd64172551990e29239281f39b727b145c01') +sha256sums=('246d1acdcd953819b09b1da22bd359335d145d8a3550d9e827dc1fd27b6bd3ff') build() { source android-env ${_android_arch} diff --git a/qt6-virtualkeyboard/android-aarch64/PKGBUILD.sh.ep b/qt6-virtualkeyboard/android-aarch64/PKGBUILD.sh.ep index 0647dba9..c4fe7846 100644 --- a/qt6-virtualkeyboard/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-virtualkeyboard/android-aarch64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'android-qt6-module'; \ -_qtver=6.1.0 +_qtver=6.1.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-virtualkeyboard/android-aarch64/qtvirtualkeyboard-sha256.txt b/qt6-virtualkeyboard/android-aarch64/qtvirtualkeyboard-sha256.txt index f2557b16..d7330b2b 100644 --- a/qt6-virtualkeyboard/android-aarch64/qtvirtualkeyboard-sha256.txt +++ b/qt6-virtualkeyboard/android-aarch64/qtvirtualkeyboard-sha256.txt @@ -1 +1 @@ -595d69dbfd43a87b4d3a270afed6dd64172551990e29239281f39b727b145c01 +246d1acdcd953819b09b1da22bd359335d145d8a3550d9e827dc1fd27b6bd3ff diff --git a/qt6-virtualkeyboard/mingw-w64-static/PKGBUILD b/qt6-virtualkeyboard/mingw-w64-static/PKGBUILD index 57f53362..2750dc24 100644 --- a/qt6-virtualkeyboard/mingw-w64-static/PKGBUILD +++ b/qt6-virtualkeyboard/mingw-w64-static/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-qt6-virtualkeyboard-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="qtvirtualkeyboard-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('595d69dbfd43a87b4d3a270afed6dd64172551990e29239281f39b727b145c01') +sha256sums=('246d1acdcd953819b09b1da22bd359335d145d8a3550d9e827dc1fd27b6bd3ff') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt6-virtualkeyboard/mingw-w64-static/qtvirtualkeyboard-sha256.txt b/qt6-virtualkeyboard/mingw-w64-static/qtvirtualkeyboard-sha256.txt index f2557b16..d7330b2b 100644 --- a/qt6-virtualkeyboard/mingw-w64-static/qtvirtualkeyboard-sha256.txt +++ b/qt6-virtualkeyboard/mingw-w64-static/qtvirtualkeyboard-sha256.txt @@ -1 +1 @@ -595d69dbfd43a87b4d3a270afed6dd64172551990e29239281f39b727b145c01 +246d1acdcd953819b09b1da22bd359335d145d8a3550d9e827dc1fd27b6bd3ff diff --git a/qt6-virtualkeyboard/mingw-w64/PKGBUILD b/qt6-virtualkeyboard/mingw-w64/PKGBUILD index d5c3634c..7ed73a03 100644 --- a/qt6-virtualkeyboard/mingw-w64/PKGBUILD +++ b/qt6-virtualkeyboard/mingw-w64/PKGBUILD @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-qt6-virtualkeyboard -_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="qtvirtualkeyboard-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('595d69dbfd43a87b4d3a270afed6dd64172551990e29239281f39b727b145c01') +sha256sums=('246d1acdcd953819b09b1da22bd359335d145d8a3550d9e827dc1fd27b6bd3ff') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt6-virtualkeyboard/mingw-w64/PKGBUILD.sh.ep b/qt6-virtualkeyboard/mingw-w64/PKGBUILD.sh.ep index 8439de9b..f620b80c 100644 --- a/qt6-virtualkeyboard/mingw-w64/PKGBUILD.sh.ep +++ b/qt6-virtualkeyboard/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt6-module'; \ -_qtver=6.1.0 +_qtver=6.1.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qt6-virtualkeyboard/mingw-w64/qtvirtualkeyboard-sha256.txt b/qt6-virtualkeyboard/mingw-w64/qtvirtualkeyboard-sha256.txt index f2557b16..d7330b2b 100644 --- a/qt6-virtualkeyboard/mingw-w64/qtvirtualkeyboard-sha256.txt +++ b/qt6-virtualkeyboard/mingw-w64/qtvirtualkeyboard-sha256.txt @@ -1 +1 @@ -595d69dbfd43a87b4d3a270afed6dd64172551990e29239281f39b727b145c01 +246d1acdcd953819b09b1da22bd359335d145d8a3550d9e827dc1fd27b6bd3ff