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: Thu, 20 Jun 2019 09:06:17 +0200 [thread overview]
Message-ID: <20190620070617.jEaJywGEbbT6NPXrMhUSO8dfi-diaEO4ylaZWn1xNdM@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: 29235 bytes --]
From 21a98792a21712d530b4de97ee77ef90215f7c13 Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <anton@doubleasoftware.com>
Date: Tue, 23 Apr 2019 21:47:49 -0700
Subject: [PATCH 01/15] New package: intellij-idea-ultimate-edition-2019.1.3
---
| 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
--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..b4c0bd37c73
--- /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="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 plugins/android/lib/libwebp/win -rf
+ rm plugins/android/lib/libwebp/mac -rf
+
+ # Remove files for other CPU architectures
+ rm bin/fsnotifier-arm -rf
+ rm lib/pty4j-native/linux/ppc64le -rf
+
+ rm bin/fsnotifier
+ rm bin/idea.vmoptions
+ rm bin/libyjpagent-linux.so
+ rm plugins/android/lib/libwebp/linux/libwebp_jni.so
+ rm lib/pty4j-native/linux/x86 -rf
+}
+
+do_install() {
+ TARGET_PATH="usr/lib/intellij-idea-ultimate-edition"
+
+ vmkdir usr/bin
+ vmkdir ${TARGET_PATH}
+
+
+ for f in license/*; do
+ if [ -f ${f} ]; then
+ vlicense ${f}
+ fi
+ done
+
+ if [ -d "license/third-party" ]; then
+ for f in license/third-party/*; do
+ if [ -f ${f} ]; then
+ new_name="third-party-${f##*/}"
+ vlicense ${f} ${new_name}
+ fi
+ done
+ fi
+
+ 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 d72da1c7f46493e7a2063f5e4732c0b5e69beef1 Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <anton@doubleasoftware.com>
Date: Mon, 29 Apr 2019 23:22:03 -0700
Subject: [PATCH 02/15] New package: CLion-2019.1.4
---
srcpkgs/CLion/INSTALL.msg | 11 +++++++
srcpkgs/CLion/template | 65 +++++++++++++++++++++++++++++++++++++++
srcpkgs/CLion/update | 2 ++
3 files changed, 78 insertions(+)
create mode 100644 srcpkgs/CLion/INSTALL.msg
create mode 100644 srcpkgs/CLion/template
create mode 100644 srcpkgs/CLion/update
diff --git a/srcpkgs/CLion/INSTALL.msg b/srcpkgs/CLion/INSTALL.msg
new file mode 100644
index 00000000000..860cb2fb6b5
--- /dev/null
+++ b/srcpkgs/CLion/INSTALL.msg
@@ -0,0 +1,11 @@
+CLion has the following optional dependencies:
+ cmake: CMake tools/build system
+ gdb: Native GNU debugger
+ lldb: Native LLVM debugger
+ gcc: GNU compiler
+ clang: LLVM compiler
+ gtest: C++ testing
+ python: Python 2 programming language support
+ python3: Python 3 programming language support
+ doxygen: Code documentation generation
+ libdbusmenu-glib: For global menu support
diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
new file mode 100644
index 00000000000..5b0a8b8854e
--- /dev/null
+++ b/srcpkgs/CLion/template
@@ -0,0 +1,65 @@
+# Template file for 'CLion'
+pkgname=CLion
+version=2019.1.4
+revision=1
+archs="x86_64"
+wrksrc="clion-${version}"
+depends="virtual?java-environment giflib libXtst"
+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=c9249f7a378b66071e4c4308a339bfd3afa38765e9316ffaaeeec66fcb3b8bb1
+repository=nonfree
+restricted=yes
+nopie=yes
+
+post_extract() {
+ # Remove files for other CPU architectures
+ rm bin/fsnotifier-arm -rf
+ rm lib/pty4j-native/linux/ppc64le -rf
+
+ rm bin/fsnotifier
+ rm bin/clion.vmoptions
+ rm bin/libyjpagent-linux.so
+ rm lib/pty4j-native/linux/x86 -rf
+
+ # Remove JetBrains JDK
+ rm -rf jre64
+
+ # TODO: JetBrains' LLDB, GDB, and CMake can be made installable via separate subpackages
+ # bin/lldb bin/gdb bin/cmake
+}
+
+do_install() {
+ TARGET_PATH="usr/lib/CLion"
+
+ vmkdir usr/bin
+ vmkdir ${TARGET_PATH}
+
+
+ for f in license/*; do
+ if [ -f ${f} ]; then
+ vlicense ${f}
+ fi
+ done
+
+ if [ -d "license/third-party" ]; then
+ for f in license/third-party/*; do
+ if [ -f ${f} ]; then
+ new_name="third-party-${f##*/}"
+ vlicense ${f} ${new_name}
+ fi
+ done
+ fi
+
+ 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}/bin/clion.sh ${DESTDIR}/usr/bin/${pkgname}
+}
diff --git a/srcpkgs/CLion/update b/srcpkgs/CLion/update
new file mode 100644
index 00000000000..162c3615358
--- /dev/null
+++ b/srcpkgs/CLion/update
@@ -0,0 +1,2 @@
+pattern="CLion-\K[\d.]+(?=\.tar)"
+site="https://data.services.jetbrains.com/products/releases?code=CL&latest=true&type=release"
From 4433d5d1a5b53c256a8db65f27b69a3714bc9cb5 Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <anton@doubleasoftware.com>
Date: Tue, 7 May 2019 01:03:29 -0700
Subject: [PATCH 03/15] New package: WebStorm-2019.1.3
---
srcpkgs/WebStorm/INSTALL.msg | 2 ++
srcpkgs/WebStorm/template | 61 ++++++++++++++++++++++++++++++++++++
srcpkgs/WebStorm/update | 2 ++
3 files changed, 65 insertions(+)
create mode 100644 srcpkgs/WebStorm/INSTALL.msg
create mode 100644 srcpkgs/WebStorm/template
create mode 100644 srcpkgs/WebStorm/update
diff --git a/srcpkgs/WebStorm/INSTALL.msg b/srcpkgs/WebStorm/INSTALL.msg
new file mode 100644
index 00000000000..8fe3d069415
--- /dev/null
+++ b/srcpkgs/WebStorm/INSTALL.msg
@@ -0,0 +1,2 @@
+WebStorm has the following optional dependencies:
+ libdbusmenu-glib: For global menu support
diff --git a/srcpkgs/WebStorm/template b/srcpkgs/WebStorm/template
new file mode 100644
index 00000000000..718215660e4
--- /dev/null
+++ b/srcpkgs/WebStorm/template
@@ -0,0 +1,61 @@
+# Template file for 'WebStorm'
+pkgname=WebStorm
+version=2019.1.3
+revision=1
+archs="x86_64"
+wrksrc="WebStorm-191.7479.14"
+depends="virtual?java-environment"
+short_desc="Smartest JavaScript IDE"
+maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
+license="custom:Commercial"
+homepage="https://www.jetbrains.com/webstorm"
+distfiles="https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"
+checksum=c3ef27051f6de608ee679035957a8a4329897c910b046cb2dbbf840cc8151dae
+repository=nonfree
+restricted=yes
+nopie=yes
+
+post_extract() {
+ # Remove files for other CPU architectures
+ rm bin/fsnotifier-arm -rf
+ rm lib/pty4j-native/linux/ppc64le -rf
+
+ rm bin/fsnotifier
+ rm bin/webstorm.vmoptions
+ rm bin/libyjpagent-linux.so
+ rm lib/pty4j-native/linux/x86 -rf
+
+ rm -rf jre64
+}
+
+do_install() {
+ TARGET_PATH="usr/lib/WebStorm"
+
+ vmkdir usr/bin
+ vmkdir ${TARGET_PATH}
+
+
+ for f in license/*; do
+ if [ -f ${f} ]; then
+ vlicense ${f}
+ fi
+ done
+
+ if [ -d "license/third-party" ]; then
+ for f in license/third-party/*; do
+ if [ -f ${f} ]; then
+ new_name="third-party-${f##*/}"
+ vlicense ${f} ${new_name}
+ fi
+ done
+ fi
+
+ 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}/bin/webstorm.sh ${DESTDIR}/usr/bin/${pkgname}
+}
diff --git a/srcpkgs/WebStorm/update b/srcpkgs/WebStorm/update
new file mode 100644
index 00000000000..a284d8a6436
--- /dev/null
+++ b/srcpkgs/WebStorm/update
@@ -0,0 +1,2 @@
+pattern="WebStorm-\K[\d.]+(?=\.tar)"
+site="https://data.services.jetbrains.com/products/releases?code=WS&latest=true&type=release"
From b90005ff9ef886d519766252c699026f85e84280 Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <anton@doubleasoftware.com>
Date: Wed, 8 May 2019 00:29:30 -0700
Subject: [PATCH 04/15] New package: GoLand-2019.1.3
---
srcpkgs/GoLand/INSTALL.msg | 2 ++
srcpkgs/GoLand/template | 58 ++++++++++++++++++++++++++++++++++++++
srcpkgs/GoLand/update | 2 ++
3 files changed, 62 insertions(+)
create mode 100644 srcpkgs/GoLand/INSTALL.msg
create mode 100644 srcpkgs/GoLand/template
create mode 100644 srcpkgs/GoLand/update
diff --git a/srcpkgs/GoLand/INSTALL.msg b/srcpkgs/GoLand/INSTALL.msg
new file mode 100644
index 00000000000..0dbec18343d
--- /dev/null
+++ b/srcpkgs/GoLand/INSTALL.msg
@@ -0,0 +1,2 @@
+GoLand has the following optional dependencies:
+ libdbusmenu-glib: For global menu support
diff --git a/srcpkgs/GoLand/template b/srcpkgs/GoLand/template
new file mode 100644
index 00000000000..142f9ccd297
--- /dev/null
+++ b/srcpkgs/GoLand/template
@@ -0,0 +1,58 @@
+# Template file for 'GoLand'
+pkgname=GoLand
+version=2019.1.3
+revision=1
+archs="x86_64"
+depends="virtual?java-environment"
+short_desc="Cross-platform IDE built specially for Go developers"
+maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
+license="custom:Commercial"
+homepage="https://www.jetbrains.com/go"
+distfiles="https://download.jetbrains.com/go/goland-${version}.tar.gz"
+checksum=b0e22be860ead904c88595f005d5fe2b0fea310c15a1d8551372b5c336d1895b
+repository=nonfree
+restricted=yes
+nopie=yes
+
+post_extract() {
+ # Remove files for other CPU architectures
+ rm bin/fsnotifier-arm -rf
+ rm lib/pty4j-native/linux/ppc64le -rf
+
+ rm bin/fsnotifier
+ rm bin/goland.vmoptions
+ rm bin/libyjpagent-linux.so
+ rm lib/pty4j-native/linux/x86 -rf
+}
+
+do_install() {
+ TARGET_PATH="usr/lib/GoLand"
+
+ vmkdir usr/bin
+ vmkdir ${TARGET_PATH}
+
+
+ for f in license/*; do
+ if [ -f ${f} ]; then
+ vlicense ${f}
+ fi
+ done
+
+ if [ -d "license/third-party" ]; then
+ for f in license/third-party/*; do
+ if [ -f ${f} ]; then
+ new_name="third-party-${f##*/}"
+ vlicense ${f} ${new_name}
+ fi
+ done
+ fi
+
+ 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}/bin/goland.sh ${DESTDIR}/usr/bin/${pkgname}
+}
diff --git a/srcpkgs/GoLand/update b/srcpkgs/GoLand/update
new file mode 100644
index 00000000000..52dc447c59e
--- /dev/null
+++ b/srcpkgs/GoLand/update
@@ -0,0 +1,2 @@
+pattern="goland-\K[\d.]+(?=\.tar)"
+site="https://data.services.jetbrains.com/products/releases?code=GO&latest=true&type=release"
From fa8e658b9f035c20aac27f60fc0df2eee62240ec Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <anton@doubleasoftware.com>
Date: Sat, 11 May 2019 21:32:48 -0700
Subject: [PATCH 05/15] New package: RubyMine-2019.1.2
---
srcpkgs/RubyMine/INSTALL.msg | 2 ++
srcpkgs/RubyMine/template | 69 ++++++++++++++++++++++++++++++++++++
srcpkgs/RubyMine/update | 2 ++
3 files changed, 73 insertions(+)
create mode 100644 srcpkgs/RubyMine/INSTALL.msg
create mode 100644 srcpkgs/RubyMine/template
create mode 100644 srcpkgs/RubyMine/update
diff --git a/srcpkgs/RubyMine/INSTALL.msg b/srcpkgs/RubyMine/INSTALL.msg
new file mode 100644
index 00000000000..6d15486619e
--- /dev/null
+++ b/srcpkgs/RubyMine/INSTALL.msg
@@ -0,0 +1,2 @@
+RubyMine has the following optional dependencies:
+ libdbusmenu-glib: For global menu support
diff --git a/srcpkgs/RubyMine/template b/srcpkgs/RubyMine/template
new file mode 100644
index 00000000000..568e5410084
--- /dev/null
+++ b/srcpkgs/RubyMine/template
@@ -0,0 +1,69 @@
+# Template file for 'RubyMine'
+pkgname=RubyMine
+version=2019.1.2
+revision=1
+archs="x86_64"
+depends="virtual?java-environment"
+short_desc="Most intelligent Ruby and Rails IDE"
+maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
+license="custom:Commercial"
+homepage="https://www.jetbrains.com/ruby"
+distfiles="https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"
+checksum=db60a07098d3fec4e72bcbd5e5c48638983e20817e41c3f83266733f2d8a0cfe
+repository=nonfree
+restricted=yes
+nopie=yes
+
+post_extract() {
+ # Remove files for other CPU architectures
+ rm bin/fsnotifier-arm -rf
+ rm lib/pty4j-native/linux/ppc64le -rf
+
+ rm bin/fsnotifier
+ rm bin/rubymine.vmoptions
+ rm bin/libyjpagent-linux.so
+ rm lib/pty4j-native/linux/x86 -rf
+}
+
+do_install() {
+ TARGET_PATH="usr/lib/RubyMine"
+
+ vmkdir usr/bin
+ vmkdir ${TARGET_PATH}
+
+
+ for f in license/*; do
+ if [ -f ${f} ]; then
+ vlicense ${f}
+ fi
+ done
+
+ if [ -d "license/third-party" ]; then
+ for f in license/third-party/*; do
+ if [ -f ${f} ]; then
+ new_name="third-party-${f##*/}"
+ vlicense ${f} ${new_name}
+ fi
+ done
+ fi
+
+ 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 rubystubs18 ${TARGET_PATH}
+ vcopy rubystubs19 ${TARGET_PATH}
+ vcopy rubystubs193 ${TARGET_PATH}
+ vcopy rubystubs20 ${TARGET_PATH}
+ vcopy rubystubs21 ${TARGET_PATH}
+ vcopy rubystubs22 ${TARGET_PATH}
+ vcopy rubystubs23 ${TARGET_PATH}
+ vcopy rubystubs24 ${TARGET_PATH}
+ vcopy rubystubs25 ${TARGET_PATH}
+ vcopy rubystubs26 ${TARGET_PATH}
+
+ ln -sf /${TARGET_PATH}/bin/rubymine.sh ${DESTDIR}/usr/bin/${pkgname}
+}
diff --git a/srcpkgs/RubyMine/update b/srcpkgs/RubyMine/update
new file mode 100644
index 00000000000..390bd071df0
--- /dev/null
+++ b/srcpkgs/RubyMine/update
@@ -0,0 +1,2 @@
+pattern="RubyMine-\K[\d.]+(?=\.tar)"
+site="https://data.services.jetbrains.com/products/releases?code=RM&latest=true&type=release"
From b1a81e87c0edb63694e244ce70908106b2373c49 Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <anton@doubleasoftware.com>
Date: Wed, 19 Jun 2019 23:31:31 -0700
Subject: [PATCH 06/15] Fix clion archs
---
srcpkgs/CLion/template | 24 +++++++++++++++++-------
1 file changed, 17 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index 5b0a8b8854e..c5f931de089 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -2,7 +2,7 @@
pkgname=CLion
version=2019.1.4
revision=1
-archs="x86_64"
+archs="i686 x86_64"
wrksrc="clion-${version}"
depends="virtual?java-environment giflib libXtst"
short_desc="Smart cross-platform IDE for C and C++"
@@ -17,13 +17,23 @@ nopie=yes
post_extract() {
# Remove files for other CPU architectures
- rm bin/fsnotifier-arm -rf
- rm lib/pty4j-native/linux/ppc64le -rf
+ rm -rf bin/fsnotifier-arm
+ rm -rf lib/pty4j-native/linux/ppc64le
- rm bin/fsnotifier
- rm bin/clion.vmoptions
- rm bin/libyjpagent-linux.so
- rm lib/pty4j-native/linux/x86 -rf
+ case "$XBPS_TARGET_MACHINE" in
+ x86_64)
+ rm -rf bin/fsnotifier
+ rm -rf bin/clion.vmoptions
+ rm -rf bin/libyjpagent-linux.so
+ rm -rf lib/pty4j-native/linux/x86
+ ;;
+ i686)
+ rm -rf bin/fsnotifier64
+ rm -rf bin/clion64.vmoptions
+ rm -rf bin/libyjpagent-linux64.so
+ rm -rf lib/pty4j-native/linux/x86_64
+ ;;
+ esac
# Remove JetBrains JDK
rm -rf jre64
From 30363e6c34ac502111c6198c01ef374b696fee14 Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <anton@doubleasoftware.com>
Date: Wed, 19 Jun 2019 23:31:44 -0700
Subject: [PATCH 07/15] Fix goland archs
---
srcpkgs/GoLand/template | 24 +++++++++++++++++-------
1 file changed, 17 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/GoLand/template b/srcpkgs/GoLand/template
index 142f9ccd297..bb4fa6c0de5 100644
--- a/srcpkgs/GoLand/template
+++ b/srcpkgs/GoLand/template
@@ -2,7 +2,7 @@
pkgname=GoLand
version=2019.1.3
revision=1
-archs="x86_64"
+archs="i686 x86_64"
depends="virtual?java-environment"
short_desc="Cross-platform IDE built specially for Go developers"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
@@ -16,13 +16,23 @@ nopie=yes
post_extract() {
# Remove files for other CPU architectures
- rm bin/fsnotifier-arm -rf
- rm lib/pty4j-native/linux/ppc64le -rf
+ rm -rf bin/fsnotifier-arm
+ rm -rf lib/pty4j-native/linux/ppc64le
- rm bin/fsnotifier
- rm bin/goland.vmoptions
- rm bin/libyjpagent-linux.so
- rm lib/pty4j-native/linux/x86 -rf
+ case "$XBPS_TARGET_MACHINE" in
+ x86_64)
+ rm -rf bin/fsnotifier
+ rm -rf bin/goland.vmoptions
+ rm -rf bin/libyjpagent-linux.so
+ rm -rf lib/pty4j-native/linux/x86
+ ;;
+ i686)
+ rm -rf bin/fsnotifier64
+ rm -rf bin/goland64.vmoptions
+ rm -rf bin/libyjpagent-linux64.so
+ rm -rf lib/pty4j-native/linux/x86_64
+ ;;
+ esac
}
do_install() {
From 077917b79c57ab4a171403684c9f8ff4ea8f8681 Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <anton@doubleasoftware.com>
Date: Wed, 19 Jun 2019 23:32:01 -0700
Subject: [PATCH 08/15] fix rubymine archs
---
srcpkgs/RubyMine/template | 24 +++++++++++++++++-------
1 file changed, 17 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/RubyMine/template b/srcpkgs/RubyMine/template
index 568e5410084..c3b264c8c5c 100644
--- a/srcpkgs/RubyMine/template
+++ b/srcpkgs/RubyMine/template
@@ -2,7 +2,7 @@
pkgname=RubyMine
version=2019.1.2
revision=1
-archs="x86_64"
+archs="i686 x86_64"
depends="virtual?java-environment"
short_desc="Most intelligent Ruby and Rails IDE"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
@@ -16,13 +16,23 @@ nopie=yes
post_extract() {
# Remove files for other CPU architectures
- rm bin/fsnotifier-arm -rf
- rm lib/pty4j-native/linux/ppc64le -rf
+ rm -rf bin/fsnotifier-arm
+ rm -rf lib/pty4j-native/linux/ppc64le
- rm bin/fsnotifier
- rm bin/rubymine.vmoptions
- rm bin/libyjpagent-linux.so
- rm lib/pty4j-native/linux/x86 -rf
+ case "$XBPS_TARGET_MACHINE" in
+ x86_64)
+ rm -rf bin/fsnotifier
+ rm -rf bin/rubymine.vmoptions
+ rm -rf bin/libyjpagent-linux.so
+ rm -rf lib/pty4j-native/linux/x86
+ ;;
+ i686)
+ rm -rf bin/fsnotifier64
+ rm -rf bin/rubymine64.vmoptions
+ rm -rf bin/libyjpagent-linux64.so
+ rm -rf lib/pty4j-native/linux/x86_64
+ ;;
+ esac
}
do_install() {
From 322b1acba71460aefa57b2aab5c1b08ed27ee6ea Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <anton@doubleasoftware.com>
Date: Wed, 19 Jun 2019 23:32:27 -0700
Subject: [PATCH 09/15] fix webstorm archs
---
srcpkgs/WebStorm/template | 24 +++++++++++++++++-------
1 file changed, 17 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/WebStorm/template b/srcpkgs/WebStorm/template
index 718215660e4..a579cdd41ee 100644
--- a/srcpkgs/WebStorm/template
+++ b/srcpkgs/WebStorm/template
@@ -2,7 +2,7 @@
pkgname=WebStorm
version=2019.1.3
revision=1
-archs="x86_64"
+archs="i686 x86_64"
wrksrc="WebStorm-191.7479.14"
depends="virtual?java-environment"
short_desc="Smartest JavaScript IDE"
@@ -17,13 +17,23 @@ nopie=yes
post_extract() {
# Remove files for other CPU architectures
- rm bin/fsnotifier-arm -rf
- rm lib/pty4j-native/linux/ppc64le -rf
+ rm -rf bin/fsnotifier-arm
+ rm -rf lib/pty4j-native/linux/ppc64le
- rm bin/fsnotifier
- rm bin/webstorm.vmoptions
- rm bin/libyjpagent-linux.so
- rm lib/pty4j-native/linux/x86 -rf
+ case "$XBPS_TARGET_MACHINE" in
+ x86_64)
+ rm -rf bin/fsnotifier
+ rm -rf bin/webstorm.vmoptions
+ rm -rf bin/libyjpagent-linux.so
+ rm -rf lib/pty4j-native/linux/x86
+ ;;
+ i686)
+ rm -rf bin/fsnotifier64
+ rm -rf bin/webstorm64.vmoptions
+ rm -rf bin/libyjpagent-linux64.so
+ rm -rf lib/pty4j-native/linux/x86_64
+ ;;
+ esac
rm -rf jre64
}
From ba505a268520f76b373dbc7feac35872d97833dd Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <anton@doubleasoftware.com>
Date: Wed, 19 Jun 2019 23:32:39 -0700
Subject: [PATCH 10/15] fix IU archs
---
.../intellij-idea-ultimate-edition/template | 31 +++++++++++++------
1 file changed, 21 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index b4c0bd37c73..0a7e2a3f5ff 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -2,7 +2,7 @@
pkgname=intellij-idea-ultimate-edition
version=2019.1.3
revision=1
-archs="x86_64"
+archs="i686 x86_64"
wrksrc="idea-IU-191.7479.19"
depends="virtual?java-environment giflib libXtst"
short_desc="Most intelligent Java IDE"
@@ -18,18 +18,29 @@ conflicts="intellij-idea-community-edition"
post_extract() {
# Remove files for other OSes
- rm plugins/android/lib/libwebp/win -rf
- rm plugins/android/lib/libwebp/mac -rf
+ rm -rf plugins/android/lib/libwebp/win
+ rm -rf plugins/android/lib/libwebp/mac
# Remove files for other CPU architectures
- rm bin/fsnotifier-arm -rf
- rm lib/pty4j-native/linux/ppc64le -rf
+ rm -rf bin/fsnotifier-arm
+ rm -rf lib/pty4j-native/linux/ppc64le
- rm bin/fsnotifier
- rm bin/idea.vmoptions
- rm bin/libyjpagent-linux.so
- rm plugins/android/lib/libwebp/linux/libwebp_jni.so
- rm lib/pty4j-native/linux/x86 -rf
+ 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() {
From 9f7707c605c69221544e9dad3b73686ec7f08886 Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <anton@doubleasoftware.com>
Date: Wed, 19 Jun 2019 23:37:56 -0700
Subject: [PATCH 11/15] fix webstorm license
---
srcpkgs/WebStorm/template | 21 +++++----------------
1 file changed, 5 insertions(+), 16 deletions(-)
diff --git a/srcpkgs/WebStorm/template b/srcpkgs/WebStorm/template
index a579cdd41ee..6602c930613 100644
--- a/srcpkgs/WebStorm/template
+++ b/srcpkgs/WebStorm/template
@@ -39,26 +39,15 @@ post_extract() {
}
do_install() {
- TARGET_PATH="usr/lib/WebStorm"
+ TARGET_PATH="usr/lib/${pkgname}"
+ LICENSE_PATH="usr/share/licenses/${pkgname}"
vmkdir usr/bin
vmkdir ${TARGET_PATH}
+ vmkdir ${LICENSE_PATH}
-
- for f in license/*; do
- if [ -f ${f} ]; then
- vlicense ${f}
- fi
- done
-
- if [ -d "license/third-party" ]; then
- for f in license/third-party/*; do
- if [ -f ${f} ]; then
- new_name="third-party-${f##*/}"
- vlicense ${f} ${new_name}
- fi
- done
- fi
+ # Ideally vlicense should be called here, but vcopy is more terse.
+ vcopy license/* ${LICENSE_PATH}
vcopy bin ${TARGET_PATH}
vcopy help ${TARGET_PATH}
From 49139a65d2644892431245441512ddc772618c6a Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <anton@doubleasoftware.com>
Date: Wed, 19 Jun 2019 23:47:15 -0700
Subject: [PATCH 12/15] fix clion license
---
srcpkgs/CLion/template | 21 +++++----------------
1 file changed, 5 insertions(+), 16 deletions(-)
diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index c5f931de089..2a3717ba1f4 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -43,26 +43,15 @@ post_extract() {
}
do_install() {
- TARGET_PATH="usr/lib/CLion"
+ TARGET_PATH="usr/lib/${pkgname}"
+ LICENSE_PATH="usr/share/licenses/${pkgname}"
vmkdir usr/bin
vmkdir ${TARGET_PATH}
+ vmkdir ${LICENSE_PATH}
-
- for f in license/*; do
- if [ -f ${f} ]; then
- vlicense ${f}
- fi
- done
-
- if [ -d "license/third-party" ]; then
- for f in license/third-party/*; do
- if [ -f ${f} ]; then
- new_name="third-party-${f##*/}"
- vlicense ${f} ${new_name}
- fi
- done
- fi
+ # Ideally vlicense should be called here, but vcopy is more terse.
+ vcopy license/* ${LICENSE_PATH}
vcopy bin ${TARGET_PATH}
vcopy help ${TARGET_PATH}
From e21bc1f647f5b07ba6927051c1bc44ea84f3c074 Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <anton@doubleasoftware.com>
Date: Wed, 19 Jun 2019 23:47:24 -0700
Subject: [PATCH 13/15] fix goland license
---
srcpkgs/GoLand/template | 21 +++++----------------
1 file changed, 5 insertions(+), 16 deletions(-)
diff --git a/srcpkgs/GoLand/template b/srcpkgs/GoLand/template
index bb4fa6c0de5..cebfb255168 100644
--- a/srcpkgs/GoLand/template
+++ b/srcpkgs/GoLand/template
@@ -36,26 +36,15 @@ post_extract() {
}
do_install() {
- TARGET_PATH="usr/lib/GoLand"
+ TARGET_PATH="usr/lib/${pkgname}"
+ LICENSE_PATH="usr/share/licenses/${pkgname}"
vmkdir usr/bin
vmkdir ${TARGET_PATH}
+ vmkdir ${LICENSE_PATH}
-
- for f in license/*; do
- if [ -f ${f} ]; then
- vlicense ${f}
- fi
- done
-
- if [ -d "license/third-party" ]; then
- for f in license/third-party/*; do
- if [ -f ${f} ]; then
- new_name="third-party-${f##*/}"
- vlicense ${f} ${new_name}
- fi
- done
- fi
+ # Ideally vlicense should be called here, but vcopy is more terse.
+ vcopy license/* ${LICENSE_PATH}
vcopy bin ${TARGET_PATH}
vcopy help ${TARGET_PATH}
From 3e0ab9bbc9a4bf60eb016f59d3186d1291e7f52d Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <anton@doubleasoftware.com>
Date: Wed, 19 Jun 2019 23:47:33 -0700
Subject: [PATCH 14/15] fix rubymine license
---
srcpkgs/RubyMine/template | 21 +++++----------------
1 file changed, 5 insertions(+), 16 deletions(-)
diff --git a/srcpkgs/RubyMine/template b/srcpkgs/RubyMine/template
index c3b264c8c5c..7b674991b74 100644
--- a/srcpkgs/RubyMine/template
+++ b/srcpkgs/RubyMine/template
@@ -36,26 +36,15 @@ post_extract() {
}
do_install() {
- TARGET_PATH="usr/lib/RubyMine"
+ TARGET_PATH="usr/lib/${pkgname}"
+ LICENSE_PATH="usr/share/licenses/${pkgname}"
vmkdir usr/bin
vmkdir ${TARGET_PATH}
+ vmkdir ${LICENSE_PATH}
-
- for f in license/*; do
- if [ -f ${f} ]; then
- vlicense ${f}
- fi
- done
-
- if [ -d "license/third-party" ]; then
- for f in license/third-party/*; do
- if [ -f ${f} ]; then
- new_name="third-party-${f##*/}"
- vlicense ${f} ${new_name}
- fi
- done
- fi
+ # Ideally vlicense should be called here, but vcopy is more terse.
+ vcopy license/* ${LICENSE_PATH}
vcopy bin ${TARGET_PATH}
vcopy help ${TARGET_PATH}
From 9a66cde1be9aa33c54e8548f228f4629360e7946 Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <anton@doubleasoftware.com>
Date: Wed, 19 Jun 2019 23:47:44 -0700
Subject: [PATCH 15/15] fix iu license
---
.../intellij-idea-ultimate-edition/template | 21 +++++--------------
1 file changed, 5 insertions(+), 16 deletions(-)
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index 0a7e2a3f5ff..bb57f7ccd99 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -44,26 +44,15 @@ post_extract() {
}
do_install() {
- TARGET_PATH="usr/lib/intellij-idea-ultimate-edition"
+ TARGET_PATH="usr/lib/${pkgname}"
+ LICENSE_PATH="usr/share/licenses/${pkgname}"
vmkdir usr/bin
vmkdir ${TARGET_PATH}
+ vmkdir ${LICENSE_PATH}
-
- for f in license/*; do
- if [ -f ${f} ]; then
- vlicense ${f}
- fi
- done
-
- if [ -d "license/third-party" ]; then
- for f in license/third-party/*; do
- if [ -f ${f} ]; then
- new_name="third-party-${f##*/}"
- vlicense ${f} ${new_name}
- fi
- done
- fi
+ # Ideally vlicense should be called here, but vcopy is more terse.
+ vcopy license/* ${LICENSE_PATH}
vcopy bin ${TARGET_PATH}
vcopy help ${TARGET_PATH}
next prev parent reply other threads:[~2019-06-20 7:06 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 [this message]
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
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=20190620070617.jEaJywGEbbT6NPXrMhUSO8dfi-diaEO4ylaZWn1xNdM@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).