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

[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.2.
#### 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: 10093 bytes --]

From 633fa6998e20024ccf0e3145ccac8c3f116fae59 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/5] CLion: update to 2022.1.3.

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

diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index 65e76c206e6c..946dbe928920 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.3
 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=6f0234d41c4ca1cf8eaa4ea5585ba4cfc17d86c16c78edc59501e0ca05a80d56
 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 3786548cadc27889c2535665c88af4cd519679e0 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/5] 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 946dbe928920..aa91a14e2de7 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
+	}
 }

From b7116bc8ba7fb7607ab9b7c39b2af69425dfe60a Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <anton@doubleasoftware.com>
Date: Fri, 29 Jul 2022 08:22:48 -0700
Subject: [PATCH 3/5] CLion: update to 2022.2.

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

diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index aa91a14e2de7..6c21a7addbd1 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,6 +1,6 @@
 # Template file for 'CLion'
 pkgname=CLion
-version=2022.1.3
+version=2022.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=6f0234d41c4ca1cf8eaa4ea5585ba4cfc17d86c16c78edc59501e0ca05a80d56
+checksum=94ffbdf82606f2f90618c1fdb89432d627e7f24ae158b36a591da2c303047436
 repository=nonfree
 restricted=yes
 nopie=yes

From 2d7ea6deebc02bc842261b99b9da7b2b9289439a Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <anton@doubleasoftware.com>
Date: Mon, 22 Aug 2022 20:45:48 -0700
Subject: [PATCH 4/5] CLion: update to 2022.2.1.

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

diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index 6c21a7addbd1..6a577238d6d6 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,6 +1,6 @@
 # Template file for 'CLion'
 pkgname=CLion
-version=2022.2
+version=2022.2.1
 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=94ffbdf82606f2f90618c1fdb89432d627e7f24ae158b36a591da2c303047436
+checksum=a0d9e77ad4afbb5f7d69e23cf84ccf132eed6ead6c3a7cd442b33924e6931656
 repository=nonfree
 restricted=yes
 nopie=yes

From eda6311f0902dc34cc69cde9ec83b00f0e41ead0 Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <anton@doubleasoftware.com>
Date: Fri, 16 Sep 2022 13:08:48 -0700
Subject: [PATCH 5/5] CLion: update to 2022.2.3.

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

diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index 6a577238d6d6..3fe1b243c70d 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,6 +1,6 @@
 # Template file for 'CLion'
 pkgname=CLion
-version=2022.2.1
+version=2022.2.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=a0d9e77ad4afbb5f7d69e23cf84ccf132eed6ead6c3a7cd442b33924e6931656
+checksum=e0338107115231c4b354870dfcf537ba6ad1741a0d310e4e50c48dfc24ff9cce
 repository=nonfree
 restricted=yes
 nopie=yes