From e12d22a22fad89305e2b199eafd4aaaf945bfc85 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 23 Feb 2024 23:11:37 +0100 Subject: [PATCH] Force Android Qt 6 packages to use Java 17 This may help to prevent https://bugreports.qt.io/browse/QTBUG-119223. --- devel/generator/templates/layouts/android-qt6-base.sh.ep | 3 +-- devel/generator/templates/layouts/android-qt6-module.sh.ep | 1 + qt6-5compat/android-aarch64/PKGBUILD | 3 ++- qt6-5compat/android-aarch64/PKGBUILD.sh.ep | 2 +- qt6-base/android-aarch64/PKGBUILD | 3 +-- qt6-charts/android-aarch64/PKGBUILD | 3 ++- qt6-charts/android-aarch64/PKGBUILD.sh.ep | 2 +- qt6-connectivity/android-aarch64/PKGBUILD | 3 ++- qt6-connectivity/android-aarch64/PKGBUILD.sh.ep | 2 +- qt6-datavis3d/android-aarch64/PKGBUILD | 3 ++- qt6-datavis3d/android-aarch64/PKGBUILD.sh.ep | 2 +- qt6-declarative/android-aarch64/PKGBUILD | 3 ++- qt6-declarative/android-aarch64/PKGBUILD.sh.ep | 2 +- qt6-grpc/android-aarch64/PKGBUILD | 3 ++- qt6-grpc/android-aarch64/PKGBUILD.sh.ep | 2 +- qt6-httpserver/android-aarch64/PKGBUILD | 3 ++- qt6-httpserver/android-aarch64/PKGBUILD.sh.ep | 2 +- qt6-imageformats/android-aarch64/PKGBUILD | 3 ++- qt6-imageformats/android-aarch64/PKGBUILD.sh.ep | 2 +- qt6-location/android-aarch64/PKGBUILD | 3 ++- qt6-location/android-aarch64/PKGBUILD.sh.ep | 2 +- qt6-lottie/android-aarch64/PKGBUILD | 3 ++- qt6-lottie/android-aarch64/PKGBUILD.sh.ep | 2 +- qt6-multimedia/android-aarch64/PKGBUILD | 3 ++- qt6-multimedia/android-aarch64/PKGBUILD.sh.ep | 2 +- qt6-networkauth/android-aarch64/PKGBUILD | 3 ++- qt6-networkauth/android-aarch64/PKGBUILD.sh.ep | 2 +- qt6-positioning/android-aarch64/PKGBUILD | 3 ++- qt6-positioning/android-aarch64/PKGBUILD.sh.ep | 2 +- qt6-quick3d/android-aarch64/PKGBUILD | 3 ++- qt6-quick3d/android-aarch64/PKGBUILD.sh.ep | 2 +- qt6-quicktimeline/android-aarch64/PKGBUILD | 3 ++- qt6-quicktimeline/android-aarch64/PKGBUILD.sh.ep | 2 +- qt6-scxml/android-aarch64/PKGBUILD | 3 ++- qt6-scxml/android-aarch64/PKGBUILD.sh.ep | 2 +- qt6-sensors/android-aarch64/PKGBUILD | 3 ++- qt6-sensors/android-aarch64/PKGBUILD.sh.ep | 2 +- qt6-serialbus/android-aarch64/PKGBUILD | 3 ++- qt6-serialbus/android-aarch64/PKGBUILD.sh.ep | 2 +- qt6-serialport/android-aarch64/PKGBUILD | 3 ++- qt6-serialport/android-aarch64/PKGBUILD.sh.ep | 2 +- qt6-shadertools/android-aarch64/PKGBUILD | 3 ++- qt6-shadertools/android-aarch64/PKGBUILD.sh.ep | 2 +- qt6-svg/android-aarch64/PKGBUILD | 3 ++- qt6-svg/android-aarch64/PKGBUILD.sh.ep | 2 +- qt6-tools/android-aarch64/PKGBUILD | 3 ++- qt6-tools/android-aarch64/PKGBUILD.sh.ep | 2 +- qt6-translations/android-aarch64/PKGBUILD | 3 ++- qt6-translations/android-aarch64/PKGBUILD.sh.ep | 2 +- qt6-virtualkeyboard/android-aarch64/PKGBUILD | 3 ++- qt6-virtualkeyboard/android-aarch64/PKGBUILD.sh.ep | 2 +- qt6-webchannel/android-aarch64/PKGBUILD | 3 ++- qt6-webchannel/android-aarch64/PKGBUILD.sh.ep | 2 +- qt6-websockets/android-aarch64/PKGBUILD | 3 ++- qt6-websockets/android-aarch64/PKGBUILD.sh.ep | 2 +- 55 files changed, 81 insertions(+), 56 deletions(-) diff --git a/devel/generator/templates/layouts/android-qt6-base.sh.ep b/devel/generator/templates/layouts/android-qt6-base.sh.ep index ffd20c9e..cecb549a 100644 --- a/devel/generator/templates/layouts/android-qt6-base.sh.ep +++ b/devel/generator/templates/layouts/android-qt6-base.sh.ep @@ -51,9 +51,8 @@ prepare () { % } build() { + export PATH=/usr/lib/jvm/java-17-openjdk/bin:$PATH source android-env ${_android_arch} - echo "Java:" - archlinux-java status android-${_android_arch}-cmake<%== $static_suffix %> -G Ninja -B build-$_android_arch -S $_pkgfqn \\ % if ($static_variant) { -DCMAKE_FIND_ROOT_PATH="${ANDROID_PREFIX}/static;${ANDROID_PREFIX}" \\ diff --git a/devel/generator/templates/layouts/android-qt6-module.sh.ep b/devel/generator/templates/layouts/android-qt6-module.sh.ep index 791b5a9d..f58fc37a 100644 --- a/devel/generator/templates/layouts/android-qt6-module.sh.ep +++ b/devel/generator/templates/layouts/android-qt6-module.sh.ep @@ -32,6 +32,7 @@ prepare () { % } build() { + export PATH=/usr/lib/jvm/java-17-openjdk/bin:$PATH source android-env ${_android_arch} <%== content_for 'before_build_config' %>\ android-${_android_arch}-cmake<%== $static_suffix %> -G Ninja -B build-$_android_arch -S $_pkgfqn \\ diff --git a/qt6-5compat/android-aarch64/PKGBUILD b/qt6-5compat/android-aarch64/PKGBUILD index 4506ed50..db42ae5a 100644 --- a/qt6-5compat/android-aarch64/PKGBUILD +++ b/qt6-5compat/android-aarch64/PKGBUILD @@ -13,7 +13,7 @@ url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) pkgdesc='Module that contains unsupported Qt 5 APIs (android)' depends=('android-aarch64-qt6-base') -makedepends=('android-cmake' 'qt6-base' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake' 'qt6-base' 'ninja' 'java-environment-openjdk=17') options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(android-${_android_arch}-qt6) _pkgfqn="qt5compat-everywhere-src-${_qtver}" @@ -21,6 +21,7 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm sha256sums=('e07b08ab7658e4856f07e3262ab342df4ed7e7a69f2720e56bb2128729191967') build() { + export PATH=/usr/lib/jvm/java-17-openjdk/bin:$PATH source android-env ${_android_arch} android-${_android_arch}-cmake -G Ninja -B build-$_android_arch -S $_pkgfqn \ -DCMAKE_FIND_ROOT_PATH="${ANDROID_PREFIX}" \ diff --git a/qt6-5compat/android-aarch64/PKGBUILD.sh.ep b/qt6-5compat/android-aarch64/PKGBUILD.sh.ep index b1abb7e2..3daa4b72 100644 --- a/qt6-5compat/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-5compat/android-aarch64/PKGBUILD.sh.ep @@ -8,4 +8,4 @@ url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) pkgdesc='Module that contains unsupported Qt 5 APIs (android)' depends=(<%== qt6deps qw(base) %>) -makedepends=('android-cmake<%== $static_suffix %>' 'qt6-base' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake<%== $static_suffix %>' 'qt6-base' 'ninja' 'java-environment-openjdk=17') diff --git a/qt6-base/android-aarch64/PKGBUILD b/qt6-base/android-aarch64/PKGBUILD index a55a4cdb..6acfc70b 100644 --- a/qt6-base/android-aarch64/PKGBUILD +++ b/qt6-base/android-aarch64/PKGBUILD @@ -75,9 +75,8 @@ prepare () { } build() { + export PATH=/usr/lib/jvm/java-17-openjdk/bin:$PATH source android-env ${_android_arch} - echo "Java:" - archlinux-java status android-${_android_arch}-cmake -G Ninja -B build-$_android_arch -S $_pkgfqn \ -DCMAKE_FIND_ROOT_PATH="${ANDROID_PREFIX}" \ -DQT_BINARY_DIR=${ANDROID_PREFIX_BIN} \ diff --git a/qt6-charts/android-aarch64/PKGBUILD b/qt6-charts/android-aarch64/PKGBUILD index a278f7c2..47c21124 100644 --- a/qt6-charts/android-aarch64/PKGBUILD +++ b/qt6-charts/android-aarch64/PKGBUILD @@ -13,7 +13,7 @@ url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) pkgdesc='Provides a set of easy to use chart components (android)' depends=('android-aarch64-qt6-declarative') -makedepends=('android-cmake' 'qt6-declarative' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake' 'qt6-declarative' 'ninja' 'java-environment-openjdk=17') options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(android-${_android_arch}-qt6) _pkgfqn="qtcharts-everywhere-src-${_qtver}" @@ -21,6 +21,7 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm sha256sums=('b1486262ee07b4420b8cdd1525c01800186b15d4fee0669cf544fdd5e941f5f4') build() { + export PATH=/usr/lib/jvm/java-17-openjdk/bin:$PATH source android-env ${_android_arch} android-${_android_arch}-cmake -G Ninja -B build-$_android_arch -S $_pkgfqn \ -DCMAKE_FIND_ROOT_PATH="${ANDROID_PREFIX}" \ diff --git a/qt6-charts/android-aarch64/PKGBUILD.sh.ep b/qt6-charts/android-aarch64/PKGBUILD.sh.ep index 58179f9b..ab4c8f34 100644 --- a/qt6-charts/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-charts/android-aarch64/PKGBUILD.sh.ep @@ -8,4 +8,4 @@ url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) pkgdesc='Provides a set of easy to use chart components (android)' depends=(<%== qt6deps qw(declarative) %>) -makedepends=('android-cmake<%== $static_suffix %>' 'qt6-declarative' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake<%== $static_suffix %>' 'qt6-declarative' 'ninja' 'java-environment-openjdk=17') diff --git a/qt6-connectivity/android-aarch64/PKGBUILD b/qt6-connectivity/android-aarch64/PKGBUILD index b6cdc7d1..a5735157 100644 --- a/qt6-connectivity/android-aarch64/PKGBUILD +++ b/qt6-connectivity/android-aarch64/PKGBUILD @@ -14,7 +14,7 @@ license=(GPL3 LGPL3 FDL custom) pkgdesc='Provides access to Bluetooth hardware (android)' depends=('android-aarch64-qt6-base') optdepends=('android-aarch64-qt6-declarative: QML bindings') -makedepends=('android-cmake' 'android-aarch64-qt6-declarative' 'qt6-declarative' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake' 'android-aarch64-qt6-declarative' 'qt6-declarative' 'ninja' 'java-environment-openjdk=17') options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(android-${_android_arch}-qt6) _pkgfqn="qtconnectivity-everywhere-src-${_qtver}" @@ -22,6 +22,7 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm sha256sums=('a36f51085883ef8ae5782826d15cef261355a822eba76ccc323f3f0b81defab7') build() { + export PATH=/usr/lib/jvm/java-17-openjdk/bin:$PATH source android-env ${_android_arch} android-${_android_arch}-cmake -G Ninja -B build-$_android_arch -S $_pkgfqn \ -DCMAKE_FIND_ROOT_PATH="${ANDROID_PREFIX}" \ diff --git a/qt6-connectivity/android-aarch64/PKGBUILD.sh.ep b/qt6-connectivity/android-aarch64/PKGBUILD.sh.ep index 4e124e21..0862cb27 100644 --- a/qt6-connectivity/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-connectivity/android-aarch64/PKGBUILD.sh.ep @@ -9,4 +9,4 @@ license=(GPL3 LGPL3 FDL custom) pkgdesc='Provides access to Bluetooth hardware (android)' depends=(<%== qt6deps qw(base) %>) optdepends=(<%== qt6optdeps declarative => 'QML bindings' %>) -makedepends=('android-cmake<%== $static_suffix %>' <%== qt6deps qw(declarative) %> 'qt6-declarative' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake<%== $static_suffix %>' <%== qt6deps qw(declarative) %> 'qt6-declarative' 'ninja' 'java-environment-openjdk=17') diff --git a/qt6-datavis3d/android-aarch64/PKGBUILD b/qt6-datavis3d/android-aarch64/PKGBUILD index 8f028039..3b7f8323 100644 --- a/qt6-datavis3d/android-aarch64/PKGBUILD +++ b/qt6-datavis3d/android-aarch64/PKGBUILD @@ -14,7 +14,7 @@ license=(GPL3 LGPL3 FDL custom) pkgdesc='Qt6 Data Visualization module (android)' depends=('android-aarch64-qt6-base') optdepends=('android-aarch64-qt6-declarative: QML bindings') -makedepends=('android-cmake' 'android-aarch64-qt6-declarative' 'qt6-declarative' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake' 'android-aarch64-qt6-declarative' 'qt6-declarative' 'ninja' 'java-environment-openjdk=17') options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(android-${_android_arch}-qt6) _pkgfqn="qtdatavis3d-everywhere-src-${_qtver}" @@ -22,6 +22,7 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm sha256sums=('314a6b2904006d151c2ec7d753814c8c63903ff814069baf9c4978d49d2a1c47') build() { + export PATH=/usr/lib/jvm/java-17-openjdk/bin:$PATH source android-env ${_android_arch} android-${_android_arch}-cmake -G Ninja -B build-$_android_arch -S $_pkgfqn \ -DCMAKE_FIND_ROOT_PATH="${ANDROID_PREFIX}" \ diff --git a/qt6-datavis3d/android-aarch64/PKGBUILD.sh.ep b/qt6-datavis3d/android-aarch64/PKGBUILD.sh.ep index 9ca255f6..0dbb2426 100644 --- a/qt6-datavis3d/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-datavis3d/android-aarch64/PKGBUILD.sh.ep @@ -9,4 +9,4 @@ license=(GPL3 LGPL3 FDL custom) pkgdesc='Qt6 Data Visualization module (android)' depends=(<%== qt6deps qw(base) %>) optdepends=(<%== qt6optdeps declarative => 'QML bindings' %>) -makedepends=('android-cmake<%== $static_suffix %>' <%== qt6deps qw(declarative) %> 'qt6-declarative' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake<%== $static_suffix %>' <%== qt6deps qw(declarative) %> 'qt6-declarative' 'ninja' 'java-environment-openjdk=17') diff --git a/qt6-declarative/android-aarch64/PKGBUILD b/qt6-declarative/android-aarch64/PKGBUILD index 64ee0f70..c5b44c20 100644 --- a/qt6-declarative/android-aarch64/PKGBUILD +++ b/qt6-declarative/android-aarch64/PKGBUILD @@ -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>=11') +makedepends=('android-cmake' 'qt6-declarative' 'qt6-shadertools' 'ninja' 'python' 'java-environment-openjdk=17') optdepends=('qt6-declarative: development tools') conflicts=('android-aarch64-qt6-quickcontrols2') provides=('android-aarch64-qt6-quickcontrols2') @@ -37,6 +37,7 @@ prepare () { } build() { + export PATH=/usr/lib/jvm/java-17-openjdk/bin:$PATH source android-env ${_android_arch} android-${_android_arch}-cmake -G Ninja -B build-$_android_arch -S $_pkgfqn \ -DCMAKE_FIND_ROOT_PATH="${ANDROID_PREFIX}" \ diff --git a/qt6-declarative/android-aarch64/PKGBUILD.sh.ep b/qt6-declarative/android-aarch64/PKGBUILD.sh.ep index 505ddefe..8fc39566 100644 --- a/qt6-declarative/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-declarative/android-aarch64/PKGBUILD.sh.ep @@ -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>=11') +makedepends=('android-cmake<%== $static_suffix %>' 'qt6-declarative' 'qt6-shadertools' 'ninja' 'python' 'java-environment-openjdk=17') optdepends=('qt6-declarative: development tools') conflicts=(<%== qt6deps qw(quickcontrols2) %>) provides=(<%== qt6deps qw(quickcontrols2) %>) diff --git a/qt6-grpc/android-aarch64/PKGBUILD b/qt6-grpc/android-aarch64/PKGBUILD index 1312136f..01f50e9b 100644 --- a/qt6-grpc/android-aarch64/PKGBUILD +++ b/qt6-grpc/android-aarch64/PKGBUILD @@ -13,7 +13,7 @@ url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) pkgdesc='Provides the modules QtGrpc and QtProtobuf (android)' depends=('android-aarch64-qt6-base') -makedepends=('android-cmake' 'protobuf' 'qt6-base' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake' 'protobuf' 'qt6-base' 'ninja' 'java-environment-openjdk=17') options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(android-${_android_arch}-qt6) _pkgfqn="qtgrpc-everywhere-src-${_qtver}" @@ -21,6 +21,7 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm sha256sums=('qtgrpc-sha256.txt missing') build() { + export PATH=/usr/lib/jvm/java-17-openjdk/bin:$PATH source android-env ${_android_arch} android-${_android_arch}-cmake -G Ninja -B build-$_android_arch -S $_pkgfqn \ -DCMAKE_FIND_ROOT_PATH="${ANDROID_PREFIX}" \ diff --git a/qt6-grpc/android-aarch64/PKGBUILD.sh.ep b/qt6-grpc/android-aarch64/PKGBUILD.sh.ep index 10b6b7d2..249e9101 100644 --- a/qt6-grpc/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-grpc/android-aarch64/PKGBUILD.sh.ep @@ -8,4 +8,4 @@ url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) pkgdesc='Provides the modules QtGrpc and QtProtobuf (android)' depends=(<%== qt6deps qw(base) %>) -makedepends=('android-cmake<%== $static_suffix %>' 'protobuf' 'qt6-base' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake<%== $static_suffix %>' 'protobuf' 'qt6-base' 'ninja' 'java-environment-openjdk=17') diff --git a/qt6-httpserver/android-aarch64/PKGBUILD b/qt6-httpserver/android-aarch64/PKGBUILD index 67b6b2e8..27e73fa2 100644 --- a/qt6-httpserver/android-aarch64/PKGBUILD +++ b/qt6-httpserver/android-aarch64/PKGBUILD @@ -14,7 +14,7 @@ license=(GPL3 LGPL3 FDL custom) pkgdesc='Qt HTTP Server (android)' depends=('android-aarch64-qt6-base') optdepends=('android-aarch64-qt6-declarative: QML bindings') -makedepends=('android-cmake' 'android-aarch64-qt6-declarative' 'qt6-base' 'qt6-declarative' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake' 'android-aarch64-qt6-declarative' 'qt6-base' 'qt6-declarative' 'ninja' 'java-environment-openjdk=17') options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(android-${_android_arch}-qt6) _pkgfqn="qthttpserver-everywhere-src-${_qtver}" @@ -22,6 +22,7 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm sha256sums=('qthttpserver-sha256.txt missing') build() { + export PATH=/usr/lib/jvm/java-17-openjdk/bin:$PATH source android-env ${_android_arch} android-${_android_arch}-cmake -G Ninja -B build-$_android_arch -S $_pkgfqn \ -DCMAKE_FIND_ROOT_PATH="${ANDROID_PREFIX}" \ diff --git a/qt6-httpserver/android-aarch64/PKGBUILD.sh.ep b/qt6-httpserver/android-aarch64/PKGBUILD.sh.ep index 9d094d93..1294ac97 100644 --- a/qt6-httpserver/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-httpserver/android-aarch64/PKGBUILD.sh.ep @@ -9,4 +9,4 @@ license=(GPL3 LGPL3 FDL custom) pkgdesc='Qt HTTP Server (android)' depends=(<%== qt6deps qw(base) %>) optdepends=(<%== qt6optdeps declarative => 'QML bindings' %>) -makedepends=('android-cmake<%== $static_suffix %>' <%== qt6deps qw(declarative) %> 'qt6-base' 'qt6-declarative' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake<%== $static_suffix %>' <%== qt6deps qw(declarative) %> 'qt6-base' 'qt6-declarative' 'ninja' 'java-environment-openjdk=17') diff --git a/qt6-imageformats/android-aarch64/PKGBUILD b/qt6-imageformats/android-aarch64/PKGBUILD index 2dfe055b..2b0748c5 100644 --- a/qt6-imageformats/android-aarch64/PKGBUILD +++ b/qt6-imageformats/android-aarch64/PKGBUILD @@ -13,7 +13,7 @@ url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) pkgdesc='Plugins for additional image formats: TIFF, TGA, WBMP (android)' depends=('android-aarch64-qt6-base' "android-${_android_arch}-libwebp") -makedepends=('android-cmake' 'qt6-base' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake' 'qt6-base' 'ninja' 'java-environment-openjdk=17') options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(android-${_android_arch}-qt6) _pkgfqn="qtimageformats-everywhere-src-${_qtver}" @@ -21,6 +21,7 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm sha256sums=('71584c9136d4983ad19fa2d017abbae57b055eb90c62a36bf3f45d6d21a87cb3') build() { + export PATH=/usr/lib/jvm/java-17-openjdk/bin:$PATH source android-env ${_android_arch} android-${_android_arch}-cmake -G Ninja -B build-$_android_arch -S $_pkgfqn \ -DCMAKE_FIND_ROOT_PATH="${ANDROID_PREFIX}" \ diff --git a/qt6-imageformats/android-aarch64/PKGBUILD.sh.ep b/qt6-imageformats/android-aarch64/PKGBUILD.sh.ep index 1ca83f52..a44e86b0 100644 --- a/qt6-imageformats/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-imageformats/android-aarch64/PKGBUILD.sh.ep @@ -8,4 +8,4 @@ url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) pkgdesc='Plugins for additional image formats: TIFF, TGA, WBMP (android)' depends=(<%== qt6deps qw(base) %> "android-${_android_arch}-libwebp") -makedepends=('android-cmake<%== $static_suffix %>' 'qt6-base' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake<%== $static_suffix %>' 'qt6-base' 'ninja' 'java-environment-openjdk=17') diff --git a/qt6-location/android-aarch64/PKGBUILD b/qt6-location/android-aarch64/PKGBUILD index 49a11b97..6d42a5d4 100644 --- a/qt6-location/android-aarch64/PKGBUILD +++ b/qt6-location/android-aarch64/PKGBUILD @@ -13,7 +13,7 @@ url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) pkgdesc='Helps you create viable mapping solutions using the data available from some of the popular location services (android)' depends=('android-aarch64-qt6-declarative' 'android-aarch64-qt6-positioning') -makedepends=('android-cmake' 'android-aarch64-qt6-shadertools' 'android-aarch64-qt6-declarative' 'qt6-shadertools' 'qt6-declarative' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake' 'android-aarch64-qt6-shadertools' 'android-aarch64-qt6-declarative' 'qt6-shadertools' 'qt6-declarative' 'ninja' 'java-environment-openjdk=17') options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(android-${_android_arch}-qt6) _pkgfqn="qtlocation-everywhere-src-${_qtver}" @@ -21,6 +21,7 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm sha256sums=('9e25dcfeafecedb288e6011ebd70f6cf68b66204c4acfb97873483a755e5f415') build() { + export PATH=/usr/lib/jvm/java-17-openjdk/bin:$PATH source android-env ${_android_arch} android-${_android_arch}-cmake -G Ninja -B build-$_android_arch -S $_pkgfqn \ -DCMAKE_FIND_ROOT_PATH="${ANDROID_PREFIX}" \ diff --git a/qt6-location/android-aarch64/PKGBUILD.sh.ep b/qt6-location/android-aarch64/PKGBUILD.sh.ep index e44a92cd..482dc7e8 100644 --- a/qt6-location/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-location/android-aarch64/PKGBUILD.sh.ep @@ -8,7 +8,7 @@ url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) pkgdesc='Helps you create viable mapping solutions using the data available from some of the popular location services (android)' depends=(<%== qt6deps qw(declarative positioning) %>) -makedepends=('android-cmake<%== $static_suffix %>' <%== qt6deps qw(shadertools declarative) %> 'qt6-shadertools' 'qt6-declarative' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake<%== $static_suffix %>' <%== qt6deps qw(shadertools declarative) %> 'qt6-shadertools' 'qt6-declarative' 'ninja' 'java-environment-openjdk=17') % \ % content_for additional_cmake_args => begin \\ diff --git a/qt6-lottie/android-aarch64/PKGBUILD b/qt6-lottie/android-aarch64/PKGBUILD index 6eac7790..8a78c7c6 100644 --- a/qt6-lottie/android-aarch64/PKGBUILD +++ b/qt6-lottie/android-aarch64/PKGBUILD @@ -14,7 +14,7 @@ license=(GPL3 LGPL3 FDL custom) pkgdesc='A family of player software for a certain json-based file format for describing 2d vector graphics animations (android)' depends=('android-aarch64-qt6-base') optdepends=('android-aarch64-qt6-declarative: QML bindings') -makedepends=('android-cmake' 'android-aarch64-qt6-declarative' 'qt6-declarative' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake' 'android-aarch64-qt6-declarative' 'qt6-declarative' 'ninja' 'java-environment-openjdk=17') options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(android-${_android_arch}-qt6) _pkgfqn="qtlottie-everywhere-src-${_qtver}" @@ -22,6 +22,7 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm sha256sums=('276e16da2cba7c242c8fa4032c3838d352c356d6607574cfdc4a2b274bb910c3') build() { + export PATH=/usr/lib/jvm/java-17-openjdk/bin:$PATH source android-env ${_android_arch} android-${_android_arch}-cmake -G Ninja -B build-$_android_arch -S $_pkgfqn \ -DCMAKE_FIND_ROOT_PATH="${ANDROID_PREFIX}" \ diff --git a/qt6-lottie/android-aarch64/PKGBUILD.sh.ep b/qt6-lottie/android-aarch64/PKGBUILD.sh.ep index 4b1eab9a..14174585 100644 --- a/qt6-lottie/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-lottie/android-aarch64/PKGBUILD.sh.ep @@ -9,4 +9,4 @@ license=(GPL3 LGPL3 FDL custom) pkgdesc='A family of player software for a certain json-based file format for describing 2d vector graphics animations (android)' depends=(<%== qt6deps qw(base) %>) optdepends=(<%== qt6optdeps declarative => 'QML bindings' %>) -makedepends=('android-cmake<%== $static_suffix %>' <%== qt6deps qw(declarative) %> 'qt6-declarative' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake<%== $static_suffix %>' <%== qt6deps qw(declarative) %> 'qt6-declarative' 'ninja' 'java-environment-openjdk=17') diff --git a/qt6-multimedia/android-aarch64/PKGBUILD b/qt6-multimedia/android-aarch64/PKGBUILD index e7642ef3..1cddaf34 100644 --- a/qt6-multimedia/android-aarch64/PKGBUILD +++ b/qt6-multimedia/android-aarch64/PKGBUILD @@ -14,7 +14,7 @@ license=(GPL3 LGPL3 FDL custom) pkgdesc='Classes for audio, video, radio and camera functionality (android)' depends=('android-aarch64-qt6-base') optdepends=('android-aarch64-qt6-declarative: QML bindings') -makedepends=('android-cmake' 'android-aarch64-qt6-declarative' 'android-aarch64-qt6-shadertools' 'qt6-declarative' 'qt6-shadertools' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake' 'android-aarch64-qt6-declarative' 'android-aarch64-qt6-shadertools' 'qt6-declarative' 'qt6-shadertools' 'ninja' 'java-environment-openjdk=17') options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(android-${_android_arch}-qt6) _pkgfqn="qtmultimedia-everywhere-src-${_qtver}" @@ -34,6 +34,7 @@ prepare () { } build() { + export PATH=/usr/lib/jvm/java-17-openjdk/bin:$PATH source android-env ${_android_arch} android-${_android_arch}-cmake -G Ninja -B build-$_android_arch -S $_pkgfqn \ -DCMAKE_FIND_ROOT_PATH="${ANDROID_PREFIX}" \ diff --git a/qt6-multimedia/android-aarch64/PKGBUILD.sh.ep b/qt6-multimedia/android-aarch64/PKGBUILD.sh.ep index 72750ef4..082e1f4d 100644 --- a/qt6-multimedia/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-multimedia/android-aarch64/PKGBUILD.sh.ep @@ -9,4 +9,4 @@ license=(GPL3 LGPL3 FDL custom) pkgdesc='Classes for audio, video, radio and camera functionality (android)' depends=(<%== qt6deps qw(base) %>) optdepends=(<%== qt6optdeps declarative => 'QML bindings' %>) -makedepends=('android-cmake<%== $static_suffix %>' <%== qt6deps qw(declarative shadertools) %> 'qt6-declarative' 'qt6-shadertools' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake<%== $static_suffix %>' <%== qt6deps qw(declarative shadertools) %> 'qt6-declarative' 'qt6-shadertools' 'ninja' 'java-environment-openjdk=17') diff --git a/qt6-networkauth/android-aarch64/PKGBUILD b/qt6-networkauth/android-aarch64/PKGBUILD index 1c2b67de..63dd433c 100644 --- a/qt6-networkauth/android-aarch64/PKGBUILD +++ b/qt6-networkauth/android-aarch64/PKGBUILD @@ -13,7 +13,7 @@ url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) pkgdesc='Network authentication module (android)' depends=('android-aarch64-qt6-base') -makedepends=('android-cmake' 'qt6-base' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake' 'qt6-base' 'ninja' 'java-environment-openjdk=17') options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(android-${_android_arch}-qt6) _pkgfqn="qtnetworkauth-everywhere-src-${_qtver}" @@ -21,6 +21,7 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm sha256sums=('32bdd5550ba893b5fb7d07ea2a3adc1729ed8b4565dc4aa963fa21b978d332d2') build() { + export PATH=/usr/lib/jvm/java-17-openjdk/bin:$PATH source android-env ${_android_arch} android-${_android_arch}-cmake -G Ninja -B build-$_android_arch -S $_pkgfqn \ -DCMAKE_FIND_ROOT_PATH="${ANDROID_PREFIX}" \ diff --git a/qt6-networkauth/android-aarch64/PKGBUILD.sh.ep b/qt6-networkauth/android-aarch64/PKGBUILD.sh.ep index 8e37d282..944f7568 100644 --- a/qt6-networkauth/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-networkauth/android-aarch64/PKGBUILD.sh.ep @@ -8,4 +8,4 @@ url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) pkgdesc='Network authentication module (android)' depends=(<%== qt6deps qw(base) %>) -makedepends=('android-cmake<%== $static_suffix %>' 'qt6-base' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake<%== $static_suffix %>' 'qt6-base' 'ninja' 'java-environment-openjdk=17') diff --git a/qt6-positioning/android-aarch64/PKGBUILD b/qt6-positioning/android-aarch64/PKGBUILD index 1b25f5d1..45eee87d 100644 --- a/qt6-positioning/android-aarch64/PKGBUILD +++ b/qt6-positioning/android-aarch64/PKGBUILD @@ -14,7 +14,7 @@ license=(GPL3 LGPL3 FDL custom) pkgdesc='Provides access to position, satellite and area monitoring classes (android)' depends=('android-aarch64-qt6-base') optdepends=('android-aarch64-qt6-declarative: QML bindings' 'android-aarch64-qt6-serialport: NMEA plugin') -makedepends=('android-cmake' 'android-aarch64-qt6-serialport' 'android-aarch64-qt6-declarative' 'qt6-serialbus' 'qt6-declarative' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake' 'android-aarch64-qt6-serialport' 'android-aarch64-qt6-declarative' 'qt6-serialbus' 'qt6-declarative' 'ninja' 'java-environment-openjdk=17') options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(android-${_android_arch}-qt6) _pkgfqn="qtpositioning-everywhere-src-${_qtver}" @@ -22,6 +22,7 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm sha256sums=('4da7567cc1ed2480b137ac7d8db16be40ee935c52585762a7a44b6a4ef0ec3e2') build() { + export PATH=/usr/lib/jvm/java-17-openjdk/bin:$PATH source android-env ${_android_arch} android-${_android_arch}-cmake -G Ninja -B build-$_android_arch -S $_pkgfqn \ -DCMAKE_FIND_ROOT_PATH="${ANDROID_PREFIX}" \ diff --git a/qt6-positioning/android-aarch64/PKGBUILD.sh.ep b/qt6-positioning/android-aarch64/PKGBUILD.sh.ep index ba4ba15c..95ecc7fd 100644 --- a/qt6-positioning/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-positioning/android-aarch64/PKGBUILD.sh.ep @@ -9,4 +9,4 @@ license=(GPL3 LGPL3 FDL custom) pkgdesc='Provides access to position, satellite and area monitoring classes (android)' depends=(<%== qt6deps qw(base) %>) optdepends=(<%== qt6optdeps serialport => 'NMEA plugin', declarative => 'QML bindings' %>) -makedepends=('android-cmake<%== $static_suffix %>' <%== qt6deps qw(serialport declarative) %> 'qt6-serialbus' 'qt6-declarative' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake<%== $static_suffix %>' <%== qt6deps qw(serialport declarative) %> 'qt6-serialbus' 'qt6-declarative' 'ninja' 'java-environment-openjdk=17') diff --git a/qt6-quick3d/android-aarch64/PKGBUILD b/qt6-quick3d/android-aarch64/PKGBUILD index 64c56ae1..e8c08b84 100644 --- a/qt6-quick3d/android-aarch64/PKGBUILD +++ b/qt6-quick3d/android-aarch64/PKGBUILD @@ -13,7 +13,7 @@ url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) pkgdesc='Qt module and API for defining 3D content in Qt Quick (android)' depends=('android-aarch64-qt6-declarative') -makedepends=('android-cmake' 'android-aarch64-qt6-shadertools' 'qt6-quick3d' 'qt6-shadertools' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake' 'android-aarch64-qt6-shadertools' 'qt6-quick3d' 'qt6-shadertools' 'ninja' 'java-environment-openjdk=17') options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(android-${_android_arch}-qt6) _pkgfqn="qtquick3d-everywhere-src-${_qtver}" @@ -21,6 +21,7 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm sha256sums=('fcdc9f8955ea12ca8ffa4d202edec2ac2b70f3955e50a17157bf7d19dab93a38') build() { + export PATH=/usr/lib/jvm/java-17-openjdk/bin:$PATH source android-env ${_android_arch} android-${_android_arch}-cmake -G Ninja -B build-$_android_arch -S $_pkgfqn \ -DCMAKE_FIND_ROOT_PATH="${ANDROID_PREFIX}" \ diff --git a/qt6-quick3d/android-aarch64/PKGBUILD.sh.ep b/qt6-quick3d/android-aarch64/PKGBUILD.sh.ep index f8696e27..28d43a67 100644 --- a/qt6-quick3d/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-quick3d/android-aarch64/PKGBUILD.sh.ep @@ -8,4 +8,4 @@ url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) pkgdesc='Qt module and API for defining 3D content in Qt Quick (android)' depends=(<%== qt6deps qw(declarative) %>) -makedepends=('android-cmake<%== $static_suffix %>' <%== qt6deps qw(shadertools) %> 'qt6-quick3d' 'qt6-shadertools' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake<%== $static_suffix %>' <%== qt6deps qw(shadertools) %> 'qt6-quick3d' 'qt6-shadertools' 'ninja' 'java-environment-openjdk=17') diff --git a/qt6-quicktimeline/android-aarch64/PKGBUILD b/qt6-quicktimeline/android-aarch64/PKGBUILD index 05286ae1..8450918d 100644 --- a/qt6-quicktimeline/android-aarch64/PKGBUILD +++ b/qt6-quicktimeline/android-aarch64/PKGBUILD @@ -13,7 +13,7 @@ url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) pkgdesc='Qt module for keyframe-based timeline construction (android)' depends=('android-aarch64-qt6-declarative') -makedepends=('android-cmake' 'qt6-declarative' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake' 'qt6-declarative' 'ninja' 'java-environment-openjdk=17') options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(android-${_android_arch}-qt6) _pkgfqn="qtquicktimeline-everywhere-src-${_qtver}" @@ -21,6 +21,7 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm sha256sums=('8c4e5273c85a23e93da3375ce5e97261707fe9800076aaf164e7e00cc14d9919') build() { + export PATH=/usr/lib/jvm/java-17-openjdk/bin:$PATH source android-env ${_android_arch} android-${_android_arch}-cmake -G Ninja -B build-$_android_arch -S $_pkgfqn \ -DCMAKE_FIND_ROOT_PATH="${ANDROID_PREFIX}" \ diff --git a/qt6-quicktimeline/android-aarch64/PKGBUILD.sh.ep b/qt6-quicktimeline/android-aarch64/PKGBUILD.sh.ep index 8024a3bb..61c3d0e0 100644 --- a/qt6-quicktimeline/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-quicktimeline/android-aarch64/PKGBUILD.sh.ep @@ -8,4 +8,4 @@ url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) pkgdesc='Qt module for keyframe-based timeline construction (android)' depends=(<%== qt6deps qw(declarative) %>) -makedepends=('android-cmake<%== $static_suffix %>' 'qt6-declarative' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake<%== $static_suffix %>' 'qt6-declarative' 'ninja' 'java-environment-openjdk=17') diff --git a/qt6-scxml/android-aarch64/PKGBUILD b/qt6-scxml/android-aarch64/PKGBUILD index bc5025aa..171ed3f6 100644 --- a/qt6-scxml/android-aarch64/PKGBUILD +++ b/qt6-scxml/android-aarch64/PKGBUILD @@ -14,7 +14,7 @@ license=(GPL3 LGPL3 FDL custom) pkgdesc='Static and runtime integration of SCXML models into Qt6 code (android)' depends=('android-aarch64-qt6-base') optdepends=('android-aarch64-qt6-declarative: QML bindings') -makedepends=('android-cmake' 'android-aarch64-qt6-declarative' 'qt6-declarative' 'qt6-scxml' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake' 'android-aarch64-qt6-declarative' 'qt6-declarative' 'qt6-scxml' 'ninja' 'java-environment-openjdk=17') options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(android-${_android_arch}-qt6) _pkgfqn="qtscxml-everywhere-src-${_qtver}" @@ -22,6 +22,7 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm sha256sums=('094982f0ff828070b2282c97b68229ec8ff4d68b32f335ab1cba81530a40a43e') build() { + export PATH=/usr/lib/jvm/java-17-openjdk/bin:$PATH source android-env ${_android_arch} android-${_android_arch}-cmake -G Ninja -B build-$_android_arch -S $_pkgfqn \ -DCMAKE_FIND_ROOT_PATH="${ANDROID_PREFIX}" \ diff --git a/qt6-scxml/android-aarch64/PKGBUILD.sh.ep b/qt6-scxml/android-aarch64/PKGBUILD.sh.ep index 2474452b..2c3862fe 100644 --- a/qt6-scxml/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-scxml/android-aarch64/PKGBUILD.sh.ep @@ -9,4 +9,4 @@ license=(GPL3 LGPL3 FDL custom) pkgdesc='Static and runtime integration of SCXML models into Qt6 code (android)' depends=(<%== qt6deps qw(base) %>) optdepends=(<%== qt6optdeps declarative => 'QML bindings' %>) -makedepends=('android-cmake<%== $static_suffix %>' <%== qt6deps qw(declarative) %> 'qt6-declarative' 'qt6-scxml' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake<%== $static_suffix %>' <%== qt6deps qw(declarative) %> 'qt6-declarative' 'qt6-scxml' 'ninja' 'java-environment-openjdk=17') diff --git a/qt6-sensors/android-aarch64/PKGBUILD b/qt6-sensors/android-aarch64/PKGBUILD index 53cde8da..90730494 100644 --- a/qt6-sensors/android-aarch64/PKGBUILD +++ b/qt6-sensors/android-aarch64/PKGBUILD @@ -14,7 +14,7 @@ license=(GPL3 LGPL3 FDL custom) pkgdesc='Provides access to sensor hardware and motion gesture recognition (android)' depends=('android-aarch64-qt6-connectivity') optdepends=('android-aarch64-qt6-declarative: QML bindings') -makedepends=('android-cmake' 'android-aarch64-qt6-declarative' 'qt6-declarative' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake' 'android-aarch64-qt6-declarative' 'qt6-declarative' 'ninja' 'java-environment-openjdk=17') options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(android-${_android_arch}-qt6) _pkgfqn="qtsensors-everywhere-src-${_qtver}" @@ -22,6 +22,7 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm sha256sums=('4a6f9fcee6d23dd0f7e8b84b0faa12153ad779f09a266bbb6fb657eb16287c28') build() { + export PATH=/usr/lib/jvm/java-17-openjdk/bin:$PATH source android-env ${_android_arch} android-${_android_arch}-cmake -G Ninja -B build-$_android_arch -S $_pkgfqn \ -DCMAKE_FIND_ROOT_PATH="${ANDROID_PREFIX}" \ diff --git a/qt6-sensors/android-aarch64/PKGBUILD.sh.ep b/qt6-sensors/android-aarch64/PKGBUILD.sh.ep index 7cee2c86..a80a4b73 100644 --- a/qt6-sensors/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-sensors/android-aarch64/PKGBUILD.sh.ep @@ -9,4 +9,4 @@ license=(GPL3 LGPL3 FDL custom) pkgdesc='Provides access to sensor hardware and motion gesture recognition (android)' depends=(<%== qt6deps qw(connectivity) %>) optdepends=(<%== qt6optdeps declarative => 'QML bindings' %>) -makedepends=('android-cmake<%== $static_suffix %>' <%== qt6deps qw(declarative) %> 'qt6-declarative' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake<%== $static_suffix %>' <%== qt6deps qw(declarative) %> 'qt6-declarative' 'ninja' 'java-environment-openjdk=17') diff --git a/qt6-serialbus/android-aarch64/PKGBUILD b/qt6-serialbus/android-aarch64/PKGBUILD index b85c7f06..b62911f4 100644 --- a/qt6-serialbus/android-aarch64/PKGBUILD +++ b/qt6-serialbus/android-aarch64/PKGBUILD @@ -13,7 +13,7 @@ url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) pkgdesc='Qt module for general purpose serial bus access (android)' depends=('android-aarch64-qt6-serialport') -makedepends=('android-cmake' 'qt6-base' 'qt6-serialbus' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake' 'qt6-base' 'qt6-serialbus' 'ninja' 'java-environment-openjdk=17') options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(android-${_android_arch}-qt6) _pkgfqn="qtserialbus-everywhere-src-${_qtver}" @@ -21,6 +21,7 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm sha256sums=('9cffaa49e1b742e315990c2cf9179f9419ad23c1f0591b6f14b9ac4c03eafa3c') build() { + export PATH=/usr/lib/jvm/java-17-openjdk/bin:$PATH source android-env ${_android_arch} android-${_android_arch}-cmake -G Ninja -B build-$_android_arch -S $_pkgfqn \ -DCMAKE_FIND_ROOT_PATH="${ANDROID_PREFIX}" \ diff --git a/qt6-serialbus/android-aarch64/PKGBUILD.sh.ep b/qt6-serialbus/android-aarch64/PKGBUILD.sh.ep index 91540092..95420cc5 100644 --- a/qt6-serialbus/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-serialbus/android-aarch64/PKGBUILD.sh.ep @@ -8,4 +8,4 @@ url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) pkgdesc='Qt module for general purpose serial bus access (android)' depends=(<%== qt6deps qw(serialport) %>) -makedepends=('android-cmake<%== $static_suffix %>' 'qt6-base' 'qt6-serialbus' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake<%== $static_suffix %>' 'qt6-base' 'qt6-serialbus' 'ninja' 'java-environment-openjdk=17') diff --git a/qt6-serialport/android-aarch64/PKGBUILD b/qt6-serialport/android-aarch64/PKGBUILD index 57490949..ac14c54e 100644 --- a/qt6-serialport/android-aarch64/PKGBUILD +++ b/qt6-serialport/android-aarch64/PKGBUILD @@ -13,7 +13,7 @@ url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) pkgdesc='Provides access to hardware and virtual serial ports (android)' depends=('android-aarch64-qt6-base') -makedepends=('android-cmake' 'qt6-base' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake' 'qt6-base' 'ninja' 'java-environment-openjdk=17') options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(android-${_android_arch}-qt6) _pkgfqn="qtserialport-everywhere-src-${_qtver}" @@ -21,6 +21,7 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm sha256sums=('ba1e0c9caeb1ee06ce940ce32c810e6fab826124281469ad0eecff56f375459a') build() { + export PATH=/usr/lib/jvm/java-17-openjdk/bin:$PATH source android-env ${_android_arch} android-${_android_arch}-cmake -G Ninja -B build-$_android_arch -S $_pkgfqn \ -DCMAKE_FIND_ROOT_PATH="${ANDROID_PREFIX}" \ diff --git a/qt6-serialport/android-aarch64/PKGBUILD.sh.ep b/qt6-serialport/android-aarch64/PKGBUILD.sh.ep index babdf226..5932816f 100644 --- a/qt6-serialport/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-serialport/android-aarch64/PKGBUILD.sh.ep @@ -8,4 +8,4 @@ url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) pkgdesc='Provides access to hardware and virtual serial ports (android)' depends=(<%== qt6deps qw(base) %>) -makedepends=('android-cmake<%== $static_suffix %>' 'qt6-base' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake<%== $static_suffix %>' 'qt6-base' 'ninja' 'java-environment-openjdk=17') diff --git a/qt6-shadertools/android-aarch64/PKGBUILD b/qt6-shadertools/android-aarch64/PKGBUILD index cb5d730d..4fa4ad99 100644 --- a/qt6-shadertools/android-aarch64/PKGBUILD +++ b/qt6-shadertools/android-aarch64/PKGBUILD @@ -13,7 +13,7 @@ url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) pkgdesc='Experimental module providing APIs and a host tool to host tool to perform graphics and compute shader conditioning for the upcoming Qt graphics abstraction layer (android)' depends=('android-aarch64-qt6-base') -makedepends=('android-cmake' 'qt6-shadertools' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake' 'qt6-shadertools' 'ninja' 'java-environment-openjdk=17') optdepends=('qt6-shadertools: development tools') options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(android-${_android_arch}-qt6) @@ -22,6 +22,7 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm sha256sums=('628bead7ff4e7f42cb910f47d2adefbdea0d8c71a0234baef8ca709bf467b92f') build() { + export PATH=/usr/lib/jvm/java-17-openjdk/bin:$PATH source android-env ${_android_arch} android-${_android_arch}-cmake -G Ninja -B build-$_android_arch -S $_pkgfqn \ -DCMAKE_FIND_ROOT_PATH="${ANDROID_PREFIX}" \ diff --git a/qt6-shadertools/android-aarch64/PKGBUILD.sh.ep b/qt6-shadertools/android-aarch64/PKGBUILD.sh.ep index 86414fbf..a9028487 100644 --- a/qt6-shadertools/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-shadertools/android-aarch64/PKGBUILD.sh.ep @@ -8,5 +8,5 @@ url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) pkgdesc='Experimental module providing APIs and a host tool to host tool to perform graphics and compute shader conditioning for the upcoming Qt graphics abstraction layer (android)' depends=(<%== qt6deps qw(base) %>) -makedepends=('android-cmake<%== $static_suffix %>' 'qt6-shadertools' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake<%== $static_suffix %>' 'qt6-shadertools' 'ninja' 'java-environment-openjdk=17') optdepends=('qt6-shadertools: development tools') diff --git a/qt6-svg/android-aarch64/PKGBUILD b/qt6-svg/android-aarch64/PKGBUILD index 3de2af78..96dda2cd 100644 --- a/qt6-svg/android-aarch64/PKGBUILD +++ b/qt6-svg/android-aarch64/PKGBUILD @@ -13,7 +13,7 @@ url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) pkgdesc='Classes for displaying the contents of SVG files (android)' depends=('android-aarch64-qt6-base') -makedepends=('android-cmake' 'qt6-base' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake' 'qt6-base' 'ninja' 'java-environment-openjdk=17') options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(android-${_android_arch}-qt6) _pkgfqn="qtsvg-everywhere-src-${_qtver}" @@ -21,6 +21,7 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm sha256sums=('5a231d59ef1b42bfbaa5174d4ff39f8e1b4ba070ef984a70b069b4b2576d8181') build() { + export PATH=/usr/lib/jvm/java-17-openjdk/bin:$PATH source android-env ${_android_arch} android-${_android_arch}-cmake -G Ninja -B build-$_android_arch -S $_pkgfqn \ -DCMAKE_FIND_ROOT_PATH="${ANDROID_PREFIX}" \ diff --git a/qt6-svg/android-aarch64/PKGBUILD.sh.ep b/qt6-svg/android-aarch64/PKGBUILD.sh.ep index 98c9c99c..67a32aa5 100644 --- a/qt6-svg/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-svg/android-aarch64/PKGBUILD.sh.ep @@ -8,4 +8,4 @@ url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) pkgdesc='Classes for displaying the contents of SVG files (android)' depends=(<%== qt6deps qw(base) %>) -makedepends=('android-cmake<%== $static_suffix %>' 'qt6-base' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake<%== $static_suffix %>' 'qt6-base' 'ninja' 'java-environment-openjdk=17') diff --git a/qt6-tools/android-aarch64/PKGBUILD b/qt6-tools/android-aarch64/PKGBUILD index 8cd88158..449381b6 100644 --- a/qt6-tools/android-aarch64/PKGBUILD +++ b/qt6-tools/android-aarch64/PKGBUILD @@ -13,7 +13,7 @@ url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) pkgdesc='A cross-platform application and UI framework (tools, android)' depends=('android-aarch64-qt6-base') -makedepends=('android-cmake' 'android-aarch64-qt6-declarative' 'qt6-declarative' 'qt6-tools' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake' 'android-aarch64-qt6-declarative' 'qt6-declarative' 'qt6-tools' 'ninja' 'java-environment-openjdk=17') options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(android-${_android_arch}-qt6) _pkgfqn="qttools-everywhere-src-${_qtver}" @@ -33,6 +33,7 @@ prepare () { } build() { + export PATH=/usr/lib/jvm/java-17-openjdk/bin:$PATH source android-env ${_android_arch} android-${_android_arch}-cmake -G Ninja -B build-$_android_arch -S $_pkgfqn \ -DCMAKE_FIND_ROOT_PATH="${ANDROID_PREFIX}" \ diff --git a/qt6-tools/android-aarch64/PKGBUILD.sh.ep b/qt6-tools/android-aarch64/PKGBUILD.sh.ep index 35f84876..c1680809 100644 --- a/qt6-tools/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-tools/android-aarch64/PKGBUILD.sh.ep @@ -8,4 +8,4 @@ url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) pkgdesc='A cross-platform application and UI framework (tools, android)' depends=(<%== qt6deps qw(base) %>) -makedepends=('android-cmake<%== $static_suffix %>' <%== qt6deps qw(declarative) %> 'qt6-declarative' 'qt6-tools' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake<%== $static_suffix %>' <%== qt6deps qw(declarative) %> 'qt6-declarative' 'qt6-tools' 'ninja' 'java-environment-openjdk=17') diff --git a/qt6-translations/android-aarch64/PKGBUILD b/qt6-translations/android-aarch64/PKGBUILD index 44b0bb11..afd2257c 100644 --- a/qt6-translations/android-aarch64/PKGBUILD +++ b/qt6-translations/android-aarch64/PKGBUILD @@ -13,7 +13,7 @@ url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) pkgdesc='A cross-platform application and UI framework (Translations, android)' depends=('android-aarch64-qt6-base') -makedepends=('android-cmake' 'android-aarch64-qt6-tools' 'qt6-tools' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake' 'android-aarch64-qt6-tools' 'qt6-tools' 'ninja' 'java-environment-openjdk=17') options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(android-${_android_arch}-qt6) _pkgfqn="qttranslations-everywhere-src-${_qtver}" @@ -21,6 +21,7 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm sha256sums=('ca3ac090ef3aa12566c26b482c106f1f986c5a3444e7003f379726a550530c77') build() { + export PATH=/usr/lib/jvm/java-17-openjdk/bin:$PATH source android-env ${_android_arch} android-${_android_arch}-cmake -G Ninja -B build-$_android_arch -S $_pkgfqn \ -DCMAKE_FIND_ROOT_PATH="${ANDROID_PREFIX}" \ diff --git a/qt6-translations/android-aarch64/PKGBUILD.sh.ep b/qt6-translations/android-aarch64/PKGBUILD.sh.ep index 26060f59..82c74940 100644 --- a/qt6-translations/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-translations/android-aarch64/PKGBUILD.sh.ep @@ -8,4 +8,4 @@ url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) pkgdesc='A cross-platform application and UI framework (Translations, android)' depends=(<%== qt6deps qw(base) %>) -makedepends=('android-cmake<%== $static_suffix %>' <%== qt6deps qw(tools) %> 'qt6-tools' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake<%== $static_suffix %>' <%== qt6deps qw(tools) %> 'qt6-tools' 'ninja' 'java-environment-openjdk=17') diff --git a/qt6-virtualkeyboard/android-aarch64/PKGBUILD b/qt6-virtualkeyboard/android-aarch64/PKGBUILD index e5bd52a1..e9d4a587 100644 --- a/qt6-virtualkeyboard/android-aarch64/PKGBUILD +++ b/qt6-virtualkeyboard/android-aarch64/PKGBUILD @@ -13,7 +13,7 @@ url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) pkgdesc='Virtual keyboard framework (android)' depends=('android-aarch64-qt6-declarative' 'android-aarch64-qt6-svg') -makedepends=('android-cmake' 'qt6-declarative' 'qt6-shadertools' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake' 'qt6-declarative' 'qt6-shadertools' 'ninja' 'java-environment-openjdk=17') options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(android-${_android_arch}-qt6) _pkgfqn="qtvirtualkeyboard-everywhere-src-${_qtver}" @@ -21,6 +21,7 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm sha256sums=('6142fddb88eb3ed03a97e0d86f7b3121207845b3ec84a92522a78b97886ed81e') build() { + export PATH=/usr/lib/jvm/java-17-openjdk/bin:$PATH source android-env ${_android_arch} android-${_android_arch}-cmake -G Ninja -B build-$_android_arch -S $_pkgfqn \ -DCMAKE_FIND_ROOT_PATH="${ANDROID_PREFIX}" \ diff --git a/qt6-virtualkeyboard/android-aarch64/PKGBUILD.sh.ep b/qt6-virtualkeyboard/android-aarch64/PKGBUILD.sh.ep index 1d420ba7..fdad41d8 100644 --- a/qt6-virtualkeyboard/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-virtualkeyboard/android-aarch64/PKGBUILD.sh.ep @@ -8,4 +8,4 @@ url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) pkgdesc='Virtual keyboard framework (android)' depends=(<%== qt6deps qw(declarative svg) %>) -makedepends=('android-cmake<%== $static_suffix %>' 'qt6-declarative' 'qt6-shadertools' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake<%== $static_suffix %>' 'qt6-declarative' 'qt6-shadertools' 'ninja' 'java-environment-openjdk=17') diff --git a/qt6-webchannel/android-aarch64/PKGBUILD b/qt6-webchannel/android-aarch64/PKGBUILD index 2f527a90..d984c2c6 100644 --- a/qt6-webchannel/android-aarch64/PKGBUILD +++ b/qt6-webchannel/android-aarch64/PKGBUILD @@ -13,7 +13,7 @@ url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) pkgdesc='Provides access to QObject or QML objects from HTML clients for seamless integration of Qt applications with HTML/JavaScript clients (android)' depends=('android-aarch64-qt6-declarative') -makedepends=('android-cmake' 'qt6-declarative' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake' 'qt6-declarative' 'ninja' 'java-environment-openjdk=17') options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(android-${_android_arch}-qt6) _pkgfqn="qtwebchannel-everywhere-src-${_qtver}" @@ -21,6 +21,7 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm sha256sums=('3d7c7d3999a394aa337bf575e33e526b058922e3760b34c942e5c8c174dcccc6') build() { + export PATH=/usr/lib/jvm/java-17-openjdk/bin:$PATH source android-env ${_android_arch} android-${_android_arch}-cmake -G Ninja -B build-$_android_arch -S $_pkgfqn \ -DCMAKE_FIND_ROOT_PATH="${ANDROID_PREFIX}" \ diff --git a/qt6-webchannel/android-aarch64/PKGBUILD.sh.ep b/qt6-webchannel/android-aarch64/PKGBUILD.sh.ep index a32007af..49890964 100644 --- a/qt6-webchannel/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-webchannel/android-aarch64/PKGBUILD.sh.ep @@ -8,4 +8,4 @@ url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) pkgdesc='Provides access to QObject or QML objects from HTML clients for seamless integration of Qt applications with HTML/JavaScript clients (android)' depends=(<%== qt6deps qw(declarative) %>) -makedepends=('android-cmake<%== $static_suffix %>' 'qt6-declarative' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake<%== $static_suffix %>' 'qt6-declarative' 'ninja' 'java-environment-openjdk=17') diff --git a/qt6-websockets/android-aarch64/PKGBUILD b/qt6-websockets/android-aarch64/PKGBUILD index 70cd5198..183e8873 100644 --- a/qt6-websockets/android-aarch64/PKGBUILD +++ b/qt6-websockets/android-aarch64/PKGBUILD @@ -14,7 +14,7 @@ license=(GPL3 LGPL3 FDL custom) pkgdesc='Provides WebSocket communication compliant with RFC 6455 (android)' depends=('android-aarch64-qt6-base') optdepends=('android-aarch64-qt6-declarative: QML bindings') -makedepends=('android-cmake' 'android-aarch64-qt6-declarative' 'qt6-declarative' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake' 'android-aarch64-qt6-declarative' 'qt6-declarative' 'ninja' 'java-environment-openjdk=17') options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') groups=(android-${_android_arch}-qt6) _pkgfqn="qtwebsockets-everywhere-src-${_qtver}" @@ -22,6 +22,7 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm sha256sums=('c0e6ea9bc8db4290bb43e683fb3d639055fe91258f357980eb6ef5abab4438f9') build() { + export PATH=/usr/lib/jvm/java-17-openjdk/bin:$PATH source android-env ${_android_arch} android-${_android_arch}-cmake -G Ninja -B build-$_android_arch -S $_pkgfqn \ -DCMAKE_FIND_ROOT_PATH="${ANDROID_PREFIX}" \ diff --git a/qt6-websockets/android-aarch64/PKGBUILD.sh.ep b/qt6-websockets/android-aarch64/PKGBUILD.sh.ep index 0ada74a3..9f4d94e9 100644 --- a/qt6-websockets/android-aarch64/PKGBUILD.sh.ep +++ b/qt6-websockets/android-aarch64/PKGBUILD.sh.ep @@ -9,4 +9,4 @@ license=(GPL3 LGPL3 FDL custom) pkgdesc='Provides WebSocket communication compliant with RFC 6455 (android)' depends=(<%== qt6deps qw(base) %>) optdepends=(<%== qt6optdeps declarative => 'QML bindings' %>) -makedepends=('android-cmake<%== $static_suffix %>' <%== qt6deps qw(declarative) %> 'qt6-declarative' 'ninja' 'java-environment-openjdk>=11') +makedepends=('android-cmake<%== $static_suffix %>' <%== qt6deps qw(declarative) %> 'qt6-declarative' 'ninja' 'java-environment-openjdk=17')