[PR PATCH] dbeaver: update to 24.3.2.

[PR PATCH] dbeaver: update to 24.3.2.

[ar-jan]

[-- Attachment #1: Type: text/plain, Size: 477 bytes --]

There is a new pull request by ar-jan against master on the void-packages repository

https://github.com/ar-jan/void-packages dbeaver
https://github.com/void-linux/void-packages/pull/53866

dbeaver: update to 24.3.2.
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)


A patch file from https://github.com/void-linux/void-packages/pull/53866.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dbeaver-53866.patch --]
[-- Type: text/x-diff, Size: 3630 bytes --]

From 980bec1c9329f60d4434eb7a81c905a9f77570c3 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 6 Jan 2025 15:28:12 +0100
Subject: [PATCH] dbeaver: update to 24.3.2.

---
 srcpkgs/dbeaver/patches/force-jdk17.patch |  6 +++---
 srcpkgs/dbeaver/template                  | 18 +++++++++++-------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/dbeaver/patches/force-jdk17.patch b/srcpkgs/dbeaver/patches/force-jdk17.patch
index 11097450a3f8db..32cc29fa1477df 100644
--- a/srcpkgs/dbeaver/patches/force-jdk17.patch
+++ b/srcpkgs/dbeaver/patches/force-jdk17.patch
@@ -6,6 +6,6 @@
      <launcherArgs>
 -        <programArgs></programArgs>
 +        <programArgs>-vm /usr/lib/jvm/openjdk17/bin</programArgs>
-         <programArgsLin>--launcher.additionalVmargs %XDG_DATA_HOME%/DBeaverData/settings/dbeaver.vmoptions %HOME%/.local/share/DBeaverData/settings/dbeaver.vmoptions</programArgsLin>
-         <programArgsWin>--launcher.additionalVmargs %APPDATA%\DBeaverData\settings\dbeaver.exe.vmoptions</programArgsWin>
-         <programArgsMac>--launcher.additionalVmargs %HOME%/Library/DBeaverData/settings/dbeaver.vmoptions -vm ../Eclipse/jre/Contents/Home/lib/libjli.dylib</programArgsMac>
+         <programArgsMac>-vm ../Eclipse/jre/Contents/Home/lib/libjli.dylib</programArgsMac>
+
+         <vmArgs>
diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 2eed3f54e6bcfd..d2c7628598ec3d 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,8 +1,9 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=24.2.3
+version=24.3.2
 revision=1
-_common_commit=605757efc02bf2d55f00d1b64f1b7f00f2819eb4
+_dbeaver_common_commit=bc3c2e688a2578156efc42550ff750254dea0378
+_dbeaver_jdbc_libsql_commit=dc67e1440c64dd2da15707e14680087103e0a19f
 # the build downloads binaries linked to glibc
 archs="x86_64 aarch64"
 build_wrksrc="dbeaver"
@@ -14,14 +15,17 @@ license="Apache-2.0"
 homepage="https://dbeaver.io"
 changelog="https://dbeaver.io/news/"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz
- https://github.com/dbeaver/dbeaver-common/archive/${_common_commit}.tar.gz"
-checksum="367d3e8e712ffb4868026f543e8386d395dc5f33250ef12286669b7a95be983d
- 6f45062fb5c7e9489ee5d801c1821af0eb54bbc6ad26eed03f91ed88db8ab681"
+ https://github.com/dbeaver/dbeaver-common/archive/${_dbeaver_common_commit}.tar.gz
+ https://github.com/dbeaver/dbeaver-jdbc-libsql/archive/${_dbeaver_jdbc_libsql_commit}.tar.gz"
+checksum="7f2f16566396f800a9345218eb4aecd5cf9e6611480454fc2372948c54c878aa
+ 8ed55dffcea0c266e466559bba608086b16c3060d57d62b57e43c992db6983c2
+ a84bd6e105a0fe8ccafd506710c08cacd038f97ff1b5b83431287564efce2271"
 nopie=true
 
 post_extract() {
 	mv ${wrksrc}/dbeaver-${version} ${wrksrc}/dbeaver
-	mv ${wrksrc}/dbeaver-common-${_common_commit} ${wrksrc}/dbeaver-common
+	mv ${wrksrc}/dbeaver-common-${_dbeaver_common_commit} ${wrksrc}/dbeaver-common
+	mv ${wrksrc}/dbeaver-jdbc-libsql-${_dbeaver_jdbc_libsql_commit} ${wrksrc}/dbeaver-jdbc-libsql
 }
 
 do_build() {
@@ -35,7 +39,7 @@ do_install() {
 	vcopy "product/community/target/products/org.jkiss.dbeaver.core.product/linux/gtk/${XBPS_TARGET_MACHINE}/dbeaver" /usr/lib/
 
 	# Delete folders with Java Native Access .so's for different architectures
-	jna_dir="${DESTDIR}/usr/lib/dbeaver/plugins/com.sun.jna_5.14.0.v20231211-1200/com/sun/jna"
+	jna_dir="${DESTDIR}/usr/lib/dbeaver/plugins/com.sun.jna_5.15.0.v20240915-2000/com/sun/jna"
 	jna_arch="linux-${XBPS_TARGET_MACHINE//_/-}"
 	find "$jna_dir" -depth -mindepth 1 -type d -not -name $jna_arch -exec rm -rf {} \;
 

Re: [PR PATCH] [Merged]: dbeaver: update to 24.3.2.

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 328 bytes --]

There's a merged pull request on the void-packages repository

dbeaver: update to 24.3.2.
https://github.com/void-linux/void-packages/pull/53866

Description:
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)