<pre style='margin:0'>
Vadim-Valdis Yudaev (judaew) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9a9b08923e6af2deb26e1b213db61ee115818c07">https://github.com/macports/macports-ports/commit/9a9b08923e6af2deb26e1b213db61ee115818c07</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 9a9b08923e6 dbeaver-community: Update to 21.2.3 and fix libjli.dylib
</span>9a9b08923e6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9a9b08923e6af2deb26e1b213db61ee115818c07
</span>Author: Vadim-Valdis Yudaev <judaew@macports.org>
AuthorDate: Mon Oct 18 15:20:29 2021 +0300
<span style='display:block; white-space:pre;color:#404040;'> dbeaver-community: Update to 21.2.3 and fix libjli.dylib
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> CHANGES:
</span><span style='display:block; white-space:pre;color:#404040;'> * Remove Java PG, because Java is embedded in the app
</span><span style='display:block; white-space:pre;color:#404040;'> * Update to 21.2.3
</span><span style='display:block; white-space:pre;color:#404040;'> * Fix broken libjli.dylib using the openjdk11-zulu
</span>---
databases/dbeaver-community/Portfile | 49 +++++++++++++++++++++++++++---------
1 file changed, 37 insertions(+), 12 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/dbeaver-community/Portfile b/databases/dbeaver-community/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index effef9ffd31..cf9bb8629e5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/dbeaver-community/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/dbeaver-community/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,9 +2,8 @@
</span>
PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup java 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup dbeaver dbeaver 21.2.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup dbeaver dbeaver 21.2.3
</span> github.tarball_from releases
revision 0
name dbeaver-community
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,19 +44,15 @@ if {${build_arch} eq "arm64"} {
</span> distname dbeaver-ce-${version}-macosx.cocoa.${arch}
checksums dbeaver-ce-${version}-macosx.cocoa.x86_64${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 24fac79ac048e5d09623be148bdd4ec97d88046e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5570f73139cdaf740b166c81f33746a7be3441adad60e7f09cee93d32252ef01 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 101474923 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 ca49335a1a37cd016d3c0a854523001f929100dd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 940eb52988c4645847b7460f9e0b0d924b543cf30fe87c45f967ef4e15326179 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 104293007 \
</span> dbeaver-ce-${version}-macosx.cocoa.aarch64${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 819ebfa7e170692b71effee88c36a2a582eb708a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d4e1deed746aec2e67c63fb5e20f85b22d7b20ba8dbf32eeb6dd39b0cef390f7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 103700103
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 ec4ce934b779cbf927a0e47e896d85bf14134b1c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 58dd81b64fbad074087948801c2c8f843f58439da60d8f8765301f371e964fd6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 104946765
</span>
extract.mkdir yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-java.version 11+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-java.fallback openjdk11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> use_configure no
build {}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,3 +60,33 @@ build {}
</span> destroot {
copy ${worksrcpath}/DBeaver.app ${destroot}${applications_dir}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Fix broken libjli.dylib using the openjdk11-zulu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See https://github.com/dbeaver/dbeaver/issues/14141#issuecomment-945218003
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites-append https://cdn.azul.com/zulu/bin/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set openjdk_distname zulu11.50.19-ca-jdk11.0.12-macosx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${build_arch} eq "x86_64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles-append ${openjdk_distname}_x64${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums-append ${openjdk_distname}_x64${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 2b136a6fbe8f0d9bcf52cf12a41099825f1fac07 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0b8c8b7cf89c7c55b7e2239b47201d704e8d2170884875b00f3103cf0662d6d7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 195713033
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {${build_arch} eq "arm64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles-append ${openjdk_distname}_aarch64${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums-append ${openjdk_distname}_aarch64${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 c482f2433c9aa6451b915bb5b56c748e7f153436 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e908a0b4c0da08d41c3e19230f819b364ff2e5f1dafd62d2cf991a85a34d3a17 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 179357206
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${worksrcpath}/DBeaver.app/Contents/Eclipse/jre/Contents/MacOS/libjli.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${build_arch} eq "x86_64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${worksrcpath}/${openjdk_distname}_x64/lib/jli/libjli.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/DBeaver.app/Contents/Eclipse/jre/Contents/MacOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${build_arch} eq "arm64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${worksrcpath}/${openjdk_distname}_aarch64/lib/jli/libjli.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/DBeaver.app/Contents/Eclipse/jre/Contents/MacOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span></pre><pre style='margin:0'>
</pre>