From ba06d97917ffcf958e1441de8ffe86972e2f43e9 Mon Sep 17 00:00:00 2001 From: Piekay 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 " 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 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 }