Github messages for voidlinux
 help / color / mirror / Atom feed
From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] New packages: intellij-idea-ultimate-edition-2019.1.3, CLion-2019.1.4, WebStorm-2019.1.3, GoLand-2019.1.3, RubyMine-2019.1.2
Date: Sun, 23 Jun 2019 08:09:42 +0200	[thread overview]
Message-ID: <20190623060942.ngkFteWTTCr8ESkH4kiS3Ns-WZ1VP2UURFktkQPpCJo@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-11736@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 877 bytes --]

There is an updated pull request by 2asoft against master on the void-packages repository

https://github.com/2asoft/void-packages 2asoft/jetbrains-intellij-pro
https://github.com/void-linux/void-packages/pull/11736

New packages: intellij-idea-ultimate-edition-2019.1.3, CLion-2019.1.4, WebStorm-2019.1.3, GoLand-2019.1.3, RubyMine-2019.1.2
These are based on the existing intellij-idea-community-edition.

I'm explicitly removing the JetBrains JDK from each of these, and requiring the virtual java-environment instead.
This works, although is not jetBrains' recommended way of running the IDEs because their build of the JDK contains some useful fixes.
I will create a separate PR for installing JetBrains-JDK and will modify these packages to require the JetBrains-JDK package.

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-2asoft/jetbrains-intellij-pro-11736.patch --]
[-- Type: application/text/x-diff, Size: 6262 bytes --]

From d151b452533e9b1db72af65c808bc1f0797ba235 Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <anton@doubleasoftware.com>
Date: Tue, 23 Apr 2019 21:47:49 -0700
Subject: [PATCH 1/2] New package: intellij-idea-ultimate-edition-2019.1.3

---
 .../intellij-idea-community-edition/template  |  1 +
 .../INSTALL.msg                               |  2 +
 .../intellij-idea-ultimate-edition/template   | 66 +++++++++++++++++++
 srcpkgs/intellij-idea-ultimate-edition/update |  2 +
 4 files changed, 71 insertions(+)
 create mode 100644 srcpkgs/intellij-idea-ultimate-edition/INSTALL.msg
 create mode 100644 srcpkgs/intellij-idea-ultimate-edition/template
 create mode 100644 srcpkgs/intellij-idea-ultimate-edition/update

diff --git a/srcpkgs/intellij-idea-community-edition/template b/srcpkgs/intellij-idea-community-edition/template
index 961c22781af..7e40ed9c8fe 100644
--- a/srcpkgs/intellij-idea-community-edition/template
+++ b/srcpkgs/intellij-idea-community-edition/template
@@ -12,6 +12,7 @@ distfiles="https://download.jetbrains.com/idea/ideaIC-${version}-no-jbr.tar.gz"
 checksum=6fbb1f99b467a7c7a39d74b835414288b113a9a136f9ba22b25ea44f87952fff
 repository=nonfree
 nopie=yes
