diff --git a/srcpkgs/dbeaver/patches/force-jdk17.patch b/srcpkgs/dbeaver/patches/force-jdk21.patch similarity index 82% rename from srcpkgs/dbeaver/patches/force-jdk17.patch rename to srcpkgs/dbeaver/patches/force-jdk21.patch index 32cc29fa147..b384278b7d8 100644 --- a/srcpkgs/dbeaver/patches/force-jdk17.patch +++ b/srcpkgs/dbeaver/patches/force-jdk21.patch @@ -5,7 +5,7 @@ - -+ -vm /usr/lib/jvm/openjdk17/bin ++ -vm /usr/lib/jvm/openjdk21/bin -vm ../Eclipse/jre/Contents/Home/lib/libjli.dylib diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template index da14b64e6de..e7bd578a9b5 100644 --- a/srcpkgs/dbeaver/template +++ b/srcpkgs/dbeaver/template @@ -1,14 +1,14 @@ # Template file for 'dbeaver' pkgname=dbeaver -version=25.0.2 +version=25.1.1 revision=1 -_dbeaver_common_commit=d072897b56551ad1bcd5ec3b04e2bbe455dfb361 -_dbeaver_jdbc_libsql_commit=61afd4214a8b0d5af90405eb82b607d57e8190e2 +_dbeaver_common_commit=73bc2505f2543cfa99ed8f2eb186070dcd4959f2 +_dbeaver_jdbc_libsql_commit=b9649475ca0e78db52a67f61b56ba5eb615a9437 # the build downloads binaries linked to glibc archs="x86_64 aarch64" build_wrksrc="dbeaver" -hostmakedepends="apache-maven openjdk17" -depends="openjdk17" +hostmakedepends="apache-maven openjdk21" +depends="openjdk21" short_desc="Free Universal Database Tool" maintainer="Kyle Nusbaum " license="Apache-2.0" @@ -17,9 +17,9 @@ changelog="https://dbeaver.io/news/" distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz 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="2ac42a4381d8d29a5e9b583299275f88fe9334d8640d607c73af89a26e2b4ae3 - d687fcce7f69da009936d7c60bc042584fa0f4390b3c31632d9c72c1fadbd2b0 - 09fc0118524b3278da9d949e55840128f5204af383c7f4fc0e997db09a464dc4" +checksum="900c35df7a14c793ee63c8583ae9231bae5303f08b73434f75066f04599ceb5c + 95f67744389ae3929a6259b91e9eca48309fbe118fbb826cc5e7e74ac406f90b + 520018cfb8f2d13470990f15e4a03fe85e04dc078d1cb82f9a334e1bec740277" nopie=true post_extract() { @@ -39,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.15.0.v20240915-2000/com/sun/jna" + jna_dir="${DESTDIR}/usr/lib/dbeaver/plugins/com.sun.jna_5.17.0.v20250316-1700/com/sun/jna" jna_arch="linux-${XBPS_TARGET_MACHINE//_/-}" find "$jna_dir" -depth -mindepth 1 -type d -not -name $jna_arch -exec rm -rf {} \;