summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO8
-rw-r--r--0001-Exclude-qmltime-when-cross-compiling.patch8
-rw-r--r--PKGBUILD6
-rw-r--r--PKGBUILD.sh.ep2
-rw-r--r--qtdeclarative-sha256.txt2
5 files changed, 13 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 415e09059f36..f1480e11bf7f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = android-aarch64-qt6-declarative
pkgdesc = Classes for QML and JavaScript languages (android)
- pkgver = 6.5.1
+ pkgver = 6.5.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.5/6.5.1/submodules/qtdeclarative-everywhere-src-6.5.1.tar.xz
+ source = https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtdeclarative-everywhere-src-6.5.2.tar.xz
source = 0001-Exclude-qmltime-when-cross-compiling.patch
- sha256sums = 201148f9614a65d169a85cd0d0fbd414603498da6ff330c4e0835ecd962dce79
- sha256sums = 8b1d5499d6ebdf046780e737a191c316c483f3dd2e161d559025adb5af6bfa96
+ sha256sums = f3a11fe54e9fac77c649e46e39f1cbe161e9efe89bad205115ba2861b1eb8719
+ sha256sums = 8fb0047a8dd719b3ad22963392d65c4f5e15f9eae331422ca6d2bf2caa3137aa
pkgname = android-aarch64-qt6-declarative
diff --git a/0001-Exclude-qmltime-when-cross-compiling.patch b/0001-Exclude-qmltime-when-cross-compiling.patch
index d400de161610..88a9058ec7a1 100644
--- a/0001-Exclude-qmltime-when-cross-compiling.patch
+++ b/0001-Exclude-qmltime-when-cross-compiling.patch
@@ -1,4 +1,4 @@
-From da07643b35d6b97a3338f38c44de012dca9aabc1 Mon Sep 17 00:00:00 2001
+From dfe78ec0131eb273dda65292b601427f470b5487 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 5 Feb 2021 02:22:45 +0100
Subject: [PATCH] Exclude qmltime when cross compiling
@@ -14,10 +14,10 @@ That's likely also why upstream did not notice this problem so far.
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
-index a99cd33c24..56243e28e8 100644
+index 75b240aeea..ccf82a457d 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
-@@ -40,7 +40,9 @@ if(QT_FEATURE_qml_preview AND QT_FEATURE_thread AND NOT ANDROID AND NOT WASM AND
+@@ -38,7 +38,9 @@ if(QT_FEATURE_qml_preview AND QT_FEATURE_thread AND NOT ANDROID AND NOT WASM AND
endif()
if(QT_BUILD_SHARED_LIBS AND QT_FEATURE_thread AND TARGET Qt::Quick AND NOT ANDROID AND NOT WASM AND NOT IOS AND NOT rtems)
add_subdirectory(qmlscene)
@@ -29,5 +29,5 @@ index a99cd33c24..56243e28e8 100644
if(QT_BUILD_SHARED_LIBS
AND QT_FEATURE_process
--
-2.40.1
+2.41.0
diff --git a/PKGBUILD b/PKGBUILD
index f2648cb78ce2..88b73870b9d7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
_android_arch=aarch64
pkgname=android-$_android_arch-qt6-declarative
-_qtver=6.5.1
+_qtver=6.5.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=('201148f9614a65d169a85cd0d0fbd414603498da6ff330c4e0835ecd962dce79'
- '8b1d5499d6ebdf046780e737a191c316c483f3dd2e161d559025adb5af6bfa96')
+sha256sums=('f3a11fe54e9fac77c649e46e39f1cbe161e9efe89bad205115ba2861b1eb8719'
+ '8fb0047a8dd719b3ad22963392d65c4f5e15f9eae331422ca6d2bf2caa3137aa')
prepare () {
cd $_pkgfqn
diff --git a/PKGBUILD.sh.ep b/PKGBUILD.sh.ep
index 89a8de4fcaef..3d2095d9b856 100644
--- a/PKGBUILD.sh.ep
+++ b/PKGBUILD.sh.ep
@@ -1,6 +1,6 @@
% layout 'android-qt6-module', has_binaries => 1;
\
-_qtver=6.5.1
+_qtver=6.5.2
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
diff --git a/qtdeclarative-sha256.txt b/qtdeclarative-sha256.txt
index d77423f76fbc..37d71f913d8c 100644
--- a/qtdeclarative-sha256.txt
+++ b/qtdeclarative-sha256.txt
@@ -1 +1 @@
-201148f9614a65d169a85cd0d0fbd414603498da6ff330c4e0835ecd962dce79
+f3a11fe54e9fac77c649e46e39f1cbe161e9efe89bad205115ba2861b1eb8719