Re: [PR PATCH] [Updated] CLion: update to 2022.2.3.

[2asoft <2asoft@users.noreply.github.com>]

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

CLion: update to 2022.2.3.
#### Testing the changes
- I tested the changes in this PR: **YES**

#### 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/36712.patch is attached

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

From b50d0d0d009204d4a44c8edb53ca0e32bcf9871d Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <anton@doubleasoftware.com>
Date: Sat, 30 Jul 2022 08:47:49 -0700
Subject: [PATCH 1/7] New package: jetbrains-jdk17-17.0.5b759.1.

---
 .../01-jdk_build_classlist_sort_to_file.diff  |  64 ++++++++++
 srcpkgs/jetbrains-jdk17/template              | 117 ++++++++++++++++++
 srcpkgs/jetbrains-jdk17/update                |   2 +
 3 files changed, 183 insertions(+)
 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/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..4b63ed2da607
--- /dev/null
+++ b/srcpkgs/jetbrains-jdk17/template
@@ -0,0 +1,117 @@
+# Template file for 'jetbrains-jdk17'
+pkgname=jetbrains-jdk17
+version=17.0.5b759.1
+revision=1
+_gtest_ver=1.8.1
+archs="x86_64"
+_tag_name="jbr-release-${version}"
+_jdk_home="usr/lib/jvm/jbrsdk"
+create_wrksrc=yes
+build_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=${version#*b}-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
+ --with-debug-level=release
+ --with-jobs=${XBPS_ORIG_MAKEJOBS}
+ --with-gtest=../googletest-release-${_gtest_ver}
+"
+make_build_args="images"
+make_install_args="INSTALL_PREFIX=\"${DESTDIR}/usr/lib\""
+make_check_target="test-hotspot-gtest"
+hostmakedepends="pkg-config zip unzip autoconf automake libtool which make-ca"
+makedepends="alsa-lib-devel cups-devel libX11-devel libjpeg-turbo-devel harfbuzz-devel giflib-devel freetype-devel libXtst-devel libXt-devel libXrender-devel alsa-lib-devel fontconfig-devel libXrandr-devel libXi-devel zlib-devel lcms2-devel"
+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
+ https://github.com/google/googletest/archive/refs/tags/release-${_gtest_ver}.tar.gz"
+checksum="25766e1f8bccd6e6b4b863a98b78309f3847434eff24461adc97da0b35a61dbb
+ 9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
+patch_args="-Np1 -d ${build_wrksrc}"
+conflicts="jetbrains-jdk-bin"
+
+# 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 and check are still parallel, but don't use -jN.
+disable_parallel_build=yes
+disable_parallel_check=yes
+
+# This does not currently accomplish anything, since only building on x86_64. Leaving this for future, taken from `openjdk17`.
+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
+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..215972d02843
--- /dev/null
+++ b/srcpkgs/jetbrains-jdk17/update
@@ -0,0 +1,2 @@
+pattern='/archive/refs/tags/jbr-release-\K17[\d.]+b[\d.]+(?=\.tar\.gz)'
+site="https://github.com/JetBrains/JetBrainsRuntime/tags"

From 508c0ed26e3c4418150eb833925c1bc9d8ae0217 Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <anton@doubleasoftware.com>
Date: Thu, 9 Feb 2023 23:15:48 -0800
Subject: [PATCH 2/7] jetbrains-jdk17: update to 17.0.5b759.1.

---
 srcpkgs/jetbrains-jdk17/template | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/jetbrains-jdk17/template b/srcpkgs/jetbrains-jdk17/template
index 4b63ed2da607..408deadad107 100644
--- a/srcpkgs/jetbrains-jdk17/template
+++ b/srcpkgs/jetbrains-jdk17/template
@@ -56,14 +56,8 @@ noverifyrdeps=yes
 disable_parallel_build=yes
 disable_parallel_check=yes
 
-# This does not currently accomplish anything, since only building on x86_64. Leaving this for future, taken from `openjdk17`.
-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
+makedepends+=" openjdk17"
+configure_args+=" --with-boot-jdk=/usr/lib/jvm/openjdk17"
 configure_args+=" --with-boot-jdk-jvmargs=-Xlog:disable"
 
 do_configure() {

From ea93ee20989f549113290caa0104babcc486d8cc Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <anton@doubleasoftware.com>
Date: Fri, 10 Feb 2023 00:00:58 -0800
Subject: [PATCH 3/7] jetbrains-jdk17: update to 17.0.6b802.1.

---
 srcpkgs/jetbrains-jdk17/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jetbrains-jdk17/template b/srcpkgs/jetbrains-jdk17/template
index 408deadad107..6700beb93b8f 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.5b759.1
+version=17.0.6b802.1
 revision=1
 _gtest_ver=1.8.1
 archs="x86_64"
@@ -43,7 +43,7 @@ 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
  https://github.com/google/googletest/archive/refs/tags/release-${_gtest_ver}.tar.gz"
-checksum="25766e1f8bccd6e6b4b863a98b78309f3847434eff24461adc97da0b35a61dbb
+checksum="72a9dc532bdccd383ffab93f7a373c3e22f4a5e345d771b15c763503728ca314
  9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
 patch_args="-Np1 -d ${build_wrksrc}"
 conflicts="jetbrains-jdk-bin"

From f35a063e0ecb9c0f5bff8580069eb39bffccafac Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <anton@doubleasoftware.com>
Date: Mon, 13 Mar 2023 10:18:59 -0700
Subject: [PATCH 4/7] jetbrains-jdk17: update to 17.0.6b829.5.

---
 srcpkgs/jetbrains-jdk17/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jetbrains-jdk17/template b/srcpkgs/jetbrains-jdk17/template
index 6700beb93b8f..8abe828d5b5d 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.6b802.1
+version=17.0.6b829.5
 revision=1
 _gtest_ver=1.8.1
 archs="x86_64"
@@ -43,7 +43,7 @@ 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
  https://github.com/google/googletest/archive/refs/tags/release-${_gtest_ver}.tar.gz"
-checksum="72a9dc532bdccd383ffab93f7a373c3e22f4a5e345d771b15c763503728ca314
+checksum="1fe7845f2d3bffcd8339ea00ef7befce016680ce3440008b046ec9d771365d89
  9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
 patch_args="-Np1 -d ${build_wrksrc}"
 conflicts="jetbrains-jdk-bin"

From 60f39df02e3e76f222af0b1bd875d9e3b425efa6 Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <anton@doubleasoftware.com>
Date: Fri, 15 Apr 2022 12:50:13 -0700
Subject: [PATCH 5/7] CLion: update to 2022.3.1.

---
 srcpkgs/CLion-cmake    |   1 +
 srcpkgs/CLion-gdb      |   1 +
 srcpkgs/CLion-lldb     |   1 +
 srcpkgs/CLion/template | 110 ++++++++++++++++++++++-------------------
 4 files changed, 61 insertions(+), 52 deletions(-)
 create mode 120000 srcpkgs/CLion-cmake
 create mode 120000 srcpkgs/CLion-gdb
 create mode 120000 srcpkgs/CLion-lldb

diff --git a/srcpkgs/CLion-cmake b/srcpkgs/CLion-cmake
new file mode 120000
index 000000000000..0c38ab4f97d6
--- /dev/null
+++ b/srcpkgs/CLion-cmake
@@ -0,0 +1 @@
+CLion
\ No newline at end of file
diff --git a/srcpkgs/CLion-gdb b/srcpkgs/CLion-gdb
new file mode 120000
index 000000000000..0c38ab4f97d6
--- /dev/null
+++ b/srcpkgs/CLion-gdb
@@ -0,0 +1 @@
+CLion
\ No newline at end of file
diff --git a/srcpkgs/CLion-lldb b/srcpkgs/CLion-lldb
new file mode 120000
index 000000000000..0c38ab4f97d6
--- /dev/null
+++ b/srcpkgs/CLion-lldb
@@ -0,0 +1 @@
+CLion
\ No newline at end of file
diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index f302b7d6798e..94627331d1fe 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,54 +1,31 @@
 # Template file for 'CLion'
 pkgname=CLion
-version=2021.3.4
+version=2022.3.1
 revision=1
 archs="x86_64 aarch64"
-depends="jetbrains-jdk-bin giflib libXtst"
+wrksrc="clion-${version}"
+depends="giflib libXtst jetbrains-jdk17"
 short_desc="Smart cross-platform IDE for C and C++"
 maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/clion"
 distfiles="https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"
-checksum=f3b0b9e0dd0cd4aebef5d424e7a22868c732daad47d6c94f73630cef449ccf78
+checksum=cd057a0aa96cf5b4216a436136a1002e6f3dc578bcd8a69f98d6908381b03526
 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
+nostrip=yes
+noshlibprovides=yes
 python_version=3
 
-build_options="bundled_cmake bundled_gdb bundled_lldb"
-build_options_default="bundled_cmake bundled_gdb bundled_lldb"
-desc_option_bundled_cmake="Install bundled CMake"
-desc_option_bundled_gdb="Install bundled GDB"
-desc_option_bundled_lldb="Install bundled LLDB"
-
 post_extract() {
 	# Remove files for other OSes and/or CPU architectures
-	# Darwin (this is not packaged for macOS)
-	rm -rf plugins/cwm-plugin/quiche-native/darwin-aarch64
-	rm -rf plugins/cwm-plugin/quiche-native/darwin-x86-64
-	rm -rf plugins/performanceTesting/bin/libyjpagent.dylib
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dylib
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86_64.dylib
-	# Windows (this is not packaged for Windows)
-	rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
-	rm -rf plugins/performanceTesting/bin/yjpagent.dll
-	rm -rf plugins/performanceTesting/bin/yjpagent64.dll
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_amd64.dll
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_x86.dll
-	# x86 (unsupported after v2021.1)
-	rm -rf bin/clion.vmoptions
-	rm -rf lib/pty4j-native/linux/x86
-	rm -rf plugins/performanceTesting/bin/libyjpagent.so
-	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
-	# MIPS
-	rm -rf lib/pty4j-native/linux/mips64el
-	# ARM
-	rm -rf lib/pty4j-native/linux/arm
-	# PPC
-	rm -rf lib/pty4j-native/linux/ppc64le
-
+	rm -rf plugins/cwm-plugin/quiche-native/{darwin-aarch64,darwin-x86-64,win32-x86-64}
+	rm -rf plugins/performanceTesting/bin/{libyjpagent.dylib,yjpagent.dll,yjpagent64.dll,libyjpagent.so}
+	rm -rf plugins/python-ce/helpers/pydev/pydevd_attach_to_process/{attach_x86.dylib,attach_x86_64.dylib,attach_amd64.dll,attach_x86.dll,attach_linux_x86.so}
+	rm -rf lib/pty4j-native/linux/{x86,mips64el,arm,ppc64le}
 
 	case "$XBPS_TARGET_MACHINE" in
 		x86_64)
@@ -61,22 +38,15 @@ post_extract() {
 			;;
 	esac
 
-	if [ ! "$build_option_bundled_cmake" ]; then
-		rm -rf bin/cmake
-	fi
-	if [ ! "$build_option_bundled_gdb" ]; then
-		rm -rf bin/gdb
-	fi
-	if [ ! "$build_option_bundled_lldb" ]; then
-		rm -rf bin/lldb
-	fi
+	# Packaged in separate packages
+	mkdir -p _bin
+	mv bin/{cmake,gdb,lldb} _bin/
 }
 
+_TARGET_PATH="usr/lib/${pkgname}"
 do_install() {
-	TARGET_PATH="usr/lib/${pkgname}"
-
 	vmkdir usr/bin
-	vmkdir ${TARGET_PATH}
+	vmkdir ${_TARGET_PATH}
 
 	local i
 	for i in license/* ; do
@@ -85,12 +55,48 @@ do_install() {
 
 	local launcher_path="bin/clion.sh"
 	sed -i '1 s/$/\nCLION_JDK=${CLION_JDK:-${IDEA_JDK}}/' "${launcher_path}"
-	vcopy bin ${TARGET_PATH}
-	vcopy help ${TARGET_PATH}
-	vcopy lib ${TARGET_PATH}
-	vcopy plugins ${TARGET_PATH}
-	vcopy product-info.json ${TARGET_PATH}
-	vcopy build.txt ${TARGET_PATH}
+	vcopy bin ${_TARGET_PATH}
+	vcopy help ${_TARGET_PATH}
+	vcopy lib ${_TARGET_PATH}
+	vcopy plugins ${_TARGET_PATH}
+	vcopy product-info.json ${_TARGET_PATH}
+	vcopy build.txt ${_TARGET_PATH}
+
+	ln -sf "/${_TARGET_PATH}/${launcher_path}" "${DESTDIR}/usr/bin/${pkgname}"
+}
+
+CLion-cmake_package() {
+	short_desc+=" - bundled CMake"
+	depends="${sourcepkg}>=${version}_${revision}"
+	noverifyrdeps=yes
+	nostrip=yes
+	noshlibprovides=yes
+	pkg_install() {
+		vmkdir ${_TARGET_PATH}/bin
+		vcopy _bin/cmake ${_TARGET_PATH}/bin
+	}
+}
+
+CLion-gdb_package() {
+	short_desc+=" - bundled GDB"
+	depends="${sourcepkg}>=${version}_${revision}"
+	noverifyrdeps=yes
+	nostrip=yes
+	noshlibprovides=yes
+	pkg_install() {
+		vmkdir ${_TARGET_PATH}/bin
+		vcopy _bin/gdb ${_TARGET_PATH}/bin
+	}
+}
 
-	ln -sf "/${TARGET_PATH}/${launcher_path}" "${DESTDIR}/usr/bin/${pkgname}"
+CLion-lldb_package() {
+	short_desc+=" - bundled LLDB"
+	depends="${sourcepkg}>=${version}_${revision}"
+	noverifyrdeps=yes
+	nostrip=yes
+	noshlibprovides=yes
+	pkg_install() {
+		vmkdir ${_TARGET_PATH}/bin
+		vcopy _bin/lldb ${_TARGET_PATH}/bin
+	}
 }

From 1c8eb2157cac7cf24ffa3a47fe35d8af1f24695a Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <anton@doubleasoftware.com>
Date: Thu, 9 Feb 2023 23:30:32 -0800
Subject: [PATCH 6/7] CLion: update to 2022.3.2.

---
 srcpkgs/CLion/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index 94627331d1fe..6c5d0ec41683 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,6 +1,6 @@
 # Template file for 'CLion'
 pkgname=CLion
-version=2022.3.1
+version=2022.3.2
 revision=1
 archs="x86_64 aarch64"
 wrksrc="clion-${version}"
@@ -10,7 +10,7 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/clion"
 distfiles="https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"
-checksum=cd057a0aa96cf5b4216a436136a1002e6f3dc578bcd8a69f98d6908381b03526
+checksum=896e9cc5b908aa51e091201c320f6f08033f9064382e44b107fccc554ed94895
 repository=nonfree
 restricted=yes
 nopie=yes

From 3714eba519b9220ecd32fb0fa89b42a97883fb2c Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <anton@doubleasoftware.com>
Date: Mon, 13 Mar 2023 10:20:25 -0700
Subject: [PATCH 7/7] CLion: update to 2022.3.3.

---
 srcpkgs/CLion/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index 6c5d0ec41683..1aeb8e56c62c 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,6 +1,6 @@
 # Template file for 'CLion'
 pkgname=CLion
-version=2022.3.2
+version=2022.3.3
 revision=1
 archs="x86_64 aarch64"
 wrksrc="clion-${version}"
@@ -10,7 +10,7 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/clion"
 distfiles="https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"
-checksum=896e9cc5b908aa51e091201c320f6f08033f9064382e44b107fccc554ed94895
+checksum=1b46ff0791bcb38ecb39c5f4a99941f99ed73d4f6d924a2042fdb55afc5fc03d
 repository=nonfree
 restricted=yes
 nopie=yes