Date: Saturday, January 23, 2021 @ 16:22:34 Author: muflone Revision: 826787
upgpkg: dbeaver 7.3.3-1 Modified: dbeaver/trunk/PKGBUILD ----------+ PKGBUILD | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-01-23 16:22:22 UTC (rev 826786) +++ PKGBUILD 2021-01-23 16:22:34 UTC (rev 826787) @@ -2,7 +2,7 @@ # Contributor: Arne Hoch <[email protected]> pkgname=dbeaver -pkgver=7.3.2 +pkgver=7.3.3 pkgrel=1 pkgdesc="Free universal SQL Client for developers and database administrators (community edition)" arch=('x86_64') @@ -9,7 +9,7 @@ url="https://dbeaver.io/"; license=("Apache") depends=('java-runtime>=11' 'gtk3' 'gtk-update-icon-cache' 'libsecret') -makedepends=('maven' 'java-runtime>=11') +makedepends=('maven' 'java-runtime<15') optdepends=('dbeaver-plugin-office: export data in Microsoft Office Excel format' 'dbeaver-plugin-svg-format: save diagrams in SVG format') source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/serge-rider/dbeaver/archive/${pkgver}.tar.gz"; @@ -18,7 +18,7 @@ "${pkgname}.profile.gz" "${pkgname}.hook" "${pkgname}.install") -sha256sums=('9b37ef875771cfb34507d5423965ce1e79d263a31c245c46a89b44f01c4d9c85' +sha256sums=('8b4cff6a1e172da763373ddc7df554569f53a0c529175e540d4b64ed2b7066d9' '27573b6ddb62a3d4dde4841a633e9b52cb020deb338b327a6d460fd3a29c8ded' '406a2980806c394670e88b1ae70134900be376c2ea4a4216610591cc8b557526' '1863e74bdcf22b7328e6e8487cbebff7d5360e34bde85c1dd226b168b4737034' @@ -31,7 +31,11 @@ gzip --decompress --keep --stdout "${pkgname}.profile.gz" | sed "s/DBEAVER_VERSION/${pkgver}/g" | gzip -9 > "${pkgname}.profile-${pkgver}.gz" - + # Avoid the use of any Java 15, actually incompatible with the build + for _java_version in $(archlinux-java status | tail -n +2 | cut -d' ' -f 3 | grep -v 'java-15') + do + export JAVA_HOME="/usr/lib/jvm/${_java_version}" + done # Download dependencies during prepare FS#55873 # https://bugs.archlinux.org/task/55873 cd "${pkgname}-${pkgver}"
