diff options
author | Martchus | 2024-02-25 18:20:19 +0100 |
---|---|---|
committer | Martchus | 2024-02-25 18:20:19 +0100 |
commit | fd16ba1186f3e5289a05e2b9810918a2393fc319 (patch) | |
tree | 06d512f2b70cdf55aed68ac684ef8b2aa13945ce | |
parent | a4a5f4ca938054fc712dedffbdbc9ab40cf37429 (diff) | |
download | aur-fd16ba1186f3e5289a05e2b9810918a2393fc319.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-lottie 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='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/PKGBUILD.sh.ep b/PKGBUILD.sh.ep index 4b1eab9aabf2..14174585cc57 100644 --- a/PKGBUILD.sh.ep +++ b/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') |