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

[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.1.1.
#### 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: 7006 bytes --]

From aa70c51b99266e057006cc733cf48834c0615754 Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <anton@doubleasoftware.com>
Date: Fri, 15 Apr 2022 12:50:13 -0700
Subject: [PATCH 1/2] CLion: update to 2022.1.2.

---
 srcpkgs/CLion/template | 34 ++++++++--------------------------
 1 file changed, 8 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index 65e76c206e6c..154a5cdd3060 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,6 +1,6 @@
 # Template file for 'CLion'
 pkgname=CLion
-version=2021.3.4
+version=2022.1.2
 revision=1
 archs="x86_64 aarch64"
 wrksrc="clion-${version}"
@@ -10,12 +10,14 @@ 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=28a156cc28c6d1c3f27b32954fdf1feb66c5ed0a15b687c243c4fb7bab4a6394
 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"
@@ -26,30 +28,10 @@ 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)

From 09c6a84ae91d86d80f4de74b7da83e7c0d71c4f1 Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <anton@doubleasoftware.com>
Date: Fri, 15 Apr 2022 12:50:34 -0700
Subject: [PATCH 2/2] CLion: repackage optional parts in optional packages, not
 options

---
 srcpkgs/CLion-cmake    |  1 +
 srcpkgs/CLion-gdb      |  1 +
 srcpkgs/CLion-lldb     |  1 +
 srcpkgs/CLion/template | 73 +++++++++++++++++++++++++++---------------
 4 files changed, 51 insertions(+), 25 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 154a5cdd3060..4f084795e57a 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -20,12 +20,6 @@ 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
 	rm -rf plugins/cwm-plugin/quiche-native/{darwin-aarch64,darwin-x86-64,win32-x86-64}
@@ -44,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
@@ -68,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
+	}
 }