* [PR PATCH] New package: jetbrains-jdk17-17.0.1b164.8
@ 2021-12-31 6:55 2asoft
2021-12-31 7:01 ` [PR PATCH] [Updated] " 2asoft
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: 2asoft @ 2021-12-31 6:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 684 bytes --]
There is a new pull request by 2asoft against master on the void-packages repository
https://github.com/2asoft/void-packages 2asoft/jb_update_jdk_src
https://github.com/void-linux/void-packages/pull/34780
New package: jetbrains-jdk17-17.0.1b164.8
#### 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**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-LIBC)
A patch file from https://github.com/void-linux/void-packages/pull/34780.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-2asoft/jb_update_jdk_src-34780.patch --]
[-- Type: text/x-diff, Size: 11643 bytes --]
From ff799fc727df9bb6ae77d2357fce83259978e8dc Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <1157248+2asoft@users.noreply.github.com>
Date: Wed, 28 Jul 2021 14:37:54 -0700
Subject: [PATCH] New package: jetbrains-jdk17-17.0.1b164.8
---
etc/defaults.virtual | 1 +
srcpkgs/CLion/template | 4 +-
srcpkgs/DataGrip/template | 4 +-
srcpkgs/GoLand/template | 6 +-
srcpkgs/PhpStorm/template | 4 +-
srcpkgs/RubyMine/template | 4 +-
srcpkgs/WebStorm/template | 4 +-
.../intellij-idea-ultimate-edition/template | 4 +-
.../template | 6 +-
.../update | 0
srcpkgs/jetbrains-jdk17/INSTALL.msg | 19 +++++
srcpkgs/jetbrains-jdk17/template | 79 +++++++++++++++++++
srcpkgs/jetbrains-jdk17/update | 5 ++
srcpkgs/removed-packages/template | 1 +
14 files changed, 124 insertions(+), 17 deletions(-)
rename srcpkgs/{jetbrains-jdk-bin => jetbrains-jdk11-bin}/template (85%)
rename srcpkgs/{jetbrains-jdk-bin => jetbrains-jdk11-bin}/update (100%)
create mode 100644 srcpkgs/jetbrains-jdk17/INSTALL.msg
create mode 100644 srcpkgs/jetbrains-jdk17/template
create mode 100644 srcpkgs/jetbrains-jdk17/update
diff --git a/etc/defaults.virtual b/etc/defaults.virtual
index 083ab6349eac..b6b88323b2ea 100644
--- a/etc/defaults.virtual
+++ b/etc/defaults.virtual
@@ -23,6 +23,7 @@ awk gawk
emacs emacs
java-environment openjdk8
java-runtime openjdk8-jre
+jetbrains-java-runtime jetbrains-jdk11-bin
libudev eudev-libudev
nodejs-runtime nodejs
ntp-daemon chrony
diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index 76f9dd3f1e8c..5b261ca2acb3 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,10 +1,10 @@
# Template file for 'CLion'
pkgname=CLion
version=2021.3
-revision=1
+revision=2
archs="x86_64 aarch64"
wrksrc="clion-${version}"
-depends="jetbrains-jdk-bin giflib libXtst"
+depends="virtual?jetbrains-java-runtime giflib libXtst"
short_desc="Smart cross-platform IDE for C and C++"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="custom:Commercial"
diff --git a/srcpkgs/DataGrip/template b/srcpkgs/DataGrip/template
index d7aff462e167..57165170da68 100644
--- a/srcpkgs/DataGrip/template
+++ b/srcpkgs/DataGrip/template
@@ -1,10 +1,10 @@
# Template file for 'DataGrip'
pkgname=DataGrip
version=2021.1.3
-revision=1
+revision=2
archs="i686 x86_64"
wrksrc="DataGrip-${version}"
-depends="jetbrains-jdk-bin"
+depends="virtual?jetbrains-java-runtime"
short_desc="Cross-Platform IDE for Databases & SQL by JetBrains"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="custom:Commercial"
diff --git a/srcpkgs/GoLand/template b/srcpkgs/GoLand/template
index 898701d61f84..3ca1f4c19785 100644
--- a/srcpkgs/GoLand/template
+++ b/srcpkgs/GoLand/template
@@ -1,9 +1,9 @@
# Template file for 'GoLand'
pkgname=GoLand
version=2021.1.3
-revision=1
-archs="i686 x86_64"
-depends="jetbrains-jdk-bin"
+revision=2
+archs="x86_64 aarch64"
+depends="virtual?jetbrains-java-runtime"
short_desc="Cross-platform IDE built specially for Go developers"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="custom:Commercial"
diff --git a/srcpkgs/PhpStorm/template b/srcpkgs/PhpStorm/template
index 1910c9cb0f9c..4e63bb185440 100644
--- a/srcpkgs/PhpStorm/template
+++ b/srcpkgs/PhpStorm/template
@@ -1,10 +1,10 @@
# Template file for 'PhpStorm'
pkgname=PhpStorm
version=2020.1.4
-revision=1
+revision=2
archs="i686 x86_64"
wrksrc="PhpStorm-201.8743.18"
-depends="jetbrains-jdk-bin"
+depends="virtual?jetbrains-java-runtime"
short_desc="Lightning-smart PHP IDE"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="custom:Commercial"
diff --git a/srcpkgs/RubyMine/template b/srcpkgs/RubyMine/template
index b071d373086f..b5063a5ced9f 100644
--- a/srcpkgs/RubyMine/template
+++ b/srcpkgs/RubyMine/template
@@ -1,9 +1,9 @@
# Template file for 'RubyMine'
pkgname=RubyMine
version=2020.1.4
-revision=1
+revision=2
archs="i686 x86_64"
-depends="jetbrains-jdk-bin"
+depends="virtual?jetbrains-java-runtime"
short_desc="Most intelligent Ruby and Rails IDE"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="custom:Commercial"
diff --git a/srcpkgs/WebStorm/template b/srcpkgs/WebStorm/template
index 8160731ee760..7e0ad829e34c 100644
--- a/srcpkgs/WebStorm/template
+++ b/srcpkgs/WebStorm/template
@@ -1,10 +1,10 @@
# Template file for 'WebStorm'
pkgname=WebStorm
version=2020.1.4
-revision=1
+revision=2
archs="i686 x86_64"
wrksrc="WebStorm-201.8743.9"
-depends="jetbrains-jdk-bin"
+depends="virtual?jetbrains-java-runtime"
short_desc="Smartest JavaScript IDE"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="custom:Commercial"
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index 20f99d94125f..9916b3e1836b 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,10 +1,10 @@
# Template file for 'intellij-idea-ultimate-edition'
pkgname=intellij-idea-ultimate-edition
version=2021.3
-revision=1
+revision=2
archs="i686 x86_64"
create_wrksrc="true"
-depends="giflib libXtst jetbrains-jdk-bin"
+depends="virtual?jetbrains-java-runtime giflib libXtst"
short_desc="Most intelligent Java IDE"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="custom:Commercial"
diff --git a/srcpkgs/jetbrains-jdk-bin/template b/srcpkgs/jetbrains-jdk11-bin/template
similarity index 85%
rename from srcpkgs/jetbrains-jdk-bin/template
rename to srcpkgs/jetbrains-jdk11-bin/template
index f6b26790ad82..2c5d9d4ab82f 100644
--- a/srcpkgs/jetbrains-jdk-bin/template
+++ b/srcpkgs/jetbrains-jdk11-bin/template
@@ -1,9 +1,11 @@
-# Template file for 'jetbrains-jdk-bin'
-pkgname=jetbrains-jdk-bin
+# Template file for 'jetbrains-jdk11-bin'
+pkgname=jetbrains-jdk11-bin
version=11.0.13b1504.49
revision=1
archs="x86_64"
wrksrc="jbr"
+provides="jetbrains-java-runtime-${version}_${revision}"
+conflicts="jetbrains-jdk17 jetbrains-jdk-bin"
short_desc="JetBrains Java 11 JDK"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="GPL-2.0-only, Classpath-exception-2.0"
diff --git a/srcpkgs/jetbrains-jdk-bin/update b/srcpkgs/jetbrains-jdk11-bin/update
similarity index 100%
rename from srcpkgs/jetbrains-jdk-bin/update
rename to srcpkgs/jetbrains-jdk11-bin/update
diff --git a/srcpkgs/jetbrains-jdk17/INSTALL.msg b/srcpkgs/jetbrains-jdk17/INSTALL.msg
new file mode 100644
index 000000000000..d2f5086317f6
--- /dev/null
+++ b/srcpkgs/jetbrains-jdk17/INSTALL.msg
@@ -0,0 +1,19 @@
+JDK17 is not yet fully supported by JetBrains' tooling, although existing evidence is that JDK17 is in general more performant.
+
+It is necessary to add the following to the vmoptions file for any of the JetBrains' IDEs you use in order for the IDE to start:
+ --illegal-access=warn
+ -Dsun.java2d.metal=true
+ --add-opens=java.desktop/java.awt.event=ALL-UNNAMED
+ --add-opens=java.desktop/sun.font=ALL-UNNAMED
+ --add-opens=java.desktop/java.awt=ALL-UNNAMED
+ --add-opens=java.desktop/sun.awt=ALL-UNNAMED
+ --add-opens=java.base/java.lang=ALL-UNNAMED
+ --add-opens=java.base/java.util=ALL-UNNAMED
+ --add-opens=java.desktop/javax.swing=ALL-UNNAMED
+ --add-opens=java.desktop/sun.swing=ALL-UNNAMED
+ --add-opens=java.desktop/javax.swing.plaf.basic=ALL-UNNAMED
+ --add-opens=java.desktop/java.awt.peer=ALL-UNNAMED
+ --add-opens=java.desktop/javax.swing.text.html=ALL-UNNAMED
+ --add-exports=java.desktop/sun.font=ALL-UNNAMED
+
+Details found at https://mustafaakin.dev/posts/2021-12-08-running-intellij-idea-with-jdk17-for-better-render-performance/
diff --git a/srcpkgs/jetbrains-jdk17/template b/srcpkgs/jetbrains-jdk17/template
new file mode 100644
index 000000000000..44b11e0ca923
--- /dev/null
+++ b/srcpkgs/jetbrains-jdk17/template
@@ -0,0 +1,79 @@
+# Template file for 'jetbrains-jdk17'
+pkgname=jetbrains-jdk17
+version=17.0.1b164.8
+revision=1
+_jdk_ver=${version%b*}
+_jdk_build=${version#*b}
+_tag_name="jbr${_jdk_ver//\./_}b${_jdk_build}"
+wrksrc="JetBrainsRuntime-${_tag_name}"
+build_style=gnu-configure
+configure_args="
+ --disable-warnings-as-errors
+ --prefix=${XBPS_DESTDIR}/${XBPS_CROSS_TRIPLET}/${pkgname}-${version}/usr/lib
+ --enable-unlimited-crypto
+ --with-zlib=system
+ --with-libjpeg=system
+ --with-giflib=system
+ --with-libpng=system
+ --with-lcms=system
+ --with-jtreg=no
+ --with-native-debug-symbols=none
+ --with-version-pre=
+ --with-vendor-name="Void"
+ --with-vendor-url="https://voidlinux.org/"
+ --with-vendor-bug-url="https://github.com/void-linux/void-packages/issues"
+ --with-vendor-vm-bug-url="https://github.com/void-linux/void-packages/issues""
+make_build_args="images"
+make_check_target="test-hotspot-gtest"
+makedepends="pkg-config zip bzip2 unzip tar wget make autoconf automake libtool alsa-lib-devel cups-devel libX11-devel libjpeg-turbo-devel giflib-devel freetype-devel file which libXtst-devel libXt-devel libXrender-devel alsa-lib-devel fontconfig-devel libXrandr-devel libXi-devel zlib-devel lcms2-devel git openjdk11"
+provides="jetbrains-java-runtime-${version}_${revision}"
+conflicts="jetbrains-jdk11-bin jetbrains-jdk-bin"
+short_desc="JetBrains Java 17 JDK"
+maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
+license="GPL-2.0-only, Classpath-exception-2.0"
+homepage="https://github.com/JetBrains/JetBrainsRuntime"
+distfiles="https://github.com/JetBrains/JetBrainsRuntime/archive/refs/tags/${_tag_name}.tar.gz"
+checksum=e843027ba4b9923e1ae12e3fac0302ec7452c821f31302c06e55d4678da7760d
+
+# Build is still parallel, but don't use -jN.
+disable_parallel_build=yes
+
+## This JDK appears to link to libs that do not exist, but functions well even in their absence.
+## Best guess is that they are optional. ¯\_(ツ)_/¯
+noverifyrdeps=yes
+nopie=yes
+
+do_configure() {
+ CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/}
+ CXXFLAGS=${CXXFLAGS/-D_FORTIFY_SOURCE=2/}
+
+ if [ "$XBPS_CCACHE" ] && [ -z "$CROSS_BUILD" ]; then
+ configure_args+=" --enable-ccache"
+ CC="/usr/bin/cc"
+ CXX="/usr/bin/c++"
+ fi
+
+ sh ./configure ${configure_args}
+}
+
+do_install() {
+ TARGET_PATH="usr/lib/jvm/jbrsdk"
+
+ vmkdir ${TARGET_PATH}
+
+ vlicense ASSEMBLY_EXCEPTION
+ vlicense LICENSE
+
+ cd build/linux-*-normal-server-release/images/jdk/
+ vcopy bin ${TARGET_PATH}
+ vcopy conf ${TARGET_PATH}
+ vcopy include ${TARGET_PATH}
+ vcopy legal ${TARGET_PATH}
+ vcopy lib ${TARGET_PATH}
+ vcopy release ${TARGET_PATH}
+
+ vmkdir etc/profile.d
+ cat > ${DESTDIR}/etc/profile.d/10_jbrsdk.sh <<EOF
+export IDEA_JDK=\${IDEA_JDK=/usr/lib/jvm/jbrsdk}
+EOF
+}
diff --git a/srcpkgs/jetbrains-jdk17/update b/srcpkgs/jetbrains-jdk17/update
new file mode 100644
index 000000000000..69ca9d5f660d
--- /dev/null
+++ b/srcpkgs/jetbrains-jdk17/update
@@ -0,0 +1,5 @@
+_jdk_ver=${version%b*}
+_jdk_build=${version#*b}
+version=${_jdk_ver}b${_jdk_build}
+pattern="/releases/tag/jbr\K17_\d+_\d+b\d+(\.\d+)?(?=\")"
+site="https://github.com/JetBrains/JetBrainsRuntime/releases"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 2b16ae44131f..c2dfd4f0c43f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -186,6 +186,7 @@ replaces="
icecat<=78.6.1_1
ioquake3-rpi<=20130506_2
isl16<=0.16_2
+ jetbrains-jdk-bin<=11.0.13b1504.49_1
js<=1.8.5_11
jwm-settings-manager<=2.1.5_1
k3s<=1.0.0_1
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] New package: jetbrains-jdk17-17.0.1b164.8
2021-12-31 6:55 [PR PATCH] New package: jetbrains-jdk17-17.0.1b164.8 2asoft
@ 2021-12-31 7:01 ` 2asoft
2021-12-31 7:03 ` 2asoft
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: 2asoft @ 2021-12-31 7:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 689 bytes --]
There is an updated pull request by 2asoft against master on the void-packages repository
https://github.com/2asoft/void-packages 2asoft/jb_update_jdk_src
https://github.com/void-linux/void-packages/pull/34780
New package: jetbrains-jdk17-17.0.1b164.8
#### 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**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-LIBC)
A patch file from https://github.com/void-linux/void-packages/pull/34780.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-2asoft/jb_update_jdk_src-34780.patch --]
[-- Type: text/x-diff, Size: 11643 bytes --]
From a5037db681e4033f7862c8dd914c6faead5633de Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <1157248+2asoft@users.noreply.github.com>
Date: Wed, 28 Jul 2021 14:37:54 -0700
Subject: [PATCH] New package: jetbrains-jdk17-17.0.1b164.8
---
etc/defaults.virtual | 1 +
srcpkgs/CLion/template | 4 +-
srcpkgs/DataGrip/template | 4 +-
srcpkgs/GoLand/template | 6 +-
srcpkgs/PhpStorm/template | 4 +-
srcpkgs/RubyMine/template | 4 +-
srcpkgs/WebStorm/template | 4 +-
.../intellij-idea-ultimate-edition/template | 4 +-
.../template | 6 +-
.../update | 0
srcpkgs/jetbrains-jdk17/INSTALL.msg | 19 +++++
srcpkgs/jetbrains-jdk17/template | 79 +++++++++++++++++++
srcpkgs/jetbrains-jdk17/update | 5 ++
srcpkgs/removed-packages/template | 1 +
14 files changed, 124 insertions(+), 17 deletions(-)
rename srcpkgs/{jetbrains-jdk-bin => jetbrains-jdk11-bin}/template (85%)
rename srcpkgs/{jetbrains-jdk-bin => jetbrains-jdk11-bin}/update (100%)
create mode 100644 srcpkgs/jetbrains-jdk17/INSTALL.msg
create mode 100644 srcpkgs/jetbrains-jdk17/template
create mode 100644 srcpkgs/jetbrains-jdk17/update
diff --git a/etc/defaults.virtual b/etc/defaults.virtual
index 083ab6349eac..b6b88323b2ea 100644
--- a/etc/defaults.virtual
+++ b/etc/defaults.virtual
@@ -23,6 +23,7 @@ awk gawk
emacs emacs
java-environment openjdk8
java-runtime openjdk8-jre
+jetbrains-java-runtime jetbrains-jdk11-bin
libudev eudev-libudev
nodejs-runtime nodejs
ntp-daemon chrony
diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index 76f9dd3f1e8c..5b261ca2acb3 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,10 +1,10 @@
# Template file for 'CLion'
pkgname=CLion
version=2021.3
-revision=1
+revision=2
archs="x86_64 aarch64"
wrksrc="clion-${version}"
-depends="jetbrains-jdk-bin giflib libXtst"
+depends="virtual?jetbrains-java-runtime giflib libXtst"
short_desc="Smart cross-platform IDE for C and C++"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="custom:Commercial"
diff --git a/srcpkgs/DataGrip/template b/srcpkgs/DataGrip/template
index d7aff462e167..57165170da68 100644
--- a/srcpkgs/DataGrip/template
+++ b/srcpkgs/DataGrip/template
@@ -1,10 +1,10 @@
# Template file for 'DataGrip'
pkgname=DataGrip
version=2021.1.3
-revision=1
+revision=2
archs="i686 x86_64"
wrksrc="DataGrip-${version}"
-depends="jetbrains-jdk-bin"
+depends="virtual?jetbrains-java-runtime"
short_desc="Cross-Platform IDE for Databases & SQL by JetBrains"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="custom:Commercial"
diff --git a/srcpkgs/GoLand/template b/srcpkgs/GoLand/template
index 898701d61f84..3ca1f4c19785 100644
--- a/srcpkgs/GoLand/template
+++ b/srcpkgs/GoLand/template
@@ -1,9 +1,9 @@
# Template file for 'GoLand'
pkgname=GoLand
version=2021.1.3
-revision=1
-archs="i686 x86_64"
-depends="jetbrains-jdk-bin"
+revision=2
+archs="x86_64 aarch64"
+depends="virtual?jetbrains-java-runtime"
short_desc="Cross-platform IDE built specially for Go developers"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="custom:Commercial"
diff --git a/srcpkgs/PhpStorm/template b/srcpkgs/PhpStorm/template
index 1910c9cb0f9c..4e63bb185440 100644
--- a/srcpkgs/PhpStorm/template
+++ b/srcpkgs/PhpStorm/template
@@ -1,10 +1,10 @@
# Template file for 'PhpStorm'
pkgname=PhpStorm
version=2020.1.4
-revision=1
+revision=2
archs="i686 x86_64"
wrksrc="PhpStorm-201.8743.18"
-depends="jetbrains-jdk-bin"
+depends="virtual?jetbrains-java-runtime"
short_desc="Lightning-smart PHP IDE"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="custom:Commercial"
diff --git a/srcpkgs/RubyMine/template b/srcpkgs/RubyMine/template
index b071d373086f..b5063a5ced9f 100644
--- a/srcpkgs/RubyMine/template
+++ b/srcpkgs/RubyMine/template
@@ -1,9 +1,9 @@
# Template file for 'RubyMine'
pkgname=RubyMine
version=2020.1.4
-revision=1
+revision=2
archs="i686 x86_64"
-depends="jetbrains-jdk-bin"
+depends="virtual?jetbrains-java-runtime"
short_desc="Most intelligent Ruby and Rails IDE"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="custom:Commercial"
diff --git a/srcpkgs/WebStorm/template b/srcpkgs/WebStorm/template
index 8160731ee760..7e0ad829e34c 100644
--- a/srcpkgs/WebStorm/template
+++ b/srcpkgs/WebStorm/template
@@ -1,10 +1,10 @@
# Template file for 'WebStorm'
pkgname=WebStorm
version=2020.1.4
-revision=1
+revision=2
archs="i686 x86_64"
wrksrc="WebStorm-201.8743.9"
-depends="jetbrains-jdk-bin"
+depends="virtual?jetbrains-java-runtime"
short_desc="Smartest JavaScript IDE"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="custom:Commercial"
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index 20f99d94125f..9916b3e1836b 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,10 +1,10 @@
# Template file for 'intellij-idea-ultimate-edition'
pkgname=intellij-idea-ultimate-edition
version=2021.3
-revision=1
+revision=2
archs="i686 x86_64"
create_wrksrc="true"
-depends="giflib libXtst jetbrains-jdk-bin"
+depends="virtual?jetbrains-java-runtime giflib libXtst"
short_desc="Most intelligent Java IDE"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="custom:Commercial"
diff --git a/srcpkgs/jetbrains-jdk-bin/template b/srcpkgs/jetbrains-jdk11-bin/template
similarity index 85%
rename from srcpkgs/jetbrains-jdk-bin/template
rename to srcpkgs/jetbrains-jdk11-bin/template
index f6b26790ad82..2c5d9d4ab82f 100644
--- a/srcpkgs/jetbrains-jdk-bin/template
+++ b/srcpkgs/jetbrains-jdk11-bin/template
@@ -1,9 +1,11 @@
-# Template file for 'jetbrains-jdk-bin'
-pkgname=jetbrains-jdk-bin
+# Template file for 'jetbrains-jdk11-bin'
+pkgname=jetbrains-jdk11-bin
version=11.0.13b1504.49
revision=1
archs="x86_64"
wrksrc="jbr"
+provides="jetbrains-java-runtime-${version}_${revision}"
+conflicts="jetbrains-jdk17 jetbrains-jdk-bin"
short_desc="JetBrains Java 11 JDK"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="GPL-2.0-only, Classpath-exception-2.0"
diff --git a/srcpkgs/jetbrains-jdk-bin/update b/srcpkgs/jetbrains-jdk11-bin/update
similarity index 100%
rename from srcpkgs/jetbrains-jdk-bin/update
rename to srcpkgs/jetbrains-jdk11-bin/update
diff --git a/srcpkgs/jetbrains-jdk17/INSTALL.msg b/srcpkgs/jetbrains-jdk17/INSTALL.msg
new file mode 100644
index 000000000000..d2f5086317f6
--- /dev/null
+++ b/srcpkgs/jetbrains-jdk17/INSTALL.msg
@@ -0,0 +1,19 @@
+JDK17 is not yet fully supported by JetBrains' tooling, although existing evidence is that JDK17 is in general more performant.
+
+It is necessary to add the following to the vmoptions file for any of the JetBrains' IDEs you use in order for the IDE to start:
+ --illegal-access=warn
+ -Dsun.java2d.metal=true
+ --add-opens=java.desktop/java.awt.event=ALL-UNNAMED
+ --add-opens=java.desktop/sun.font=ALL-UNNAMED
+ --add-opens=java.desktop/java.awt=ALL-UNNAMED
+ --add-opens=java.desktop/sun.awt=ALL-UNNAMED
+ --add-opens=java.base/java.lang=ALL-UNNAMED
+ --add-opens=java.base/java.util=ALL-UNNAMED
+ --add-opens=java.desktop/javax.swing=ALL-UNNAMED
+ --add-opens=java.desktop/sun.swing=ALL-UNNAMED
+ --add-opens=java.desktop/javax.swing.plaf.basic=ALL-UNNAMED
+ --add-opens=java.desktop/java.awt.peer=ALL-UNNAMED
+ --add-opens=java.desktop/javax.swing.text.html=ALL-UNNAMED
+ --add-exports=java.desktop/sun.font=ALL-UNNAMED
+
+Details found at https://mustafaakin.dev/posts/2021-12-08-running-intellij-idea-with-jdk17-for-better-render-performance/
diff --git a/srcpkgs/jetbrains-jdk17/template b/srcpkgs/jetbrains-jdk17/template
new file mode 100644
index 000000000000..a10ebff2390f
--- /dev/null
+++ b/srcpkgs/jetbrains-jdk17/template
@@ -0,0 +1,79 @@
+# Template file for 'jetbrains-jdk17'
+pkgname=jetbrains-jdk17
+version=17.0.1b164.8
+revision=1
+_jdk_ver=${version%b*}
+_jdk_build=${version#*b}
+_tag_name="jbr${_jdk_ver//\./_}b${_jdk_build}"
+wrksrc="JetBrainsRuntime-${_tag_name}"
+build_style=gnu-configure
+configure_args="
+ --disable-warnings-as-errors
+ --prefix=${XBPS_DESTDIR}/${XBPS_CROSS_TRIPLET}/${pkgname}-${version}/usr/lib
+ --enable-unlimited-crypto
+ --with-zlib=system
+ --with-libjpeg=system
+ --with-giflib=system
+ --with-libpng=system
+ --with-lcms=system
+ --with-jtreg=no
+ --with-native-debug-symbols=none
+ --with-version-pre=
+ --with-vendor-name="Void"
+ --with-vendor-url="https://voidlinux.org/"
+ --with-vendor-bug-url="https://github.com/void-linux/void-packages/issues"
+ --with-vendor-vm-bug-url="https://github.com/void-linux/void-packages/issues""
+make_build_args="images"
+make_check_target="test-hotspot-gtest"
+makedepends="pkg-config zip bzip2 unzip tar wget make autoconf automake libtool alsa-lib-devel cups-devel libX11-devel libjpeg-turbo-devel giflib-devel freetype-devel file which libXtst-devel libXt-devel libXrender-devel alsa-lib-devel fontconfig-devel libXrandr-devel libXi-devel zlib-devel lcms2-devel git openjdk11"
+conflicts="jetbrains-jdk11-bin jetbrains-jdk-bin"
+short_desc="JetBrains Java 17 JDK"
+maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
+license="GPL-2.0-only, Classpath-exception-2.0"
+homepage="https://github.com/JetBrains/JetBrainsRuntime"
+distfiles="https://github.com/JetBrains/JetBrainsRuntime/archive/refs/tags/${_tag_name}.tar.gz"
+checksum=e843027ba4b9923e1ae12e3fac0302ec7452c821f31302c06e55d4678da7760d
+provides="jetbrains-java-runtime-${version}_${revision}"
+
+# Build is still parallel, but don't use -jN.
+disable_parallel_build=yes
+
+## This JDK appears to link to libs that do not exist, but functions well even in their absence.
+## Best guess is that they are optional. ¯\_(ツ)_/¯
+noverifyrdeps=yes
+nopie=yes
+
+do_configure() {
+ CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/}
+ CXXFLAGS=${CXXFLAGS/-D_FORTIFY_SOURCE=2/}
+
+ if [ "$XBPS_CCACHE" ] && [ -z "$CROSS_BUILD" ]; then
+ configure_args+=" --enable-ccache"
+ CC="/usr/bin/cc"
+ CXX="/usr/bin/c++"
+ fi
+
+ sh ./configure ${configure_args}
+}
+
+do_install() {
+ TARGET_PATH="usr/lib/jvm/jbrsdk"
+
+ vmkdir ${TARGET_PATH}
+
+ vlicense ASSEMBLY_EXCEPTION
+ vlicense LICENSE
+
+ cd build/linux-*-normal-server-release/images/jdk/
+ vcopy bin ${TARGET_PATH}
+ vcopy conf ${TARGET_PATH}
+ vcopy include ${TARGET_PATH}
+ vcopy legal ${TARGET_PATH}
+ vcopy lib ${TARGET_PATH}
+ vcopy release ${TARGET_PATH}
+
+ vmkdir etc/profile.d
+ cat > ${DESTDIR}/etc/profile.d/10_jbrsdk.sh <<EOF
+export IDEA_JDK=\${IDEA_JDK=/usr/lib/jvm/jbrsdk}
+EOF
+}
diff --git a/srcpkgs/jetbrains-jdk17/update b/srcpkgs/jetbrains-jdk17/update
new file mode 100644
index 000000000000..69ca9d5f660d
--- /dev/null
+++ b/srcpkgs/jetbrains-jdk17/update
@@ -0,0 +1,5 @@
+_jdk_ver=${version%b*}
+_jdk_build=${version#*b}
+version=${_jdk_ver}b${_jdk_build}
+pattern="/releases/tag/jbr\K17_\d+_\d+b\d+(\.\d+)?(?=\")"
+site="https://github.com/JetBrains/JetBrainsRuntime/releases"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 2b16ae44131f..c2dfd4f0c43f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -186,6 +186,7 @@ replaces="
icecat<=78.6.1_1
ioquake3-rpi<=20130506_2
isl16<=0.16_2
+ jetbrains-jdk-bin<=11.0.13b1504.49_1
js<=1.8.5_11
jwm-settings-manager<=2.1.5_1
k3s<=1.0.0_1
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] New package: jetbrains-jdk17-17.0.1b164.8
2021-12-31 6:55 [PR PATCH] New package: jetbrains-jdk17-17.0.1b164.8 2asoft
2021-12-31 7:01 ` [PR PATCH] [Updated] " 2asoft
@ 2021-12-31 7:03 ` 2asoft
2021-12-31 7:05 ` 2asoft
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: 2asoft @ 2021-12-31 7:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 689 bytes --]
There is an updated pull request by 2asoft against master on the void-packages repository
https://github.com/2asoft/void-packages 2asoft/jb_update_jdk_src
https://github.com/void-linux/void-packages/pull/34780
New package: jetbrains-jdk17-17.0.1b164.8
#### 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**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-LIBC)
A patch file from https://github.com/void-linux/void-packages/pull/34780.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-2asoft/jb_update_jdk_src-34780.patch --]
[-- Type: text/x-diff, Size: 11643 bytes --]
From 4cee9db6bc04b282b869647a5665a316999d17a9 Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <1157248+2asoft@users.noreply.github.com>
Date: Wed, 28 Jul 2021 14:37:54 -0700
Subject: [PATCH] New package: jetbrains-jdk17-17.0.1b164.8
---
etc/defaults.virtual | 1 +
srcpkgs/CLion/template | 4 +-
srcpkgs/DataGrip/template | 4 +-
srcpkgs/GoLand/template | 6 +-
srcpkgs/PhpStorm/template | 4 +-
srcpkgs/RubyMine/template | 4 +-
srcpkgs/WebStorm/template | 4 +-
.../intellij-idea-ultimate-edition/template | 4 +-
.../template | 6 +-
.../update | 0
srcpkgs/jetbrains-jdk17/INSTALL.msg | 19 +++++
srcpkgs/jetbrains-jdk17/template | 79 +++++++++++++++++++
srcpkgs/jetbrains-jdk17/update | 5 ++
srcpkgs/removed-packages/template | 1 +
14 files changed, 124 insertions(+), 17 deletions(-)
rename srcpkgs/{jetbrains-jdk-bin => jetbrains-jdk11-bin}/template (85%)
rename srcpkgs/{jetbrains-jdk-bin => jetbrains-jdk11-bin}/update (100%)
create mode 100644 srcpkgs/jetbrains-jdk17/INSTALL.msg
create mode 100644 srcpkgs/jetbrains-jdk17/template
create mode 100644 srcpkgs/jetbrains-jdk17/update
diff --git a/etc/defaults.virtual b/etc/defaults.virtual
index 083ab6349eac..b6b88323b2ea 100644
--- a/etc/defaults.virtual
+++ b/etc/defaults.virtual
@@ -23,6 +23,7 @@ awk gawk
emacs emacs
java-environment openjdk8
java-runtime openjdk8-jre
+jetbrains-java-runtime jetbrains-jdk11-bin
libudev eudev-libudev
nodejs-runtime nodejs
ntp-daemon chrony
diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index 76f9dd3f1e8c..5b261ca2acb3 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,10 +1,10 @@
# Template file for 'CLion'
pkgname=CLion
version=2021.3
-revision=1
+revision=2
archs="x86_64 aarch64"
wrksrc="clion-${version}"
-depends="jetbrains-jdk-bin giflib libXtst"
+depends="virtual?jetbrains-java-runtime giflib libXtst"
short_desc="Smart cross-platform IDE for C and C++"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="custom:Commercial"
diff --git a/srcpkgs/DataGrip/template b/srcpkgs/DataGrip/template
index d7aff462e167..57165170da68 100644
--- a/srcpkgs/DataGrip/template
+++ b/srcpkgs/DataGrip/template
@@ -1,10 +1,10 @@
# Template file for 'DataGrip'
pkgname=DataGrip
version=2021.1.3
-revision=1
+revision=2
archs="i686 x86_64"
wrksrc="DataGrip-${version}"
-depends="jetbrains-jdk-bin"
+depends="virtual?jetbrains-java-runtime"
short_desc="Cross-Platform IDE for Databases & SQL by JetBrains"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="custom:Commercial"
diff --git a/srcpkgs/GoLand/template b/srcpkgs/GoLand/template
index 898701d61f84..3ca1f4c19785 100644
--- a/srcpkgs/GoLand/template
+++ b/srcpkgs/GoLand/template
@@ -1,9 +1,9 @@
# Template file for 'GoLand'
pkgname=GoLand
version=2021.1.3
-revision=1
-archs="i686 x86_64"
-depends="jetbrains-jdk-bin"
+revision=2
+archs="x86_64 aarch64"
+depends="virtual?jetbrains-java-runtime"
short_desc="Cross-platform IDE built specially for Go developers"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="custom:Commercial"
diff --git a/srcpkgs/PhpStorm/template b/srcpkgs/PhpStorm/template
index 1910c9cb0f9c..4e63bb185440 100644
--- a/srcpkgs/PhpStorm/template
+++ b/srcpkgs/PhpStorm/template
@@ -1,10 +1,10 @@
# Template file for 'PhpStorm'
pkgname=PhpStorm
version=2020.1.4
-revision=1
+revision=2
archs="i686 x86_64"
wrksrc="PhpStorm-201.8743.18"
-depends="jetbrains-jdk-bin"
+depends="virtual?jetbrains-java-runtime"
short_desc="Lightning-smart PHP IDE"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="custom:Commercial"
diff --git a/srcpkgs/RubyMine/template b/srcpkgs/RubyMine/template
index b071d373086f..b5063a5ced9f 100644
--- a/srcpkgs/RubyMine/template
+++ b/srcpkgs/RubyMine/template
@@ -1,9 +1,9 @@
# Template file for 'RubyMine'
pkgname=RubyMine
version=2020.1.4
-revision=1
+revision=2
archs="i686 x86_64"
-depends="jetbrains-jdk-bin"
+depends="virtual?jetbrains-java-runtime"
short_desc="Most intelligent Ruby and Rails IDE"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="custom:Commercial"
diff --git a/srcpkgs/WebStorm/template b/srcpkgs/WebStorm/template
index 8160731ee760..7e0ad829e34c 100644
--- a/srcpkgs/WebStorm/template
+++ b/srcpkgs/WebStorm/template
@@ -1,10 +1,10 @@
# Template file for 'WebStorm'
pkgname=WebStorm
version=2020.1.4
-revision=1
+revision=2
archs="i686 x86_64"
wrksrc="WebStorm-201.8743.9"
-depends="jetbrains-jdk-bin"
+depends="virtual?jetbrains-java-runtime"
short_desc="Smartest JavaScript IDE"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="custom:Commercial"
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index 20f99d94125f..9916b3e1836b 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,10 +1,10 @@
# Template file for 'intellij-idea-ultimate-edition'
pkgname=intellij-idea-ultimate-edition
version=2021.3
-revision=1
+revision=2
archs="i686 x86_64"
create_wrksrc="true"
-depends="giflib libXtst jetbrains-jdk-bin"
+depends="virtual?jetbrains-java-runtime giflib libXtst"
short_desc="Most intelligent Java IDE"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="custom:Commercial"
diff --git a/srcpkgs/jetbrains-jdk-bin/template b/srcpkgs/jetbrains-jdk11-bin/template
similarity index 85%
rename from srcpkgs/jetbrains-jdk-bin/template
rename to srcpkgs/jetbrains-jdk11-bin/template
index f6b26790ad82..2c5d9d4ab82f 100644
--- a/srcpkgs/jetbrains-jdk-bin/template
+++ b/srcpkgs/jetbrains-jdk11-bin/template
@@ -1,9 +1,11 @@
-# Template file for 'jetbrains-jdk-bin'
-pkgname=jetbrains-jdk-bin
+# Template file for 'jetbrains-jdk11-bin'
+pkgname=jetbrains-jdk11-bin
version=11.0.13b1504.49
revision=1
archs="x86_64"
wrksrc="jbr"
+provides="jetbrains-java-runtime-${version}_${revision}"
+conflicts="jetbrains-jdk17 jetbrains-jdk-bin"
short_desc="JetBrains Java 11 JDK"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="GPL-2.0-only, Classpath-exception-2.0"
diff --git a/srcpkgs/jetbrains-jdk-bin/update b/srcpkgs/jetbrains-jdk11-bin/update
similarity index 100%
rename from srcpkgs/jetbrains-jdk-bin/update
rename to srcpkgs/jetbrains-jdk11-bin/update
diff --git a/srcpkgs/jetbrains-jdk17/INSTALL.msg b/srcpkgs/jetbrains-jdk17/INSTALL.msg
new file mode 100644
index 000000000000..d2f5086317f6
--- /dev/null
+++ b/srcpkgs/jetbrains-jdk17/INSTALL.msg
@@ -0,0 +1,19 @@
+JDK17 is not yet fully supported by JetBrains' tooling, although existing evidence is that JDK17 is in general more performant.
+
+It is necessary to add the following to the vmoptions file for any of the JetBrains' IDEs you use in order for the IDE to start:
+ --illegal-access=warn
+ -Dsun.java2d.metal=true
+ --add-opens=java.desktop/java.awt.event=ALL-UNNAMED
+ --add-opens=java.desktop/sun.font=ALL-UNNAMED
+ --add-opens=java.desktop/java.awt=ALL-UNNAMED
+ --add-opens=java.desktop/sun.awt=ALL-UNNAMED
+ --add-opens=java.base/java.lang=ALL-UNNAMED
+ --add-opens=java.base/java.util=ALL-UNNAMED
+ --add-opens=java.desktop/javax.swing=ALL-UNNAMED
+ --add-opens=java.desktop/sun.swing=ALL-UNNAMED
+ --add-opens=java.desktop/javax.swing.plaf.basic=ALL-UNNAMED
+ --add-opens=java.desktop/java.awt.peer=ALL-UNNAMED
+ --add-opens=java.desktop/javax.swing.text.html=ALL-UNNAMED
+ --add-exports=java.desktop/sun.font=ALL-UNNAMED
+
+Details found at https://mustafaakin.dev/posts/2021-12-08-running-intellij-idea-with-jdk17-for-better-render-performance/
diff --git a/srcpkgs/jetbrains-jdk17/template b/srcpkgs/jetbrains-jdk17/template
new file mode 100644
index 000000000000..4425fb990bde
--- /dev/null
+++ b/srcpkgs/jetbrains-jdk17/template
@@ -0,0 +1,79 @@
+# Template file for 'jetbrains-jdk17'
+pkgname=jetbrains-jdk17
+version=17.0.1b164.8
+revision=1
+_jdk_ver=${version%b*}
+_jdk_build=${version#*b}
+_tag_name="jbr${_jdk_ver//\./_}b${_jdk_build}"
+wrksrc="JetBrainsRuntime-${_tag_name}"
+build_style=gnu-configure
+configure_args="
+ --disable-warnings-as-errors
+ --prefix=${XBPS_DESTDIR}/${XBPS_CROSS_TRIPLET}/${pkgname}-${version}/usr/lib
+ --enable-unlimited-crypto
+ --with-zlib=system
+ --with-libjpeg=system
+ --with-giflib=system
+ --with-libpng=system
+ --with-lcms=system
+ --with-jtreg=no
+ --with-native-debug-symbols=none
+ --with-version-pre=
+ --with-vendor-name="Void"
+ --with-vendor-url="https://voidlinux.org/"
+ --with-vendor-bug-url="https://github.com/void-linux/void-packages/issues"
+ --with-vendor-vm-bug-url="https://github.com/void-linux/void-packages/issues""
+make_build_args="images"
+make_check_target="test-hotspot-gtest"
+makedepends="pkg-config zip bzip2 unzip tar wget make autoconf automake libtool alsa-lib-devel cups-devel libX11-devel libjpeg-turbo-devel giflib-devel freetype-devel file which libXtst-devel libXt-devel libXrender-devel alsa-lib-devel fontconfig-devel libXrandr-devel libXi-devel zlib-devel lcms2-devel git openjdk11"
+short_desc="JetBrains Java 17 JDK"
+maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
+license="GPL-2.0-only, Classpath-exception-2.0"
+homepage="https://github.com/JetBrains/JetBrainsRuntime"
+distfiles="https://github.com/JetBrains/JetBrainsRuntime/archive/refs/tags/${_tag_name}.tar.gz"
+checksum=e843027ba4b9923e1ae12e3fac0302ec7452c821f31302c06e55d4678da7760d
+conflicts="jetbrains-jdk11-bin jetbrains-jdk-bin"
+provides="jetbrains-java-runtime-${version}_${revision}"
+
+# Build is still parallel, but don't use -jN.
+disable_parallel_build=yes
+
+## This JDK appears to link to libs that do not exist, but functions well even in their absence.
+## Best guess is that they are optional. ¯\_(ツ)_/¯
+noverifyrdeps=yes
+nopie=yes
+
+do_configure() {
+ CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/}
+ CXXFLAGS=${CXXFLAGS/-D_FORTIFY_SOURCE=2/}
+
+ if [ "$XBPS_CCACHE" ] && [ -z "$CROSS_BUILD" ]; then
+ configure_args+=" --enable-ccache"
+ CC="/usr/bin/cc"
+ CXX="/usr/bin/c++"
+ fi
+
+ sh ./configure ${configure_args}
+}
+
+do_install() {
+ TARGET_PATH="usr/lib/jvm/jbrsdk"
+
+ vmkdir ${TARGET_PATH}
+
+ vlicense ASSEMBLY_EXCEPTION
+ vlicense LICENSE
+
+ cd build/linux-*-normal-server-release/images/jdk/
+ vcopy bin ${TARGET_PATH}
+ vcopy conf ${TARGET_PATH}
+ vcopy include ${TARGET_PATH}
+ vcopy legal ${TARGET_PATH}
+ vcopy lib ${TARGET_PATH}
+ vcopy release ${TARGET_PATH}
+
+ vmkdir etc/profile.d
+ cat > ${DESTDIR}/etc/profile.d/10_jbrsdk.sh <<EOF
+export IDEA_JDK=\${IDEA_JDK=/usr/lib/jvm/jbrsdk}
+EOF
+}
diff --git a/srcpkgs/jetbrains-jdk17/update b/srcpkgs/jetbrains-jdk17/update
new file mode 100644
index 000000000000..69ca9d5f660d
--- /dev/null
+++ b/srcpkgs/jetbrains-jdk17/update
@@ -0,0 +1,5 @@
+_jdk_ver=${version%b*}
+_jdk_build=${version#*b}
+version=${_jdk_ver}b${_jdk_build}
+pattern="/releases/tag/jbr\K17_\d+_\d+b\d+(\.\d+)?(?=\")"
+site="https://github.com/JetBrains/JetBrainsRuntime/releases"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 2b16ae44131f..c2dfd4f0c43f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -186,6 +186,7 @@ replaces="
icecat<=78.6.1_1
ioquake3-rpi<=20130506_2
isl16<=0.16_2
+ jetbrains-jdk-bin<=11.0.13b1504.49_1
js<=1.8.5_11
jwm-settings-manager<=2.1.5_1
k3s<=1.0.0_1
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] New package: jetbrains-jdk17-17.0.1b164.8
2021-12-31 6:55 [PR PATCH] New package: jetbrains-jdk17-17.0.1b164.8 2asoft
2021-12-31 7:01 ` [PR PATCH] [Updated] " 2asoft
2021-12-31 7:03 ` 2asoft
@ 2021-12-31 7:05 ` 2asoft
2021-12-31 8:26 ` 2asoft
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: 2asoft @ 2021-12-31 7:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 689 bytes --]
There is an updated pull request by 2asoft against master on the void-packages repository
https://github.com/2asoft/void-packages 2asoft/jb_update_jdk_src
https://github.com/void-linux/void-packages/pull/34780
New package: jetbrains-jdk17-17.0.1b164.8
#### 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**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-LIBC)
A patch file from https://github.com/void-linux/void-packages/pull/34780.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-2asoft/jb_update_jdk_src-34780.patch --]
[-- Type: text/x-diff, Size: 11922 bytes --]
From 3f8ff0ec4098875544eef7030d2034bd4f7fff26 Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <1157248+2asoft@users.noreply.github.com>
Date: Wed, 28 Jul 2021 14:37:54 -0700
Subject: [PATCH] New package: jetbrains-jdk17-17.0.1b164.8
---
etc/defaults.virtual | 1 +
srcpkgs/CLion/template | 4 +-
srcpkgs/DataGrip/template | 4 +-
srcpkgs/GoLand/template | 6 +-
srcpkgs/PhpStorm/template | 4 +-
srcpkgs/RubyMine/template | 4 +-
srcpkgs/WebStorm/template | 4 +-
.../intellij-idea-ultimate-edition/template | 4 +-
.../template | 6 +-
.../update | 0
srcpkgs/jetbrains-jdk17/INSTALL.msg | 19 +++++
srcpkgs/jetbrains-jdk17/template | 79 +++++++++++++++++++
srcpkgs/jetbrains-jdk17/update | 5 ++
srcpkgs/removed-packages/template | 1 +
14 files changed, 124 insertions(+), 17 deletions(-)
rename srcpkgs/{jetbrains-jdk-bin => jetbrains-jdk11-bin}/template (85%)
rename srcpkgs/{jetbrains-jdk-bin => jetbrains-jdk11-bin}/update (100%)
create mode 100644 srcpkgs/jetbrains-jdk17/INSTALL.msg
create mode 100644 srcpkgs/jetbrains-jdk17/template
create mode 100644 srcpkgs/jetbrains-jdk17/update
diff --git a/etc/defaults.virtual b/etc/defaults.virtual
index 083ab6349eac..b6b88323b2ea 100644
--- a/etc/defaults.virtual
+++ b/etc/defaults.virtual
@@ -23,6 +23,7 @@ awk gawk
emacs emacs
java-environment openjdk8
java-runtime openjdk8-jre
+jetbrains-java-runtime jetbrains-jdk11-bin
libudev eudev-libudev
nodejs-runtime nodejs
ntp-daemon chrony
diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index 76f9dd3f1e8c..5b261ca2acb3 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,10 +1,10 @@
# Template file for 'CLion'
pkgname=CLion
version=2021.3
-revision=1
+revision=2
archs="x86_64 aarch64"
wrksrc="clion-${version}"
-depends="jetbrains-jdk-bin giflib libXtst"
+depends="virtual?jetbrains-java-runtime giflib libXtst"
short_desc="Smart cross-platform IDE for C and C++"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="custom:Commercial"
diff --git a/srcpkgs/DataGrip/template b/srcpkgs/DataGrip/template
index d7aff462e167..57165170da68 100644
--- a/srcpkgs/DataGrip/template
+++ b/srcpkgs/DataGrip/template
@@ -1,10 +1,10 @@
# Template file for 'DataGrip'
pkgname=DataGrip
version=2021.1.3
-revision=1
+revision=2
archs="i686 x86_64"
wrksrc="DataGrip-${version}"
-depends="jetbrains-jdk-bin"
+depends="virtual?jetbrains-java-runtime"
short_desc="Cross-Platform IDE for Databases & SQL by JetBrains"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="custom:Commercial"
diff --git a/srcpkgs/GoLand/template b/srcpkgs/GoLand/template
index 898701d61f84..3ca1f4c19785 100644
--- a/srcpkgs/GoLand/template
+++ b/srcpkgs/GoLand/template
@@ -1,9 +1,9 @@
# Template file for 'GoLand'
pkgname=GoLand
version=2021.1.3
-revision=1
-archs="i686 x86_64"
-depends="jetbrains-jdk-bin"
+revision=2
+archs="x86_64 aarch64"
+depends="virtual?jetbrains-java-runtime"
short_desc="Cross-platform IDE built specially for Go developers"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="custom:Commercial"
diff --git a/srcpkgs/PhpStorm/template b/srcpkgs/PhpStorm/template
index 1910c9cb0f9c..4e63bb185440 100644
--- a/srcpkgs/PhpStorm/template
+++ b/srcpkgs/PhpStorm/template
@@ -1,10 +1,10 @@
# Template file for 'PhpStorm'
pkgname=PhpStorm
version=2020.1.4
-revision=1
+revision=2
archs="i686 x86_64"
wrksrc="PhpStorm-201.8743.18"
-depends="jetbrains-jdk-bin"
+depends="virtual?jetbrains-java-runtime"
short_desc="Lightning-smart PHP IDE"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="custom:Commercial"
diff --git a/srcpkgs/RubyMine/template b/srcpkgs/RubyMine/template
index b071d373086f..b5063a5ced9f 100644
--- a/srcpkgs/RubyMine/template
+++ b/srcpkgs/RubyMine/template
@@ -1,9 +1,9 @@
# Template file for 'RubyMine'
pkgname=RubyMine
version=2020.1.4
-revision=1
+revision=2
archs="i686 x86_64"
-depends="jetbrains-jdk-bin"
+depends="virtual?jetbrains-java-runtime"
short_desc="Most intelligent Ruby and Rails IDE"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="custom:Commercial"
diff --git a/srcpkgs/WebStorm/template b/srcpkgs/WebStorm/template
index 8160731ee760..7e0ad829e34c 100644
--- a/srcpkgs/WebStorm/template
+++ b/srcpkgs/WebStorm/template
@@ -1,10 +1,10 @@
# Template file for 'WebStorm'
pkgname=WebStorm
version=2020.1.4
-revision=1
+revision=2
archs="i686 x86_64"
wrksrc="WebStorm-201.8743.9"
-depends="jetbrains-jdk-bin"
+depends="virtual?jetbrains-java-runtime"
short_desc="Smartest JavaScript IDE"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="custom:Commercial"
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index 20f99d94125f..9916b3e1836b 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,10 +1,10 @@
# Template file for 'intellij-idea-ultimate-edition'
pkgname=intellij-idea-ultimate-edition
version=2021.3
-revision=1
+revision=2
archs="i686 x86_64"
create_wrksrc="true"
-depends="giflib libXtst jetbrains-jdk-bin"
+depends="virtual?jetbrains-java-runtime giflib libXtst"
short_desc="Most intelligent Java IDE"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="custom:Commercial"
diff --git a/srcpkgs/jetbrains-jdk-bin/template b/srcpkgs/jetbrains-jdk11-bin/template
similarity index 85%
rename from srcpkgs/jetbrains-jdk-bin/template
rename to srcpkgs/jetbrains-jdk11-bin/template
index f6b26790ad82..85993a2b103a 100644
--- a/srcpkgs/jetbrains-jdk-bin/template
+++ b/srcpkgs/jetbrains-jdk11-bin/template
@@ -1,5 +1,5 @@
-# Template file for 'jetbrains-jdk-bin'
-pkgname=jetbrains-jdk-bin
+# Template file for 'jetbrains-jdk11-bin'
+pkgname=jetbrains-jdk11-bin
version=11.0.13b1504.49
revision=1
archs="x86_64"
@@ -12,6 +12,8 @@ _jdk_ver=${version%b*}
_jdk_build=${version#*b}
distfiles="https://cache-redirector.jetbrains.com/intellij-jbr/jbr_jcef-${_jdk_ver//\./_}-linux-x64-b${_jdk_build}.tar.gz"
checksum=6e84df3c86adc9ec8d63f1151ffbe2081b2c10eb04ff40e1cb86d04b20c5d36e
+conflicts="jetbrains-jdk17 jetbrains-jdk-bin"
+provides="jetbrains-java-runtime-${version}_${revision}"
# This JDK appears to link to libs that do not exist, but functions well even in their absence.
# Best guess is that they are optional. ¯\_(ツ)_/¯
noverifyrdeps=yes
diff --git a/srcpkgs/jetbrains-jdk-bin/update b/srcpkgs/jetbrains-jdk11-bin/update
similarity index 100%
rename from srcpkgs/jetbrains-jdk-bin/update
rename to srcpkgs/jetbrains-jdk11-bin/update
diff --git a/srcpkgs/jetbrains-jdk17/INSTALL.msg b/srcpkgs/jetbrains-jdk17/INSTALL.msg
new file mode 100644
index 000000000000..d2f5086317f6
--- /dev/null
+++ b/srcpkgs/jetbrains-jdk17/INSTALL.msg
@@ -0,0 +1,19 @@
+JDK17 is not yet fully supported by JetBrains' tooling, although existing evidence is that JDK17 is in general more performant.
+
+It is necessary to add the following to the vmoptions file for any of the JetBrains' IDEs you use in order for the IDE to start:
+ --illegal-access=warn
+ -Dsun.java2d.metal=true
+ --add-opens=java.desktop/java.awt.event=ALL-UNNAMED
+ --add-opens=java.desktop/sun.font=ALL-UNNAMED
+ --add-opens=java.desktop/java.awt=ALL-UNNAMED
+ --add-opens=java.desktop/sun.awt=ALL-UNNAMED
+ --add-opens=java.base/java.lang=ALL-UNNAMED
+ --add-opens=java.base/java.util=ALL-UNNAMED
+ --add-opens=java.desktop/javax.swing=ALL-UNNAMED
+ --add-opens=java.desktop/sun.swing=ALL-UNNAMED
+ --add-opens=java.desktop/javax.swing.plaf.basic=ALL-UNNAMED
+ --add-opens=java.desktop/java.awt.peer=ALL-UNNAMED
+ --add-opens=java.desktop/javax.swing.text.html=ALL-UNNAMED
+ --add-exports=java.desktop/sun.font=ALL-UNNAMED
+
+Details found at https://mustafaakin.dev/posts/2021-12-08-running-intellij-idea-with-jdk17-for-better-render-performance/
diff --git a/srcpkgs/jetbrains-jdk17/template b/srcpkgs/jetbrains-jdk17/template
new file mode 100644
index 000000000000..4425fb990bde
--- /dev/null
+++ b/srcpkgs/jetbrains-jdk17/template
@@ -0,0 +1,79 @@
+# Template file for 'jetbrains-jdk17'
+pkgname=jetbrains-jdk17
+version=17.0.1b164.8
+revision=1
+_jdk_ver=${version%b*}
+_jdk_build=${version#*b}
+_tag_name="jbr${_jdk_ver//\./_}b${_jdk_build}"
+wrksrc="JetBrainsRuntime-${_tag_name}"
+build_style=gnu-configure
+configure_args="
+ --disable-warnings-as-errors
+ --prefix=${XBPS_DESTDIR}/${XBPS_CROSS_TRIPLET}/${pkgname}-${version}/usr/lib
+ --enable-unlimited-crypto
+ --with-zlib=system
+ --with-libjpeg=system
+ --with-giflib=system
+ --with-libpng=system
+ --with-lcms=system
+ --with-jtreg=no
+ --with-native-debug-symbols=none
+ --with-version-pre=
+ --with-vendor-name="Void"
+ --with-vendor-url="https://voidlinux.org/"
+ --with-vendor-bug-url="https://github.com/void-linux/void-packages/issues"
+ --with-vendor-vm-bug-url="https://github.com/void-linux/void-packages/issues""
+make_build_args="images"
+make_check_target="test-hotspot-gtest"
+makedepends="pkg-config zip bzip2 unzip tar wget make autoconf automake libtool alsa-lib-devel cups-devel libX11-devel libjpeg-turbo-devel giflib-devel freetype-devel file which libXtst-devel libXt-devel libXrender-devel alsa-lib-devel fontconfig-devel libXrandr-devel libXi-devel zlib-devel lcms2-devel git openjdk11"
+short_desc="JetBrains Java 17 JDK"
+maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
+license="GPL-2.0-only, Classpath-exception-2.0"
+homepage="https://github.com/JetBrains/JetBrainsRuntime"
+distfiles="https://github.com/JetBrains/JetBrainsRuntime/archive/refs/tags/${_tag_name}.tar.gz"
+checksum=e843027ba4b9923e1ae12e3fac0302ec7452c821f31302c06e55d4678da7760d
+conflicts="jetbrains-jdk11-bin jetbrains-jdk-bin"
+provides="jetbrains-java-runtime-${version}_${revision}"
+
+# Build is still parallel, but don't use -jN.
+disable_parallel_build=yes
+
+## This JDK appears to link to libs that do not exist, but functions well even in their absence.
+## Best guess is that they are optional. ¯\_(ツ)_/¯
+noverifyrdeps=yes
+nopie=yes
+
+do_configure() {
+ CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/}
+ CXXFLAGS=${CXXFLAGS/-D_FORTIFY_SOURCE=2/}
+
+ if [ "$XBPS_CCACHE" ] && [ -z "$CROSS_BUILD" ]; then
+ configure_args+=" --enable-ccache"
+ CC="/usr/bin/cc"
+ CXX="/usr/bin/c++"
+ fi
+
+ sh ./configure ${configure_args}
+}
+
+do_install() {
+ TARGET_PATH="usr/lib/jvm/jbrsdk"
+
+ vmkdir ${TARGET_PATH}
+
+ vlicense ASSEMBLY_EXCEPTION
+ vlicense LICENSE
+
+ cd build/linux-*-normal-server-release/images/jdk/
+ vcopy bin ${TARGET_PATH}
+ vcopy conf ${TARGET_PATH}
+ vcopy include ${TARGET_PATH}
+ vcopy legal ${TARGET_PATH}
+ vcopy lib ${TARGET_PATH}
+ vcopy release ${TARGET_PATH}
+
+ vmkdir etc/profile.d
+ cat > ${DESTDIR}/etc/profile.d/10_jbrsdk.sh <<EOF
+export IDEA_JDK=\${IDEA_JDK=/usr/lib/jvm/jbrsdk}
+EOF
+}
diff --git a/srcpkgs/jetbrains-jdk17/update b/srcpkgs/jetbrains-jdk17/update
new file mode 100644
index 000000000000..69ca9d5f660d
--- /dev/null
+++ b/srcpkgs/jetbrains-jdk17/update
@@ -0,0 +1,5 @@
+_jdk_ver=${version%b*}
+_jdk_build=${version#*b}
+version=${_jdk_ver}b${_jdk_build}
+pattern="/releases/tag/jbr\K17_\d+_\d+b\d+(\.\d+)?(?=\")"
+site="https://github.com/JetBrains/JetBrainsRuntime/releases"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 2b16ae44131f..c2dfd4f0c43f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -186,6 +186,7 @@ replaces="
icecat<=78.6.1_1
ioquake3-rpi<=20130506_2
isl16<=0.16_2
+ jetbrains-jdk-bin<=11.0.13b1504.49_1
js<=1.8.5_11
jwm-settings-manager<=2.1.5_1
k3s<=1.0.0_1
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] New package: jetbrains-jdk17-17.0.1b164.8
2021-12-31 6:55 [PR PATCH] New package: jetbrains-jdk17-17.0.1b164.8 2asoft
` (2 preceding siblings ...)
2021-12-31 7:05 ` 2asoft
@ 2021-12-31 8:26 ` 2asoft
2021-12-31 19:02 ` Chocimier
2021-12-31 20:59 ` [PR PATCH] [Closed]: " 2asoft
5 siblings, 0 replies; 7+ messages in thread
From: 2asoft @ 2021-12-31 8:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 689 bytes --]
There is an updated pull request by 2asoft against master on the void-packages repository
https://github.com/2asoft/void-packages 2asoft/jb_update_jdk_src
https://github.com/void-linux/void-packages/pull/34780
New package: jetbrains-jdk17-17.0.1b164.8
#### 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**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-LIBC)
A patch file from https://github.com/void-linux/void-packages/pull/34780.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-2asoft/jb_update_jdk_src-34780.patch --]
[-- Type: text/x-diff, Size: 12290 bytes --]
From 7b3749a6b98ea7f7bb3dd78337f8c624f929a2cb Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <1157248+2asoft@users.noreply.github.com>
Date: Wed, 28 Jul 2021 14:37:54 -0700
Subject: [PATCH] New package: jetbrains-jdk17-17.0.1b164.8
---
etc/defaults.virtual | 1 +
srcpkgs/CLion/template | 4 +-
srcpkgs/DataGrip/template | 4 +-
srcpkgs/GoLand/template | 6 +-
srcpkgs/PhpStorm/template | 4 +-
srcpkgs/RubyMine/template | 4 +-
srcpkgs/WebStorm/template | 4 +-
.../intellij-idea-ultimate-edition/template | 4 +-
.../template | 6 +-
.../update | 0
srcpkgs/jetbrains-jdk17/INSTALL.msg | 19 ++++
srcpkgs/jetbrains-jdk17/template | 89 +++++++++++++++++++
srcpkgs/jetbrains-jdk17/update | 5 ++
srcpkgs/removed-packages/template | 1 +
14 files changed, 134 insertions(+), 17 deletions(-)
rename srcpkgs/{jetbrains-jdk-bin => jetbrains-jdk11-bin}/template (85%)
rename srcpkgs/{jetbrains-jdk-bin => jetbrains-jdk11-bin}/update (100%)
create mode 100644 srcpkgs/jetbrains-jdk17/INSTALL.msg
create mode 100644 srcpkgs/jetbrains-jdk17/template
create mode 100644 srcpkgs/jetbrains-jdk17/update
diff --git a/etc/defaults.virtual b/etc/defaults.virtual
index 083ab6349eac..b6b88323b2ea 100644
--- a/etc/defaults.virtual
+++ b/etc/defaults.virtual
@@ -23,6 +23,7 @@ awk gawk
emacs emacs
java-environment openjdk8
java-runtime openjdk8-jre
+jetbrains-java-runtime jetbrains-jdk11-bin
libudev eudev-libudev
nodejs-runtime nodejs
ntp-daemon chrony
diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index 76f9dd3f1e8c..5b261ca2acb3 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,10 +1,10 @@
# Template file for 'CLion'
pkgname=CLion
version=2021.3
-revision=1
+revision=2
archs="x86_64 aarch64"
wrksrc="clion-${version}"
-depends="jetbrains-jdk-bin giflib libXtst"
+depends="virtual?jetbrains-java-runtime giflib libXtst"
short_desc="Smart cross-platform IDE for C and C++"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="custom:Commercial"
diff --git a/srcpkgs/DataGrip/template b/srcpkgs/DataGrip/template
index d7aff462e167..57165170da68 100644
--- a/srcpkgs/DataGrip/template
+++ b/srcpkgs/DataGrip/template
@@ -1,10 +1,10 @@
# Template file for 'DataGrip'
pkgname=DataGrip
version=2021.1.3
-revision=1
+revision=2
archs="i686 x86_64"
wrksrc="DataGrip-${version}"
-depends="jetbrains-jdk-bin"
+depends="virtual?jetbrains-java-runtime"
short_desc="Cross-Platform IDE for Databases & SQL by JetBrains"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="custom:Commercial"
diff --git a/srcpkgs/GoLand/template b/srcpkgs/GoLand/template
index 898701d61f84..3ca1f4c19785 100644
--- a/srcpkgs/GoLand/template
+++ b/srcpkgs/GoLand/template
@@ -1,9 +1,9 @@
# Template file for 'GoLand'
pkgname=GoLand
version=2021.1.3
-revision=1
-archs="i686 x86_64"
-depends="jetbrains-jdk-bin"
+revision=2
+archs="x86_64 aarch64"
+depends="virtual?jetbrains-java-runtime"
short_desc="Cross-platform IDE built specially for Go developers"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="custom:Commercial"
diff --git a/srcpkgs/PhpStorm/template b/srcpkgs/PhpStorm/template
index 1910c9cb0f9c..4e63bb185440 100644
--- a/srcpkgs/PhpStorm/template
+++ b/srcpkgs/PhpStorm/template
@@ -1,10 +1,10 @@
# Template file for 'PhpStorm'
pkgname=PhpStorm
version=2020.1.4
-revision=1
+revision=2
archs="i686 x86_64"
wrksrc="PhpStorm-201.8743.18"
-depends="jetbrains-jdk-bin"
+depends="virtual?jetbrains-java-runtime"
short_desc="Lightning-smart PHP IDE"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="custom:Commercial"
diff --git a/srcpkgs/RubyMine/template b/srcpkgs/RubyMine/template
index b071d373086f..b5063a5ced9f 100644
--- a/srcpkgs/RubyMine/template
+++ b/srcpkgs/RubyMine/template
@@ -1,9 +1,9 @@
# Template file for 'RubyMine'
pkgname=RubyMine
version=2020.1.4
-revision=1
+revision=2
archs="i686 x86_64"
-depends="jetbrains-jdk-bin"
+depends="virtual?jetbrains-java-runtime"
short_desc="Most intelligent Ruby and Rails IDE"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="custom:Commercial"
diff --git a/srcpkgs/WebStorm/template b/srcpkgs/WebStorm/template
index 8160731ee760..7e0ad829e34c 100644
--- a/srcpkgs/WebStorm/template
+++ b/srcpkgs/WebStorm/template
@@ -1,10 +1,10 @@
# Template file for 'WebStorm'
pkgname=WebStorm
version=2020.1.4
-revision=1
+revision=2
archs="i686 x86_64"
wrksrc="WebStorm-201.8743.9"
-depends="jetbrains-jdk-bin"
+depends="virtual?jetbrains-java-runtime"
short_desc="Smartest JavaScript IDE"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="custom:Commercial"
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index 20f99d94125f..9916b3e1836b 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,10 +1,10 @@
# Template file for 'intellij-idea-ultimate-edition'
pkgname=intellij-idea-ultimate-edition
version=2021.3
-revision=1
+revision=2
archs="i686 x86_64"
create_wrksrc="true"
-depends="giflib libXtst jetbrains-jdk-bin"
+depends="virtual?jetbrains-java-runtime giflib libXtst"
short_desc="Most intelligent Java IDE"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="custom:Commercial"
diff --git a/srcpkgs/jetbrains-jdk-bin/template b/srcpkgs/jetbrains-jdk11-bin/template
similarity index 85%
rename from srcpkgs/jetbrains-jdk-bin/template
rename to srcpkgs/jetbrains-jdk11-bin/template
index f6b26790ad82..85993a2b103a 100644
--- a/srcpkgs/jetbrains-jdk-bin/template
+++ b/srcpkgs/jetbrains-jdk11-bin/template
@@ -1,5 +1,5 @@
-# Template file for 'jetbrains-jdk-bin'
-pkgname=jetbrains-jdk-bin
+# Template file for 'jetbrains-jdk11-bin'
+pkgname=jetbrains-jdk11-bin
version=11.0.13b1504.49
revision=1
archs="x86_64"
@@ -12,6 +12,8 @@ _jdk_ver=${version%b*}
_jdk_build=${version#*b}
distfiles="https://cache-redirector.jetbrains.com/intellij-jbr/jbr_jcef-${_jdk_ver//\./_}-linux-x64-b${_jdk_build}.tar.gz"
checksum=6e84df3c86adc9ec8d63f1151ffbe2081b2c10eb04ff40e1cb86d04b20c5d36e
+conflicts="jetbrains-jdk17 jetbrains-jdk-bin"
+provides="jetbrains-java-runtime-${version}_${revision}"
# This JDK appears to link to libs that do not exist, but functions well even in their absence.
# Best guess is that they are optional. ¯\_(ツ)_/¯
noverifyrdeps=yes
diff --git a/srcpkgs/jetbrains-jdk-bin/update b/srcpkgs/jetbrains-jdk11-bin/update
similarity index 100%
rename from srcpkgs/jetbrains-jdk-bin/update
rename to srcpkgs/jetbrains-jdk11-bin/update
diff --git a/srcpkgs/jetbrains-jdk17/INSTALL.msg b/srcpkgs/jetbrains-jdk17/INSTALL.msg
new file mode 100644
index 000000000000..d2f5086317f6
--- /dev/null
+++ b/srcpkgs/jetbrains-jdk17/INSTALL.msg
@@ -0,0 +1,19 @@
+JDK17 is not yet fully supported by JetBrains' tooling, although existing evidence is that JDK17 is in general more performant.
+
+It is necessary to add the following to the vmoptions file for any of the JetBrains' IDEs you use in order for the IDE to start:
+ --illegal-access=warn
+ -Dsun.java2d.metal=true
+ --add-opens=java.desktop/java.awt.event=ALL-UNNAMED
+ --add-opens=java.desktop/sun.font=ALL-UNNAMED
+ --add-opens=java.desktop/java.awt=ALL-UNNAMED
+ --add-opens=java.desktop/sun.awt=ALL-UNNAMED
+ --add-opens=java.base/java.lang=ALL-UNNAMED
+ --add-opens=java.base/java.util=ALL-UNNAMED
+ --add-opens=java.desktop/javax.swing=ALL-UNNAMED
+ --add-opens=java.desktop/sun.swing=ALL-UNNAMED
+ --add-opens=java.desktop/javax.swing.plaf.basic=ALL-UNNAMED
+ --add-opens=java.desktop/java.awt.peer=ALL-UNNAMED
+ --add-opens=java.desktop/javax.swing.text.html=ALL-UNNAMED
+ --add-exports=java.desktop/sun.font=ALL-UNNAMED
+
+Details found at https://mustafaakin.dev/posts/2021-12-08-running-intellij-idea-with-jdk17-for-better-render-performance/
diff --git a/srcpkgs/jetbrains-jdk17/template b/srcpkgs/jetbrains-jdk17/template
new file mode 100644
index 000000000000..696cdbd2f316
--- /dev/null
+++ b/srcpkgs/jetbrains-jdk17/template
@@ -0,0 +1,89 @@
+# Template file for 'jetbrains-jdk17'
+pkgname=jetbrains-jdk17
+version=17.0.1b164.8
+revision=1
+archs="x86_64"
+_jdk_ver=${version%b*}
+_jdk_build=${version#*b}
+_tag_name="jbr${_jdk_ver//\./_}b${_jdk_build}"
+wrksrc="JetBrainsRuntime-${_tag_name}"
+build_style=gnu-configure
+configure_args="
+ --disable-warnings-as-errors
+ --prefix=${XBPS_DESTDIR}/${XBPS_CROSS_TRIPLET}/${pkgname}-${version}/usr/lib
+ --enable-unlimited-crypto
+ --with-zlib=system
+ --with-libjpeg=system
+ --with-giflib=system
+ --with-libpng=system
+ --with-lcms=system
+ --with-jtreg=no
+ --with-native-debug-symbols=none
+ --with-version-pre=
+ --with-vendor-name="Void"
+ --with-vendor-url="https://voidlinux.org/"
+ --with-vendor-bug-url="https://github.com/void-linux/void-packages/issues"
+ --with-vendor-vm-bug-url="https://github.com/void-linux/void-packages/issues""
+make_build_args="images"
+make_check_target="test-hotspot-gtest"
+makedepends="pkg-config zip bzip2 unzip tar wget make autoconf automake libtool alsa-lib-devel cups-devel libX11-devel libjpeg-turbo-devel giflib-devel freetype-devel file which libXtst-devel libXt-devel libXrender-devel alsa-lib-devel fontconfig-devel libXrandr-devel libXi-devel zlib-devel lcms2-devel git"
+short_desc="JetBrains Java 17 JDK"
+maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
+license="GPL-2.0-only, Classpath-exception-2.0"
+homepage="https://github.com/JetBrains/JetBrainsRuntime"
+distfiles="https://github.com/JetBrains/JetBrainsRuntime/archive/refs/tags/${_tag_name}.tar.gz"
+checksum=e843027ba4b9923e1ae12e3fac0302ec7452c821f31302c06e55d4678da7760d
+conflicts="jetbrains-jdk11-bin jetbrains-jdk-bin"
+provides="jetbrains-java-runtime-${version}_${revision}"
+
+# Build is still parallel, but don't use -jN.
+disable_parallel_build=yes
+
+## This JDK appears to link to libs that do not exist, but functions well even in their absence.
+## Best guess is that they are optional. ¯\_(ツ)_/¯
+noverifyrdeps=yes
+nopie=yes
+
+# This does not currently accomplish anything, since only building on x86_64. Leaving this for future, taken from `openjdk11`.
+if [ ! "$CROSS_BUILD" ]; then
+ makedepends+=" openjdk10-bootstrap"
+ configure_args+=" --with-boot-jdk=/usr/lib/jvm/java-10-openjdk"
+else
+ makedepends+=" openjdk11"
+ configure_args+=" --with-boot-jdk=/usr/lib/jvm/openjdk11"
+fi
+
+do_configure() {
+ CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/}
+ CXXFLAGS=${CXXFLAGS/-D_FORTIFY_SOURCE=2/}
+
+ if [ "$XBPS_CCACHE" ] && [ -z "$CROSS_BUILD" ]; then
+ configure_args+=" --enable-ccache"
+ CC="/usr/bin/cc"
+ CXX="/usr/bin/c++"
+ fi
+
+ sh ./configure ${configure_args}
+}
+
+do_install() {
+ TARGET_PATH="usr/lib/jvm/jbrsdk"
+
+ vmkdir ${TARGET_PATH}
+
+ vlicense ASSEMBLY_EXCEPTION
+ vlicense LICENSE
+
+ cd build/linux-*-normal-server-release/images/jdk/
+ vcopy bin ${TARGET_PATH}
+ vcopy conf ${TARGET_PATH}
+ vcopy include ${TARGET_PATH}
+ vcopy legal ${TARGET_PATH}
+ vcopy lib ${TARGET_PATH}
+ vcopy release ${TARGET_PATH}
+
+ vmkdir etc/profile.d
+ cat > ${DESTDIR}/etc/profile.d/10_jbrsdk.sh <<EOF
+export IDEA_JDK=\${IDEA_JDK=/usr/lib/jvm/jbrsdk}
+EOF
+}
diff --git a/srcpkgs/jetbrains-jdk17/update b/srcpkgs/jetbrains-jdk17/update
new file mode 100644
index 000000000000..69ca9d5f660d
--- /dev/null
+++ b/srcpkgs/jetbrains-jdk17/update
@@ -0,0 +1,5 @@
+_jdk_ver=${version%b*}
+_jdk_build=${version#*b}
+version=${_jdk_ver}b${_jdk_build}
+pattern="/releases/tag/jbr\K17_\d+_\d+b\d+(\.\d+)?(?=\")"
+site="https://github.com/JetBrains/JetBrainsRuntime/releases"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 2b16ae44131f..c2dfd4f0c43f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -186,6 +186,7 @@ replaces="
icecat<=78.6.1_1
ioquake3-rpi<=20130506_2
isl16<=0.16_2
+ jetbrains-jdk-bin<=11.0.13b1504.49_1
js<=1.8.5_11
jwm-settings-manager<=2.1.5_1
k3s<=1.0.0_1
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: New package: jetbrains-jdk17-17.0.1b164.8
2021-12-31 6:55 [PR PATCH] New package: jetbrains-jdk17-17.0.1b164.8 2asoft
` (3 preceding siblings ...)
2021-12-31 8:26 ` 2asoft
@ 2021-12-31 19:02 ` Chocimier
2021-12-31 20:59 ` [PR PATCH] [Closed]: " 2asoft
5 siblings, 0 replies; 7+ messages in thread
From: Chocimier @ 2021-12-31 19:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 235 bytes --]
New comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/34780#issuecomment-1003436700
Comment:
Great work, but let's stay with single version of jdk and switch to 17 when it gets stable.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Closed]: New package: jetbrains-jdk17-17.0.1b164.8
2021-12-31 6:55 [PR PATCH] New package: jetbrains-jdk17-17.0.1b164.8 2asoft
` (4 preceding siblings ...)
2021-12-31 19:02 ` Chocimier
@ 2021-12-31 20:59 ` 2asoft
5 siblings, 0 replies; 7+ messages in thread
From: 2asoft @ 2021-12-31 20:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 518 bytes --]
There's a closed pull request on the void-packages repository
New package: jetbrains-jdk17-17.0.1b164.8
https://github.com/void-linux/void-packages/pull/34780
Description:
#### 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**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-LIBC)
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-12-31 20:59 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-31 6:55 [PR PATCH] New package: jetbrains-jdk17-17.0.1b164.8 2asoft
2021-12-31 7:01 ` [PR PATCH] [Updated] " 2asoft
2021-12-31 7:03 ` 2asoft
2021-12-31 7:05 ` 2asoft
2021-12-31 8:26 ` 2asoft
2021-12-31 19:02 ` Chocimier
2021-12-31 20:59 ` [PR PATCH] [Closed]: " 2asoft
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).