Github messages for voidlinux
 help / color / mirror / Atom feed
From: 2asoft <2asoft@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] intellij-idea-ultimate-edition: update to 2022.1.2.
Date: Tue, 26 Jul 2022 21:59:08 +0200	[thread overview]
Message-ID: <20220726195908.lUxVQ-55n9Nii0PXr-XF1Hb6qk_T3XrRDbVClADqpgg@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-36713@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 526 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_idea_ultimate
https://github.com/void-linux/void-packages/pull/36713

intellij-idea-ultimate-edition: update to 2022.1.2.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64)

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

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

From 4e6a840b467c7ac41e498a586e6ee5ff932b95da Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <anton@doubleasoftware.com>
Date: Mon, 4 Jul 2022 02:42:06 -0700
Subject: [PATCH 1/5] New package: jetbrains-jdk17-17.0.3b469.19

---
 etc/defaults.virtual                          |   1 +
 srcpkgs/CLion/template                        |   2 +-
 srcpkgs/DataGrip/template                     |   2 +-
 srcpkgs/GoLand/template                       |   2 +-
 srcpkgs/PhpStorm/template                     |   2 +-
 srcpkgs/RubyMine/template                     |   2 +-
 srcpkgs/WebStorm/template                     |   2 +-
 .../intellij-idea-ultimate-edition/template   |   2 +-
 srcpkgs/jetbrains-jdk-bin                     |   1 +
 .../template                                  |  12 +-
 .../update                                    |   0
 srcpkgs/jetbrains-jdk17/INSTALL.msg           |  29 +++++
 .../01-jdk_build_classlist_sort_to_file.diff  |  64 ++++++++++
 srcpkgs/jetbrains-jdk17/template              | 111 ++++++++++++++++++
 srcpkgs/jetbrains-jdk17/update                |   5 +
 15 files changed, 228 insertions(+), 9 deletions(-)
 create mode 120000 srcpkgs/jetbrains-jdk-bin
 rename srcpkgs/{jetbrains-jdk-bin => jetbrains-jdk11-bin}/template (78%)
 rename srcpkgs/{jetbrains-jdk-bin => jetbrains-jdk11-bin}/update (100%)
 create mode 100644 srcpkgs/jetbrains-jdk17/INSTALL.msg
 create mode 100644 srcpkgs/jetbrains-jdk17/patches/01-jdk_build_classlist_sort_to_file.diff
 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 65e76c206e6c..7ea81b2d608a 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -4,7 +4,7 @@ version=2021.3.4
 revision=1
 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..3118d509bba7 100644
--- a/srcpkgs/DataGrip/template
+++ b/srcpkgs/DataGrip/template
@@ -4,7 +4,7 @@ version=2021.1.3
 revision=1
 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 f807f0861adb..e065d3506482 100644
--- a/srcpkgs/GoLand/template
+++ b/srcpkgs/GoLand/template
@@ -3,7 +3,7 @@ pkgname=GoLand
 version=2021.3.3
 revision=1
 archs="x86_64 aarch64"
-depends="jetbrains-jdk-bin"
+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..0f209fc1e9a2 100644
--- a/srcpkgs/PhpStorm/template
+++ b/srcpkgs/PhpStorm/template
@@ -4,7 +4,7 @@ version=2020.1.4
 revision=1
 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..6424dca53645 100644
--- a/srcpkgs/RubyMine/template
+++ b/srcpkgs/RubyMine/template
@@ -3,7 +3,7 @@ pkgname=RubyMine
 version=2020.1.4
 revision=1
 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..e2653a9ab988 100644
--- a/srcpkgs/WebStorm/template
+++ b/srcpkgs/WebStorm/template
@@ -4,7 +4,7 @@ version=2020.1.4
 revision=1
 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 92ad9135f3a9..09c679be9adf 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -4,7 +4,7 @@ version=2021.3.3
 revision=1
 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 b/srcpkgs/jetbrains-jdk-bin
new file mode 120000
index 000000000000..aa928ca1ac35
--- /dev/null
+++ b/srcpkgs/jetbrains-jdk-bin
@@ -0,0 +1 @@
+jetbrains-jdk11-bin
\ No newline at end of file
diff --git a/srcpkgs/jetbrains-jdk-bin/template b/srcpkgs/jetbrains-jdk11-bin/template
similarity index 78%
rename from srcpkgs/jetbrains-jdk-bin/template
rename to srcpkgs/jetbrains-jdk11-bin/template
index 1f428e05bd3a..b31097e2a946 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.14.1b2043.17
 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=2c5b7398acb2b718cbdd8327e4c77e52b131fdf3424fee03d0c51afb3b315c10
