summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO10
-rw-r--r--0001-Exclude-qmltime-when-cross-compiling.patch4
-rw-r--r--PKGBUILD8
-rw-r--r--PKGBUILD.sh.ep4
-rw-r--r--qtdeclarative-sha256.txt2
5 files changed, 14 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ef33734d3c0a..57962a760d43 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = android-aarch64-qt6-declarative
pkgdesc = Classes for QML and JavaScript languages (android)
- pkgver = 6.4.2
+ pkgver = 6.4.3
pkgrel = 1
url = https://www.qt.io
arch = any
@@ -14,7 +14,7 @@ pkgbase = android-aarch64-qt6-declarative
makedepends = qt6-shadertools
makedepends = ninja
makedepends = python
- makedepends = java-environment-openjdk=8
+ makedepends = java-environment-openjdk>=11
depends = android-aarch64-qt6-base
optdepends = qt6-declarative: development tools
provides = android-aarch64-qt6-quickcontrols2
@@ -24,9 +24,9 @@ pkgbase = android-aarch64-qt6-declarative
options = !buildflags
options = staticlibs
options = !emptydirs
- source = https://download.qt.io/official_releases/qt/6.4/6.4.2/submodules/qtdeclarative-everywhere-src-6.4.2.tar.xz
+ source = https://download.qt.io/official_releases/qt/6.4/6.4.3/submodules/qtdeclarative-everywhere-src-6.4.3.tar.xz
source = 0001-Exclude-qmltime-when-cross-compiling.patch
- sha256sums = a4bdd983de4e9cbca0f85b767dbdd8598711554e370a06da8f509ded4430f5bd
- sha256sums = 6c81fd374061005704249559ac384941c9fc959e0946394f4944ae5927e87e6d
+ sha256sums = 67ded1b3b988135e3600916b34bb156fe3986c88420c6f87a6d0fd53521ba795
+ sha256sums = 1f5b90f3a7b7121d071982d99435a9fa2a4fa19f026d439d393c0fd1c7f9059a
pkgname = android-aarch64-qt6-declarative
diff --git a/0001-Exclude-qmltime-when-cross-compiling.patch b/0001-Exclude-qmltime-when-cross-compiling.patch
index 042d24b14b99..375eee5816a8 100644
--- a/0001-Exclude-qmltime-when-cross-compiling.patch
+++ b/0001-Exclude-qmltime-when-cross-compiling.patch
@@ -1,4 +1,4 @@
-From d8b2e1abbe50e03bf0776d2ea6b8f658204b8c4b Mon Sep 17 00:00:00 2001
+From 861e8176f6332d7743530f00b15a1fbac1ea9496 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
@@ -29,5 +29,5 @@ index 5a34fd4c11..063f38a943 100644
if(QT_BUILD_SHARED_LIBS
AND QT_FEATURE_process
--
-2.39.0
+2.39.2
diff --git a/PKGBUILD b/PKGBUILD
index 2a062b5574ee..5d4ba4caace0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
_android_arch=aarch64
pkgname=android-$_android_arch-qt6-declarative
-_qtver=6.4.2
+_qtver=6.4.3
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@@ -13,7 +13,7 @@ url='https://www.qt.io'
license=(GPL3 LGPL3 FDL custom)
pkgdesc='Classes for QML and JavaScript languages (android)'
depends=('android-aarch64-qt6-base')
-makedepends=('android-cmake' 'qt6-declarative' 'qt6-shadertools' 'ninja' 'python' 'java-environment-openjdk=8')
+makedepends=('android-cmake' 'qt6-declarative' 'qt6-shadertools' 'ninja' 'python' 'java-environment-openjdk>=11')
optdepends=('qt6-declarative: development tools')
conflicts=('android-aarch64-qt6-quickcontrols2')
provides=('android-aarch64-qt6-quickcontrols2')
@@ -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=('a4bdd983de4e9cbca0f85b767dbdd8598711554e370a06da8f509ded4430f5bd'
- '6c81fd374061005704249559ac384941c9fc959e0946394f4944ae5927e87e6d')
+sha256sums=('67ded1b3b988135e3600916b34bb156fe3986c88420c6f87a6d0fd53521ba795'
+ '1f5b90f3a7b7121d071982d99435a9fa2a4fa19f026d439d393c0fd1c7f9059a')
prepare () {
cd $_pkgfqn
diff --git a/PKGBUILD.sh.ep b/PKGBUILD.sh.ep
index aebaefebea62..e33e82325d62 100644
--- a/PKGBUILD.sh.ep
+++ b/PKGBUILD.sh.ep
@@ -1,6 +1,6 @@
% layout 'android-qt6-module', has_binaries => 1;
\
-_qtver=6.4.2
+_qtver=6.4.3
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@@ -8,7 +8,7 @@ url='https://www.qt.io'
license=(GPL3 LGPL3 FDL custom)
pkgdesc='Classes for QML and JavaScript languages (android)'
depends=(<%== qt6deps qw(base) %>)
-makedepends=('android-cmake<%== $static_suffix %>' 'qt6-declarative' 'qt6-shadertools' 'ninja' 'python' 'java-environment-openjdk=8')
+makedepends=('android-cmake<%== $static_suffix %>' 'qt6-declarative' 'qt6-shadertools' 'ninja' 'python' 'java-environment-openjdk>=11')
optdepends=('qt6-declarative: development tools')
conflicts=(<%== qt6deps qw(quickcontrols2) %>)
provides=(<%== qt6deps qw(quickcontrols2) %>)
diff --git a/qtdeclarative-sha256.txt b/qtdeclarative-sha256.txt
index 14debec19299..03bf395a55e7 100644
--- a/qtdeclarative-sha256.txt
+++ b/qtdeclarative-sha256.txt
@@ -1 +1 @@
-a4bdd983de4e9cbca0f85b767dbdd8598711554e370a06da8f509ded4430f5bd
+67ded1b3b988135e3600916b34bb156fe3986c88420c6f87a6d0fd53521ba795