summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO8
-rw-r--r--0001-Exclude-qmltime-when-cross-compiling.patch6
-rw-r--r--PKGBUILD6
-rw-r--r--PKGBUILD.sh.ep2
-rw-r--r--qtdeclarative-sha256.txt2
5 files changed, 12 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c05353037e00..a2d991d8a949 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = android-aarch64-qt6-declarative
pkgdesc = Classes for QML and JavaScript languages (android)
- pkgver = 6.2.3
+ pkgver = 6.2.4
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.3/submodules/qtdeclarative-everywhere-src-6.2.3.tar.xz
+ source = https://download.qt.io/official_releases/qt/6.2/6.2.4/submodules/qtdeclarative-everywhere-src-6.2.4.tar.xz
source = 0001-Exclude-qmltime-when-cross-compiling.patch
- sha256sums = 2618c31f64820ed426ebfe2c10b6f3a43f08d2c03d6c63f024bc396455c1a86b
- sha256sums = 2f37c5a0c21cc7f31ed0cc689a14f0a64a50f1d272de77867b194cd2b7a2a17e
+ sha256sums = fa6a8b5bfe43203daf022b7949c7874240ec28b9c4b7ebc52b2e5ea440e6e94f
+ sha256sums = c5890ff7deb09459b67852148e46a596c531e32eba6b658a6eb78490c22423e8
pkgname = android-aarch64-qt6-declarative
diff --git a/0001-Exclude-qmltime-when-cross-compiling.patch b/0001-Exclude-qmltime-when-cross-compiling.patch
index 9b6cde36611d..e85427eb0585 100644
--- a/0001-Exclude-qmltime-when-cross-compiling.patch
+++ b/0001-Exclude-qmltime-when-cross-compiling.patch
@@ -1,4 +1,4 @@
-From adf84a12c5e0aed23958fc1a5360f3cc71aae140 Mon Sep 17 00:00:00 2001
+From 14a8581cd5451196b809f184b7f75e22a3e056b4 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,7 +14,7 @@ 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 3206222261..48148c4f7d 100644
+index 0d7a7cddc6..45ad0adee7 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
@@ -29,5 +29,5 @@ index 3206222261..48148c4f7d 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.35.0
+2.35.1
diff --git a/PKGBUILD b/PKGBUILD
index f2106d10f30b..f6384f767e43 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
_android_arch=aarch64
pkgname=android-$_android_arch-qt6-declarative
-_qtver=6.2.3
+_qtver=6.2.4
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=('2618c31f64820ed426ebfe2c10b6f3a43f08d2c03d6c63f024bc396455c1a86b'
- '2f37c5a0c21cc7f31ed0cc689a14f0a64a50f1d272de77867b194cd2b7a2a17e')
+sha256sums=('fa6a8b5bfe43203daf022b7949c7874240ec28b9c4b7ebc52b2e5ea440e6e94f'
+ 'c5890ff7deb09459b67852148e46a596c531e32eba6b658a6eb78490c22423e8')
prepare () {
cd $_pkgfqn
diff --git a/PKGBUILD.sh.ep b/PKGBUILD.sh.ep
index 28cc831f66ac..6f9ed7fb1017 100644
--- a/PKGBUILD.sh.ep
+++ b/PKGBUILD.sh.ep
@@ -1,6 +1,6 @@
% layout 'android-qt6-module', has_binaries => 1;
\
-_qtver=6.2.3
+_qtver=6.2.4
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
diff --git a/qtdeclarative-sha256.txt b/qtdeclarative-sha256.txt
index 20592c977099..abc16e832613 100644
--- a/qtdeclarative-sha256.txt
+++ b/qtdeclarative-sha256.txt
@@ -1 +1 @@
-2618c31f64820ed426ebfe2c10b6f3a43f08d2c03d6c63f024bc396455c1a86b
+fa6a8b5bfe43203daf022b7949c7874240ec28b9c4b7ebc52b2e5ea440e6e94f