+conflicts="jetbrains-jdk17"
+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
@@ -34,3 +36,9 @@ do_install() {
 export IDEA_JDK=\${IDEA_JDK=/usr/lib/jvm/jbrsdk}
 EOF
 }
+
+jetbrains-jdk-bin_package() {
+	depends="${pkgname}-${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}
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..21f1f57c16d2
--- /dev/null
+++ b/srcpkgs/jetbrains-jdk17/INSTALL.msg
@@ -0,0 +1,29 @@
+JDK17 is not fully supported by JetBrains' IDEs prior to v2022.2.
+There is anecdotal evidence that JDK17 is in general more performant, so it may be desirable to use it despite incomplete support.
+
+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.base/java.lang=ALL-UNNAMED
+--add-opens=java.base/java.util=ALL-UNNAMED
+--add-opens=java.desktop/java.awt.event=ALL-UNNAMED
+--add-opens=java.desktop/java.awt.peer=ALL-UNNAMED
+--add-opens=java.desktop/java.awt=ALL-UNNAMED
+--add-opens=java.desktop/javax.swing.plaf.basic=ALL-UNNAMED
+--add-opens=java.desktop/javax.swing.text.html=ALL-UNNAMED
+--add-opens=java.desktop/javax.swing=ALL-UNNAMED
+--add-opens=java.desktop/sun.awt=ALL-UNNAMED
+--add-opens=java.desktop/sun.awt.datatransfer=ALL-UNNAMED
+--add-opens=java.desktop/sun.awt.image=ALL-UNNAMED
+--add-opens=java.desktop/sun.awt.X11=ALL-UNNAMED
+--add-opens=java.desktop/sun.font=ALL-UNNAMED
+--add-opens=java.desktop/sun.swing=ALL-UNNAMED
+--add-exports=java.desktop/sun.awt=ALL-UNNAMED
+--add-exports=java.desktop/sun.awt.datatransfer=ALL-UNNAMED
+--add-exports=java.desktop/sun.awt.image=ALL-UNNAMED
+--add-exports=java.desktop/sun.awt.X11=ALL-UNNAMED
+
+
+Original idea taken from https://mustafaakin.dev/posts/2021-12-08-running-intellij-idea-with-jdk17-for-better-render-performance/.
+MacOS namespaces removed, new namespaces added as necessary.
diff --git a/srcpkgs/jetbrains-jdk17/patches/01-jdk_build_classlist_sort_to_file.diff b/srcpkgs/jetbrains-jdk17/patches/01-jdk_build_classlist_sort_to_file.diff
new file mode 100644
index 000000000000..e94884daf217
--- /dev/null
+++ b/srcpkgs/jetbrains-jdk17/patches/01-jdk_build_classlist_sort_to_file.diff
@@ -0,0 +1,64 @@
+diff --git a/make/GenerateLinkOptData.gmk b/make/GenerateLinkOptData.gmk
+index 5dd766c8c07..7b2480625f1 100644
+--- a/make/GenerateLinkOptData.gmk
++++ b/make/GenerateLinkOptData.gmk
+@@ -89,9 +89,10 @@ $(CLASSLIST_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXECUTABLE_SUFFIX) $(CLASSLIST
+ 	        exit $$exitcode \
+ 	    )
+ 	$(GREP) -v HelloClasslist $@.raw.2 > $@.raw.3
++	echo "" > $@
+ 	$(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java \
+ 	    -cp $(SUPPORT_OUTPUTDIR)/classlist.jar \
+-	    build.tools.classlist.SortClasslist $@.raw.3 > $@
++	    build.tools.classlist.SortClasslist $@.raw.3 $@
+ 
+ # The jli trace is created by the same recipe as classlist. By declaring these
+ # dependencies, make will correctly rebuild both jli trace and classlist
+diff --git a/make/jdk/src/classes/build/tools/classlist/SortClasslist.java b/make/jdk/src/classes/build/tools/classlist/SortClasslist.java
+index 07987feb2da..7a5b84421fc 100644
+--- a/make/jdk/src/classes/build/tools/classlist/SortClasslist.java
++++ b/make/jdk/src/classes/build/tools/classlist/SortClasslist.java
+@@ -33,6 +33,10 @@ package build.tools.classlist;
+ 
+ import java.io.FileInputStream;
+ import java.io.FileNotFoundException;
++import java.io.FileOutputStream;
++import java.io.OutputStreamWriter;
++import java.io.PrintWriter;
++import java.nio.charset.StandardCharsets;
+ import java.util.ArrayList;
+ import java.util.Collections;
+ import java.util.regex.Pattern;
+@@ -50,13 +54,15 @@ public class SortClasslist {
+         ArrayList<String> lambdas = new ArrayList<>();
+ 
+         FileInputStream fis = new FileInputStream(args[0]);
++        FileOutputStream fos = new FileOutputStream(args[1], false);
++        PrintWriter outWriter = new PrintWriter(new OutputStreamWriter(fos, StandardCharsets.UTF_8));
+         Scanner scanner = new Scanner(fis);
+         while (scanner.hasNextLine()) {
+             String line = scanner.nextLine();
+             if (line.startsWith("#")) {
+                 // Comments -- print them first without sorting. These appear only at the top
+                 // of the file.
+-                System.out.println(line);
++                outWriter.println(line);
+             } else if (line.startsWith("@")) {
+                 // @lambda-form-invoker, @lambda-proxy, etc.
+                 lambdas.add(line);
+@@ -73,10 +79,13 @@ public class SortClasslist {
+         Collections.sort(lambdas);
+ 
+         for (String s : classes) {
+-            System.out.println(s);
++            outWriter.println(s);
+         }
+         for (String s : lambdas) {
+-            System.out.println(s);
++            outWriter.println(s);
+         }
++
++        outWriter.flush();
++        outWriter.close();
+     }
+ }
diff --git a/srcpkgs/jetbrains-jdk17/template b/srcpkgs/jetbrains-jdk17/template
new file mode 100644
index 000000000000..80bf9b09c304
--- /dev/null
+++ b/srcpkgs/jetbrains-jdk17/template
@@ -0,0 +1,111 @@
+# Template file for 'jetbrains-jdk17'
+pkgname=jetbrains-jdk17
+version=17.0.3b469.19
+revision=1
+archs="x86_64"
+_jdk_ver=${version%b*}
+_jdk_build=${version#*b}
+_tag_name="jb${_jdk_ver}-b${_jdk_build}"
+_jdk_home="usr/lib/jvm/jbrsdk"
+wrksrc="JetBrainsRuntime-${_tag_name}"
+build_style=gnu-configure
+configure_args="
+ --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
+ --with-version-pre=
+ --with-version-opt=${_jdk_build}-void-r${revision}
+ --with-stdc++lib=dynamic
+ --with-libjpeg=system
+ --with-giflib=system
+ --with-libpng=system
+ --with-lcms=system
+ --with-zlib=system
+ --with-jtreg=no
+ --with-harfbuzz=system
+ --with-jvm-features=zgc
+ --enable-unlimited-crypto
+ --disable-warnings-as-errors
+ --with-native-debug-symbols=internal
+"
+make_build_args="images"
+make_install_args="INSTALL_PREFIX=\"${DESTDIR}/usr/lib\""
+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 harfbuzz-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 make-ca"
+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=e70701226dfebd44d530c135c1d1d3c6e6e6315c5a25b184942b7e939a40f2c3
+conflicts="jetbrains-jdk11-bin"
+provides="jetbrains-java-runtime-${version}_${revision}"
+
+# For whatever reason, XBPS finds libjava, libjli, etc as dependencies of this package, and decides to make it depend on openjdk8, which provides those.
+# But that is not true, nor desired -- this is a full fledged JDK distribution, just not installed as such here in XBPS land.
+noverifyrdeps=yes
+
+# Build is still parallel, but don't use -jN.
+disable_parallel_build=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+=" openjdk16-bootstrap"
+	configure_args+=" --with-boot-jdk=/usr/lib/jvm/openjdk16"
+else
+	makedepends+=" openjdk17"
+	configure_args+=" --with-boot-jdk=/usr/lib/jvm/openjdk17"
+fi
+#--with-boot-jdk-jvmargs=-Xlog:disable -Xlog:all=warning:stderr -Xlog:all=error:stderr
+configure_args+=" --with-boot-jdk-jvmargs=-Xlog:disable"
+
+do_configure() {
+	CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/}
+	CXXFLAGS=${CXXFLAGS/-D_FORTIFY_SOURCE=2/}
+
+	configure_args=${configure_args/--with-libtool-sysroot=$XBPS_CROSS_BASE}
+	if [ "$XBPS_CCACHE" ] && [ -z "$CROSS_BUILD" ]; then
+		configure_args+=" --enable-ccache"
+		CC="/usr/bin/cc"
+		CXX="/usr/bin/c++"
+	fi
+
+	sh ./configure ${configure_args} \
+		--with-extra-cflags="$CFLAGS" \
+		--with-extra-cxxflags="$CXXFLAGS" \
+		--with-extra-ldflags="$LDFLAGS" \
+		READELF=$READELF AR=$AR STRIP=$STRIP NM=$NM \
+		OBJDUMP=$OBJDUMP OBJCOPY=$OBJCOPY
+}
+
+# TODO: openjdk17 had the following hook in it. Debug it for understanding.
+#post_install() {
+#	vmkdir $_jdk_home/lib/security
+#	make-ca -g -f --destdir "${PWD}/ca" -k "${DESTDIR}/$_jdk_home/bin/keytool"
+#	mv ./ca/etc/pki/tls/java/cacerts ${DESTDIR}/$_jdk_home/lib/security/
+#	chmod -R ugo+rw ./ca
+#	rm -rf ./ca
+#}
+
+do_install() {
+	TARGET_PATH="${_jdk_home}"
+
+	vmkdir ${TARGET_PATH}
+
+	vlicense ASSEMBLY_EXCEPTION
+	vlicense LICENSE
+
+	cd build/linux-*-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=/${_jdk_home}}
+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"

From 50401fc62ff9c9b9414a7dd638a6f8da92af4efc Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <anton@doubleasoftware.com>
Date: Thu, 21 Jul 2022 23:51:21 -0700
Subject: [PATCH 2/5] jetbrains-jdk17: update to 17.0.3b518.1.

---
 srcpkgs/jetbrains-jdk17/template | 4 ++--
 srcpkgs/jetbrains-jdk17/update   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/jetbrains-jdk17/template b/srcpkgs/jetbrains-jdk17/template
index 80bf9b09c304..a65d5bf799f7 100644
--- a/srcpkgs/jetbrains-jdk17/template
+++ b/srcpkgs/jetbrains-jdk17/template
@@ -1,6 +1,6 @@
 # Template file for 'jetbrains-jdk17'
 pkgname=jetbrains-jdk17
-version=17.0.3b469.19
+version=17.0.3b518.1
 revision=1
 archs="x86_64"
 _jdk_ver=${version%b*}
@@ -38,7 +38,7 @@ 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=e70701226dfebd44d530c135c1d1d3c6e6e6315c5a25b184942b7e939a40f2c3
+checksum=ec36d8a412ff3345c0d63fbe1a18efd95d9667a09024f4a0dc36ff20305a2ded
 conflicts="jetbrains-jdk11-bin"
 provides="jetbrains-java-runtime-${version}_${revision}"
 
diff --git a/srcpkgs/jetbrains-jdk17/update b/srcpkgs/jetbrains-jdk17/update
index 69ca9d5f660d..b8a971d471d5 100644
--- a/srcpkgs/jetbrains-jdk17/update
+++ b/srcpkgs/jetbrains-jdk17/update
@@ -1,5 +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"
+version=${_jdk_ver}-b${_jdk_build}
+pattern="/releases/tag/jb\K17.\d+.\d+-b\d+(\.\d+)?(?=\")"
+site="https://github.com/JetBrains/JetBrainsRuntime/tags"

From 534b1e8718cf8e73fe951c7249ecb19525c87e8b Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <anton@doubleasoftware.com>
Date: Fri, 15 Apr 2022 09:13:20 -0700
Subject: [PATCH 3/5] intellij-idea-ultimate-edition: update to 2022.1.3.

---
 .../intellij-idea-ultimate-edition/template   | 34 ++++++-------------
 1 file changed, 10 insertions(+), 24 deletions(-)

diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index 09c679be9adf..ced11e9f5344 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,6 +1,6 @@
 # Template file for 'intellij-idea-ultimate-edition'
 pkgname=intellij-idea-ultimate-edition
-version=2021.3.3
+version=2022.1.3
 revision=1
 archs="i686 x86_64"
 create_wrksrc="true"
@@ -11,13 +11,15 @@ license="custom:Commercial"
 homepage="https://www.jetbrains.com/idea"
 _filename="ideaIU-${version}-no-jbr.tar.gz"
 distfiles="https://download.jetbrains.com/idea/${_filename}"
-checksum=2a3295fca08060ad515f6c7198879d09963724cfb36af3ea94f16dcd76636470
+checksum=97748cd2dacf74701eb4ec30227d96a9b5ab5c09afc7e59443669ab839d20d02
 repository=nonfree
 restricted=yes
 nopie=yes
 # JetBrains' tools are self-sufficient and while they include code that appears to be linked to libs from other packages, these libs are either included in the tool package, or the code works by looking for one of several supported libs.
 noverifyrdeps=yes
+noshlibprovides=yes
 python_version=3
+nostrip=yes
 
 do_extract() {
 	bsdtar xf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_filename} --strip-components=1 -C .
@@ -25,30 +27,17 @@ do_extract() {
 
 post_extract() {
 	# Remove files for other OSes
-	rm -rf plugins/cwm-plugin/quiche-native/darwin-aarch64
-	rm -rf plugins/cwm-plugin/quiche-native/darwin-x86-64
-	rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
-	rm -rf plugins/maven/lib/maven3/lib/jansi-native/freebsd64
-	rm -rf plugins/maven/lib/maven3/lib/jansi-native/freebsd32
-	rm -rf plugins/maven/lib/maven3/lib/jansi-native/osx
-	rm -rf plugins/maven/lib/maven3/lib/jansi-native/windows32
-	rm -rf plugins/maven/lib/maven3/lib/jansi-native/windows64
-	rm -rf plugins/performanceTesting/bin/libyjpagent.dylib
-	rm -rf plugins/performanceTesting/bin/yjpagent.dll
-	rm -rf plugins/performanceTesting/bin/yjpagent64.dll
-	rm -rf plugins/webp/lib/libwebp/mac
-	rm -rf plugins/webp/lib/libwebp/win
+	rm -rf plugins/cwm-plugin/quiche-native/{darwin-aarch64,darwin-x86-64,win32-x86-64}
+	rm -rf plugins/Kotlin/bin/{macos,windows}
+	rm -rf plugins/maven/lib/maven3/lib/jansi-native/{freebsd32,freebsd64,osx,windows32,windows64}
+	rm -rf plugins/performanceTesting/bin/{libyjpagent.dylib,yjpagent.dll,yjpagent64.dll}
+	rm -rf plugins/webp/lib/libwebp/{mac,win}
 
 	# Remove files for other CPU architectures
-	rm -rf bin/fsnotifier-arm
-	rm -rf lib/pty4j-native/linux/aarch64
-	rm -rf lib/pty4j-native/linux/arm
-	rm -rf lib/pty4j-native/linux/mips64el
-	rm -rf lib/pty4j-native/linux/ppc64le
+	rm -rf lib/pty4j-native/linux/{aarch64,arm,mips64el,ppc64le}
 
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
-			rm -rf bin/idea.vmoptions
 			rm -rf lib/pty4j-native/linux/x86
 			rm -rf plugins/android/lib/libwebp/linux/libwebp_jni.so
 			rm -rf plugins/maven/lib/maven3/lib/jansi-native/linux32
@@ -56,8 +45,6 @@ post_extract() {
 			rm -rf plugins/webp/lib/libwebp/linux/libwebp_jni.so
 			;;
 		i686)
-			rm -rf bin/idea64.vmoptions
-			rm -rf bin/libyjpagent-linux64.so
 			rm -rf lib/pty4j-native/linux/x86_64
 			rm -rf plugins/android/lib/libwebp/linux/libwebp_jni64.so
 			rm -rf plugins/maven/lib/maven3/lib/jansi-native/linux64
@@ -82,7 +69,6 @@ do_install() {
 	vcopy help ${TARGET_PATH}
 	vcopy lib ${TARGET_PATH}
 	vcopy plugins ${TARGET_PATH}
-	vcopy redist ${TARGET_PATH}
 	vcopy product-info.json ${TARGET_PATH}
 	vcopy build.txt ${TARGET_PATH}
 

From 0f596fbf3c540c4339eb3c6540522b7c01a0a8b9 Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <anton@doubleasoftware.com>
Date: Thu, 21 Jul 2022 23:58:24 -0700
Subject: [PATCH 4/5] intellij-idea-ultimate-edition: update to 2022.1.4.

---
 srcpkgs/intellij-idea-ultimate-edition/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index ced11e9f5344..41716be379d2 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,6 +1,6 @@
 # Template file for 'intellij-idea-ultimate-edition'
 pkgname=intellij-idea-ultimate-edition
-version=2022.1.3
+version=2022.1.4
 revision=1
 archs="i686 x86_64"
 create_wrksrc="true"
@@ -11,7 +11,7 @@ license="custom:Commercial"
 homepage="https://www.jetbrains.com/idea"
 _filename="ideaIU-${version}-no-jbr.tar.gz"
 distfiles="https://download.jetbrains.com/idea/${_filename}"
-checksum=97748cd2dacf74701eb4ec30227d96a9b5ab5c09afc7e59443669ab839d20d02
+checksum=3bea36ac18a577ef2808a1c00fe2e9a3bc16b77c146e3da3eb81483fba4da593
 repository=nonfree
 restricted=yes
 nopie=yes

From 60a186ce765ebbc3c606051c6a31da3218031481 Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <anton@doubleasoftware.com>
Date: Tue, 26 Jul 2022 12:50:41 -0700
Subject: [PATCH 5/5] intellij-idea-ultimate-edition: update to 2022.2.

---
 srcpkgs/intellij-idea-ultimate-edition/template | 6 +++---
 srcpkgs/intellij-idea-ultimate-edition/update   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index 41716be379d2..545496d97457 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,6 +1,6 @@
 # Template file for 'intellij-idea-ultimate-edition'
 pkgname=intellij-idea-ultimate-edition
-version=2022.1.4
+version=2022.2
 revision=1
 archs="i686 x86_64"
 create_wrksrc="true"
@@ -9,9 +9,9 @@ short_desc="Most intelligent Java IDE"
 maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/idea"
-_filename="ideaIU-${version}-no-jbr.tar.gz"
+_filename="ideaIU-${version}.tar.gz"
 distfiles="https://download.jetbrains.com/idea/${_filename}"
-checksum=3bea36ac18a577ef2808a1c00fe2e9a3bc16b77c146e3da3eb81483fba4da593
+checksum=15654e4b0b27f56427184ceefe5229f2a644218f83dfd735b0e8dcb7041610e7
 repository=nonfree
 restricted=yes
 nopie=yes
diff --git a/srcpkgs/intellij-idea-ultimate-edition/update b/srcpkgs/intellij-idea-ultimate-edition/update
index 0fd4e8031bd5..47b4c56e8f7e 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/update
+++ b/srcpkgs/intellij-idea-ultimate-edition/update
@@ -1,2 +1,2 @@
-pattern="ideaIU-\K[\d.]+(?=-no-jbr\.tar)"
-site="https://data.services.jetbrains.com/products/releases?code=IIU%2CIIC&latest=true&type=release"
+pattern="ideaIU-\K[\d.]+(?=\.tar\.gz)"
+site="https://data.services.jetbrains.com/products/releases?code=IIU&latest=true&type=release"

  parent reply	other threads:[~2022-07-26 19:59 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-15 19:55 [PR PATCH] intellij-idea-ultimate-edition: update to 2022.1 2asoft
2022-05-13  6:12 ` [PR PATCH] [Updated] " 2asoft
2022-06-02  5:42 ` [PR PATCH] [Updated] intellij-idea-ultimate-edition: update to 2022.1.1 2asoft
2022-06-22  8:01 ` [PR PATCH] [Updated] intellij-idea-ultimate-edition: update to 2022.1.2 2asoft
2022-07-22  6:58 ` 2asoft
2022-07-26 19:59 ` 2asoft [this message]
2022-07-29 15:57 ` 2asoft
2022-08-23  3:48 ` 2asoft
2022-09-09 18:25 ` 2asoft
2022-09-16 20:14 ` 2asoft
2022-09-16 21:01 ` [PR PATCH] [Updated] intellij-idea-ultimate-edition: update to 2022.2.2 2asoft

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220726195908.lUxVQ-55n9Nii0PXr-XF1Hb6qk_T3XrRDbVClADqpgg@z \
    --to=2asoft@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).