diff options
| author | Martchus | 2021-12-02 12:25:15 +0100 |
|---|---|---|
| committer | Martchus | 2021-12-02 12:25:15 +0100 |
| commit | 6003fcf8253bd8a7fc2eb95b47765e39eec3121b (patch) | |
| tree | a656451f3e5c9d744a0d6cb25f360b4f619fc4b3 | |
| parent | 60d00f8e1a5fd9c08d93895376b153134752c282 (diff) | |
| download | aur-6003fcf8253bd8a7fc2eb95b47765e39eec3121b.tar.gz | |
Update to 6.2.2
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | 0001-Exclude-qmltime-when-cross-compiling.patch | 8 | ||||
| -rw-r--r-- | PKGBUILD | 6 | ||||
| -rw-r--r-- | PKGBUILD.sh.ep | 2 | ||||
| -rw-r--r-- | qtdeclarative-sha256.txt | 2 |
5 files changed, 13 insertions, 13 deletions
@@ -1,6 +1,6 @@ pkgbase = android-aarch64-qt6-declarative pkgdesc = Classes for QML and JavaScript languages (android) - pkgver = 6.2.1 + pkgver = 6.2.2 pkgrel = 1 url = https://www.qt.io arch = any @@ -24,9 +24,9 @@ pkgbase = android-aarch64-qt6-declarative options = !buildflags options = staticlibs options = !emptydirs - source = https://download.qt.io/official_releases/qt/6.2/6.2.1/submodules/qtdeclarative-everywhere-src-6.2.1.tar.xz + source = https://download.qt.io/official_releases/qt/6.2/6.2.2/submodules/qtdeclarative-everywhere-src-6.2.2.tar.xz source = 0001-Exclude-qmltime-when-cross-compiling.patch - sha256sums = 5aeb841a5665f79672a302569754ea7d541c69102c551707e43489e797213c71 - sha256sums = c84240d88b53bcf91c4804f8af00d83952a14bc61924e45d587be63ea8309782 + sha256sums = 1a04ef0092b31354e0fded0d8391865719cb58f9ca5dc604da2b1f62c742cf28 + sha256sums = 0d3ab1faed346dff5ba75a7bbd1af56c913a9c4a6eaff0b36f0e67a1ca4b6f1b pkgname = android-aarch64-qt6-declarative diff --git a/0001-Exclude-qmltime-when-cross-compiling.patch b/0001-Exclude-qmltime-when-cross-compiling.patch index aaaa20cc80b0..14781f9de4fd 100644 --- a/0001-Exclude-qmltime-when-cross-compiling.patch +++ b/0001-Exclude-qmltime-when-cross-compiling.patch @@ -1,4 +1,4 @@ -From 8265326c024047695c42763027a7d1057d3cd442 Mon Sep 17 00:00:00 2001 +From 6c65e4aea191119c012f57112f0d74808e35beb5 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Fri, 5 Feb 2021 02:22:45 +0100 Subject: [PATCH] Exclude qmltime when cross compiling @@ -14,12 +14,12 @@ That's likely also why upstream did not notice this problem so far. 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt -index 01fa0bf043..c855dc0338 100644 +index 3206222261..48148c4f7d 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -31,7 +31,9 @@ if(QT_FEATURE_qml_preview AND QT_FEATURE_thread AND NOT ANDROID AND NOT WASM AND endif() - if(QT_BUILD_SHARED_LIBS AND QT_FEATURE_thread AND TARGET Qt::Quick AND NOT ANDROID AND NOT WASM AND NOT rtems) + if(QT_BUILD_SHARED_LIBS AND QT_FEATURE_thread AND TARGET Qt::Quick AND NOT ANDROID AND NOT WASM AND NOT IOS AND NOT rtems) add_subdirectory(qmlscene) - add_subdirectory(qmltime) + if(NOT CMAKE_CROSSCOMPILING) @@ -29,5 +29,5 @@ index 01fa0bf043..c855dc0338 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.33.1 +2.34.1 @@ -5,7 +5,7 @@ _android_arch=aarch64 pkgname=android-$_android_arch-qt6-declarative -_qtver=6.2.1 +_qtver=6.2.2 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -23,8 +23,8 @@ groups=(android-${_android_arch}-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=('5aeb841a5665f79672a302569754ea7d541c69102c551707e43489e797213c71' - 'c84240d88b53bcf91c4804f8af00d83952a14bc61924e45d587be63ea8309782') +sha256sums=('1a04ef0092b31354e0fded0d8391865719cb58f9ca5dc604da2b1f62c742cf28' + '0d3ab1faed346dff5ba75a7bbd1af56c913a9c4a6eaff0b36f0e67a1ca4b6f1b') prepare () { cd $_pkgfqn diff --git a/PKGBUILD.sh.ep b/PKGBUILD.sh.ep index 13648bc8c3f9..efcd89ffaf8b 100644 --- a/PKGBUILD.sh.ep +++ b/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'android-qt6-module', has_binaries => 1; \ -_qtver=6.2.1 +_qtver=6.2.2 pkgver=${_qtver/-/} pkgrel=1 arch=(any) diff --git a/qtdeclarative-sha256.txt b/qtdeclarative-sha256.txt index 73316ebaf67e..dcc690f6fe08 100644 --- a/qtdeclarative-sha256.txt +++ b/qtdeclarative-sha256.txt @@ -1 +1 @@ -5aeb841a5665f79672a302569754ea7d541c69102c551707e43489e797213c71 +1a04ef0092b31354e0fded0d8391865719cb58f9ca5dc604da2b1f62c742cf28 |