diff options
author | Martchus | 2024-02-25 18:20:16 +0100 |
---|---|---|
committer | Martchus | 2024-02-25 18:20:16 +0100 |
commit | 0bbd676b25c9673a8e38a6efbcaf9460c879de7e (patch) | |
tree | 7de068fcac355597aab065067dee82e92ea719e2 | |
parent | 8f01ebfcab9ebbb9e20c4019d036ab149d9ec272 (diff) | |
download | aur-0bbd676b25c9673a8e38a6efbcaf9460c879de7e.tar.gz |
Force Android Qt 6 packages to use Java 17
This may help to prevent https://bugreports.qt.io/browse/QTBUG-119223.
-rw-r--r-- | .SRCINFO | 2 | ||||
-rw-r--r-- | PKGBUILD | 3 | ||||
-rw-r--r-- | PKGBUILD.sh.ep | 2 |
3 files changed, 4 insertions, 3 deletions
@@ -13,7 +13,7 @@ pkgbase = android-aarch64-qt6-datavis3d makedepends = android-aarch64-qt6-declarative makedepends = qt6-declarative makedepends = ninja - makedepends = java-environment-openjdk>=11 + makedepends = java-environment-openjdk=17 depends = android-aarch64-qt6-base optdepends = android-aarch64-qt6-declarative: QML bindings options = !strip @@ -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/PKGBUILD.sh.ep b/PKGBUILD.sh.ep index 9ca255f61093..0dbb2426481c 100644 --- a/PKGBUILD.sh.ep +++ b/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') |