[PR PATCH] dbeaver: update to 22.2.4.

[PR PATCH] dbeaver: update to 22.2.4.

[ar-jan]

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

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

https://github.com/ar-jan/void-packages dbeaver2224
https://github.com/void-linux/void-packages/pull/40374

dbeaver: update to 22.2.4.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 8bc4f19bbba620e6333cf2dae35f9c77a234e425 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 7 Nov 2022 12:42:24 +0100
Subject: [PATCH] dbeaver: update to 22.2.4.

---
 .../patches/{force-jdk11.patch => force-jdk17.patch}      | 2 +-
 srcpkgs/dbeaver/template                                  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename srcpkgs/dbeaver/patches/{force-jdk11.patch => force-jdk17.patch} (86%)

diff --git a/srcpkgs/dbeaver/patches/force-jdk11.patch b/srcpkgs/dbeaver/patches/force-jdk17.patch
similarity index 86%
rename from srcpkgs/dbeaver/patches/force-jdk11.patch
rename to srcpkgs/dbeaver/patches/force-jdk17.patch
index 47290b3e8639..d285a6052522 100644
--- a/srcpkgs/dbeaver/patches/force-jdk11.patch
+++ b/srcpkgs/dbeaver/patches/force-jdk17.patch
@@ -5,7 +5,7 @@
  
      <launcherArgs>
 -        <programArgs></programArgs>
-+        <programArgs>-vm /usr/lib/jvm/openjdk11/bin</programArgs>
++        <programArgs>-vm /usr/lib/jvm/openjdk17/bin</programArgs>
          <programArgsMac>-vm ../Eclipse/jre/Contents/Home/bin/java</programArgsMac>
  
          <vmArgs>-XX:+IgnoreUnrecognizedVMOptions --add-modules=ALL-SYSTEM -Dosgi.requiredJavaVersion=11 -Xms64m -Xmx1024m</vmArgs>
diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 43fe53c89bfc..a4cd7c0fb296 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,17 +1,17 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=22.1.3
+version=22.2.4
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64 aarch64"
-hostmakedepends="apache-maven"
-depends="openjdk11" # openjdk11 or later version, when available
+hostmakedepends="apache-maven openjdk17"
+depends="openjdk17"
 short_desc="Free Universal Database Tool"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=874921bad8bdcf37e4c9cb94f0b599f5d561de3934cecfef5ae2da3603a970a8
+checksum=a71529aca4da6af520b2dfc70cf0dec36750c2dc8575a76ece105ebf1e0b765e
 nopie=true
 
 if [ "$XBPS_TARGET_MACHINE" = aarch64 ]; then

Re: [PR PATCH] [Updated] dbeaver: update to 22.2.4.

[ar-jan]

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

There is an updated pull request by ar-jan against master on the void-packages repository

https://github.com/ar-jan/void-packages dbeaver2224
https://github.com/void-linux/void-packages/pull/40374

dbeaver: update to 22.2.4.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 1c2ca314623b344eea4c76fe9d703088b760738d Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 7 Nov 2022 12:42:24 +0100
Subject: [PATCH] dbeaver: update to 22.2.4; reenable aarch64

---
 .../patches/{force-jdk11.patch => force-jdk17.patch} |  2 +-
 srcpkgs/dbeaver/template                             | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)
 rename srcpkgs/dbeaver/patches/{force-jdk11.patch => force-jdk17.patch} (86%)

diff --git a/srcpkgs/dbeaver/patches/force-jdk11.patch b/srcpkgs/dbeaver/patches/force-jdk17.patch
similarity index 86%
rename from srcpkgs/dbeaver/patches/force-jdk11.patch
rename to srcpkgs/dbeaver/patches/force-jdk17.patch
index 47290b3e8639..d285a6052522 100644
--- a/srcpkgs/dbeaver/patches/force-jdk11.patch
+++ b/srcpkgs/dbeaver/patches/force-jdk17.patch
@@ -5,7 +5,7 @@
  
      <launcherArgs>
 -        <programArgs></programArgs>
-+        <programArgs>-vm /usr/lib/jvm/openjdk11/bin</programArgs>
++        <programArgs>-vm /usr/lib/jvm/openjdk17/bin</programArgs>
          <programArgsMac>-vm ../Eclipse/jre/Contents/Home/bin/java</programArgsMac>
  
          <vmArgs>-XX:+IgnoreUnrecognizedVMOptions --add-modules=ALL-SYSTEM -Dosgi.requiredJavaVersion=11 -Xms64m -Xmx1024m</vmArgs>
diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 43fe53c89bfc..648a7c0170b1 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,23 +1,19 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=22.1.3
+version=22.2.4
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64 aarch64"
-hostmakedepends="apache-maven"
-depends="openjdk11" # openjdk11 or later version, when available
+hostmakedepends="apache-maven openjdk17"
+depends="openjdk17"
 short_desc="Free Universal Database Tool"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=874921bad8bdcf37e4c9cb94f0b599f5d561de3934cecfef5ae2da3603a970a8
+checksum=a71529aca4da6af520b2dfc70cf0dec36750c2dc8575a76ece105ebf1e0b765e
 nopie=true
 
-if [ "$XBPS_TARGET_MACHINE" = aarch64 ]; then
-	broken="https://build.voidlinux.org/builders/aarch64_builder/builds/36442/steps/shell_3/logs/stdio"
-fi
-
 do_build() {
 	mvn package -P all-platforms
 }

Re: dbeaver: update to 22.2.4.

[ar-jan]

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

New comment by ar-jan on void-packages repository

https://github.com/void-linux/void-packages/pull/40374#issuecomment-1305566518

Comment:
This version requires an update to openjdk. @classabbyamp I've updated your patch from #36653 to use `openjdk17` as well, works for me.

`aarch64` builds OK locally so I've reenabled it. But on CI it seems stuck -- unrelated CI issue? (no errors either).

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

[classabbyamp]

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

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

dbeaver: update to 22.2.4.
https://github.com/void-linux/void-packages/pull/40374

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->