Date: Friday, October 8, 2021 @ 22:04:46 Author: muflone Revision: 1028067
upgpkg: dbeaver 21.2.2-1 Added: dbeaver/trunk/tycho_source_11.patch Modified: dbeaver/trunk/PKGBUILD -----------------------+ PKGBUILD | 18 +++++++++++------- tycho_source_11.patch | 15 +++++++++++++++ 2 files changed, 26 insertions(+), 7 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-10-08 21:57:29 UTC (rev 1028066) +++ PKGBUILD 2021-10-08 22:04:46 UTC (rev 1028067) @@ -2,7 +2,7 @@ # Contributor: Arne Hoch <a...@derhoch.de> pkgname=dbeaver -pkgver=21.2.0 +pkgver=21.2.2 pkgrel=1 pkgdesc="Free universal SQL Client for developers and database administrators (community edition)" arch=('x86_64') @@ -17,13 +17,15 @@ "${pkgname}.sh" "${pkgname}.profile.gz" "${pkgname}.hook" - "${pkgname}.install") -sha256sums=('da1aefdb5b98bec0fad11524cc7860e257037770daa5f5b263b82609db2668bd' + "${pkgname}.install" + "tycho_source_11.patch") +sha256sums=('955046eec4a77085b74ac40e40c1754fad8642dd8b8cb99896d10d3b81731e52' '9480a7d08f680e10c399db070c5a04cbabf282442602a2ef83d1159fe7c3e88b' '406a2980806c394670e88b1ae70134900be376c2ea4a4216610591cc8b557526' '1863e74bdcf22b7328e6e8487cbebff7d5360e34bde85c1dd226b168b4737034' 'f8b763ca210bfa4d9a4e407b656ba4f5d1bf2f3f54c67044f7a4dd0c3625fc22' - 'f8d65dd933049b587a5815ea75a30ef944300b812df383ca1c2dcd68280bc7ab') + 'f8d65dd933049b587a5815ea75a30ef944300b812df383ca1c2dcd68280bc7ab' + '2b5259a22ecd17c7fe501fe161aa866652c6c87f0435d94bf16d3447fc0cfd1c') install="${pkgname}.install" prepare() { @@ -32,9 +34,11 @@ sed "s/DBEAVER_VERSION/${pkgver}/g" | gzip -9 > "${pkgname}.profile-${pkgver}.gz" - # Avoid the use of any Java 15/16, actually incompatible with the build - export JAVA_HOME="/usr/lib/jvm/$(archlinux-java status | tail -n +2 | sort | cut -d ' ' -f 3 | sort -nr -k 2 -t '-' | grep -vE '15-|16-' -m 1)" - + # Fix for Java >= 11 + patch -Np0 -i "${srcdir}/tycho_source_11.patch" + + # Avoid the use of any Java 15/16/17, actually incompatible with the build + export JAVA_HOME="/usr/lib/jvm/$(archlinux-java status | tail -n +2 | sort | cut -d ' ' -f 3 | sort -nr -k 2 -t '-' | grep -vE '15-|16-|17-' -m 1)" cd "${pkgname}-${pkgver}" # Download dependencies during prepare FS#55873 Added: tycho_source_11.patch =================================================================== --- tycho_source_11.patch (rev 0) +++ tycho_source_11.patch 2021-10-08 22:04:46 UTC (rev 1028067) @@ -0,0 +1,15 @@ +diff -Naur dbeaver-21.2.2.orig/pom.xml dbeaver-21.2.2/pom.xml +--- dbeaver-21.2.2.orig/pom.xml 2021-10-01 13:29:29.000000000 +0200 ++++ dbeaver-21.2.2/pom.xml 2021-10-08 23:05:18.730932087 +0200 +@@ -97,9 +97,9 @@ + <version>${tycho-version}</version> + <configuration> + <useProjectSettings>false</useProjectSettings> +- <source>1.8</source> ++ <source>11</source> + <target>11</target> +- <compilerVersion>1.8</compilerVersion> ++ <compilerVersion>11</compilerVersion> + <compilerArgs> + <!-- + Java 11-compatibility options.