* Re: [PR REVIEW] Upgrading Intellij Idea Ultimate to 2024.1.2
2024-06-06 3:53 [PR PATCH] Upgrading Intellij Idea Ultimate to 2024.1.2 piekay
@ 2024-06-06 4:33 ` classabbyamp
2024-06-06 10:33 ` piekay
` (22 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: classabbyamp @ 2024-06-06 4:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 256 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/50713#discussion_r1628760676
Comment:
we should not be vendoring these desktop files https://github.com/void-linux/void-packages/issues/49164
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PR REVIEW] Upgrading Intellij Idea Ultimate to 2024.1.2
2024-06-06 3:53 [PR PATCH] Upgrading Intellij Idea Ultimate to 2024.1.2 piekay
2024-06-06 4:33 ` [PR REVIEW] " classabbyamp
@ 2024-06-06 10:33 ` piekay
2024-06-06 10:38 ` [PR PATCH] [Updated] " piekay
` (21 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: piekay @ 2024-06-06 10:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 307 bytes --]
New review comment by piekay on void-packages repository
https://github.com/void-linux/void-packages/pull/50713#discussion_r1629250771
Comment:
I get that, but I sadly don't see a way around for Jetbrains products, which don't offer a desktop entry by default, which is problematic for a GUI application
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PR PATCH] [Updated] Upgrading Intellij Idea Ultimate to 2024.1.2
2024-06-06 3:53 [PR PATCH] Upgrading Intellij Idea Ultimate to 2024.1.2 piekay
2024-06-06 4:33 ` [PR REVIEW] " classabbyamp
2024-06-06 10:33 ` piekay
@ 2024-06-06 10:38 ` piekay
2024-06-06 12:18 ` [PR REVIEW] " classabbyamp
` (20 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: piekay @ 2024-06-06 10:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1280 bytes --]
There is an updated pull request by piekay against master on the void-packages repository
https://github.com/piekay/void-packages intellij-ultimate-update
https://github.com/void-linux/void-packages/pull/50713
Upgrading Intellij Idea Ultimate to 2024.1.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/50713.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-intellij-ultimate-update-50713.patch --]
[-- Type: text/x-diff, Size: 6852 bytes --]
From ba06d97917ffcf958e1441de8ffe86972e2f43e9 Mon Sep 17 00:00:00 2001
From: Piekay <github@piekay.de>
Date: Thu, 6 Jun 2024 05:44:58 +0200
Subject: [PATCH] Upgrading Intellij Idea Ultimate to 2024.1.2
---
.../files/README.voidlinux | 2 -
.../files/idea-ultimate.desktop | 8 ++
.../intellij-idea-ultimate-edition/template | 100 ++++--------------
srcpkgs/intellij-idea-ultimate-edition/update | 2 +-
4 files changed, 31 insertions(+), 81 deletions(-)
delete mode 100644 srcpkgs/intellij-idea-ultimate-edition/files/README.voidlinux
create mode 100644 srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop
diff --git a/srcpkgs/intellij-idea-ultimate-edition/files/README.voidlinux b/srcpkgs/intellij-idea-ultimate-edition/files/README.voidlinux
deleted file mode 100644
index c04f6c9ab2a951..00000000000000
--- a/srcpkgs/intellij-idea-ultimate-edition/files/README.voidlinux
+++ /dev/null
@@ -1,2 +0,0 @@
-IntelliJ Ultimate has the following optional dependencies:
- libdbusmenu-glib: For global menu support
diff --git a/srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop b/srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop
new file mode 100644
index 00000000000000..b3ac93776401ab
--- /dev/null
+++ b/srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=IntelliJ IDEA Ultimate Edition
+Comment=Java integrated development environment by JetBrains
+Exec=/usr/bin/idea-ultimate %f
+Icon=idea-ultimate
+Terminal=false
+Type=Application
+Categories=Development;
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index 40e4a8b9c8a068..77b5eecaef32cf 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,90 +1,34 @@
# Template file for 'intellij-idea-ultimate-edition'
pkgname=intellij-idea-ultimate-edition
-version=2021.3.3
-revision=2
-archs="i686 x86_64"
-depends="giflib libXtst jetbrains-jdk-bin lldb-devel"
-short_desc="Most intelligent Java IDE"
+version=2024.1.2
+revision=1
+archs="x86_64"
+depends="virtual?java-environment giflib libXtst hicolor-icon-theme"
+short_desc="Java integrated development environment by JetBrains"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="custom:Commercial"
-homepage="https://www.jetbrains.com/idea"
-_filename="ideaIU-${version}-no-jbr.tar.gz"
-distfiles="https://download.jetbrains.com/idea/${_filename}"
-checksum=2a3295fca08060ad515f6c7198879d09963724cfb36af3ea94f16dcd76636470
+homepage="https://www.jetbrains.org/"
+distfiles="https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz"
+checksum=c50ed70f90c69a7e6eaafab44d926d554aafbd7310608570e4085d97df3bf763
repository=nonfree
restricted=yes
nopie=yes
python_version=3
-# requires liblldb.so which is unversioned, pulled by lldb-devel
-skiprdeps="/usr/lib/intellij-idea-ultimate-edition/plugins/Kotlin/bin/linux/LLDBFrontend"
-
-do_extract() {
- bsdtar xf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_filename} --strip-components=1 -C .
-}
-
-post_extract() {
- # Remove files for other OSes
- rm -rf plugins/cwm-plugin/quiche-native/darwin-aarch64
- rm -rf plugins/cwm-plugin/quiche-native/darwin-x86-64
- rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/freebsd64
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/freebsd32
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/osx
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/windows32
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/windows64
- rm -rf plugins/performanceTesting/bin/libyjpagent.dylib
- rm -rf plugins/performanceTesting/bin/yjpagent.dll
- rm -rf plugins/performanceTesting/bin/yjpagent64.dll
- rm -rf plugins/webp/lib/libwebp/mac
- rm -rf plugins/webp/lib/libwebp/win
-
- # Remove files for other CPU architectures
- rm -rf bin/fsnotifier-arm
- rm -rf lib/pty4j-native/linux/aarch64
- rm -rf lib/pty4j-native/linux/arm
- rm -rf lib/pty4j-native/linux/mips64el
- rm -rf lib/pty4j-native/linux/ppc64le
-
- case "$XBPS_TARGET_MACHINE" in
- x86_64)
- rm -rf bin/idea.vmoptions
- rm -rf lib/pty4j-native/linux/x86
- rm -rf plugins/android/lib/libwebp/linux/libwebp_jni.so
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/linux32
- rm -rf plugins/performanceTesting/bin/libyjpagent.so
- rm -rf plugins/webp/lib/libwebp/linux/libwebp_jni.so
- ;;
- i686)
- rm -rf bin/idea64.vmoptions
- rm -rf bin/libyjpagent-linux64.so
- rm -rf lib/pty4j-native/linux/x86_64
- rm -rf plugins/android/lib/libwebp/linux/libwebp_jni64.so
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/linux64
- rm -rf plugins/performanceTesting/bin/libyjpagent64.so
- rm -rf plugins/webp/lib/libwebp/linux/libwebp_jni64.so
- ;;
- esac
-}
+skiprdeps="/usr/lib/intellij-idea-ultimate/plugins/Kotlin/bin/linux/LLDBFrontend"
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-ultimate
- vdoc "${FILESDIR}/README.voidlinux"
+ vmkdir usr/share/doc/intellij-idea-ultimate
+ vmkdir usr/lib/intellij-idea-ultimate
+ vmkdir usr/share/pixmaps
+ vmkdir usr/share/icons/hicolor/scalable/apps
+
+ mv bin lib plugins product-info.json build.txt jbr ${DESTDIR}/usr/lib/intellij-idea-ultimate
+ mv license ${DESTDIR}/usr/share/doc/intellij-idea-ultimate
+ rm ${DESTDIR}/usr/lib/intellij-idea-ultimate/lib/async-profiler -rf
+ rm ${DESTDIR}/usr/lib/intellij-idea-ultimate/lib/async-profiler.jar
+ ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.sh ${DESTDIR}/usr/bin/idea-ultimate
+ ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.png ${DESTDIR}/usr/share/pixmaps/idea-ultimate.svg
+ ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.svg ${DESTDIR}/usr/share/icons/hicolor/scalable/apps/idea-ultimate.svg
+ vinstall ${FILESDIR}/idea-ultimate.desktop 644 usr/share/applications
}
diff --git a/srcpkgs/intellij-idea-ultimate-edition/update b/srcpkgs/intellij-idea-ultimate-edition/update
index 0fd4e8031bd570..bfaca62dd6e108 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/update
+++ b/srcpkgs/intellij-idea-ultimate-edition/update
@@ -1,2 +1,2 @@
-pattern="ideaIU-\K[\d.]+(?=-no-jbr\.tar)"
+pattern="ideaIU-\K[\d.]+(?=\.tar)"
site="https://data.services.jetbrains.com/products/releases?code=IIU%2CIIC&latest=true&type=release"
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PR REVIEW] Upgrading Intellij Idea Ultimate to 2024.1.2
2024-06-06 3:53 [PR PATCH] Upgrading Intellij Idea Ultimate to 2024.1.2 piekay
` (2 preceding siblings ...)
2024-06-06 10:38 ` [PR PATCH] [Updated] " piekay
@ 2024-06-06 12:18 ` classabbyamp
2024-06-06 12:40 ` classabbyamp
` (19 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: classabbyamp @ 2024-06-06 12:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 303 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/50713#discussion_r1629422126
Comment:
upstream says to create the desktop file from within the application: https://www.jetbrains.com/help/idea/installation-guide.html#create-desktop-entry
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PR REVIEW] Upgrading Intellij Idea Ultimate to 2024.1.2
2024-06-06 3:53 [PR PATCH] Upgrading Intellij Idea Ultimate to 2024.1.2 piekay
` (3 preceding siblings ...)
2024-06-06 12:18 ` [PR REVIEW] " classabbyamp
@ 2024-06-06 12:40 ` classabbyamp
2024-06-06 12:44 ` classabbyamp
` (18 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: classabbyamp @ 2024-06-06 12:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 822 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/50713#discussion_r1629465388
Comment:
jars are archives, so we can do shenanigans:
```
bsdtar xOf lib/app-client.jar entry.desktop
[Desktop Entry]
Version=1.0
Type=Application
Name=$NAME$
Icon=$ICON$
Exec=$SCRIPT$ %f
Comment=$COMMENT$
Categories=Development;IDE;
Terminal=false
StartupWMClass=$WM_CLASS$
StartupNotify=true
```
Use this as a base. run the application to grab what it replaces the `$templates$` with.
e.g.:
```bash
post_extract() {
bsdtar xf lib/app-client.jar entry.desktop
}
post_patch() {
vsed -i -e 's/$NAME$/whatever/; s/$ICON$/whatever; ...' entry.desktop
}
do_install() {
vinstall entry.desktop 644 usr/share/applications idea-ultimate.desktop
}
```
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PR REVIEW] Upgrading Intellij Idea Ultimate to 2024.1.2
2024-06-06 3:53 [PR PATCH] Upgrading Intellij Idea Ultimate to 2024.1.2 piekay
` (4 preceding siblings ...)
2024-06-06 12:40 ` classabbyamp
@ 2024-06-06 12:44 ` classabbyamp
2024-06-06 13:00 ` [PR PATCH] [Updated] " classabbyamp
` (17 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: classabbyamp @ 2024-06-06 12:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 823 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/50713#discussion_r1629465388
Comment:
jars are archives, so we can do shenanigans:
```
bsdtar xOf lib/app-client.jar entry.desktop
[Desktop Entry]
Version=1.0
Type=Application
Name=$NAME$
Icon=$ICON$
Exec=$SCRIPT$ %f
Comment=$COMMENT$
Categories=Development;IDE;
Terminal=false
StartupWMClass=$WM_CLASS$
StartupNotify=true
```
Use this as a base. run the application to grab what it replaces the `$templates$` with.
e.g.:
```bash
post_extract() {
bsdtar xf lib/app-client.jar entry.desktop
}
post_patch() {
vsed -i -e 's/$NAME$/whatever/; s/$ICON$/whatever/; ...' entry.desktop
}
do_install() {
vinstall entry.desktop 644 usr/share/applications idea-ultimate.desktop
}
```
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PR PATCH] [Updated] Upgrading Intellij Idea Ultimate to 2024.1.2
2024-06-06 3:53 [PR PATCH] Upgrading Intellij Idea Ultimate to 2024.1.2 piekay
` (5 preceding siblings ...)
2024-06-06 12:44 ` classabbyamp
@ 2024-06-06 13:00 ` classabbyamp
2024-06-06 13:00 ` classabbyamp
` (16 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: classabbyamp @ 2024-06-06 13:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1286 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/piekay/void-packages intellij-ultimate-update
https://github.com/void-linux/void-packages/pull/50713
Upgrading Intellij Idea Ultimate to 2024.1.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/50713.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-intellij-ultimate-update-50713.patch --]
[-- Type: text/x-diff, Size: 8581 bytes --]
From ba06d97917ffcf958e1441de8ffe86972e2f43e9 Mon Sep 17 00:00:00 2001
From: Piekay <github@piekay.de>
Date: Thu, 6 Jun 2024 05:44:58 +0200
Subject: [PATCH 1/2] Upgrading Intellij Idea Ultimate to 2024.1.2
---
.../files/README.voidlinux | 2 -
.../files/idea-ultimate.desktop | 8 ++
.../intellij-idea-ultimate-edition/template | 100 ++++--------------
srcpkgs/intellij-idea-ultimate-edition/update | 2 +-
4 files changed, 31 insertions(+), 81 deletions(-)
delete mode 100644 srcpkgs/intellij-idea-ultimate-edition/files/README.voidlinux
create mode 100644 srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop
diff --git a/srcpkgs/intellij-idea-ultimate-edition/files/README.voidlinux b/srcpkgs/intellij-idea-ultimate-edition/files/README.voidlinux
deleted file mode 100644
index c04f6c9ab2a951..00000000000000
--- a/srcpkgs/intellij-idea-ultimate-edition/files/README.voidlinux
+++ /dev/null
@@ -1,2 +0,0 @@
-IntelliJ Ultimate has the following optional dependencies:
- libdbusmenu-glib: For global menu support
diff --git a/srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop b/srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop
new file mode 100644
index 00000000000000..b3ac93776401ab
--- /dev/null
+++ b/srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=IntelliJ IDEA Ultimate Edition
+Comment=Java integrated development environment by JetBrains
+Exec=/usr/bin/idea-ultimate %f
+Icon=idea-ultimate
+Terminal=false
+Type=Application
+Categories=Development;
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index 40e4a8b9c8a068..77b5eecaef32cf 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,90 +1,34 @@
# Template file for 'intellij-idea-ultimate-edition'
pkgname=intellij-idea-ultimate-edition
-version=2021.3.3
-revision=2
-archs="i686 x86_64"
-depends="giflib libXtst jetbrains-jdk-bin lldb-devel"
-short_desc="Most intelligent Java IDE"
+version=2024.1.2
+revision=1
+archs="x86_64"
+depends="virtual?java-environment giflib libXtst hicolor-icon-theme"
+short_desc="Java integrated development environment by JetBrains"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="custom:Commercial"
-homepage="https://www.jetbrains.com/idea"
-_filename="ideaIU-${version}-no-jbr.tar.gz"
-distfiles="https://download.jetbrains.com/idea/${_filename}"
-checksum=2a3295fca08060ad515f6c7198879d09963724cfb36af3ea94f16dcd76636470
+homepage="https://www.jetbrains.org/"
+distfiles="https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz"
+checksum=c50ed70f90c69a7e6eaafab44d926d554aafbd7310608570e4085d97df3bf763
repository=nonfree
restricted=yes
nopie=yes
python_version=3
-# requires liblldb.so which is unversioned, pulled by lldb-devel
-skiprdeps="/usr/lib/intellij-idea-ultimate-edition/plugins/Kotlin/bin/linux/LLDBFrontend"
-
-do_extract() {
- bsdtar xf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_filename} --strip-components=1 -C .
-}
-
-post_extract() {
- # Remove files for other OSes
- rm -rf plugins/cwm-plugin/quiche-native/darwin-aarch64
- rm -rf plugins/cwm-plugin/quiche-native/darwin-x86-64
- rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/freebsd64
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/freebsd32
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/osx
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/windows32
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/windows64
- rm -rf plugins/performanceTesting/bin/libyjpagent.dylib
- rm -rf plugins/performanceTesting/bin/yjpagent.dll
- rm -rf plugins/performanceTesting/bin/yjpagent64.dll
- rm -rf plugins/webp/lib/libwebp/mac
- rm -rf plugins/webp/lib/libwebp/win
-
- # Remove files for other CPU architectures
- rm -rf bin/fsnotifier-arm
- rm -rf lib/pty4j-native/linux/aarch64
- rm -rf lib/pty4j-native/linux/arm
- rm -rf lib/pty4j-native/linux/mips64el
- rm -rf lib/pty4j-native/linux/ppc64le
-
- case "$XBPS_TARGET_MACHINE" in
- x86_64)
- rm -rf bin/idea.vmoptions
- rm -rf lib/pty4j-native/linux/x86
- rm -rf plugins/android/lib/libwebp/linux/libwebp_jni.so
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/linux32
- rm -rf plugins/performanceTesting/bin/libyjpagent.so
- rm -rf plugins/webp/lib/libwebp/linux/libwebp_jni.so
- ;;
- i686)
- rm -rf bin/idea64.vmoptions
- rm -rf bin/libyjpagent-linux64.so
- rm -rf lib/pty4j-native/linux/x86_64
- rm -rf plugins/android/lib/libwebp/linux/libwebp_jni64.so
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/linux64
- rm -rf plugins/performanceTesting/bin/libyjpagent64.so
- rm -rf plugins/webp/lib/libwebp/linux/libwebp_jni64.so
- ;;
- esac
-}
+skiprdeps="/usr/lib/intellij-idea-ultimate/plugins/Kotlin/bin/linux/LLDBFrontend"
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-ultimate
- vdoc "${FILESDIR}/README.voidlinux"
+ vmkdir usr/share/doc/intellij-idea-ultimate
+ vmkdir usr/lib/intellij-idea-ultimate
+ vmkdir usr/share/pixmaps
+ vmkdir usr/share/icons/hicolor/scalable/apps
+
+ mv bin lib plugins product-info.json build.txt jbr ${DESTDIR}/usr/lib/intellij-idea-ultimate
+ mv license ${DESTDIR}/usr/share/doc/intellij-idea-ultimate
+ rm ${DESTDIR}/usr/lib/intellij-idea-ultimate/lib/async-profiler -rf
+ rm ${DESTDIR}/usr/lib/intellij-idea-ultimate/lib/async-profiler.jar
+ ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.sh ${DESTDIR}/usr/bin/idea-ultimate
+ ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.png ${DESTDIR}/usr/share/pixmaps/idea-ultimate.svg
+ ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.svg ${DESTDIR}/usr/share/icons/hicolor/scalable/apps/idea-ultimate.svg
+ vinstall ${FILESDIR}/idea-ultimate.desktop 644 usr/share/applications
}
diff --git a/srcpkgs/intellij-idea-ultimate-edition/update b/srcpkgs/intellij-idea-ultimate-edition/update
index 0fd4e8031bd570..bfaca62dd6e108 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/update
+++ b/srcpkgs/intellij-idea-ultimate-edition/update
@@ -1,2 +1,2 @@
-pattern="ideaIU-\K[\d.]+(?=-no-jbr\.tar)"
+pattern="ideaIU-\K[\d.]+(?=\.tar)"
site="https://data.services.jetbrains.com/products/releases?code=IIU%2CIIC&latest=true&type=release"
From 34f7eeb1144c2bfd56c229f967db345632b22b4b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 6 Jun 2024 08:59:55 -0400
Subject: [PATCH 2/2] fixup! Upgrading Intellij Idea Ultimate to 2024.1.2
---
srcpkgs/intellij-idea-ultimate-edition/template | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index 77b5eecaef32cf..dcbe18e03222db 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -16,6 +16,18 @@ nopie=yes
python_version=3
skiprdeps="/usr/lib/intellij-idea-ultimate/plugins/Kotlin/bin/linux/LLDBFrontend"
+post_extract() {
+ bsdtar xf lib/app-client.jar entry.desktop
+}
+
+post_patch() {
+ vsed -i -e 's/\$NAME\$/IntelliJ IDEA Ultimate Edition/' entry.desktop
+ vsed -i -e 's/\$ICON\$/idea-ultimate/' entry.desktop
+ vsed -i -e 's/\$SCRIPT\$/idea-ultimate/' entry.desktop
+ vsed -i -e 's/\$COMMENT\$/Capable and Ergonomic IDE for JVM/' entry.desktop
+ vsed -i -e 's/\$WM_CLASS\$/jetbrains-idea/' entry.desktop
+}
+
do_install() {
vmkdir usr/bin
vmkdir usr/share/doc/intellij-idea-ultimate
@@ -30,5 +42,5 @@ do_install() {
ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.sh ${DESTDIR}/usr/bin/idea-ultimate
ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.png ${DESTDIR}/usr/share/pixmaps/idea-ultimate.svg
ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.svg ${DESTDIR}/usr/share/icons/hicolor/scalable/apps/idea-ultimate.svg
- vinstall ${FILESDIR}/idea-ultimate.desktop 644 usr/share/applications
+ vinstall entry.desktop 644 usr/share/applications idea-ultimate.desktop
}
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PR PATCH] [Updated] Upgrading Intellij Idea Ultimate to 2024.1.2
2024-06-06 3:53 [PR PATCH] Upgrading Intellij Idea Ultimate to 2024.1.2 piekay
` (6 preceding siblings ...)
2024-06-06 13:00 ` [PR PATCH] [Updated] " classabbyamp
@ 2024-06-06 13:00 ` classabbyamp
2024-06-06 13:04 ` [PR REVIEW] " classabbyamp
` (15 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: classabbyamp @ 2024-06-06 13:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1286 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/piekay/void-packages intellij-ultimate-update
https://github.com/void-linux/void-packages/pull/50713
Upgrading Intellij Idea Ultimate to 2024.1.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/50713.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-intellij-ultimate-update-50713.patch --]
[-- Type: text/x-diff, Size: 9280 bytes --]
From ba06d97917ffcf958e1441de8ffe86972e2f43e9 Mon Sep 17 00:00:00 2001
From: Piekay <github@piekay.de>
Date: Thu, 6 Jun 2024 05:44:58 +0200
Subject: [PATCH 1/2] Upgrading Intellij Idea Ultimate to 2024.1.2
---
.../files/README.voidlinux | 2 -
.../files/idea-ultimate.desktop | 8 ++
.../intellij-idea-ultimate-edition/template | 100 ++++--------------
srcpkgs/intellij-idea-ultimate-edition/update | 2 +-
4 files changed, 31 insertions(+), 81 deletions(-)
delete mode 100644 srcpkgs/intellij-idea-ultimate-edition/files/README.voidlinux
create mode 100644 srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop
diff --git a/srcpkgs/intellij-idea-ultimate-edition/files/README.voidlinux b/srcpkgs/intellij-idea-ultimate-edition/files/README.voidlinux
deleted file mode 100644
index c04f6c9ab2a951..00000000000000
--- a/srcpkgs/intellij-idea-ultimate-edition/files/README.voidlinux
+++ /dev/null
@@ -1,2 +0,0 @@
-IntelliJ Ultimate has the following optional dependencies:
- libdbusmenu-glib: For global menu support
diff --git a/srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop b/srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop
new file mode 100644
index 00000000000000..b3ac93776401ab
--- /dev/null
+++ b/srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=IntelliJ IDEA Ultimate Edition
+Comment=Java integrated development environment by JetBrains
+Exec=/usr/bin/idea-ultimate %f
+Icon=idea-ultimate
+Terminal=false
+Type=Application
+Categories=Development;
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index 40e4a8b9c8a068..77b5eecaef32cf 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,90 +1,34 @@
# Template file for 'intellij-idea-ultimate-edition'
pkgname=intellij-idea-ultimate-edition
-version=2021.3.3
-revision=2
-archs="i686 x86_64"
-depends="giflib libXtst jetbrains-jdk-bin lldb-devel"
-short_desc="Most intelligent Java IDE"
+version=2024.1.2
+revision=1
+archs="x86_64"
+depends="virtual?java-environment giflib libXtst hicolor-icon-theme"
+short_desc="Java integrated development environment by JetBrains"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="custom:Commercial"
-homepage="https://www.jetbrains.com/idea"
-_filename="ideaIU-${version}-no-jbr.tar.gz"
-distfiles="https://download.jetbrains.com/idea/${_filename}"
-checksum=2a3295fca08060ad515f6c7198879d09963724cfb36af3ea94f16dcd76636470
+homepage="https://www.jetbrains.org/"
+distfiles="https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz"
+checksum=c50ed70f90c69a7e6eaafab44d926d554aafbd7310608570e4085d97df3bf763
repository=nonfree
restricted=yes
nopie=yes
python_version=3
-# requires liblldb.so which is unversioned, pulled by lldb-devel
-skiprdeps="/usr/lib/intellij-idea-ultimate-edition/plugins/Kotlin/bin/linux/LLDBFrontend"
-
-do_extract() {
- bsdtar xf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_filename} --strip-components=1 -C .
-}
-
-post_extract() {
- # Remove files for other OSes
- rm -rf plugins/cwm-plugin/quiche-native/darwin-aarch64
- rm -rf plugins/cwm-plugin/quiche-native/darwin-x86-64
- rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/freebsd64
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/freebsd32
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/osx
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/windows32
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/windows64
- rm -rf plugins/performanceTesting/bin/libyjpagent.dylib
- rm -rf plugins/performanceTesting/bin/yjpagent.dll
- rm -rf plugins/performanceTesting/bin/yjpagent64.dll
- rm -rf plugins/webp/lib/libwebp/mac
- rm -rf plugins/webp/lib/libwebp/win
-
- # Remove files for other CPU architectures
- rm -rf bin/fsnotifier-arm
- rm -rf lib/pty4j-native/linux/aarch64
- rm -rf lib/pty4j-native/linux/arm
- rm -rf lib/pty4j-native/linux/mips64el
- rm -rf lib/pty4j-native/linux/ppc64le
-
- case "$XBPS_TARGET_MACHINE" in
- x86_64)
- rm -rf bin/idea.vmoptions
- rm -rf lib/pty4j-native/linux/x86
- rm -rf plugins/android/lib/libwebp/linux/libwebp_jni.so
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/linux32
- rm -rf plugins/performanceTesting/bin/libyjpagent.so
- rm -rf plugins/webp/lib/libwebp/linux/libwebp_jni.so
- ;;
- i686)
- rm -rf bin/idea64.vmoptions
- rm -rf bin/libyjpagent-linux64.so
- rm -rf lib/pty4j-native/linux/x86_64
- rm -rf plugins/android/lib/libwebp/linux/libwebp_jni64.so
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/linux64
- rm -rf plugins/performanceTesting/bin/libyjpagent64.so
- rm -rf plugins/webp/lib/libwebp/linux/libwebp_jni64.so
- ;;
- esac
-}
+skiprdeps="/usr/lib/intellij-idea-ultimate/plugins/Kotlin/bin/linux/LLDBFrontend"
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-ultimate
- vdoc "${FILESDIR}/README.voidlinux"
+ vmkdir usr/share/doc/intellij-idea-ultimate
+ vmkdir usr/lib/intellij-idea-ultimate
+ vmkdir usr/share/pixmaps
+ vmkdir usr/share/icons/hicolor/scalable/apps
+
+ mv bin lib plugins product-info.json build.txt jbr ${DESTDIR}/usr/lib/intellij-idea-ultimate
+ mv license ${DESTDIR}/usr/share/doc/intellij-idea-ultimate
+ rm ${DESTDIR}/usr/lib/intellij-idea-ultimate/lib/async-profiler -rf
+ rm ${DESTDIR}/usr/lib/intellij-idea-ultimate/lib/async-profiler.jar
+ ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.sh ${DESTDIR}/usr/bin/idea-ultimate
+ ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.png ${DESTDIR}/usr/share/pixmaps/idea-ultimate.svg
+ ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.svg ${DESTDIR}/usr/share/icons/hicolor/scalable/apps/idea-ultimate.svg
+ vinstall ${FILESDIR}/idea-ultimate.desktop 644 usr/share/applications
}
diff --git a/srcpkgs/intellij-idea-ultimate-edition/update b/srcpkgs/intellij-idea-ultimate-edition/update
index 0fd4e8031bd570..bfaca62dd6e108 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/update
+++ b/srcpkgs/intellij-idea-ultimate-edition/update
@@ -1,2 +1,2 @@
-pattern="ideaIU-\K[\d.]+(?=-no-jbr\.tar)"
+pattern="ideaIU-\K[\d.]+(?=\.tar)"
site="https://data.services.jetbrains.com/products/releases?code=IIU%2CIIC&latest=true&type=release"
From c1d5675d22fcc8ece307943b0bea9028c5ae966b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 6 Jun 2024 08:59:55 -0400
Subject: [PATCH 2/2] fixup! Upgrading Intellij Idea Ultimate to 2024.1.2
---
.../files/idea-ultimate.desktop | 8 --------
srcpkgs/intellij-idea-ultimate-edition/template | 14 +++++++++++++-
2 files changed, 13 insertions(+), 9 deletions(-)
delete mode 100644 srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop
diff --git a/srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop b/srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop
deleted file mode 100644
index b3ac93776401ab..00000000000000
--- a/srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=IntelliJ IDEA Ultimate Edition
-Comment=Java integrated development environment by JetBrains
-Exec=/usr/bin/idea-ultimate %f
-Icon=idea-ultimate
-Terminal=false
-Type=Application
-Categories=Development;
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index 77b5eecaef32cf..dcbe18e03222db 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -16,6 +16,18 @@ nopie=yes
python_version=3
skiprdeps="/usr/lib/intellij-idea-ultimate/plugins/Kotlin/bin/linux/LLDBFrontend"
+post_extract() {
+ bsdtar xf lib/app-client.jar entry.desktop
+}
+
+post_patch() {
+ vsed -i -e 's/\$NAME\$/IntelliJ IDEA Ultimate Edition/' entry.desktop
+ vsed -i -e 's/\$ICON\$/idea-ultimate/' entry.desktop
+ vsed -i -e 's/\$SCRIPT\$/idea-ultimate/' entry.desktop
+ vsed -i -e 's/\$COMMENT\$/Capable and Ergonomic IDE for JVM/' entry.desktop
+ vsed -i -e 's/\$WM_CLASS\$/jetbrains-idea/' entry.desktop
+}
+
do_install() {
vmkdir usr/bin
vmkdir usr/share/doc/intellij-idea-ultimate
@@ -30,5 +42,5 @@ do_install() {
ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.sh ${DESTDIR}/usr/bin/idea-ultimate
ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.png ${DESTDIR}/usr/share/pixmaps/idea-ultimate.svg
ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.svg ${DESTDIR}/usr/share/icons/hicolor/scalable/apps/idea-ultimate.svg
- vinstall ${FILESDIR}/idea-ultimate.desktop 644 usr/share/applications
+ vinstall entry.desktop 644 usr/share/applications idea-ultimate.desktop
}
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PR REVIEW] Upgrading Intellij Idea Ultimate to 2024.1.2
2024-06-06 3:53 [PR PATCH] Upgrading Intellij Idea Ultimate to 2024.1.2 piekay
` (7 preceding siblings ...)
2024-06-06 13:00 ` classabbyamp
@ 2024-06-06 13:04 ` classabbyamp
2024-06-06 13:04 ` classabbyamp
` (14 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: classabbyamp @ 2024-06-06 13:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 231 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/50713#discussion_r1629500303
Comment:
does this work with any jdk (8, 11, 17) or does it need at least some version?
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PR REVIEW] Upgrading Intellij Idea Ultimate to 2024.1.2
2024-06-06 3:53 [PR PATCH] Upgrading Intellij Idea Ultimate to 2024.1.2 piekay
` (8 preceding siblings ...)
2024-06-06 13:04 ` [PR REVIEW] " classabbyamp
@ 2024-06-06 13:04 ` classabbyamp
2024-06-06 13:04 ` classabbyamp
` (13 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: classabbyamp @ 2024-06-06 13:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 503 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/50713#discussion_r1629498141
Comment:
```suggestion
ln -sf ../lib/intellij-idea-ultimate/bin/idea.sh ${DESTDIR}/usr/bin/idea-ultimate
ln -sf ../lib/intellij-idea-ultimate/bin/idea.png ${DESTDIR}/usr/share/pixmaps/idea-ultimate.svg
ln -sf ../lib/intellij-idea-ultimate/bin/idea.svg ${DESTDIR}/usr/share/icons/hicolor/scalable/apps/idea-ultimate.svg
```
relative symlinks are better
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PR REVIEW] Upgrading Intellij Idea Ultimate to 2024.1.2
2024-06-06 3:53 [PR PATCH] Upgrading Intellij Idea Ultimate to 2024.1.2 piekay
` (9 preceding siblings ...)
2024-06-06 13:04 ` classabbyamp
@ 2024-06-06 13:04 ` classabbyamp
2024-06-06 13:05 ` classabbyamp
` (12 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: classabbyamp @ 2024-06-06 13:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 180 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/50713#discussion_r1629496217
Comment:
use `vcopy` instead of `mv`
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PR REVIEW] Upgrading Intellij Idea Ultimate to 2024.1.2
2024-06-06 3:53 [PR PATCH] Upgrading Intellij Idea Ultimate to 2024.1.2 piekay
` (10 preceding siblings ...)
2024-06-06 13:04 ` classabbyamp
@ 2024-06-06 13:05 ` classabbyamp
2024-06-06 13:23 ` piekay
` (11 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: classabbyamp @ 2024-06-06 13:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 300 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/50713#discussion_r1629501782
Comment:
I've pushed this, please use `git rebase -i` to squash (and fix the commit message, should be `intellij-idea-ultimate-edition: update to 2024.1.2`)
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PR REVIEW] Upgrading Intellij Idea Ultimate to 2024.1.2
2024-06-06 3:53 [PR PATCH] Upgrading Intellij Idea Ultimate to 2024.1.2 piekay
` (11 preceding siblings ...)
2024-06-06 13:05 ` classabbyamp
@ 2024-06-06 13:23 ` piekay
2024-06-06 15:03 ` [PR PATCH] [Updated] " piekay
` (10 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: piekay @ 2024-06-06 13:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 221 bytes --]
New review comment by piekay on void-packages repository
https://github.com/void-linux/void-packages/pull/50713#discussion_r1629532290
Comment:
Jetbrains recommends JDK17, but it should work with any supported version
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PR PATCH] [Updated] Upgrading Intellij Idea Ultimate to 2024.1.2
2024-06-06 3:53 [PR PATCH] Upgrading Intellij Idea Ultimate to 2024.1.2 piekay
` (12 preceding siblings ...)
2024-06-06 13:23 ` piekay
@ 2024-06-06 15:03 ` piekay
2024-06-06 15:04 ` piekay
` (9 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: piekay @ 2024-06-06 15:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1280 bytes --]
There is an updated pull request by piekay against master on the void-packages repository
https://github.com/piekay/void-packages intellij-ultimate-update
https://github.com/void-linux/void-packages/pull/50713
Upgrading Intellij Idea Ultimate to 2024.1.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/50713.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-intellij-ultimate-update-50713.patch --]
[-- Type: text/x-diff, Size: 9280 bytes --]
From ba06d97917ffcf958e1441de8ffe86972e2f43e9 Mon Sep 17 00:00:00 2001
From: Piekay <github@piekay.de>
Date: Thu, 6 Jun 2024 05:44:58 +0200
Subject: [PATCH 1/2] Upgrading Intellij Idea Ultimate to 2024.1.2
---
.../files/README.voidlinux | 2 -
.../files/idea-ultimate.desktop | 8 ++
.../intellij-idea-ultimate-edition/template | 100 ++++--------------
srcpkgs/intellij-idea-ultimate-edition/update | 2 +-
4 files changed, 31 insertions(+), 81 deletions(-)
delete mode 100644 srcpkgs/intellij-idea-ultimate-edition/files/README.voidlinux
create mode 100644 srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop
diff --git a/srcpkgs/intellij-idea-ultimate-edition/files/README.voidlinux b/srcpkgs/intellij-idea-ultimate-edition/files/README.voidlinux
deleted file mode 100644
index c04f6c9ab2a951..00000000000000
--- a/srcpkgs/intellij-idea-ultimate-edition/files/README.voidlinux
+++ /dev/null
@@ -1,2 +0,0 @@
-IntelliJ Ultimate has the following optional dependencies:
- libdbusmenu-glib: For global menu support
diff --git a/srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop b/srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop
new file mode 100644
index 00000000000000..b3ac93776401ab
--- /dev/null
+++ b/srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=IntelliJ IDEA Ultimate Edition
+Comment=Java integrated development environment by JetBrains
+Exec=/usr/bin/idea-ultimate %f
+Icon=idea-ultimate
+Terminal=false
+Type=Application
+Categories=Development;
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index 40e4a8b9c8a068..77b5eecaef32cf 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,90 +1,34 @@
# Template file for 'intellij-idea-ultimate-edition'
pkgname=intellij-idea-ultimate-edition
-version=2021.3.3
-revision=2
-archs="i686 x86_64"
-depends="giflib libXtst jetbrains-jdk-bin lldb-devel"
-short_desc="Most intelligent Java IDE"
+version=2024.1.2
+revision=1
+archs="x86_64"
+depends="virtual?java-environment giflib libXtst hicolor-icon-theme"
+short_desc="Java integrated development environment by JetBrains"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="custom:Commercial"
-homepage="https://www.jetbrains.com/idea"
-_filename="ideaIU-${version}-no-jbr.tar.gz"
-distfiles="https://download.jetbrains.com/idea/${_filename}"
-checksum=2a3295fca08060ad515f6c7198879d09963724cfb36af3ea94f16dcd76636470
+homepage="https://www.jetbrains.org/"
+distfiles="https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz"
+checksum=c50ed70f90c69a7e6eaafab44d926d554aafbd7310608570e4085d97df3bf763
repository=nonfree
restricted=yes
nopie=yes
python_version=3
-# requires liblldb.so which is unversioned, pulled by lldb-devel
-skiprdeps="/usr/lib/intellij-idea-ultimate-edition/plugins/Kotlin/bin/linux/LLDBFrontend"
-
-do_extract() {
- bsdtar xf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_filename} --strip-components=1 -C .
-}
-
-post_extract() {
- # Remove files for other OSes
- rm -rf plugins/cwm-plugin/quiche-native/darwin-aarch64
- rm -rf plugins/cwm-plugin/quiche-native/darwin-x86-64
- rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/freebsd64
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/freebsd32
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/osx
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/windows32
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/windows64
- rm -rf plugins/performanceTesting/bin/libyjpagent.dylib
- rm -rf plugins/performanceTesting/bin/yjpagent.dll
- rm -rf plugins/performanceTesting/bin/yjpagent64.dll
- rm -rf plugins/webp/lib/libwebp/mac
- rm -rf plugins/webp/lib/libwebp/win
-
- # Remove files for other CPU architectures
- rm -rf bin/fsnotifier-arm
- rm -rf lib/pty4j-native/linux/aarch64
- rm -rf lib/pty4j-native/linux/arm
- rm -rf lib/pty4j-native/linux/mips64el
- rm -rf lib/pty4j-native/linux/ppc64le
-
- case "$XBPS_TARGET_MACHINE" in
- x86_64)
- rm -rf bin/idea.vmoptions
- rm -rf lib/pty4j-native/linux/x86
- rm -rf plugins/android/lib/libwebp/linux/libwebp_jni.so
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/linux32
- rm -rf plugins/performanceTesting/bin/libyjpagent.so
- rm -rf plugins/webp/lib/libwebp/linux/libwebp_jni.so
- ;;
- i686)
- rm -rf bin/idea64.vmoptions
- rm -rf bin/libyjpagent-linux64.so
- rm -rf lib/pty4j-native/linux/x86_64
- rm -rf plugins/android/lib/libwebp/linux/libwebp_jni64.so
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/linux64
- rm -rf plugins/performanceTesting/bin/libyjpagent64.so
- rm -rf plugins/webp/lib/libwebp/linux/libwebp_jni64.so
- ;;
- esac
-}
+skiprdeps="/usr/lib/intellij-idea-ultimate/plugins/Kotlin/bin/linux/LLDBFrontend"
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-ultimate
- vdoc "${FILESDIR}/README.voidlinux"
+ vmkdir usr/share/doc/intellij-idea-ultimate
+ vmkdir usr/lib/intellij-idea-ultimate
+ vmkdir usr/share/pixmaps
+ vmkdir usr/share/icons/hicolor/scalable/apps
+
+ mv bin lib plugins product-info.json build.txt jbr ${DESTDIR}/usr/lib/intellij-idea-ultimate
+ mv license ${DESTDIR}/usr/share/doc/intellij-idea-ultimate
+ rm ${DESTDIR}/usr/lib/intellij-idea-ultimate/lib/async-profiler -rf
+ rm ${DESTDIR}/usr/lib/intellij-idea-ultimate/lib/async-profiler.jar
+ ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.sh ${DESTDIR}/usr/bin/idea-ultimate
+ ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.png ${DESTDIR}/usr/share/pixmaps/idea-ultimate.svg
+ ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.svg ${DESTDIR}/usr/share/icons/hicolor/scalable/apps/idea-ultimate.svg
+ vinstall ${FILESDIR}/idea-ultimate.desktop 644 usr/share/applications
}
diff --git a/srcpkgs/intellij-idea-ultimate-edition/update b/srcpkgs/intellij-idea-ultimate-edition/update
index 0fd4e8031bd570..bfaca62dd6e108 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/update
+++ b/srcpkgs/intellij-idea-ultimate-edition/update
@@ -1,2 +1,2 @@
-pattern="ideaIU-\K[\d.]+(?=-no-jbr\.tar)"
+pattern="ideaIU-\K[\d.]+(?=\.tar)"
site="https://data.services.jetbrains.com/products/releases?code=IIU%2CIIC&latest=true&type=release"
From 87297d9af6157a32652e6d485dc7c3889395b78f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 6 Jun 2024 08:59:55 -0400
Subject: [PATCH 2/2] fixup! Upgrading Intellij Idea Ultimate to 2024.1.2
---
.../files/idea-ultimate.desktop | 8 --------
srcpkgs/intellij-idea-ultimate-edition/template | 14 +++++++++++++-
2 files changed, 13 insertions(+), 9 deletions(-)
delete mode 100644 srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop
diff --git a/srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop b/srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop
deleted file mode 100644
index b3ac93776401ab..00000000000000
--- a/srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=IntelliJ IDEA Ultimate Edition
-Comment=Java integrated development environment by JetBrains
-Exec=/usr/bin/idea-ultimate %f
-Icon=idea-ultimate
-Terminal=false
-Type=Application
-Categories=Development;
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index 77b5eecaef32cf..dcbe18e03222db 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -16,6 +16,18 @@ nopie=yes
python_version=3
skiprdeps="/usr/lib/intellij-idea-ultimate/plugins/Kotlin/bin/linux/LLDBFrontend"
+post_extract() {
+ bsdtar xf lib/app-client.jar entry.desktop
+}
+
+post_patch() {
+ vsed -i -e 's/\$NAME\$/IntelliJ IDEA Ultimate Edition/' entry.desktop
+ vsed -i -e 's/\$ICON\$/idea-ultimate/' entry.desktop
+ vsed -i -e 's/\$SCRIPT\$/idea-ultimate/' entry.desktop
+ vsed -i -e 's/\$COMMENT\$/Capable and Ergonomic IDE for JVM/' entry.desktop
+ vsed -i -e 's/\$WM_CLASS\$/jetbrains-idea/' entry.desktop
+}
+
do_install() {
vmkdir usr/bin
vmkdir usr/share/doc/intellij-idea-ultimate
@@ -30,5 +42,5 @@ do_install() {
ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.sh ${DESTDIR}/usr/bin/idea-ultimate
ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.png ${DESTDIR}/usr/share/pixmaps/idea-ultimate.svg
ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.svg ${DESTDIR}/usr/share/icons/hicolor/scalable/apps/idea-ultimate.svg
- vinstall ${FILESDIR}/idea-ultimate.desktop 644 usr/share/applications
+ vinstall entry.desktop 644 usr/share/applications idea-ultimate.desktop
}
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PR PATCH] [Updated] Upgrading Intellij Idea Ultimate to 2024.1.2
2024-06-06 3:53 [PR PATCH] Upgrading Intellij Idea Ultimate to 2024.1.2 piekay
` (13 preceding siblings ...)
2024-06-06 15:03 ` [PR PATCH] [Updated] " piekay
@ 2024-06-06 15:04 ` piekay
2024-06-06 15:06 ` piekay
` (8 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: piekay @ 2024-06-06 15:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1280 bytes --]
There is an updated pull request by piekay against master on the void-packages repository
https://github.com/piekay/void-packages intellij-ultimate-update
https://github.com/void-linux/void-packages/pull/50713
Upgrading Intellij Idea Ultimate to 2024.1.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/50713.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-intellij-ultimate-update-50713.patch --]
[-- Type: text/x-diff, Size: 10325 bytes --]
From ba06d97917ffcf958e1441de8ffe86972e2f43e9 Mon Sep 17 00:00:00 2001
From: Piekay <github@piekay.de>
Date: Thu, 6 Jun 2024 05:44:58 +0200
Subject: [PATCH 1/2] Upgrading Intellij Idea Ultimate to 2024.1.2
---
.../files/README.voidlinux | 2 -
.../files/idea-ultimate.desktop | 8 ++
.../intellij-idea-ultimate-edition/template | 100 ++++--------------
srcpkgs/intellij-idea-ultimate-edition/update | 2 +-
4 files changed, 31 insertions(+), 81 deletions(-)
delete mode 100644 srcpkgs/intellij-idea-ultimate-edition/files/README.voidlinux
create mode 100644 srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop
diff --git a/srcpkgs/intellij-idea-ultimate-edition/files/README.voidlinux b/srcpkgs/intellij-idea-ultimate-edition/files/README.voidlinux
deleted file mode 100644
index c04f6c9ab2a951..00000000000000
--- a/srcpkgs/intellij-idea-ultimate-edition/files/README.voidlinux
+++ /dev/null
@@ -1,2 +0,0 @@
-IntelliJ Ultimate has the following optional dependencies:
- libdbusmenu-glib: For global menu support
diff --git a/srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop b/srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop
new file mode 100644
index 00000000000000..b3ac93776401ab
--- /dev/null
+++ b/srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=IntelliJ IDEA Ultimate Edition
+Comment=Java integrated development environment by JetBrains
+Exec=/usr/bin/idea-ultimate %f
+Icon=idea-ultimate
+Terminal=false
+Type=Application
+Categories=Development;
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index 40e4a8b9c8a068..77b5eecaef32cf 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,90 +1,34 @@
# Template file for 'intellij-idea-ultimate-edition'
pkgname=intellij-idea-ultimate-edition
-version=2021.3.3
-revision=2
-archs="i686 x86_64"
-depends="giflib libXtst jetbrains-jdk-bin lldb-devel"
-short_desc="Most intelligent Java IDE"
+version=2024.1.2
+revision=1
+archs="x86_64"
+depends="virtual?java-environment giflib libXtst hicolor-icon-theme"
+short_desc="Java integrated development environment by JetBrains"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="custom:Commercial"
-homepage="https://www.jetbrains.com/idea"
-_filename="ideaIU-${version}-no-jbr.tar.gz"
-distfiles="https://download.jetbrains.com/idea/${_filename}"
-checksum=2a3295fca08060ad515f6c7198879d09963724cfb36af3ea94f16dcd76636470
+homepage="https://www.jetbrains.org/"
+distfiles="https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz"
+checksum=c50ed70f90c69a7e6eaafab44d926d554aafbd7310608570e4085d97df3bf763
repository=nonfree
restricted=yes
nopie=yes
python_version=3
-# requires liblldb.so which is unversioned, pulled by lldb-devel
-skiprdeps="/usr/lib/intellij-idea-ultimate-edition/plugins/Kotlin/bin/linux/LLDBFrontend"
-
-do_extract() {
- bsdtar xf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_filename} --strip-components=1 -C .
-}
-
-post_extract() {
- # Remove files for other OSes
- rm -rf plugins/cwm-plugin/quiche-native/darwin-aarch64
- rm -rf plugins/cwm-plugin/quiche-native/darwin-x86-64
- rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/freebsd64
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/freebsd32
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/osx
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/windows32
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/windows64
- rm -rf plugins/performanceTesting/bin/libyjpagent.dylib
- rm -rf plugins/performanceTesting/bin/yjpagent.dll
- rm -rf plugins/performanceTesting/bin/yjpagent64.dll
- rm -rf plugins/webp/lib/libwebp/mac
- rm -rf plugins/webp/lib/libwebp/win
-
- # Remove files for other CPU architectures
- rm -rf bin/fsnotifier-arm
- rm -rf lib/pty4j-native/linux/aarch64
- rm -rf lib/pty4j-native/linux/arm
- rm -rf lib/pty4j-native/linux/mips64el
- rm -rf lib/pty4j-native/linux/ppc64le
-
- case "$XBPS_TARGET_MACHINE" in
- x86_64)
- rm -rf bin/idea.vmoptions
- rm -rf lib/pty4j-native/linux/x86
- rm -rf plugins/android/lib/libwebp/linux/libwebp_jni.so
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/linux32
- rm -rf plugins/performanceTesting/bin/libyjpagent.so
- rm -rf plugins/webp/lib/libwebp/linux/libwebp_jni.so
- ;;
- i686)
- rm -rf bin/idea64.vmoptions
- rm -rf bin/libyjpagent-linux64.so
- rm -rf lib/pty4j-native/linux/x86_64
- rm -rf plugins/android/lib/libwebp/linux/libwebp_jni64.so
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/linux64
- rm -rf plugins/performanceTesting/bin/libyjpagent64.so
- rm -rf plugins/webp/lib/libwebp/linux/libwebp_jni64.so
- ;;
- esac
-}
+skiprdeps="/usr/lib/intellij-idea-ultimate/plugins/Kotlin/bin/linux/LLDBFrontend"
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-ultimate
- vdoc "${FILESDIR}/README.voidlinux"
+ vmkdir usr/share/doc/intellij-idea-ultimate
+ vmkdir usr/lib/intellij-idea-ultimate
+ vmkdir usr/share/pixmaps
+ vmkdir usr/share/icons/hicolor/scalable/apps
+
+ mv bin lib plugins product-info.json build.txt jbr ${DESTDIR}/usr/lib/intellij-idea-ultimate
+ mv license ${DESTDIR}/usr/share/doc/intellij-idea-ultimate
+ rm ${DESTDIR}/usr/lib/intellij-idea-ultimate/lib/async-profiler -rf
+ rm ${DESTDIR}/usr/lib/intellij-idea-ultimate/lib/async-profiler.jar
+ ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.sh ${DESTDIR}/usr/bin/idea-ultimate
+ ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.png ${DESTDIR}/usr/share/pixmaps/idea-ultimate.svg
+ ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.svg ${DESTDIR}/usr/share/icons/hicolor/scalable/apps/idea-ultimate.svg
+ vinstall ${FILESDIR}/idea-ultimate.desktop 644 usr/share/applications
}
diff --git a/srcpkgs/intellij-idea-ultimate-edition/update b/srcpkgs/intellij-idea-ultimate-edition/update
index 0fd4e8031bd570..bfaca62dd6e108 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/update
+++ b/srcpkgs/intellij-idea-ultimate-edition/update
@@ -1,2 +1,2 @@
-pattern="ideaIU-\K[\d.]+(?=-no-jbr\.tar)"
+pattern="ideaIU-\K[\d.]+(?=\.tar)"
site="https://data.services.jetbrains.com/products/releases?code=IIU%2CIIC&latest=true&type=release"
From 227484fbb6d40a143a4eba3f24c4e734774ce409 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 6 Jun 2024 08:59:55 -0400
Subject: [PATCH 2/2] fixup! Upgrading Intellij Idea Ultimate to 2024.1.2
---
.../files/idea-ultimate.desktop | 8 -----
.../intellij-idea-ultimate-edition/template | 29 +++++++++++++++----
2 files changed, 23 insertions(+), 14 deletions(-)
delete mode 100644 srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop
diff --git a/srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop b/srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop
deleted file mode 100644
index b3ac93776401ab..00000000000000
--- a/srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=IntelliJ IDEA Ultimate Edition
-Comment=Java integrated development environment by JetBrains
-Exec=/usr/bin/idea-ultimate %f
-Icon=idea-ultimate
-Terminal=false
-Type=Application
-Categories=Development;
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index 77b5eecaef32cf..02234c435ca6f6 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -16,6 +16,18 @@ nopie=yes
python_version=3
skiprdeps="/usr/lib/intellij-idea-ultimate/plugins/Kotlin/bin/linux/LLDBFrontend"
+post_extract() {
+ bsdtar xf lib/app-client.jar entry.desktop
+}
+
+post_patch() {
+ vsed -i -e 's/\$NAME\$/IntelliJ IDEA Ultimate Edition/' entry.desktop
+ vsed -i -e 's/\$ICON\$/idea-ultimate/' entry.desktop
+ vsed -i -e 's/\$SCRIPT\$/idea-ultimate/' entry.desktop
+ vsed -i -e 's/\$COMMENT\$/Capable and Ergonomic IDE for JVM/' entry.desktop
+ vsed -i -e 's/\$WM_CLASS\$/jetbrains-idea/' entry.desktop
+}
+
do_install() {
vmkdir usr/bin
vmkdir usr/share/doc/intellij-idea-ultimate
@@ -23,12 +35,17 @@ do_install() {
vmkdir usr/share/pixmaps
vmkdir usr/share/icons/hicolor/scalable/apps
- mv bin lib plugins product-info.json build.txt jbr ${DESTDIR}/usr/lib/intellij-idea-ultimate
- mv license ${DESTDIR}/usr/share/doc/intellij-idea-ultimate
+ vcopy bin usr/lib/intellij-idea-ultimate
+ vcopy lib usr/lib/intellij-idea-ultimate
+ vcopy plugins usr/lib/intellij-idea-ultimate
+ vcopy product-info.json usr/lib/intellij-idea-ultimate
+ vcopy build.txt usr/lib/intellij-idea-ultimate
+ vcopy jbr usr/lib/intellij-idea-ultimate
+ vcopy license usr/share/doc/intellij-idea-ultimate
rm ${DESTDIR}/usr/lib/intellij-idea-ultimate/lib/async-profiler -rf
rm ${DESTDIR}/usr/lib/intellij-idea-ultimate/lib/async-profiler.jar
- ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.sh ${DESTDIR}/usr/bin/idea-ultimate
- ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.png ${DESTDIR}/usr/share/pixmaps/idea-ultimate.svg
- ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.svg ${DESTDIR}/usr/share/icons/hicolor/scalable/apps/idea-ultimate.svg
- vinstall ${FILESDIR}/idea-ultimate.desktop 644 usr/share/applications
+ ln -sf ../lib/intellij-idea-ultimate/bin/idea.sh ${DESTDIR}/usr/bin/idea-ultimate
+ ln -sf ../../lib/intellij-idea-ultimate/bin/idea.png ${DESTDIR}/usr/share/pixmaps/idea-ultimate.png
+ ln -sf ../../lib/intellij-idea-ultimate/bin/idea.svg ${DESTDIR}/usr/share/icons/hicolor/scalable/apps/idea-ultimate.svg
+ vinstall entry.desktop 644 usr/share/applications idea-ultimate.desktop
}
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: Upgrading Intellij Idea Ultimate to 2024.1.2
2024-06-06 3:53 [PR PATCH] Upgrading Intellij Idea Ultimate to 2024.1.2 piekay
` (14 preceding siblings ...)
2024-06-06 15:04 ` piekay
@ 2024-06-06 15:06 ` piekay
2024-06-06 15:49 ` [PR PATCH] [Updated] intellij-idea-ultimate-edition: update " piekay
` (7 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: piekay @ 2024-06-06 15:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 212 bytes --]
New comment by piekay on void-packages repository
https://github.com/void-linux/void-packages/pull/50713#issuecomment-2152771034
Comment:
I applied your suggesrions and merged your commit. Thanks for the help.
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PR PATCH] [Updated] intellij-idea-ultimate-edition: update to 2024.1.2
2024-06-06 3:53 [PR PATCH] Upgrading Intellij Idea Ultimate to 2024.1.2 piekay
` (15 preceding siblings ...)
2024-06-06 15:06 ` piekay
@ 2024-06-06 15:49 ` piekay
2024-06-06 15:50 ` piekay
` (6 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: piekay @ 2024-06-06 15:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1286 bytes --]
There is an updated pull request by piekay against master on the void-packages repository
https://github.com/piekay/void-packages intellij-ultimate-update
https://github.com/void-linux/void-packages/pull/50713
intellij-idea-ultimate-edition: update to 2024.1.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/50713.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-intellij-ultimate-update-50713.patch --]
[-- Type: text/x-diff, Size: 10788 bytes --]
From ba06d97917ffcf958e1441de8ffe86972e2f43e9 Mon Sep 17 00:00:00 2001
From: Piekay <github@piekay.de>
Date: Thu, 6 Jun 2024 05:44:58 +0200
Subject: [PATCH 1/2] Upgrading Intellij Idea Ultimate to 2024.1.2
---
.../files/README.voidlinux | 2 -
.../files/idea-ultimate.desktop | 8 ++
.../intellij-idea-ultimate-edition/template | 100 ++++--------------
srcpkgs/intellij-idea-ultimate-edition/update | 2 +-
4 files changed, 31 insertions(+), 81 deletions(-)
delete mode 100644 srcpkgs/intellij-idea-ultimate-edition/files/README.voidlinux
create mode 100644 srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop
diff --git a/srcpkgs/intellij-idea-ultimate-edition/files/README.voidlinux b/srcpkgs/intellij-idea-ultimate-edition/files/README.voidlinux
deleted file mode 100644
index c04f6c9ab2a951..00000000000000
--- a/srcpkgs/intellij-idea-ultimate-edition/files/README.voidlinux
+++ /dev/null
@@ -1,2 +0,0 @@
-IntelliJ Ultimate has the following optional dependencies:
- libdbusmenu-glib: For global menu support
diff --git a/srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop b/srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop
new file mode 100644
index 00000000000000..b3ac93776401ab
--- /dev/null
+++ b/srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=IntelliJ IDEA Ultimate Edition
+Comment=Java integrated development environment by JetBrains
+Exec=/usr/bin/idea-ultimate %f
+Icon=idea-ultimate
+Terminal=false
+Type=Application
+Categories=Development;
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index 40e4a8b9c8a068..77b5eecaef32cf 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,90 +1,34 @@
# Template file for 'intellij-idea-ultimate-edition'
pkgname=intellij-idea-ultimate-edition
-version=2021.3.3
-revision=2
-archs="i686 x86_64"
-depends="giflib libXtst jetbrains-jdk-bin lldb-devel"
-short_desc="Most intelligent Java IDE"
+version=2024.1.2
+revision=1
+archs="x86_64"
+depends="virtual?java-environment giflib libXtst hicolor-icon-theme"
+short_desc="Java integrated development environment by JetBrains"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="custom:Commercial"
-homepage="https://www.jetbrains.com/idea"
-_filename="ideaIU-${version}-no-jbr.tar.gz"
-distfiles="https://download.jetbrains.com/idea/${_filename}"
-checksum=2a3295fca08060ad515f6c7198879d09963724cfb36af3ea94f16dcd76636470
+homepage="https://www.jetbrains.org/"
+distfiles="https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz"
+checksum=c50ed70f90c69a7e6eaafab44d926d554aafbd7310608570e4085d97df3bf763
repository=nonfree
restricted=yes
nopie=yes
python_version=3
-# requires liblldb.so which is unversioned, pulled by lldb-devel
-skiprdeps="/usr/lib/intellij-idea-ultimate-edition/plugins/Kotlin/bin/linux/LLDBFrontend"
-
-do_extract() {
- bsdtar xf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_filename} --strip-components=1 -C .
-}
-
-post_extract() {
- # Remove files for other OSes
- rm -rf plugins/cwm-plugin/quiche-native/darwin-aarch64
- rm -rf plugins/cwm-plugin/quiche-native/darwin-x86-64
- rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/freebsd64
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/freebsd32
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/osx
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/windows32
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/windows64
- rm -rf plugins/performanceTesting/bin/libyjpagent.dylib
- rm -rf plugins/performanceTesting/bin/yjpagent.dll
- rm -rf plugins/performanceTesting/bin/yjpagent64.dll
- rm -rf plugins/webp/lib/libwebp/mac
- rm -rf plugins/webp/lib/libwebp/win
-
- # Remove files for other CPU architectures
- rm -rf bin/fsnotifier-arm
- rm -rf lib/pty4j-native/linux/aarch64
- rm -rf lib/pty4j-native/linux/arm
- rm -rf lib/pty4j-native/linux/mips64el
- rm -rf lib/pty4j-native/linux/ppc64le
-
- case "$XBPS_TARGET_MACHINE" in
- x86_64)
- rm -rf bin/idea.vmoptions
- rm -rf lib/pty4j-native/linux/x86
- rm -rf plugins/android/lib/libwebp/linux/libwebp_jni.so
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/linux32
- rm -rf plugins/performanceTesting/bin/libyjpagent.so
- rm -rf plugins/webp/lib/libwebp/linux/libwebp_jni.so
- ;;
- i686)
- rm -rf bin/idea64.vmoptions
- rm -rf bin/libyjpagent-linux64.so
- rm -rf lib/pty4j-native/linux/x86_64
- rm -rf plugins/android/lib/libwebp/linux/libwebp_jni64.so
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/linux64
- rm -rf plugins/performanceTesting/bin/libyjpagent64.so
- rm -rf plugins/webp/lib/libwebp/linux/libwebp_jni64.so
- ;;
- esac
-}
+skiprdeps="/usr/lib/intellij-idea-ultimate/plugins/Kotlin/bin/linux/LLDBFrontend"
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-ultimate
- vdoc "${FILESDIR}/README.voidlinux"
+ vmkdir usr/share/doc/intellij-idea-ultimate
+ vmkdir usr/lib/intellij-idea-ultimate
+ vmkdir usr/share/pixmaps
+ vmkdir usr/share/icons/hicolor/scalable/apps
+
+ mv bin lib plugins product-info.json build.txt jbr ${DESTDIR}/usr/lib/intellij-idea-ultimate
+ mv license ${DESTDIR}/usr/share/doc/intellij-idea-ultimate
+ rm ${DESTDIR}/usr/lib/intellij-idea-ultimate/lib/async-profiler -rf
+ rm ${DESTDIR}/usr/lib/intellij-idea-ultimate/lib/async-profiler.jar
+ ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.sh ${DESTDIR}/usr/bin/idea-ultimate
+ ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.png ${DESTDIR}/usr/share/pixmaps/idea-ultimate.svg
+ ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.svg ${DESTDIR}/usr/share/icons/hicolor/scalable/apps/idea-ultimate.svg
+ vinstall ${FILESDIR}/idea-ultimate.desktop 644 usr/share/applications
}
diff --git a/srcpkgs/intellij-idea-ultimate-edition/update b/srcpkgs/intellij-idea-ultimate-edition/update
index 0fd4e8031bd570..bfaca62dd6e108 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/update
+++ b/srcpkgs/intellij-idea-ultimate-edition/update
@@ -1,2 +1,2 @@
-pattern="ideaIU-\K[\d.]+(?=-no-jbr\.tar)"
+pattern="ideaIU-\K[\d.]+(?=\.tar)"
site="https://data.services.jetbrains.com/products/releases?code=IIU%2CIIC&latest=true&type=release"
From 4920ef48b70b3c158108ce7c7f21956315bc6ca3 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 6 Jun 2024 08:59:55 -0400
Subject: [PATCH 2/2] fixup! Upgrading Intellij Idea Ultimate to 2024.1.2
---
.../intellij-idea-ultimate-edition/files/EULA | 1 +
.../files/idea-ultimate.desktop | 8 -----
.../intellij-idea-ultimate-edition/template | 32 +++++++++++++++----
3 files changed, 27 insertions(+), 14 deletions(-)
create mode 100644 srcpkgs/intellij-idea-ultimate-edition/files/EULA
delete mode 100644 srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop
diff --git a/srcpkgs/intellij-idea-ultimate-edition/files/EULA b/srcpkgs/intellij-idea-ultimate-edition/files/EULA
new file mode 100644
index 00000000000000..3fcdbc7857c569
--- /dev/null
+++ b/srcpkgs/intellij-idea-ultimate-edition/files/EULA
@@ -0,0 +1 @@
+see https://www.jetbrains.com/legal/docs/toolbox/license_personal/
diff --git a/srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop b/srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop
deleted file mode 100644
index b3ac93776401ab..00000000000000
--- a/srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=IntelliJ IDEA Ultimate Edition
-Comment=Java integrated development environment by JetBrains
-Exec=/usr/bin/idea-ultimate %f
-Icon=idea-ultimate
-Terminal=false
-Type=Application
-Categories=Development;
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index 77b5eecaef32cf..a32c930b120e89 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -16,6 +16,18 @@ nopie=yes
python_version=3
skiprdeps="/usr/lib/intellij-idea-ultimate/plugins/Kotlin/bin/linux/LLDBFrontend"
+post_extract() {
+ bsdtar xf lib/app-client.jar entry.desktop
+}
+
+post_patch() {
+ vsed -i -e 's/\$NAME\$/IntelliJ IDEA Ultimate Edition/' entry.desktop
+ vsed -i -e 's/\$ICON\$/idea-ultimate/' entry.desktop
+ vsed -i -e 's/\$SCRIPT\$/idea-ultimate/' entry.desktop
+ vsed -i -e 's/\$COMMENT\$/Capable and Ergonomic IDE for JVM/' entry.desktop
+ vsed -i -e 's/\$WM_CLASS\$/jetbrains-idea/' entry.desktop
+}
+
do_install() {
vmkdir usr/bin
vmkdir usr/share/doc/intellij-idea-ultimate
@@ -23,12 +35,20 @@ do_install() {
vmkdir usr/share/pixmaps
vmkdir usr/share/icons/hicolor/scalable/apps
- mv bin lib plugins product-info.json build.txt jbr ${DESTDIR}/usr/lib/intellij-idea-ultimate
- mv license ${DESTDIR}/usr/share/doc/intellij-idea-ultimate
+ vcopy bin usr/lib/intellij-idea-ultimate
+ vcopy lib usr/lib/intellij-idea-ultimate
+ vcopy plugins usr/lib/intellij-idea-ultimate
+ vcopy product-info.json usr/lib/intellij-idea-ultimate
+ vcopy build.txt usr/lib/intellij-idea-ultimate
+ vcopy jbr usr/lib/intellij-idea-ultimate
+ vcopy license usr/share/doc/intellij-idea-ultimate
rm ${DESTDIR}/usr/lib/intellij-idea-ultimate/lib/async-profiler -rf
rm ${DESTDIR}/usr/lib/intellij-idea-ultimate/lib/async-profiler.jar
- ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.sh ${DESTDIR}/usr/bin/idea-ultimate
- ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.png ${DESTDIR}/usr/share/pixmaps/idea-ultimate.svg
- ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.svg ${DESTDIR}/usr/share/icons/hicolor/scalable/apps/idea-ultimate.svg
- vinstall ${FILESDIR}/idea-ultimate.desktop 644 usr/share/applications
+ ln -sf ../lib/intellij-idea-ultimate/bin/idea.sh ${DESTDIR}/usr/bin/idea-ultimate
+ ln -sf ../../lib/intellij-idea-ultimate/bin/idea.png ${DESTDIR}/usr/share/pixmaps/idea-ultimate.png
+ ln -sf ../../lib/intellij-idea-ultimate/bin/idea.svg ${DESTDIR}/usr/share/icons/hicolor/scalable/apps/idea-ultimate.svg
+ vinstall entry.desktop 644 usr/share/applications idea-ultimate.desktop
+}
+post_install() {
+ vlicense ${FILESDIR}/EULA
}
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: intellij-idea-ultimate-edition: update to 2024.1.2
2024-06-06 3:53 [PR PATCH] Upgrading Intellij Idea Ultimate to 2024.1.2 piekay
` (16 preceding siblings ...)
2024-06-06 15:49 ` [PR PATCH] [Updated] intellij-idea-ultimate-edition: update " piekay
@ 2024-06-06 15:50 ` piekay
2024-06-06 19:00 ` [PR PATCH] [Updated] " piekay
` (5 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: piekay @ 2024-06-06 15:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 180 bytes --]
New comment by piekay on void-packages repository
https://github.com/void-linux/void-packages/pull/50713#issuecomment-2152865169
Comment:
Added a vlicense and removed all spaces
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PR PATCH] [Updated] intellij-idea-ultimate-edition: update to 2024.1.2
2024-06-06 3:53 [PR PATCH] Upgrading Intellij Idea Ultimate to 2024.1.2 piekay
` (17 preceding siblings ...)
2024-06-06 15:50 ` piekay
@ 2024-06-06 19:00 ` piekay
2024-06-06 19:03 ` piekay
` (4 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: piekay @ 2024-06-06 19:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1286 bytes --]
There is an updated pull request by piekay against master on the void-packages repository
https://github.com/piekay/void-packages intellij-ultimate-update
https://github.com/void-linux/void-packages/pull/50713
intellij-idea-ultimate-edition: update to 2024.1.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/50713.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-intellij-ultimate-update-50713.patch --]
[-- Type: text/x-diff, Size: 10787 bytes --]
From ba06d97917ffcf958e1441de8ffe86972e2f43e9 Mon Sep 17 00:00:00 2001
From: Piekay <github@piekay.de>
Date: Thu, 6 Jun 2024 05:44:58 +0200
Subject: [PATCH 1/2] Upgrading Intellij Idea Ultimate to 2024.1.2
---
.../files/README.voidlinux | 2 -
.../files/idea-ultimate.desktop | 8 ++
.../intellij-idea-ultimate-edition/template | 100 ++++--------------
srcpkgs/intellij-idea-ultimate-edition/update | 2 +-
4 files changed, 31 insertions(+), 81 deletions(-)
delete mode 100644 srcpkgs/intellij-idea-ultimate-edition/files/README.voidlinux
create mode 100644 srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop
diff --git a/srcpkgs/intellij-idea-ultimate-edition/files/README.voidlinux b/srcpkgs/intellij-idea-ultimate-edition/files/README.voidlinux
deleted file mode 100644
index c04f6c9ab2a951..00000000000000
--- a/srcpkgs/intellij-idea-ultimate-edition/files/README.voidlinux
+++ /dev/null
@@ -1,2 +0,0 @@
-IntelliJ Ultimate has the following optional dependencies:
- libdbusmenu-glib: For global menu support
diff --git a/srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop b/srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop
new file mode 100644
index 00000000000000..b3ac93776401ab
--- /dev/null
+++ b/srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=IntelliJ IDEA Ultimate Edition
+Comment=Java integrated development environment by JetBrains
+Exec=/usr/bin/idea-ultimate %f
+Icon=idea-ultimate
+Terminal=false
+Type=Application
+Categories=Development;
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index 40e4a8b9c8a068..77b5eecaef32cf 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,90 +1,34 @@
# Template file for 'intellij-idea-ultimate-edition'
pkgname=intellij-idea-ultimate-edition
-version=2021.3.3
-revision=2
-archs="i686 x86_64"
-depends="giflib libXtst jetbrains-jdk-bin lldb-devel"
-short_desc="Most intelligent Java IDE"
+version=2024.1.2
+revision=1
+archs="x86_64"
+depends="virtual?java-environment giflib libXtst hicolor-icon-theme"
+short_desc="Java integrated development environment by JetBrains"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="custom:Commercial"
-homepage="https://www.jetbrains.com/idea"
-_filename="ideaIU-${version}-no-jbr.tar.gz"
-distfiles="https://download.jetbrains.com/idea/${_filename}"
-checksum=2a3295fca08060ad515f6c7198879d09963724cfb36af3ea94f16dcd76636470
+homepage="https://www.jetbrains.org/"
+distfiles="https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz"
+checksum=c50ed70f90c69a7e6eaafab44d926d554aafbd7310608570e4085d97df3bf763
repository=nonfree
restricted=yes
nopie=yes
python_version=3
-# requires liblldb.so which is unversioned, pulled by lldb-devel
-skiprdeps="/usr/lib/intellij-idea-ultimate-edition/plugins/Kotlin/bin/linux/LLDBFrontend"
-
-do_extract() {
- bsdtar xf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_filename} --strip-components=1 -C .
-}
-
-post_extract() {
- # Remove files for other OSes
- rm -rf plugins/cwm-plugin/quiche-native/darwin-aarch64
- rm -rf plugins/cwm-plugin/quiche-native/darwin-x86-64
- rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/freebsd64
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/freebsd32
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/osx
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/windows32
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/windows64
- rm -rf plugins/performanceTesting/bin/libyjpagent.dylib
- rm -rf plugins/performanceTesting/bin/yjpagent.dll
- rm -rf plugins/performanceTesting/bin/yjpagent64.dll
- rm -rf plugins/webp/lib/libwebp/mac
- rm -rf plugins/webp/lib/libwebp/win
-
- # Remove files for other CPU architectures
- rm -rf bin/fsnotifier-arm
- rm -rf lib/pty4j-native/linux/aarch64
- rm -rf lib/pty4j-native/linux/arm
- rm -rf lib/pty4j-native/linux/mips64el
- rm -rf lib/pty4j-native/linux/ppc64le
-
- case "$XBPS_TARGET_MACHINE" in
- x86_64)
- rm -rf bin/idea.vmoptions
- rm -rf lib/pty4j-native/linux/x86
- rm -rf plugins/android/lib/libwebp/linux/libwebp_jni.so
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/linux32
- rm -rf plugins/performanceTesting/bin/libyjpagent.so
- rm -rf plugins/webp/lib/libwebp/linux/libwebp_jni.so
- ;;
- i686)
- rm -rf bin/idea64.vmoptions
- rm -rf bin/libyjpagent-linux64.so
- rm -rf lib/pty4j-native/linux/x86_64
- rm -rf plugins/android/lib/libwebp/linux/libwebp_jni64.so
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/linux64
- rm -rf plugins/performanceTesting/bin/libyjpagent64.so
- rm -rf plugins/webp/lib/libwebp/linux/libwebp_jni64.so
- ;;
- esac
-}
+skiprdeps="/usr/lib/intellij-idea-ultimate/plugins/Kotlin/bin/linux/LLDBFrontend"
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-ultimate
- vdoc "${FILESDIR}/README.voidlinux"
+ vmkdir usr/share/doc/intellij-idea-ultimate
+ vmkdir usr/lib/intellij-idea-ultimate
+ vmkdir usr/share/pixmaps
+ vmkdir usr/share/icons/hicolor/scalable/apps
+
+ mv bin lib plugins product-info.json build.txt jbr ${DESTDIR}/usr/lib/intellij-idea-ultimate
+ mv license ${DESTDIR}/usr/share/doc/intellij-idea-ultimate
+ rm ${DESTDIR}/usr/lib/intellij-idea-ultimate/lib/async-profiler -rf
+ rm ${DESTDIR}/usr/lib/intellij-idea-ultimate/lib/async-profiler.jar
+ ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.sh ${DESTDIR}/usr/bin/idea-ultimate
+ ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.png ${DESTDIR}/usr/share/pixmaps/idea-ultimate.svg
+ ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.svg ${DESTDIR}/usr/share/icons/hicolor/scalable/apps/idea-ultimate.svg
+ vinstall ${FILESDIR}/idea-ultimate.desktop 644 usr/share/applications
}
diff --git a/srcpkgs/intellij-idea-ultimate-edition/update b/srcpkgs/intellij-idea-ultimate-edition/update
index 0fd4e8031bd570..bfaca62dd6e108 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/update
+++ b/srcpkgs/intellij-idea-ultimate-edition/update
@@ -1,2 +1,2 @@
-pattern="ideaIU-\K[\d.]+(?=-no-jbr\.tar)"
+pattern="ideaIU-\K[\d.]+(?=\.tar)"
site="https://data.services.jetbrains.com/products/releases?code=IIU%2CIIC&latest=true&type=release"
From aad5db09f0f984ea69ef342e41e695114a6f609d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 6 Jun 2024 08:59:55 -0400
Subject: [PATCH 2/2] intellij-idea-ultimate-edition: update to 2024.1.2
---
.../intellij-idea-ultimate-edition/files/EULA | 1 +
.../files/idea-ultimate.desktop | 8 -----
.../intellij-idea-ultimate-edition/template | 32 +++++++++++++++----
3 files changed, 27 insertions(+), 14 deletions(-)
create mode 100644 srcpkgs/intellij-idea-ultimate-edition/files/EULA
delete mode 100644 srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop
diff --git a/srcpkgs/intellij-idea-ultimate-edition/files/EULA b/srcpkgs/intellij-idea-ultimate-edition/files/EULA
new file mode 100644
index 00000000000000..3fcdbc7857c569
--- /dev/null
+++ b/srcpkgs/intellij-idea-ultimate-edition/files/EULA
@@ -0,0 +1 @@
+see https://www.jetbrains.com/legal/docs/toolbox/license_personal/
diff --git a/srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop b/srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop
deleted file mode 100644
index b3ac93776401ab..00000000000000
--- a/srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=IntelliJ IDEA Ultimate Edition
-Comment=Java integrated development environment by JetBrains
-Exec=/usr/bin/idea-ultimate %f
-Icon=idea-ultimate
-Terminal=false
-Type=Application
-Categories=Development;
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index 77b5eecaef32cf..a32c930b120e89 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -16,6 +16,18 @@ nopie=yes
python_version=3
skiprdeps="/usr/lib/intellij-idea-ultimate/plugins/Kotlin/bin/linux/LLDBFrontend"
+post_extract() {
+ bsdtar xf lib/app-client.jar entry.desktop
+}
+
+post_patch() {
+ vsed -i -e 's/\$NAME\$/IntelliJ IDEA Ultimate Edition/' entry.desktop
+ vsed -i -e 's/\$ICON\$/idea-ultimate/' entry.desktop
+ vsed -i -e 's/\$SCRIPT\$/idea-ultimate/' entry.desktop
+ vsed -i -e 's/\$COMMENT\$/Capable and Ergonomic IDE for JVM/' entry.desktop
+ vsed -i -e 's/\$WM_CLASS\$/jetbrains-idea/' entry.desktop
+}
+
do_install() {
vmkdir usr/bin
vmkdir usr/share/doc/intellij-idea-ultimate
@@ -23,12 +35,20 @@ do_install() {
vmkdir usr/share/pixmaps
vmkdir usr/share/icons/hicolor/scalable/apps
- mv bin lib plugins product-info.json build.txt jbr ${DESTDIR}/usr/lib/intellij-idea-ultimate
- mv license ${DESTDIR}/usr/share/doc/intellij-idea-ultimate
+ vcopy bin usr/lib/intellij-idea-ultimate
+ vcopy lib usr/lib/intellij-idea-ultimate
+ vcopy plugins usr/lib/intellij-idea-ultimate
+ vcopy product-info.json usr/lib/intellij-idea-ultimate
+ vcopy build.txt usr/lib/intellij-idea-ultimate
+ vcopy jbr usr/lib/intellij-idea-ultimate
+ vcopy license usr/share/doc/intellij-idea-ultimate
rm ${DESTDIR}/usr/lib/intellij-idea-ultimate/lib/async-profiler -rf
rm ${DESTDIR}/usr/lib/intellij-idea-ultimate/lib/async-profiler.jar
- ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.sh ${DESTDIR}/usr/bin/idea-ultimate
- ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.png ${DESTDIR}/usr/share/pixmaps/idea-ultimate.svg
- ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.svg ${DESTDIR}/usr/share/icons/hicolor/scalable/apps/idea-ultimate.svg
- vinstall ${FILESDIR}/idea-ultimate.desktop 644 usr/share/applications
+ ln -sf ../lib/intellij-idea-ultimate/bin/idea.sh ${DESTDIR}/usr/bin/idea-ultimate
+ ln -sf ../../lib/intellij-idea-ultimate/bin/idea.png ${DESTDIR}/usr/share/pixmaps/idea-ultimate.png
+ ln -sf ../../lib/intellij-idea-ultimate/bin/idea.svg ${DESTDIR}/usr/share/icons/hicolor/scalable/apps/idea-ultimate.svg
+ vinstall entry.desktop 644 usr/share/applications idea-ultimate.desktop
+}
+post_install() {
+ vlicense ${FILESDIR}/EULA
}
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PR PATCH] [Updated] intellij-idea-ultimate-edition: update to 2024.1.2
2024-06-06 3:53 [PR PATCH] Upgrading Intellij Idea Ultimate to 2024.1.2 piekay
` (18 preceding siblings ...)
2024-06-06 19:00 ` [PR PATCH] [Updated] " piekay
@ 2024-06-06 19:03 ` piekay
2024-06-06 19:07 ` piekay
` (3 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: piekay @ 2024-06-06 19:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1286 bytes --]
There is an updated pull request by piekay against master on the void-packages repository
https://github.com/piekay/void-packages intellij-ultimate-update
https://github.com/void-linux/void-packages/pull/50713
intellij-idea-ultimate-edition: update to 2024.1.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/50713.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-intellij-ultimate-update-50713.patch --]
[-- Type: text/x-diff, Size: 10787 bytes --]
From ba06d97917ffcf958e1441de8ffe86972e2f43e9 Mon Sep 17 00:00:00 2001
From: Piekay <github@piekay.de>
Date: Thu, 6 Jun 2024 05:44:58 +0200
Subject: [PATCH 1/2] Upgrading Intellij Idea Ultimate to 2024.1.2
---
.../files/README.voidlinux | 2 -
.../files/idea-ultimate.desktop | 8 ++
.../intellij-idea-ultimate-edition/template | 100 ++++--------------
srcpkgs/intellij-idea-ultimate-edition/update | 2 +-
4 files changed, 31 insertions(+), 81 deletions(-)
delete mode 100644 srcpkgs/intellij-idea-ultimate-edition/files/README.voidlinux
create mode 100644 srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop
diff --git a/srcpkgs/intellij-idea-ultimate-edition/files/README.voidlinux b/srcpkgs/intellij-idea-ultimate-edition/files/README.voidlinux
deleted file mode 100644
index c04f6c9ab2a951..00000000000000
--- a/srcpkgs/intellij-idea-ultimate-edition/files/README.voidlinux
+++ /dev/null
@@ -1,2 +0,0 @@
-IntelliJ Ultimate has the following optional dependencies:
- libdbusmenu-glib: For global menu support
diff --git a/srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop b/srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop
new file mode 100644
index 00000000000000..b3ac93776401ab
--- /dev/null
+++ b/srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=IntelliJ IDEA Ultimate Edition
+Comment=Java integrated development environment by JetBrains
+Exec=/usr/bin/idea-ultimate %f
+Icon=idea-ultimate
+Terminal=false
+Type=Application
+Categories=Development;
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index 40e4a8b9c8a068..77b5eecaef32cf 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,90 +1,34 @@
# Template file for 'intellij-idea-ultimate-edition'
pkgname=intellij-idea-ultimate-edition
-version=2021.3.3
-revision=2
-archs="i686 x86_64"
-depends="giflib libXtst jetbrains-jdk-bin lldb-devel"
-short_desc="Most intelligent Java IDE"
+version=2024.1.2
+revision=1
+archs="x86_64"
+depends="virtual?java-environment giflib libXtst hicolor-icon-theme"
+short_desc="Java integrated development environment by JetBrains"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="custom:Commercial"
-homepage="https://www.jetbrains.com/idea"
-_filename="ideaIU-${version}-no-jbr.tar.gz"
-distfiles="https://download.jetbrains.com/idea/${_filename}"
-checksum=2a3295fca08060ad515f6c7198879d09963724cfb36af3ea94f16dcd76636470
+homepage="https://www.jetbrains.org/"
+distfiles="https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz"
+checksum=c50ed70f90c69a7e6eaafab44d926d554aafbd7310608570e4085d97df3bf763
repository=nonfree
restricted=yes
nopie=yes
python_version=3
-# requires liblldb.so which is unversioned, pulled by lldb-devel
-skiprdeps="/usr/lib/intellij-idea-ultimate-edition/plugins/Kotlin/bin/linux/LLDBFrontend"
-
-do_extract() {
- bsdtar xf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_filename} --strip-components=1 -C .
-}
-
-post_extract() {
- # Remove files for other OSes
- rm -rf plugins/cwm-plugin/quiche-native/darwin-aarch64
- rm -rf plugins/cwm-plugin/quiche-native/darwin-x86-64
- rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/freebsd64
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/freebsd32
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/osx
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/windows32
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/windows64
- rm -rf plugins/performanceTesting/bin/libyjpagent.dylib
- rm -rf plugins/performanceTesting/bin/yjpagent.dll
- rm -rf plugins/performanceTesting/bin/yjpagent64.dll
- rm -rf plugins/webp/lib/libwebp/mac
- rm -rf plugins/webp/lib/libwebp/win
-
- # Remove files for other CPU architectures
- rm -rf bin/fsnotifier-arm
- rm -rf lib/pty4j-native/linux/aarch64
- rm -rf lib/pty4j-native/linux/arm
- rm -rf lib/pty4j-native/linux/mips64el
- rm -rf lib/pty4j-native/linux/ppc64le
-
- case "$XBPS_TARGET_MACHINE" in
- x86_64)
- rm -rf bin/idea.vmoptions
- rm -rf lib/pty4j-native/linux/x86
- rm -rf plugins/android/lib/libwebp/linux/libwebp_jni.so
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/linux32
- rm -rf plugins/performanceTesting/bin/libyjpagent.so
- rm -rf plugins/webp/lib/libwebp/linux/libwebp_jni.so
- ;;
- i686)
- rm -rf bin/idea64.vmoptions
- rm -rf bin/libyjpagent-linux64.so
- rm -rf lib/pty4j-native/linux/x86_64
- rm -rf plugins/android/lib/libwebp/linux/libwebp_jni64.so
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/linux64
- rm -rf plugins/performanceTesting/bin/libyjpagent64.so
- rm -rf plugins/webp/lib/libwebp/linux/libwebp_jni64.so
- ;;
- esac
-}
+skiprdeps="/usr/lib/intellij-idea-ultimate/plugins/Kotlin/bin/linux/LLDBFrontend"
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-ultimate
- vdoc "${FILESDIR}/README.voidlinux"
+ vmkdir usr/share/doc/intellij-idea-ultimate
+ vmkdir usr/lib/intellij-idea-ultimate
+ vmkdir usr/share/pixmaps
+ vmkdir usr/share/icons/hicolor/scalable/apps
+
+ mv bin lib plugins product-info.json build.txt jbr ${DESTDIR}/usr/lib/intellij-idea-ultimate
+ mv license ${DESTDIR}/usr/share/doc/intellij-idea-ultimate
+ rm ${DESTDIR}/usr/lib/intellij-idea-ultimate/lib/async-profiler -rf
+ rm ${DESTDIR}/usr/lib/intellij-idea-ultimate/lib/async-profiler.jar
+ ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.sh ${DESTDIR}/usr/bin/idea-ultimate
+ ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.png ${DESTDIR}/usr/share/pixmaps/idea-ultimate.svg
+ ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.svg ${DESTDIR}/usr/share/icons/hicolor/scalable/apps/idea-ultimate.svg
+ vinstall ${FILESDIR}/idea-ultimate.desktop 644 usr/share/applications
}
diff --git a/srcpkgs/intellij-idea-ultimate-edition/update b/srcpkgs/intellij-idea-ultimate-edition/update
index 0fd4e8031bd570..bfaca62dd6e108 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/update
+++ b/srcpkgs/intellij-idea-ultimate-edition/update
@@ -1,2 +1,2 @@
-pattern="ideaIU-\K[\d.]+(?=-no-jbr\.tar)"
+pattern="ideaIU-\K[\d.]+(?=\.tar)"
site="https://data.services.jetbrains.com/products/releases?code=IIU%2CIIC&latest=true&type=release"
From 235c991b50ea530bd47ea06ad072e6bbd2010356 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 6 Jun 2024 08:59:55 -0400
Subject: [PATCH 2/2] intellij-idea-ultimate-edition: update to 2024.1.2
---
.../intellij-idea-ultimate-edition/files/EULA | 1 +
.../files/idea-ultimate.desktop | 8 -----
.../intellij-idea-ultimate-edition/template | 32 +++++++++++++++----
3 files changed, 27 insertions(+), 14 deletions(-)
create mode 100644 srcpkgs/intellij-idea-ultimate-edition/files/EULA
delete mode 100644 srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop
diff --git a/srcpkgs/intellij-idea-ultimate-edition/files/EULA b/srcpkgs/intellij-idea-ultimate-edition/files/EULA
new file mode 100644
index 00000000000000..3fcdbc7857c569
--- /dev/null
+++ b/srcpkgs/intellij-idea-ultimate-edition/files/EULA
@@ -0,0 +1 @@
+see https://www.jetbrains.com/legal/docs/toolbox/license_personal/
diff --git a/srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop b/srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop
deleted file mode 100644
index b3ac93776401ab..00000000000000
--- a/srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=IntelliJ IDEA Ultimate Edition
-Comment=Java integrated development environment by JetBrains
-Exec=/usr/bin/idea-ultimate %f
-Icon=idea-ultimate
-Terminal=false
-Type=Application
-Categories=Development;
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index 77b5eecaef32cf..a32c930b120e89 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -16,6 +16,18 @@ nopie=yes
python_version=3
skiprdeps="/usr/lib/intellij-idea-ultimate/plugins/Kotlin/bin/linux/LLDBFrontend"
+post_extract() {
+ bsdtar xf lib/app-client.jar entry.desktop
+}
+
+post_patch() {
+ vsed -i -e 's/\$NAME\$/IntelliJ IDEA Ultimate Edition/' entry.desktop
+ vsed -i -e 's/\$ICON\$/idea-ultimate/' entry.desktop
+ vsed -i -e 's/\$SCRIPT\$/idea-ultimate/' entry.desktop
+ vsed -i -e 's/\$COMMENT\$/Capable and Ergonomic IDE for JVM/' entry.desktop
+ vsed -i -e 's/\$WM_CLASS\$/jetbrains-idea/' entry.desktop
+}
+
do_install() {
vmkdir usr/bin
vmkdir usr/share/doc/intellij-idea-ultimate
@@ -23,12 +35,20 @@ do_install() {
vmkdir usr/share/pixmaps
vmkdir usr/share/icons/hicolor/scalable/apps
- mv bin lib plugins product-info.json build.txt jbr ${DESTDIR}/usr/lib/intellij-idea-ultimate
- mv license ${DESTDIR}/usr/share/doc/intellij-idea-ultimate
+ vcopy bin usr/lib/intellij-idea-ultimate
+ vcopy lib usr/lib/intellij-idea-ultimate
+ vcopy plugins usr/lib/intellij-idea-ultimate
+ vcopy product-info.json usr/lib/intellij-idea-ultimate
+ vcopy build.txt usr/lib/intellij-idea-ultimate
+ vcopy jbr usr/lib/intellij-idea-ultimate
+ vcopy license usr/share/doc/intellij-idea-ultimate
rm ${DESTDIR}/usr/lib/intellij-idea-ultimate/lib/async-profiler -rf
rm ${DESTDIR}/usr/lib/intellij-idea-ultimate/lib/async-profiler.jar
- ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.sh ${DESTDIR}/usr/bin/idea-ultimate
- ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.png ${DESTDIR}/usr/share/pixmaps/idea-ultimate.svg
- ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.svg ${DESTDIR}/usr/share/icons/hicolor/scalable/apps/idea-ultimate.svg
- vinstall ${FILESDIR}/idea-ultimate.desktop 644 usr/share/applications
+ ln -sf ../lib/intellij-idea-ultimate/bin/idea.sh ${DESTDIR}/usr/bin/idea-ultimate
+ ln -sf ../../lib/intellij-idea-ultimate/bin/idea.png ${DESTDIR}/usr/share/pixmaps/idea-ultimate.png
+ ln -sf ../../lib/intellij-idea-ultimate/bin/idea.svg ${DESTDIR}/usr/share/icons/hicolor/scalable/apps/idea-ultimate.svg
+ vinstall entry.desktop 644 usr/share/applications idea-ultimate.desktop
+}
+post_install() {
+ vlicense ${FILESDIR}/EULA
}
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PR PATCH] [Updated] intellij-idea-ultimate-edition: update to 2024.1.2
2024-06-06 3:53 [PR PATCH] Upgrading Intellij Idea Ultimate to 2024.1.2 piekay
` (19 preceding siblings ...)
2024-06-06 19:03 ` piekay
@ 2024-06-06 19:07 ` piekay
2024-06-06 19:09 ` piekay
` (2 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: piekay @ 2024-06-06 19:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1286 bytes --]
There is an updated pull request by piekay against master on the void-packages repository
https://github.com/piekay/void-packages intellij-ultimate-update
https://github.com/void-linux/void-packages/pull/50713
intellij-idea-ultimate-edition: update to 2024.1.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/50713.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-intellij-ultimate-update-50713.patch --]
[-- Type: text/x-diff, Size: 10793 bytes --]
From 331ea5703f5e474654bb90608831742027ea0eee Mon Sep 17 00:00:00 2001
From: Piekay <github@piekay.de>
Date: Thu, 6 Jun 2024 05:44:58 +0200
Subject: [PATCH 1/2] intellij-idea-ultimate-edition: update to 2024.1.2
---
.../files/README.voidlinux | 2 -
.../files/idea-ultimate.desktop | 8 ++
.../intellij-idea-ultimate-edition/template | 100 ++++--------------
srcpkgs/intellij-idea-ultimate-edition/update | 2 +-
4 files changed, 31 insertions(+), 81 deletions(-)
delete mode 100644 srcpkgs/intellij-idea-ultimate-edition/files/README.voidlinux
create mode 100644 srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop
diff --git a/srcpkgs/intellij-idea-ultimate-edition/files/README.voidlinux b/srcpkgs/intellij-idea-ultimate-edition/files/README.voidlinux
deleted file mode 100644
index c04f6c9ab2a951..00000000000000
--- a/srcpkgs/intellij-idea-ultimate-edition/files/README.voidlinux
+++ /dev/null
@@ -1,2 +0,0 @@
-IntelliJ Ultimate has the following optional dependencies:
- libdbusmenu-glib: For global menu support
diff --git a/srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop b/srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop
new file mode 100644
index 00000000000000..b3ac93776401ab
--- /dev/null
+++ b/srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=IntelliJ IDEA Ultimate Edition
+Comment=Java integrated development environment by JetBrains
+Exec=/usr/bin/idea-ultimate %f
+Icon=idea-ultimate
+Terminal=false
+Type=Application
+Categories=Development;
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index 40e4a8b9c8a068..77b5eecaef32cf 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,90 +1,34 @@
# Template file for 'intellij-idea-ultimate-edition'
pkgname=intellij-idea-ultimate-edition
-version=2021.3.3
-revision=2
-archs="i686 x86_64"
-depends="giflib libXtst jetbrains-jdk-bin lldb-devel"
-short_desc="Most intelligent Java IDE"
+version=2024.1.2
+revision=1
+archs="x86_64"
+depends="virtual?java-environment giflib libXtst hicolor-icon-theme"
+short_desc="Java integrated development environment by JetBrains"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="custom:Commercial"
-homepage="https://www.jetbrains.com/idea"
-_filename="ideaIU-${version}-no-jbr.tar.gz"
-distfiles="https://download.jetbrains.com/idea/${_filename}"
-checksum=2a3295fca08060ad515f6c7198879d09963724cfb36af3ea94f16dcd76636470
+homepage="https://www.jetbrains.org/"
+distfiles="https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz"
+checksum=c50ed70f90c69a7e6eaafab44d926d554aafbd7310608570e4085d97df3bf763
repository=nonfree
restricted=yes
nopie=yes
python_version=3
-# requires liblldb.so which is unversioned, pulled by lldb-devel
-skiprdeps="/usr/lib/intellij-idea-ultimate-edition/plugins/Kotlin/bin/linux/LLDBFrontend"
-
-do_extract() {
- bsdtar xf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_filename} --strip-components=1 -C .
-}
-
-post_extract() {
- # Remove files for other OSes
- rm -rf plugins/cwm-plugin/quiche-native/darwin-aarch64
- rm -rf plugins/cwm-plugin/quiche-native/darwin-x86-64
- rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/freebsd64
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/freebsd32
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/osx
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/windows32
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/windows64
- rm -rf plugins/performanceTesting/bin/libyjpagent.dylib
- rm -rf plugins/performanceTesting/bin/yjpagent.dll
- rm -rf plugins/performanceTesting/bin/yjpagent64.dll
- rm -rf plugins/webp/lib/libwebp/mac
- rm -rf plugins/webp/lib/libwebp/win
-
- # Remove files for other CPU architectures
- rm -rf bin/fsnotifier-arm
- rm -rf lib/pty4j-native/linux/aarch64
- rm -rf lib/pty4j-native/linux/arm
- rm -rf lib/pty4j-native/linux/mips64el
- rm -rf lib/pty4j-native/linux/ppc64le
-
- case "$XBPS_TARGET_MACHINE" in
- x86_64)
- rm -rf bin/idea.vmoptions
- rm -rf lib/pty4j-native/linux/x86
- rm -rf plugins/android/lib/libwebp/linux/libwebp_jni.so
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/linux32
- rm -rf plugins/performanceTesting/bin/libyjpagent.so
- rm -rf plugins/webp/lib/libwebp/linux/libwebp_jni.so
- ;;
- i686)
- rm -rf bin/idea64.vmoptions
- rm -rf bin/libyjpagent-linux64.so
- rm -rf lib/pty4j-native/linux/x86_64
- rm -rf plugins/android/lib/libwebp/linux/libwebp_jni64.so
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/linux64
- rm -rf plugins/performanceTesting/bin/libyjpagent64.so
- rm -rf plugins/webp/lib/libwebp/linux/libwebp_jni64.so
- ;;
- esac
-}
+skiprdeps="/usr/lib/intellij-idea-ultimate/plugins/Kotlin/bin/linux/LLDBFrontend"
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-ultimate
- vdoc "${FILESDIR}/README.voidlinux"
+ vmkdir usr/share/doc/intellij-idea-ultimate
+ vmkdir usr/lib/intellij-idea-ultimate
+ vmkdir usr/share/pixmaps
+ vmkdir usr/share/icons/hicolor/scalable/apps
+
+ mv bin lib plugins product-info.json build.txt jbr ${DESTDIR}/usr/lib/intellij-idea-ultimate
+ mv license ${DESTDIR}/usr/share/doc/intellij-idea-ultimate
+ rm ${DESTDIR}/usr/lib/intellij-idea-ultimate/lib/async-profiler -rf
+ rm ${DESTDIR}/usr/lib/intellij-idea-ultimate/lib/async-profiler.jar
+ ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.sh ${DESTDIR}/usr/bin/idea-ultimate
+ ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.png ${DESTDIR}/usr/share/pixmaps/idea-ultimate.svg
+ ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.svg ${DESTDIR}/usr/share/icons/hicolor/scalable/apps/idea-ultimate.svg
+ vinstall ${FILESDIR}/idea-ultimate.desktop 644 usr/share/applications
}
diff --git a/srcpkgs/intellij-idea-ultimate-edition/update b/srcpkgs/intellij-idea-ultimate-edition/update
index 0fd4e8031bd570..bfaca62dd6e108 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/update
+++ b/srcpkgs/intellij-idea-ultimate-edition/update
@@ -1,2 +1,2 @@
-pattern="ideaIU-\K[\d.]+(?=-no-jbr\.tar)"
+pattern="ideaIU-\K[\d.]+(?=\.tar)"
site="https://data.services.jetbrains.com/products/releases?code=IIU%2CIIC&latest=true&type=release"
From bd74f82a0245987a632801456e86c52b9e966d93 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 6 Jun 2024 08:59:55 -0400
Subject: [PATCH 2/2] intellij-idea-ultimate-edition: update to 2024.1.2
---
.../intellij-idea-ultimate-edition/files/EULA | 1 +
.../files/idea-ultimate.desktop | 8 -----
.../intellij-idea-ultimate-edition/template | 32 +++++++++++++++----
3 files changed, 27 insertions(+), 14 deletions(-)
create mode 100644 srcpkgs/intellij-idea-ultimate-edition/files/EULA
delete mode 100644 srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop
diff --git a/srcpkgs/intellij-idea-ultimate-edition/files/EULA b/srcpkgs/intellij-idea-ultimate-edition/files/EULA
new file mode 100644
index 00000000000000..3fcdbc7857c569
--- /dev/null
+++ b/srcpkgs/intellij-idea-ultimate-edition/files/EULA
@@ -0,0 +1 @@
+see https://www.jetbrains.com/legal/docs/toolbox/license_personal/
diff --git a/srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop b/srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop
deleted file mode 100644
index b3ac93776401ab..00000000000000
--- a/srcpkgs/intellij-idea-ultimate-edition/files/idea-ultimate.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=IntelliJ IDEA Ultimate Edition
-Comment=Java integrated development environment by JetBrains
-Exec=/usr/bin/idea-ultimate %f
-Icon=idea-ultimate
-Terminal=false
-Type=Application
-Categories=Development;
diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index 77b5eecaef32cf..a32c930b120e89 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -16,6 +16,18 @@ nopie=yes
python_version=3
skiprdeps="/usr/lib/intellij-idea-ultimate/plugins/Kotlin/bin/linux/LLDBFrontend"
+post_extract() {
+ bsdtar xf lib/app-client.jar entry.desktop
+}
+
+post_patch() {
+ vsed -i -e 's/\$NAME\$/IntelliJ IDEA Ultimate Edition/' entry.desktop
+ vsed -i -e 's/\$ICON\$/idea-ultimate/' entry.desktop
+ vsed -i -e 's/\$SCRIPT\$/idea-ultimate/' entry.desktop
+ vsed -i -e 's/\$COMMENT\$/Capable and Ergonomic IDE for JVM/' entry.desktop
+ vsed -i -e 's/\$WM_CLASS\$/jetbrains-idea/' entry.desktop
+}
+
do_install() {
vmkdir usr/bin
vmkdir usr/share/doc/intellij-idea-ultimate
@@ -23,12 +35,20 @@ do_install() {
vmkdir usr/share/pixmaps
vmkdir usr/share/icons/hicolor/scalable/apps
- mv bin lib plugins product-info.json build.txt jbr ${DESTDIR}/usr/lib/intellij-idea-ultimate
- mv license ${DESTDIR}/usr/share/doc/intellij-idea-ultimate
+ vcopy bin usr/lib/intellij-idea-ultimate
+ vcopy lib usr/lib/intellij-idea-ultimate
+ vcopy plugins usr/lib/intellij-idea-ultimate
+ vcopy product-info.json usr/lib/intellij-idea-ultimate
+ vcopy build.txt usr/lib/intellij-idea-ultimate
+ vcopy jbr usr/lib/intellij-idea-ultimate
+ vcopy license usr/share/doc/intellij-idea-ultimate
rm ${DESTDIR}/usr/lib/intellij-idea-ultimate/lib/async-profiler -rf
rm ${DESTDIR}/usr/lib/intellij-idea-ultimate/lib/async-profiler.jar
- ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.sh ${DESTDIR}/usr/bin/idea-ultimate
- ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.png ${DESTDIR}/usr/share/pixmaps/idea-ultimate.svg
- ln -sf /usr/lib/intellij-idea-ultimate/bin/idea.svg ${DESTDIR}/usr/share/icons/hicolor/scalable/apps/idea-ultimate.svg
- vinstall ${FILESDIR}/idea-ultimate.desktop 644 usr/share/applications
+ ln -sf ../lib/intellij-idea-ultimate/bin/idea.sh ${DESTDIR}/usr/bin/idea-ultimate
+ ln -sf ../../lib/intellij-idea-ultimate/bin/idea.png ${DESTDIR}/usr/share/pixmaps/idea-ultimate.png
+ ln -sf ../../lib/intellij-idea-ultimate/bin/idea.svg ${DESTDIR}/usr/share/icons/hicolor/scalable/apps/idea-ultimate.svg
+ vinstall entry.desktop 644 usr/share/applications idea-ultimate.desktop
+}
+post_install() {
+ vlicense ${FILESDIR}/EULA
}
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: intellij-idea-ultimate-edition: update to 2024.1.2
2024-06-06 3:53 [PR PATCH] Upgrading Intellij Idea Ultimate to 2024.1.2 piekay
` (20 preceding siblings ...)
2024-06-06 19:07 ` piekay
@ 2024-06-06 19:09 ` piekay
2024-06-07 9:05 ` [PR PATCH] [Updated] " classabbyamp
2024-06-07 9:08 ` [PR PATCH] [Merged]: " classabbyamp
23 siblings, 0 replies; 25+ messages in thread
From: piekay @ 2024-06-06 19:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 210 bytes --]
New comment by piekay on void-packages repository
https://github.com/void-linux/void-packages/pull/50713#issuecomment-2153231500
Comment:
Commit naming scheme should now follow the CONTRIBUTING.md guidelines
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PR PATCH] [Updated] intellij-idea-ultimate-edition: update to 2024.1.2
2024-06-06 3:53 [PR PATCH] Upgrading Intellij Idea Ultimate to 2024.1.2 piekay
` (21 preceding siblings ...)
2024-06-06 19:09 ` piekay
@ 2024-06-07 9:05 ` classabbyamp
2024-06-07 9:08 ` [PR PATCH] [Merged]: " classabbyamp
23 siblings, 0 replies; 25+ messages in thread
From: classabbyamp @ 2024-06-07 9:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1292 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/piekay/void-packages intellij-ultimate-update
https://github.com/void-linux/void-packages/pull/50713
intellij-idea-ultimate-edition: update to 2024.1.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/50713.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-intellij-ultimate-update-50713.patch --]
[-- Type: text/x-diff, Size: 7244 bytes --]
From 1d9a4aa74a133fff5d4311b47e6bc343f300e0e4 Mon Sep 17 00:00:00 2001
From: Piekay <github@piekay.de>
Date: Thu, 6 Jun 2024 05:44:58 +0200
Subject: [PATCH] intellij-idea-ultimate-edition: update to 2024.1.2
---
.../intellij-idea-ultimate-edition/files/EULA | 1 +
.../files/README.voidlinux | 2 -
.../intellij-idea-ultimate-edition/template | 112 ++++++------------
srcpkgs/intellij-idea-ultimate-edition/update | 2 +-
4 files changed, 40 insertions(+), 77 deletions(-)
create mode 100644 srcpkgs/intellij-idea-ultimate-edition/files/EULA
delete mode 100644 srcpkgs/intellij-idea-ultimate-edition/files/README.voidlinux
diff --git a/srcpkgs/intellij-idea-ultimate-edition/files/EULA b/srcpkgs/intellij-idea-ultimate-edition/files/EULA
new file mode 100644
index 00000000000000..3fcdbc7857c569
--- /dev/null
+++ b/srcpkgs/intellij-idea-ultimate-edition/files/EULA
@@ -0,0 +1 @@
+see https://www.jetbrains.com/legal/docs/toolbox/license_personal/
diff --git a/srcpkgs/intellij-idea-ultimate-edition/files/README.voidlinux b/srcpkgs/intellij-idea-ultimate-edition/files/README.voidlinux
deleted file mode 100644
index c04f6c9ab2a951..00000000000000
--- a/srcpkgs/intellij-idea-ultimate-edition/files/README.voidlinux
+++ /dev/null
@@ -1,2 +0,0 @@
-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
index 40e4a8b9c8a068..a32c930b120e89 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,90 +1,54 @@
# Template file for 'intellij-idea-ultimate-edition'
pkgname=intellij-idea-ultimate-edition
-version=2021.3.3
-revision=2
-archs="i686 x86_64"
-depends="giflib libXtst jetbrains-jdk-bin lldb-devel"
-short_desc="Most intelligent Java IDE"
+version=2024.1.2
+revision=1
+archs="x86_64"
+depends="virtual?java-environment giflib libXtst hicolor-icon-theme"
+short_desc="Java integrated development environment by JetBrains"
maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
license="custom:Commercial"
-homepage="https://www.jetbrains.com/idea"
-_filename="ideaIU-${version}-no-jbr.tar.gz"
-distfiles="https://download.jetbrains.com/idea/${_filename}"
-checksum=2a3295fca08060ad515f6c7198879d09963724cfb36af3ea94f16dcd76636470
+homepage="https://www.jetbrains.org/"
+distfiles="https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz"
+checksum=c50ed70f90c69a7e6eaafab44d926d554aafbd7310608570e4085d97df3bf763
repository=nonfree
restricted=yes
nopie=yes
python_version=3
-# requires liblldb.so which is unversioned, pulled by lldb-devel
-skiprdeps="/usr/lib/intellij-idea-ultimate-edition/plugins/Kotlin/bin/linux/LLDBFrontend"
-
-do_extract() {
- bsdtar xf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_filename} --strip-components=1 -C .
-}
+skiprdeps="/usr/lib/intellij-idea-ultimate/plugins/Kotlin/bin/linux/LLDBFrontend"
post_extract() {
- # Remove files for other OSes
- rm -rf plugins/cwm-plugin/quiche-native/darwin-aarch64
- rm -rf plugins/cwm-plugin/quiche-native/darwin-x86-64
- rm -rf plugins/cwm-plugin/quiche-native/win32-x86-64
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/freebsd64
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/freebsd32
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/osx
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/windows32
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/windows64
- rm -rf plugins/performanceTesting/bin/libyjpagent.dylib
- rm -rf plugins/performanceTesting/bin/yjpagent.dll
- rm -rf plugins/performanceTesting/bin/yjpagent64.dll
- rm -rf plugins/webp/lib/libwebp/mac
- rm -rf plugins/webp/lib/libwebp/win
-
- # Remove files for other CPU architectures
- rm -rf bin/fsnotifier-arm
- rm -rf lib/pty4j-native/linux/aarch64
- rm -rf lib/pty4j-native/linux/arm
- rm -rf lib/pty4j-native/linux/mips64el
- rm -rf lib/pty4j-native/linux/ppc64le
+ bsdtar xf lib/app-client.jar entry.desktop
+}
- case "$XBPS_TARGET_MACHINE" in
- x86_64)
- rm -rf bin/idea.vmoptions
- rm -rf lib/pty4j-native/linux/x86
- rm -rf plugins/android/lib/libwebp/linux/libwebp_jni.so
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/linux32
- rm -rf plugins/performanceTesting/bin/libyjpagent.so
- rm -rf plugins/webp/lib/libwebp/linux/libwebp_jni.so
- ;;
- i686)
- rm -rf bin/idea64.vmoptions
- rm -rf bin/libyjpagent-linux64.so
- rm -rf lib/pty4j-native/linux/x86_64
- rm -rf plugins/android/lib/libwebp/linux/libwebp_jni64.so
- rm -rf plugins/maven/lib/maven3/lib/jansi-native/linux64
- rm -rf plugins/performanceTesting/bin/libyjpagent64.so
- rm -rf plugins/webp/lib/libwebp/linux/libwebp_jni64.so
- ;;
- esac
+post_patch() {
+ vsed -i -e 's/\$NAME\$/IntelliJ IDEA Ultimate Edition/' entry.desktop
+ vsed -i -e 's/\$ICON\$/idea-ultimate/' entry.desktop
+ vsed -i -e 's/\$SCRIPT\$/idea-ultimate/' entry.desktop
+ vsed -i -e 's/\$COMMENT\$/Capable and Ergonomic IDE for JVM/' entry.desktop
+ vsed -i -e 's/\$WM_CLASS\$/jetbrains-idea/' entry.desktop
}
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-ultimate
- vdoc "${FILESDIR}/README.voidlinux"
+ vmkdir usr/share/doc/intellij-idea-ultimate
+ vmkdir usr/lib/intellij-idea-ultimate
+ vmkdir usr/share/pixmaps
+ vmkdir usr/share/icons/hicolor/scalable/apps
+
+ vcopy bin usr/lib/intellij-idea-ultimate
+ vcopy lib usr/lib/intellij-idea-ultimate
+ vcopy plugins usr/lib/intellij-idea-ultimate
+ vcopy product-info.json usr/lib/intellij-idea-ultimate
+ vcopy build.txt usr/lib/intellij-idea-ultimate
+ vcopy jbr usr/lib/intellij-idea-ultimate
+ vcopy license usr/share/doc/intellij-idea-ultimate
+ rm ${DESTDIR}/usr/lib/intellij-idea-ultimate/lib/async-profiler -rf
+ rm ${DESTDIR}/usr/lib/intellij-idea-ultimate/lib/async-profiler.jar
+ ln -sf ../lib/intellij-idea-ultimate/bin/idea.sh ${DESTDIR}/usr/bin/idea-ultimate
+ ln -sf ../../lib/intellij-idea-ultimate/bin/idea.png ${DESTDIR}/usr/share/pixmaps/idea-ultimate.png
+ ln -sf ../../lib/intellij-idea-ultimate/bin/idea.svg ${DESTDIR}/usr/share/icons/hicolor/scalable/apps/idea-ultimate.svg
+ vinstall entry.desktop 644 usr/share/applications idea-ultimate.desktop
+}
+post_install() {
+ vlicense ${FILESDIR}/EULA
}
diff --git a/srcpkgs/intellij-idea-ultimate-edition/update b/srcpkgs/intellij-idea-ultimate-edition/update
index 0fd4e8031bd570..bfaca62dd6e108 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/update
+++ b/srcpkgs/intellij-idea-ultimate-edition/update
@@ -1,2 +1,2 @@
-pattern="ideaIU-\K[\d.]+(?=-no-jbr\.tar)"
+pattern="ideaIU-\K[\d.]+(?=\.tar)"
site="https://data.services.jetbrains.com/products/releases?code=IIU%2CIIC&latest=true&type=release"
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PR PATCH] [Merged]: intellij-idea-ultimate-edition: update to 2024.1.2
2024-06-06 3:53 [PR PATCH] Upgrading Intellij Idea Ultimate to 2024.1.2 piekay
` (22 preceding siblings ...)
2024-06-07 9:05 ` [PR PATCH] [Updated] " classabbyamp
@ 2024-06-07 9:08 ` classabbyamp
23 siblings, 0 replies; 25+ messages in thread
From: classabbyamp @ 2024-06-07 9:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1115 bytes --]
There's a merged pull request on the void-packages repository
intellij-idea-ultimate-edition: update to 2024.1.2
https://github.com/void-linux/void-packages/pull/50713
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 25+ messages in thread