* [PR PATCH] dbeaver: force jdk11 regardless of alternatives setting
@ 2022-04-12 5:43 classabbyamp
2022-04-12 17:42 ` [PR PATCH] [Merged]: " leahneukirchen
0 siblings, 1 reply; 2+ messages in thread
From: classabbyamp @ 2022-04-12 5:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1320 bytes --]
There is a new pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages dbeaver-fix-jdk-version
https://github.com/void-linux/void-packages/pull/36653
dbeaver: force jdk11 regardless of alternatives setting
fixes #34857
based on the fix provided in that issue
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-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/36653.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dbeaver-fix-jdk-version-36653.patch --]
[-- Type: text/x-diff, Size: 1543 bytes --]
From e4effb79b77066f4b49d7dd4cc6a0e4916601d93 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Tue, 12 Apr 2022 01:27:48 -0400
Subject: [PATCH] dbeaver: force jdk11 regardless of alternatives setting
fixes #34857
---
srcpkgs/dbeaver/patches/force-jdk11.patch | 11 +++++++++++
srcpkgs/dbeaver/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/dbeaver/patches/force-jdk11.patch
diff --git a/srcpkgs/dbeaver/patches/force-jdk11.patch b/srcpkgs/dbeaver/patches/force-jdk11.patch
new file mode 100644
index 000000000000..47290b3e8639
--- /dev/null
+++ b/srcpkgs/dbeaver/patches/force-jdk11.patch
@@ -0,0 +1,11 @@
+--- a/product/community/DBeaver.product
++++ b/product/community/DBeaver.product
+@@ -9,7 +9,7 @@
+ </configIni>
+
+ <launcherArgs>
+- <programArgs></programArgs>
++ <programArgs>-vm /usr/lib/jvm/openjdk11/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 276af8802424..74a67e77e4f6 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,7 +1,7 @@
# Template file for 'dbeaver'
pkgname=dbeaver
version=22.0.1
-revision=1
+revision=2
# the build downloads binaries linked to glibc
archs="x86_64 aarch64"
hostmakedepends="apache-maven"
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-04-12 17:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-12 5:43 [PR PATCH] dbeaver: force jdk11 regardless of alternatives setting classabbyamp
2022-04-12 17:42 ` [PR PATCH] [Merged]: " leahneukirchen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).