Date: Sunday, August 25, 2019 @ 14:35:23 Author: muflone Revision: 501701
upgpkg: dbeaver 6.1.5-2 Added: dbeaver/trunk/dbeaver.sh Modified: dbeaver/trunk/PKGBUILD dbeaver/trunk/dbeaver.desktop -----------------+ PKGBUILD | 20 ++++++++++++++------ dbeaver.desktop | 17 +++++++++++------ dbeaver.sh | 3 +++ 3 files changed, 28 insertions(+), 12 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-08-25 14:34:18 UTC (rev 501700) +++ PKGBUILD 2019-08-25 14:35:23 UTC (rev 501701) @@ -1,25 +1,26 @@ # Maintainer: Muflone http://www.muflone.com/contacts/english/ # Contributor: Arne Hoch <a...@derhoch.de> -# Unable to build it using JDK 12: https://github.com/dbeaver/dbeaver/issues/6615 pkgname=dbeaver pkgver=6.1.5 -pkgrel=1 +pkgrel=2 pkgdesc="Free universal SQL Client for developers and database administrators (community edition)" arch=('x86_64') url="http://dbeaver.jkiss.org/" license=("Apache") -depends=('java-runtime<12' 'java-runtime>=8' 'gtk2' 'gtk-update-icon-cache' 'libsecret') +depends=('java-runtime>=8' 'gtk2' 'gtk-update-icon-cache' 'libsecret') makedepends=('maven' 'java-environment<12' 'java-runtime>=8') 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" "${pkgname}.desktop" + "${pkgname}.sh" "${pkgname}.profile.gz" "${pkgname}.hook" "${pkgname}.install") sha256sums=('3f5d75859dbdbd57acd3e6bea7d416d5327391a0b58c2ec9cadb7dedafd36a75' - '8d6311e85b33b65b9109fe54cc2bb811639bfd31af94be403d5112e09fafd40c' + '27573b6ddb62a3d4dde4841a633e9b52cb020deb338b327a6d460fd3a29c8ded' + '088d5ca64159aa988ccee8a20a926ca4d10bfbd4371def6f426b3cc6b7ff1b82' '1863e74bdcf22b7328e6e8487cbebff7d5360e34bde85c1dd226b168b4737034' 'b035ea82c5c349cf992a411f208d8c874c2844d2f8490e4ad21cafb5be3fbfba' 'f8d65dd933049b587a5815ea75a30ef944300b812df383ca1c2dcd68280bc7ab') @@ -30,6 +31,13 @@ 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 12, actually incompatible with the build + # https://github.com/dbeaver/dbeaver/issues/6615 + # https://bugs.archlinux.org/task/63428 + for _java_version in $(archlinux-java status | tail -n +2 | cut -d' ' -f 3 | grep -v 'java-12') + do + export JAVA_HOME="/usr/lib/jvm/${_java_version}" + done } build() { @@ -72,9 +80,9 @@ mv dbeaver.png "${pkgdir}/usr/share/pixmaps/${pkgname}.png" mv icon.xpm "${pkgdir}/usr/share/pixmaps/${pkgname}.xpm" - # Install executable files into /usr/bin + # Install executable script into /usr/bin install -m 755 -d "${pkgdir}/usr/bin" - ln -s "/usr/lib/${pkgname}/${pkgname}" "${pkgdir}/usr/bin/${pkgname}" + install -m 755 "${srcdir}/dbeaver.sh" "${pkgdir}/usr/bin/${pkgname}" # Install application launcher into /usr/share/applications install -m 755 -d "${pkgdir}/usr/share/applications" Modified: dbeaver.desktop =================================================================== --- dbeaver.desktop 2019-08-25 14:34:18 UTC (rev 501700) +++ dbeaver.desktop 2019-08-25 14:35:23 UTC (rev 501701) @@ -1,9 +1,14 @@ [Desktop Entry] -Name=DBeaver -GenericName=Free universal SQL Client for developers and database administrators +Version=1.0 +Type=Application +Terminal=false +Name=DBeaver Community +GenericName=UniversaL Database Manager +Comment=Universal Database Manager and SQL Client. Exec=dbeaver -Terminal=false -Type=Application Icon=dbeaver -Categories=Development;Java;Database; -StartupWMClass=SWT +Categories=IDE;Development +StartupWMClass=DBeaver +StartupNotify=true +Keywords=Database;SQL;IDE;JDBC;ODBC;MySQL;PostgreSQL +MimeType=application/sql Added: dbeaver.sh =================================================================== --- dbeaver.sh (rev 0) +++ dbeaver.sh 2019-08-25 14:35:23 UTC (rev 501701) @@ -0,0 +1,3 @@ +#!/bin/sh +export GTK_OVERLAY_SCROLLING=0 +/usr/lib/dbeaver/dbeaver