diff options
author | Martchus | 2024-02-25 18:20:41 +0100 |
---|---|---|
committer | Martchus | 2024-02-25 18:20:41 +0100 |
commit | ac556b80ca42bc21f5c6c320734307fc4ce77f87 (patch) | |
tree | f33000e04b96621af714dabd2753e14b31019054 | |
parent | ebcb9dc5b5885e9d650bf163f08c2291f5d9cc19 (diff) | |
download | aur-ac556b80ca42bc21f5c6c320734307fc4ce77f87.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
@@ -12,7 +12,7 @@ pkgbase = android-aarch64-qt6-webchannel makedepends = android-cmake makedepends = qt6-declarative makedepends = ninja - makedepends = java-environment-openjdk>=11 + makedepends = java-environment-openjdk=17 depends = android-aarch64-qt6-declarative options = !strip options = !buildflags @@ -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/PKGBUILD.sh.ep b/PKGBUILD.sh.ep index a32007af7fdd..4989096464f9 100644 --- a/PKGBUILD.sh.ep +++ b/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') |