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] CLion: update to 2022.1.2.
Date: Tue, 23 Aug 2022 05:45:42 +0200	[thread overview]
Message-ID: <20220823034542.G93NGdXo0Ld5GZbgeUL5qXhqpCC1s6EdRiZS-iiWxPE@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-36712@inbox.vuxu.org>

[-- 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: 9062 bytes --]

From 924a0c29e0c3bced4e9709bb22f0717af0678a61 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/4] 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 1446a0189e6033ceff8a4e551882653ea2ae2c26 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/4] 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 63b2f82667150bca56783bb9257f9942fd5c271f 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/4] 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 c8d3b221031f110da825bec2c8e738cf8182346c 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/4] 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

  parent reply	other threads:[~2022-08-23  3:45 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-15 19:55 [PR PATCH] CLion: update to 2022.1 2asoft
2022-04-15 19:57 ` [PR PATCH] [Updated] " 2asoft
2022-05-13  6:06 ` 2asoft
2022-06-02  5:45 ` [PR PATCH] [Updated] CLion: update to 2022.1.1 2asoft
2022-06-22  7:55 ` [PR PATCH] [Updated] CLion: update to 2022.1.2 2asoft
2022-06-24  6:03 ` 2asoft
2022-07-22  7:00 ` 2asoft
2022-07-29 15:23 ` 2asoft
2022-07-29 15:57 ` 2asoft
2022-08-23  3:45 ` 2asoft [this message]
2022-09-09 18:26 ` 2asoft
2022-09-16 20:09 ` 2asoft
2022-09-16 21:41 ` [PR PATCH] [Updated] CLion: update to 2022.2.3 2asoft
2022-10-08  8:44 ` 2asoft
2022-10-08  9:06 ` 2asoft
2022-10-31  8:19 ` 2asoft
2022-11-10 13:36 ` 2asoft
2022-12-07 18:38 ` 2asoft
2023-01-14  5:43 ` 2asoft
2023-02-10  8:01 ` 2asoft
2023-02-10  8:08 ` 2asoft
2023-03-26 22:17 ` 2asoft
2023-06-25  2:12 ` github-actions
2023-07-10  2:08 ` [PR PATCH] [Closed]: " github-actions

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=20220823034542.G93NGdXo0Ld5GZbgeUL5qXhqpCC1s6EdRiZS-iiWxPE@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).