+conflicts="intellij-idea-ultimate-edition"
 
 post_extract() {
 	mv $XBPS_BUILDDIR/idea-IC-* ${wrksrc}
diff --git a/srcpkgs/intellij-idea-ultimate-edition/INSTALL.msg b/srcpkgs/intellij-idea-ultimate-edition/INSTALL.msg
new file mode 100644
index 00000000000..c04f6c9ab2a
--- /dev/null
+++ b/srcpkgs/intellij-idea-ultimate-edition/INSTALL.msg
@@ -0,0 +1,2 @@
+IntelliJ Ultimate has the following optional dependencies:
+	libdbusmenu-glib: For global menu support
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
new file mode 100644
index 00000000000..bb57f7ccd99
--- /dev/null
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -0,0 +1,66 @@
+# Template file for 'intellij-idea-ultimate-edition'
+pkgname=intellij-idea-ultimate-edition
+version=2019.1.3
+revision=1
+archs="i686 x86_64"
+wrksrc="idea-IU-191.7479.19"
+depends="virtual?java-environment giflib libXtst"
+short_desc="Most intelligent Java IDE"
+maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
+license="custom:Commercial"
+homepage="https://www.jetbrains.com/idea"
+distfiles="https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"
+checksum=3af44f942c07b672b1cf465e3497eec060d1773c62b2d6d05b634910151f1262
+repository=nonfree
+restricted=yes
+nopie=yes
+conflicts="intellij-idea-community-edition"
+
+post_extract() {
+	# Remove files for other OSes
+	rm -rf plugins/android/lib/libwebp/win
+	rm -rf plugins/android/lib/libwebp/mac
+
+	# Remove files for other CPU architectures
+	rm -rf bin/fsnotifier-arm
+	rm -rf lib/pty4j-native/linux/ppc64le
+
+	case "$XBPS_TARGET_MACHINE" in
+		x86_64)
+			rm -rf bin/fsnotifier
+			rm -rf bin/idea.vmoptions
+			rm -rf bin/libyjpagent-linux.so
+			rm -rf plugins/android/lib/libwebp/linux/libwebp_jni.so
+			rm -rf lib/pty4j-native/linux/x86
+			;;
+		i686)
+			rm -rf bin/fsnotifier64
+			rm -rf bin/idea64.vmoptions
+			rm -rf bin/libyjpagent-linux64.so
+			rm -rf plugins/android/lib/libwebp/linux/libwebp_jni64.so
+			rm -rf lib/pty4j-native/linux/x86_64
+			;;
+	esac
+}
+
+do_install() {
+	TARGET_PATH="usr/lib/${pkgname}"
+	LICENSE_PATH="usr/share/licenses/${pkgname}"
+
+	vmkdir usr/bin
+	vmkdir ${TARGET_PATH}
+	vmkdir ${LICENSE_PATH}
+
+	# Ideally vlicense should be called here, but vcopy is more terse.
+	vcopy license/* ${LICENSE_PATH}
+
+	vcopy bin ${TARGET_PATH}
+	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}
+
+	ln -sf /${TARGET_PATH}/bin/idea.sh ${DESTDIR}/usr/bin/idea
+}
diff --git a/srcpkgs/intellij-idea-ultimate-edition/update b/srcpkgs/intellij-idea-ultimate-edition/update
new file mode 100644
index 00000000000..0fd4e8031bd
--- /dev/null
+++ b/srcpkgs/intellij-idea-ultimate-edition/update
@@ -0,0 +1,2 @@
+pattern="ideaIU-\K[\d.]+(?=-no-jbr\.tar)"
+site="https://data.services.jetbrains.com/products/releases?code=IIU%2CIIC&latest=true&type=release"

From fe5842f5a96bb79c5abb3ae242e985dbee54bb3c Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <anton@doubleasoftware.com>
Date: Sat, 22 Jun 2019 23:10:23 -0700
Subject: [PATCH 2/2] Mark IntelliJ IDEA Community and Ultimate as alternatives
 of each other

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

diff --git a/srcpkgs/intellij-idea-community-edition/template b/srcpkgs/intellij-idea-community-edition/template
index 7e40ed9c8fe..9c1b28f1e35 100644
--- a/srcpkgs/intellij-idea-community-edition/template
+++ b/srcpkgs/intellij-idea-community-edition/template
@@ -12,7 +12,7 @@ distfiles="https://download.jetbrains.com/idea/ideaIC-${version}-no-jbr.tar.gz"
 checksum=6fbb1f99b467a7c7a39d74b835414288b113a9a136f9ba22b25ea44f87952fff
 repository=nonfree
 nopie=yes
-conflicts="intellij-idea-ultimate-edition"
+alternatives="intellij-idea:/usr/bin/idea:/usr/bin/idea-community"
 
 post_extract() {
 	mv $XBPS_BUILDDIR/idea-IC-* ${wrksrc}
@@ -46,5 +46,5 @@ do_install() {
 		;;
 	esac
 
-	ln -sf /usr/lib/intellij-idea/bin/idea.sh ${DESTDIR}/usr/bin/idea
+	ln -sf /usr/lib/intellij-idea/bin/idea.sh ${DESTDIR}/usr/bin/idea-community
 }
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index bb57f7ccd99..558936b4543 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -14,7 +14,7 @@ checksum=3af44f942c07b672b1cf465e3497eec060d1773c62b2d6d05b634910151f1262
 repository=nonfree
 restricted=yes
 nopie=yes
-conflicts="intellij-idea-community-edition"
+alternatives="intellij-idea:/usr/bin/idea:/usr/bin/idea-ultimate"
 
 post_extract() {
 	# Remove files for other OSes
@@ -62,5 +62,5 @@ do_install() {
 	vcopy product-info.json ${TARGET_PATH}
 	vcopy build.txt ${TARGET_PATH}
 
-	ln -sf /${TARGET_PATH}/bin/idea.sh ${DESTDIR}/usr/bin/idea
+	ln -sf /${TARGET_PATH}/bin/idea.sh ${DESTDIR}/usr/bin/idea-ultimate
 }

  parent reply	other threads:[~2019-06-23  6:09 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-11736@inbox.vuxu.org>
2019-06-10  1:06 ` [PR PATCH] [Updated] New packages: intellij-idea-ultimate-edition-2019.1.1, CLion-2019.1.2, WebStorm-2019.1.1, GoLand-2019.1.1, RubyMine-2019.1.1 voidlinux-github
2019-06-11 20:47 ` voidlinux-github
2019-06-15 17:53 ` [PR PATCH] [Updated] " voidlinux-github
2019-06-15 17:53 ` voidlinux-github
2019-06-15 17:56 ` voidlinux-github
2019-06-15 17:58 ` [PR PATCH] [Updated] " voidlinux-github
2019-06-15 17:58 ` voidlinux-github
2019-06-15 22:25 ` New packages: intellij-idea-ultimate-edition-2019.1.3, CLion-2019.1.4, WebStorm-2019.1.3, GoLand-2019.1.3, RubyMine-2019.1.2 voidlinux-github
2019-06-18  6:09 ` voidlinux-github
2019-06-18 15:26 ` voidlinux-github
2019-06-20  7:06 ` [PR PATCH] [Updated] " voidlinux-github
2019-06-20  7:06 ` voidlinux-github
2019-06-20  7:08 ` voidlinux-github
2019-06-20  7:08 ` voidlinux-github
2019-06-22 18:09 ` voidlinux-github
2019-06-22 18:17 ` voidlinux-github
2019-06-23  6:09 ` [PR PATCH] [Updated] " voidlinux-github
2019-06-23  6:09 ` voidlinux-github [this message]
2019-06-23  6:10 ` voidlinux-github
2019-06-23  6:10 ` [PR PATCH] [Updated] " voidlinux-github
2019-06-23  6:10 ` voidlinux-github
2019-06-23 19:54 ` voidlinux-github
2019-06-23 19:54 ` voidlinux-github
2019-06-24  6:09 ` voidlinux-github
2019-06-24 15:11 ` voidlinux-github
2019-06-26  5:39 ` [PR PATCH] [Updated] " voidlinux-github
2019-06-26  5:39 ` voidlinux-github
2019-06-26  5:39 ` voidlinux-github
2019-06-29 12:09 ` voidlinux-github
2019-06-29 16:45 ` voidlinux-github
2019-06-29 16:45 ` voidlinux-github
2019-07-08 19:53 ` voidlinux-github
2019-07-15  1:33 ` voidlinux-github
2019-10-15  6:31 ` [PR PATCH] [Updated] " voidlinux-github
2019-10-15  6:31 ` voidlinux-github
2019-10-15 16:41 ` voidlinux-github
2019-10-19 20:05 ` voidlinux-github
2019-11-04 19:06 ` voidlinux-github
2019-11-09  6:28 ` [PR PATCH] [Updated] " voidlinux-github
2020-01-22  4:22 ` [PR PATCH] [Updated] New packages: intellij-idea-ultimate-edition-2019.3.1 voidlinux-github
2020-01-22  5:40 ` [PR PATCH] [Merged]: New packages: intellij-idea-ultimate-edition-2019.3.2 voidlinux-github

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=20190623060942.ngkFteWTTCr8ESkH4kiS3Ns-WZ1VP2UURFktkQPpCJo@z \
    --to=voidlinux-github@inbox.vuxu.org \
    --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).