From 7cb45140659f0ae58e637fdee32e4869f796a634 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 5 Feb 2024 18:38:30 +0100
Subject: [PATCH] dbeaver: update to 23.3.5.

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 @@
      </configIni>
 
      <launcherArgs>
 -        <programArgs></programArgs>
 +        <programArgs>-vm /usr/lib/jvm/openjdk17/bin</programArgs>
-         <programArgsMac>-nosplash -vm ../Eclipse/jre/Contents/Home/bin/java</programArgsMac>
+         <programArgsMac>-vm ../Eclipse/jre/Contents/Home/bin/java</programArgsMac>
 
-         <vmArgs>-XX:+IgnoreUnrecognizedVMOptions --add-modules=ALL-SYSTEM -Dosgi.requiredJavaVersion=11 -Xms64m -Xmx1024m</vmArgs>
+         <vmArgs>
diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 4aef127a2d35c4..9f5c7503185ae2 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,9 +1,11 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=23.3.3
+version=23.3.5
 revision=1
+_common_commit=0231a01fe5a128d3cee41965929ca6a8fd90e95a
 # 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 <knusbaum+void@sdf.org>"
 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="70da8b1f6046185f0ad6ccf878b1bd66914774e30b80ef475160fd421d6c5f48
+ c37d2ff9397c64005d14e9a2429a0034a1325432ef80166ff0c418dbb623003c"
 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
 }