From ae3a38c4943f620eaca4602a096c8962bf9013f8 Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Mon, 5 Feb 2024 18:38:30 +0100 Subject: [PATCH] dbeaver: update to 24.0.1. Add dbeaver-common distfile --- srcpkgs/dbeaver/patches/force-jdk17.patch | 8 ++++---- srcpkgs/dbeaver/template | 16 +++++++++++++--- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/srcpkgs/dbeaver/patches/force-jdk17.patch b/srcpkgs/dbeaver/patches/force-jdk17.patch index 87e1807c3b7758..69d6171a8bdf9a 100644 --- a/srcpkgs/dbeaver/patches/force-jdk17.patch +++ b/srcpkgs/dbeaver/patches/force-jdk17.patch @@ -1,11 +1,11 @@ ---- a/product/community/DBeaver.product -+++ b/product/community/DBeaver.product +--- a/dbeaver/product/community/DBeaver.product ++++ b/dbeaver/product/community/DBeaver.product @@ -9,7 +9,7 @@ - + -vm /usr/lib/jvm/openjdk17/bin - -nosplash -vm ../Eclipse/jre/Contents/Home/bin/java + -vm ../Eclipse/jre/Contents/Home/bin/java - -XX:+IgnoreUnrecognizedVMOptions --add-modules=ALL-SYSTEM -Dosgi.requiredJavaVersion=11 -Xms64m -Xmx1024m + diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template index 4aef127a2d35c4..b327bacb40b421 100644 --- a/srcpkgs/dbeaver/template +++ b/srcpkgs/dbeaver/template @@ -1,9 +1,11 @@ # Template file for 'dbeaver' pkgname=dbeaver -version=23.3.3 +version=24.0.1 revision=1 +_common_commit=9939531b043b00f1f74cad3490ee1e5bdfa4dd62 # the build downloads binaries linked to glibc archs="x86_64 aarch64" +build_wrksrc="dbeaver" hostmakedepends="apache-maven openjdk17" depends="openjdk17" short_desc="Free Universal Database Tool" @@ -11,12 +13,20 @@ maintainer="Kyle Nusbaum " license="Apache-2.0" homepage="https://dbeaver.io" changelog="https://dbeaver.io/news/" -distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz" -checksum=88bea41cf0f1f555150c32645903ef7e3f64de52476d9a62eb3bbcd82841169d +distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz + https://github.com/dbeaver/dbeaver-common/archive/${_common_commit}.tar.gz" +checksum="bcf9608aeaec6a9590d8f31b5aad0fc2bb0f467b95405adcc953dfecf0dff3b3 + d95199f3420cf12a738625ccf847c36ff65129369605044fca7f1f6ec70805ff" nopie=true +post_extract() { + mv ${wrksrc}/dbeaver-${version} ${wrksrc}/dbeaver + mv ${wrksrc}/dbeaver-common-${_common_commit} ${wrksrc}/dbeaver-common +} + do_build() { . /etc/profile.d/jdk.sh + cd "product/aggregate" mvn package -P all-platforms }