summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartchus2022-10-11 21:30:12 +0200
committerMartchus2022-10-11 21:30:12 +0200
commit6a325db5ed3e55f6fd106b35c7422de7623d4fbe (patch)
tree1bba2f77fb7e58cfec73c4f3b312d82a298bea33
parent03ef3eda429c68b6ff665af41409c5fcdfb90702 (diff)
downloadaur-6a325db5ed3e55f6fd106b35c7422de7623d4fbe.tar.gz
Update to 6.4.0
-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 ac92f8cbc386..e69e398012bc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = android-aarch64-qt6-declarative
pkgdesc = Classes for QML and JavaScript languages (android)
- pkgver = 6.3.1
+ pkgver = 6.4.0
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.3/6.3.1/submodules/qtdeclarative-everywhere-src-6.3.1.tar.xz
+ source = https://download.qt.io/official_releases/qt/6.4/6.4.0/submodules/qtdeclarative-everywhere-src-6.4.0.tar.xz
source = 0001-Exclude-qmltime-when-cross-compiling.patch
- sha256sums = 03e7694123820fcca397f95ce312e0b7f3039493c8754c836da098a1a04346e8
- sha256sums = 572cf6af00c733aa7e7c5ec72ce522b5a640e89e27ab3f6c93debcaf335fa31c
+ sha256sums = 3434e72fccfa0c929c326790723d05c155f5067746b1ab05cfd7a9ba632c4383
+ sha256sums = f6144501b09fa433a9469a6d5228342641ab695fc90c1290e7cc5f4f824d6916
pkgname = android-aarch64-qt6-declarative
diff --git a/0001-Exclude-qmltime-when-cross-compiling.patch b/0001-Exclude-qmltime-when-cross-compiling.patch
index 5f263d3fe6bb..ec29829d90e2 100644
--- a/0001-Exclude-qmltime-when-cross-compiling.patch
+++ b/0001-Exclude-qmltime-when-cross-compiling.patch
@@ -1,4 +1,4 @@
-From 306826507f0814b1da3e119dde347ca9086a0571 Mon Sep 17 00:00:00 2001
+From 1dc60db6bed621c3de58d4305e196ebe8e02e8db 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 48545ff2d2..dafcad8a2e 100644
+index 5a34fd4c11..063f38a943 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
-@@ -33,7 +33,9 @@ if(QT_FEATURE_qml_preview AND QT_FEATURE_thread AND NOT ANDROID AND NOT WASM AND
+@@ -36,7 +36,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 48545ff2d2..dafcad8a2e 100644
if(QT_BUILD_SHARED_LIBS
AND QT_FEATURE_process
--
-2.36.1
+2.37.3
diff --git a/PKGBUILD b/PKGBUILD
index 845501c1ce7b..8efd762b6309 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
_android_arch=aarch64
pkgname=android-$_android_arch-qt6-declarative
-_qtver=6.3.1
+_qtver=6.4.0
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=('03e7694123820fcca397f95ce312e0b7f3039493c8754c836da098a1a04346e8'
- '572cf6af00c733aa7e7c5ec72ce522b5a640e89e27ab3f6c93debcaf335fa31c')
+sha256sums=('3434e72fccfa0c929c326790723d05c155f5067746b1ab05cfd7a9ba632c4383'
+ 'f6144501b09fa433a9469a6d5228342641ab695fc90c1290e7cc5f4f824d6916')
prepare () {
cd $_pkgfqn
diff --git a/PKGBUILD.sh.ep b/PKGBUILD.sh.ep
index ac16e24e2ddc..033e83348a70 100644
--- a/PKGBUILD.sh.ep
+++ b/PKGBUILD.sh.ep
@@ -1,6 +1,6 @@
% layout 'android-qt6-module', has_binaries => 1;
\
-_qtver=6.3.1
+_qtver=6.4.0
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
diff --git a/qtdeclarative-sha256.txt b/qtdeclarative-sha256.txt
index f0f33fa284e4..c3e824f15c89 100644
--- a/qtdeclarative-sha256.txt
+++ b/qtdeclarative-sha256.txt
@@ -1 +1 @@
-03e7694123820fcca397f95ce312e0b7f3039493c8754c836da098a1a04346e8
+3434e72fccfa0c929c326790723d05c155f5067746b1ab05cfd7a9ba632c4383