Improve documentation about using devel container for Android cross-compilation

Update mingw-w64-extra-cmake-modules and -kirigami2 to 6.0.0
Not tested yet
2024-02-24 22:10:43 +01:00 · 2024-02-24 21:59:32 +01:00 · 2024-02-24 21:47:18 +01:00 · 2024-02-24 21:14:37 +01:00 · 2024-02-24 21:14:20 +01:00 · 2024-02-24 21:13:16 +01:00
63 changed files with 166 additions and 137 deletions
--- a/README.md
+++ b/README.md
@ -121,26 +121,17 @@ for this purpose.

 Here are some example commands how one might do that:
 ```
-# create a directory to store builds and new container and start it
-mkdir -p /hdd/build/container
-podman container create -it \
-  --name archlinux-devel-container \                    # give container a meaningful name
-  -v /hdd/cache/pacman/pkg:/var/cache/pacman/pkg \      # share pacman cache accross different containers
-  -v /hdd/build/container:/build \                      # expose build directory to host
-  -v /hdd/projects:/src \                               # access source files from host
-  -v /hdd/chroot/remote-config-x86_64:/cfg \            # mount directory containing pacman.conf/makepkg.conf
-  archlinux-base-devel
-podman container start archlinux-devel-container
-
-# configure pacman to use config from mounted directory
-podman container exec archlinux-devel-container bash -c "$(cat devel/container/containersync)"
+# do basic container setup
+containers/create-devel-container-example

 # start interactive shell in container
 podman container exec -it archlinux-devel-container bash

-# install stuff you want
+# install stuff you want, e.g. mingw-w64 or android Qt package
 podman container exec -it archlinux-devel-container \
  pacman -Syu ninja git mingw-w64-cmake qt6-{base,tools} mingw-w64-qt6-{base,tools,translations,svg,5compat}
+podman container exec -it archlinux-devel-container \
+  pacman -Syu clang ninja git extra-cmake-modules android-cmake qt6-{base,tools,declarative,shadertools} android-aarch64-qt6-{base,declarative,tools,translations,svg,5compat} android-aarch64-{boost,libiconv,kirigami2}

 # configure the build using mingw-w64 packages, e.g. run CMake
 podman container exec -it archlinux-devel-container x86_64-w64-mingw32-cmake \
@ -158,6 +149,7 @@ podman container exec -it archlinux-devel-container bash -c '
 # configure the build using android packages, e.g. run CMake
 podman container exec -it archlinux-devel-container bash -c '
  android_arch=aarch64
+  export PATH=/usr/lib/jvm/java-17-openjdk/bin:$PATH
  source /usr/bin/android-env $android_arch && \
  android-$android_arch-cmake \
    -G Ninja \
@ -171,6 +163,7 @@ podman container exec -it archlinux-devel-container bash -c '

 # conduct the build using android packages, e.g. invoke Ninja build system via CMake
 podman container exec -it archlinux-devel-container bash -c '
+  export PATH=/usr/lib/jvm/java-17-openjdk/bin:$PATH
  source /usr/bin/android-env aarch64 && \
  cmake --build /build/passwordmanager-android-aarch64-release --verbose'

--- a/devel/container/base-devel/Dockerfile
+++ b/devel/container/base-devel/Dockerfile
@ -10,6 +10,7 @@ RUN mkdir -p /startdir /build && \
    pacman-key --recv-keys B9E36A7275FC61B464B67907E06FE8F53CDC6A4C && \
    pacman-key --finger    B9E36A7275FC61B464B67907E06FE8F53CDC6A4C && \
    pacman-key --lsign-key B9E36A7275FC61B464B67907E06FE8F53CDC6A4C && \
+    pacman -Sy --verbose --noconfirm --needed archlinux-keyring && \
    pacman -Syu --verbose --noconfirm --needed base-devel pacman-contrib ccache && \
    pacman -Scc --noconfirm && \
    paccache -r -k0 && \
--- a/devel/container/containersync
+++ b/devel/container/containersync
@ -1,7 +1,8 @@
 #!/bin/bash
 set -e
+[ "$(whoami)" == root ] && sudo= || sudo=sudo
 for config_file in {/cfg/,}{makepkg,pacman}.conf; do
-    [[ -f $config_file ]] && sudo cp --target-directory=/etc "$config_file"
+    [[ -f $config_file ]] && $sudo cp --target-directory=/etc "$config_file"
 done
 [[ -f PKGBUILD ]] && source PKGBUILD
-sudo pacman -Syu --noconfirm --needed "${depends[@]}" "${makedepends[@]}" "${checkdepends[@]}"
+$sudo pacman -Syu --noconfirm --needed "${depends[@]}" "${makedepends[@]}" "${checkdepends[@]}"
--- a/devel/container/create-devel-container-example
+++ b/devel/container/create-devel-container-example
@ -0,0 +1,19 @@
+#!/bin/bash
+dev_dir=/hdd
+bindir=$(dirname "$0")
+
+# create a directory to store builds and new container and start it
+mkdir -p "$dev_dir/build/container"
+
+# create container sharing pacman cache, chroot directory and build and source directory with host
+podman container create -it \
+  --name archlinux-devel-container \
+  -v "$dev_dir/cache/pacman/pkg:/var/cache/pacman/pkg" \
+  -v "$dev_dir/build/container:/build" \
+  -v "$dev_dir/projects:/src" \
+  -v "$dev_dir/chroot/remote-config-x86_64:/cfg" \
+  archlinux-base-devel
+
+# configure pacman to use config from mounted directory
+podman container start archlinux-devel-container
+podman container exec archlinux-devel-container bash -c "$(cat "$bindir/containersync")"
--- 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}" \\
--- 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 \\
--- a/extra-cmake-modules/mingw-w64/PKGBUILD
+++ b/extra-cmake-modules/mingw-w64/PKGBUILD
@ -1,5 +1,6 @@
-pkgname=mingw-w64-extra-cmake-modules
-pkgver=5.102.0
+_pkgname=extra-cmake-modules
+pkgname=mingw-w64-$_pkgname
+pkgver=6.0.0
 pkgrel=1
 arch=(any)
 pkgdesc="Extra modules and scripts for CMake (mingw-w64)"
@ -8,14 +9,12 @@ license=("LGPL")
 depends=(mingw-w64-cmake)
 options=(staticlibs !strip !buildflags)
 url="https://community.kde.org/Frameworks"
-source=("http://download.kde.org/stable/frameworks/${pkgver%.*}/extra-cmake-modules-${pkgver}.tar.xz"{,.sig}
-"set-AUTOSTATICPLUGINS.patch"
-"05aa27dc0e14dab407379a4d22f895e9eff13cc0.patch")
-sha256sums=('f259aeb5a8e046ee2a0e658645f3af6d3e42145d3ae576f305b2b6e24a297f9b'
-            'SKIP'
-            '30bdcedab402c69ea0db3460f5a23cbd226a5cd1e12b13926b8a65df773e14a0'
-            '7e44cf56a8274c8166eaf02e60c2d34e5048992a7e3c8309b998b762a394e909')
-validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure@kde.org>
+source=(https://download.kde.org/stable/frameworks/${pkgver%.*}/$_pkgname-$pkgver.tar.xz{,.sig})
+sha256sums=('23992bf19db717156b7d6dd13118caa79fd57f090beb062e8308db3c09f70d0c'
+            'SKIP')
+validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB  # David Faure <faure@kde.org>
+              E0A3EB202F8E57528E13E72FD7574483BB57B18D) # Jonathan Esk-Riddell <jr@jriddell.org>
+options=(!buildflags staticlibs !strip !emptydirs)

 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"

--- a/kirigami2/android-aarch64/PKGBUILD
+++ b/kirigami2/android-aarch64/PKGBUILD
@ -4,25 +4,26 @@
 # All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
 # you also find the URL of a binary repository.

-_pkgname=kirigami2
+_pkgname=kirigami
 _android_arch=aarch64

-pkgname=android-$_android_arch-$_pkgname
-pkgver=5.240.0.20231004
+pkgname=android-${_android_arch}-${_pkgname}2
+pkgver=6.0.0
 pkgrel=1
 pkgdesc="A QtQuick based components set (Android, $_android_arch)"
 arch=('any')
 url='https://community.kde.org/Frameworks'
 license=(LGPL)
 depends=("android-$_android_arch-qt6"-{declarative,shadertools,svg,5compat})
-makedepends=('cmake' 'android-ndk' 'android-sdk' 'android-cmake' 'extra-cmake-modules-git' 'ninja' 'git' 'qt6-base' 'qt6-declarative' 'qt6-tools' 'qt6-shadertools')
-#source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/$_pkgname-$pkgver.tar.xz"{,.sig})
-#sha256sums=('9706915f219ef9394b030dbb24974d4fddef091008954cf75cf97cc97586e35f'
+makedepends=('cmake' 'android-ndk' 'android-sdk' 'android-cmake' 'extra-cmake-modules' 'ninja' 'git' 'qt6-base' 'qt6-declarative' 'qt6-tools' 'qt6-shadertools')
+#source=(https://download.kde.org/stable/frameworks/${pkgver%.*}/$_pkgname-$pkgver.tar.xz{,.sig})
+#sha256sums=('ed0f56c89249fb92a9af99a94fd13542abbae4a8f1613aaaa2bfab87914b601a'
 #            'SKIP')
-_commit=41bdddb37ea96ea19109c2aa9e7158cb57986386
+validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB  # David Faure <faure@kde.org>
+              E0A3EB202F8E57528E13E72FD7574483BB57B18D) # Jonathan Esk-Riddell <jr@jriddell.org>
+_commit=05626819a0ed2f5b3db65191803b237992cbf17d
 source=(git+https://invent.kde.org/frameworks/kirigami.git#commit=$_commit)
 sha256sums=(SKIP)
-validpgpkeys=('53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB') # David Faure <faure@kde.org>
 options=(!buildflags staticlibs !strip !emptydirs)

 #pkgver() {
@ -32,7 +33,7 @@ options=(!buildflags staticlibs !strip !emptydirs)

 build() {
  source android-env ${_android_arch}
-  android-${_android_arch}-cmake -G Ninja -B build-$_android_arch -S kirigami \
+  android-${_android_arch}-cmake -G Ninja -B build-$_android_arch -S $_pkgname \
    -DCMAKE_FIND_ROOT_PATH="${ANDROID_PREFIX}" \
    -DECM_DIR:PATH=/usr/share/ECM/cmake \
    -DBUILD_EXAMPLES=OFF \
--- a/kirigami2/android-armv7a-eabi/PKGBUILD
+++ b/kirigami2/android-armv7a-eabi/PKGBUILD
@ -4,59 +4,45 @@
 # All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
 # you also find the URL of a binary repository.

-_pkgname=kirigami2
-_android_arch=armeabi-v7a
-_pkg_arch=armv7a-eabi
-_android_toolchain=arm-linux-androideabi
-_android_platform=24
-_prefix=/opt/android-libs/$_pkg_arch
+_pkgname=kirigami
+_android_arch=aarch64

-pkgname=android-$_pkg_arch-$_pkgname
-pkgver=5.74.0
+pkgname=android-${_android_arch}-${_pkgname}2
+pkgver=6.0.0
 pkgrel=1
-pkgdesc="A QtQuick based components set (Android, $_pkg_arch)"
+pkgdesc="A QtQuick based components set (Android, $_android_arch)"
 arch=('any')
 url='https://community.kde.org/Frameworks'
 license=(LGPL)
-depends=("android-$_pkg_arch-qt5")
-makedepends=('cmake' 'android-ndk' 'android-sdk' 'extra-cmake-modules')
-conflicts=("android-$_pkgname-$_android_arch")
-replaces=("android-$_pkgname-$_android_arch")
-source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/$_pkgname-$pkgver.tar.xz"{,.sig})
-sha256sums=('9706915f219ef9394b030dbb24974d4fddef091008954cf75cf97cc97586e35f'
-            'SKIP')
-validpgpkeys=('53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB') # David Faure <faure@kde.org>
+depends=("android-$_android_arch-qt6"-{declarative,shadertools,svg,5compat})
+makedepends=('cmake' 'android-ndk' 'android-sdk' 'android-cmake' 'extra-cmake-modules' 'ninja' 'git' 'qt6-base' 'qt6-declarative' 'qt6-tools' 'qt6-shadertools')
+#source=(https://download.kde.org/stable/frameworks/${pkgver%.*}/$_pkgname-$pkgver.tar.xz{,.sig})
+#sha256sums=('ed0f56c89249fb92a9af99a94fd13542abbae4a8f1613aaaa2bfab87914b601a'
+#            'SKIP')
+validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB  # David Faure <faure@kde.org>
+              E0A3EB202F8E57528E13E72FD7574483BB57B18D) # Jonathan Esk-Riddell <jr@jriddell.org>
+_commit=05626819a0ed2f5b3db65191803b237992cbf17d
+source=(git+https://invent.kde.org/frameworks/kirigami.git#commit=$_commit)
+sha256sums=(SKIP)
 options=(!buildflags staticlibs !strip !emptydirs)

-prepare() {
-  mkdir -p build
-}
+#pkgver() {
+#  cd kirigami
+#  echo "$pkgver.r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
+#}

 build() {
-  cd build
-
-  # note: needs workaround for https://gitlab.kitware.com/cmake/cmake/issues/18739 (currently provided outside of the PKGBUILD itself)
-
-  cmake ../$_pkgname-$pkgver \
-    -DCMAKE_SYSTEM_NAME=Android \
-    -DCMAKE_SYSTEM_VERSION=$_android_platform \
-    -DANDROID_ABI=$_android_arch \
-    -DCMAKE_ANDROID_ARCH_ABI=$_android_arch \
-    -DCMAKE_ANDROID_NDK=/opt/android-ndk \
-    -DCMAKE_ANDROID_SDK=/opt/android-sdk \
-    -DCMAKE_ANDROID_STL_TYPE=c++_shared \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX="$_prefix" \
-    -DCMAKE_EXE_LINKER_FLAGS="-Wl,-rpath-link,$_prefix/lib" \
-    -DCMAKE_FIND_ROOT_PATH="/opt/android-ndk/sysroot;$_prefix" \
-    -DECM_DIR=/usr/share/ECM/cmake \
+  source android-env ${_android_arch}
+  android-${_android_arch}-cmake -G Ninja -B build-$_android_arch -S $_pkgname \
+    -DCMAKE_FIND_ROOT_PATH="${ANDROID_PREFIX}" \
+    -DECM_DIR:PATH=/usr/share/ECM/cmake \
    -DBUILD_EXAMPLES=OFF \
    -DBUILD_TESTING=OFF \
    -DBUILD_QCH=OFF
-  make VERBOSE=1
+  VERBOSE=1 cmake --build build-$_android_arch
 }

 package() {
-  cd build
-  make DESTDIR="$pkgdir" install
+  source android-env ${_android_arch}
+  DESTDIR="$pkgdir" VERBOSE=1 cmake --install build-$_android_arch
 }
--- a/kirigami2/mingw-w64/PKGBUILD
+++ b/kirigami2/mingw-w64/PKGBUILD
@ -4,9 +4,9 @@
 # All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
 # you also find the URL of a binary repository.

-_pkgname=kirigami2
-pkgname=mingw-w64-$_pkgname
-pkgver=5.94.0
+_pkgname=kirigami
+pkgname=mingw-w64-${_pkgname}2
+pkgver=6.0.0
 pkgrel=1
 pkgdesc="A QtQuick based components set (mingw-w64)"
 arch=('any')
@ -14,10 +14,14 @@ url='https://community.kde.org/Frameworks'
 license=(LGPL)
 depends=(mingw-w64-crt mingw-w64-qt5-quickcontrols mingw-w64-qt5-quickcontrols2 mingw-w64-qt5-graphicaleffects)
 makedepends=(mingw-w64-gcc mingw-w64-cmake mingw-w64-extra-cmake-modules mingw-w64-qt5-tools mingw-w64-qt5-svg kpackage)
-source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/$_pkgname-$pkgver.tar.xz"{,.sig})
-sha256sums=('d7f27da3325feb339f4e1a3db78df44f05e4f505f36e15c7caeac04da0428e39'
+source=(https://download.kde.org/stable/frameworks/${pkgver%.*}/$_pkgname-$pkgver.tar.xz{,.sig})
+sha256sums=('ed0f56c89249fb92a9af99a94fd13542abbae4a8f1613aaaa2bfab87914b601a'
            'SKIP')
-validpgpkeys=('53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB') # David Faure <faure@kde.org>
+validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB  # David Faure <faure@kde.org>
+              E0A3EB202F8E57528E13E72FD7574483BB57B18D) # Jonathan Esk-Riddell <jr@jriddell.org>
+#_commit=05626819a0ed2f5b3db65191803b237992cbf17d
+#source=(git+https://invent.kde.org/frameworks/kirigami.git#commit=$_commit)
+#sha256sums=(SKIP)
 options=(!buildflags staticlibs !strip !emptydirs)

 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
--- 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}" \
--- 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')
--- 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} \
--- 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}" \
--- 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')
--- 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}" \
--- 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')
--- 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}" \
--- 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')
--- 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}" \
--- 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) %>)
--- 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}" \
--- 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')
--- 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}" \
--- 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')
--- 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}" \
--- 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')
--- 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}" \
--- 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
 \\
--- 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}" \
--- 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')
--- 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}" \
--- 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')
--- 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}" \
--- 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')
--- 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}" \
--- 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')
--- 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}" \
--- 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')
--- 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}" \
--- 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')
--- 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}" \
--- 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')
--- 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}" \
--- 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')
--- 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}" \
--- 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')
--- 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}" \
--- 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')
--- 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}" \
--- 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')
--- 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}" \
--- 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')
--- 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}" \
--- 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')
--- 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}" \
--- 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')
--- 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}" \
--- 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')
--- 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}" \
--- 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')
--- 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}" \
--- 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')
Author	SHA1	Message	Date
Martchus	9c39a3e5e7	Improve documentation about using devel container for Android cross-compilation	2024-02-24 22:10:43 +01:00
Martchus	ea7e7fcd9b	Update mingw-w64-extra-cmake-modules and -kirigami2 to 6.0.0 Not tested yet	2024-02-24 21:59:32 +01:00
Martchus	6035e582fe	Update android-*-kirigami2 to 6.0.0	2024-02-24 21:47:18 +01:00
Martchus	8d74d797ac	Provide example command for installing android packages	2024-02-24 21:14:37 +01:00
Martchus	8c8cb02156	Move basic devel container setup into separate script for easier use	2024-02-24 21:14:20 +01:00
Martchus	a63b4535e1	Make `containersync` script usable again when it already runs as root	2024-02-24 21:13:16 +01:00
Martchus	1e5ded1c67	Ensure the devel container can be built if archlinux-keyring needs an update	2024-02-24 21:12:23 +01:00
Martchus	25a131916b	Force Androit Qt 6 packages to use Java 17 This may help to prevent https://bugreports.qt.io/browse/QTBUG-119223.	2024-02-23 23:18:52 +01:00