pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/devel/intellij-ce-bin
Module Name: pkgsrc
Committed By: schmonz
Date: Tue Aug 19 03:58:22 UTC 2025
Modified Files:
pkgsrc/devel/intellij-ce-bin: Makefile PLIST distinfo
pkgsrc/devel/intellij-ce-bin/patches: patch-bin_idea.sh
Log Message:
intellij-ce-bin: add aarch64 support.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/intellij-ce-bin/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/intellij-ce-bin/PLIST
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/intellij-ce-bin/distinfo
cvs rdiff -u -r1.4 -r1.5 \
pkgsrc/devel/intellij-ce-bin/patches/patch-bin_idea.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/devel/intellij-ce-bin/Makefile
diff -u pkgsrc/devel/intellij-ce-bin/Makefile:1.14 pkgsrc/devel/intellij-ce-bin/Makefile:1.15
--- pkgsrc/devel/intellij-ce-bin/Makefile:1.14 Fri Aug 15 15:54:27 2025
+++ pkgsrc/devel/intellij-ce-bin/Makefile Tue Aug 19 03:58:21 2025
@@ -1,22 +1,26 @@
-# $NetBSD: Makefile,v 1.14 2025/08/15 15:54:27 schmonz Exp $
+# $NetBSD: Makefile,v 1.15 2025/08/19 03:58:21 schmonz Exp $
-VERSION= 2025.2
-DISTNAME= ideaIC-${VERSION:S/.0.0//}
-PKGNAME= intellij-ce-bin-${VERSION}
-CATEGORIES= devel
-MASTER_SITES= https://download.jetbrains.com/idea/
+VERSION= 2025.2
+JB_SUFX= # empty
+.if ${MACHINE_ARCH} == "aarch64"
+JB_SUFX= -aarch64
+.endif
+DISTNAME= ideaIC-${VERSION:S/.0.0//}${JB_SUFX}
+PKGNAME= intellij-ce-bin-${VERSION}
+CATEGORIES= devel
+MASTER_SITES= https://download.jetbrains.com/idea/
+
+MAINTAINER= youri%NetBSD.org@localhost
+HOMEPAGE= https://www.jetbrains.com/opensource/idea/
+COMMENT= JetBrains IntelliJ IDEA Community Edition
+LICENSE= apache-2.0
-MAINTAINER= youri%NetBSD.org@localhost
-HOMEPAGE= https://www.jetbrains.com/idea/
-COMMENT= JetBrains IntelliJ IDEA Community Edition
-LICENSE= apache-2.0
+DEPENDS+= intellij-fsnotifier-[0-9]*:../../sysutils/intellij-fsnotifier
-DEPENDS+= intellij-fsnotifier-[0-9]*:../../sysutils/intellij-fsnotifier
+WRKSRC= ${WRKDIR}/idea-IC-252.23892.409
+USE_JAVA2= 17
-WRKSRC= ${WRKDIR}/idea-IC-252.23892.409
-USE_JAVA2= 17
-
-USE_TOOLS+= bash pax sed
+USE_TOOLS+= bash pax sed
REPLACE_BASH= plugins/Kotlin/kotlinc/bin/kapt \
plugins/Kotlin/kotlinc/bin/kotlin \
@@ -32,20 +36,31 @@ CHECK_PIE_SUPPORTED= no
INSTALLATION_DIRS= ${PKGBASE} \
share/applications
-NO_BUILD= yes
-
SUBST_CLASSES+= jdk
SUBST_STAGE.jdk= pre-configure
SUBST_FILES.jdk= bin/idea.sh
SUBST_VARS.jdk= PKG_JAVA_HOME
+SUBST_CLASSES+= vmoptions
+SUBST_STAGE.vmoptions= pre-configure
+SUBST_FILES.vmoptions= bin/idea64.vmoptions
+SUBST_SED.vmoptions= -e 's|^-Xmx.*|-Xmx4096m|'
+SUBST_SED.vmoptions+= -e 's|^-Xms.*|-Xms4096m|'
+
+PLIST_VARS+= aarch64 x86_64
+.if ${MACHINE_ARCH} == "aarch64"
+PLIST.aarch64= yes
+.else
+PLIST.x86_64= yes
+.endif
+
pre-configure:
cd ${WRKSRC} && \
- ${RM} -r bin/*.orig \
+ ${RM} -rf bin/*.orig \
bin/fsnotifier \
- lib/jna/amd64/libjnidispatch.so \
- lib/native/linux-x86_64/libsqliteij.so \
- lib/pty4j/linux/x86-64/libpty.so \
+ lib/jna/*/libjnidispatch.so \
+ lib/native/*/libsqliteij.so \
+ lib/pty4j/linux/*/libpty.so \
plugins/cwm-plugin/quiche-native/*/*.so \
plugins/webp/lib/libwebp/linux/*.so \
plugins/maven/lib/maven3/lib/jansi-native/Windows/*/*.dll \
@@ -56,13 +71,22 @@ post-configure:
< ${FILESDIR}/idea.desktop \
> ${WRKDIR}/idea.desktop
+do-build:
+ ${ECHO} "-XX:-UseCompressedClassPointers" \
+ >> ${WRKSRC}/bin/idea64.vmoptions
+ ${ECHO} "-XX:-UseCompressedOops" \
+ >> ${WRKSRC}/bin/idea64.vmoptions
+ ${ECHO} "idea.filewatcher.executable.path=${PREFIX}/bin/fsnotifier" \
+ >> ${WRKSRC}/bin/idea.properties
+ # https://youtrack.jetbrains.com/issue/IDEA-323750
+ ${ECHO} "idea.ui.icons.svg.disk.cache=false" \
+ >> ${WRKSRC}/bin/idea.properties
+
do-install:
${INSTALL_DATA} ${WRKDIR}/idea.desktop \
${DESTDIR}${PREFIX}/share/applications/
cd ${WRKSRC} && pax -rw -pm -s ',.*\.orig,,' \
* ${DESTDIR}${PREFIX}/${PKGBASE}
- ${ECHO} "idea.filewatcher.executable.path=${PREFIX}/bin/fsnotifier" \
- > ${DESTDIR}${PREFIX}/${PKGBASE}/bin/idea.properties
.include "../../mk/java-vm.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/intellij-ce-bin/PLIST
diff -u pkgsrc/devel/intellij-ce-bin/PLIST:1.5 pkgsrc/devel/intellij-ce-bin/PLIST:1.6
--- pkgsrc/devel/intellij-ce-bin/PLIST:1.5 Fri Aug 15 15:54:27 2025
+++ pkgsrc/devel/intellij-ce-bin/PLIST Tue Aug 19 03:58:21 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2025/08/15 15:54:27 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.6 2025/08/19 03:58:21 schmonz Exp $
intellij-ce-bin/Install-Linux-tar.txt
intellij-ce-bin/LICENSE.txt
intellij-ce-bin/NOTICE.txt
@@ -157,7 +157,8 @@ intellij-ce-bin/lib/platform-loader.jar
intellij-ce-bin/lib/protobuf.jar
intellij-ce-bin/lib/rd.jar
intellij-ce-bin/lib/rhino.jar
-intellij-ce-bin/lib/skiko-awt-runtime-all/libskiko-linux-x64.so
+${PLIST.aarch64}intellij-ce-bin/lib/skiko-awt-runtime-all/libskiko-linux-arm64.so
+${PLIST.x86_64}intellij-ce-bin/lib/skiko-awt-runtime-all/libskiko-linux-x64.so
intellij-ce-bin/lib/stats.jar
intellij-ce-bin/lib/testFramework.jar
intellij-ce-bin/lib/trove.jar
Index: pkgsrc/devel/intellij-ce-bin/distinfo
diff -u pkgsrc/devel/intellij-ce-bin/distinfo:1.7 pkgsrc/devel/intellij-ce-bin/distinfo:1.8
--- pkgsrc/devel/intellij-ce-bin/distinfo:1.7 Fri Aug 15 15:54:27 2025
+++ pkgsrc/devel/intellij-ce-bin/distinfo Tue Aug 19 03:58:21 2025
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.7 2025/08/15 15:54:27 schmonz Exp $
+$NetBSD: distinfo,v 1.8 2025/08/19 03:58:21 schmonz Exp $
BLAKE2s (ideaIC-2025.2.tar.gz) = f6075e5fdd09230e800064be67870beb2c925ce4df260829fbaaed2568dfdf3d
SHA512 (ideaIC-2025.2.tar.gz) = c4258b77071fafc6bb22e238b9734994b572d0e8f68f8b994f79572c170ceb2e2fe6c466233b9348fe4d9fee4211b0c5d2e732704d74048696e45e62b0702b77
Size (ideaIC-2025.2.tar.gz) = 1209241428 bytes
-SHA1 (patch-bin_idea.sh) = 70c824b8958a19b636ec6a284e2c0ccca3a5c2f2
+BLAKE2s (ideaIC-2025.2-aarch64.tar.gz) = 282bf9930edd3ecf9c6272282567811d78d257f1d2501d6e8bf781e0006663d8
+SHA512 (ideaIC-2025.2-aarch64.tar.gz) = 1ef9944a0bfe3642adcfd099e3568acae4a80bf554a5a841a4e5c12ec2593fbf3e807d1d8378db887976b73e2d490f1ccae160514d3ec7c5234db5fac6be410f
+Size (ideaIC-2025.2-aarch64.tar.gz) = 1206873941 bytes
+SHA1 (patch-bin_idea.sh) = 9b92d2194c928b2e761258a8aca6488e5936ff98
Index: pkgsrc/devel/intellij-ce-bin/patches/patch-bin_idea.sh
diff -u pkgsrc/devel/intellij-ce-bin/patches/patch-bin_idea.sh:1.4 pkgsrc/devel/intellij-ce-bin/patches/patch-bin_idea.sh:1.5
--- pkgsrc/devel/intellij-ce-bin/patches/patch-bin_idea.sh:1.4 Fri Aug 15 15:54:27 2025
+++ pkgsrc/devel/intellij-ce-bin/patches/patch-bin_idea.sh Tue Aug 19 03:58:22 2025
@@ -1,34 +1,15 @@
-$NetBSD: patch-bin_idea.sh,v 1.4 2025/08/15 15:54:27 schmonz Exp $
+$NetBSD: patch-bin_idea.sh,v 1.5 2025/08/19 03:58:22 schmonz Exp $
-Add a few JVM options to make it work in a common case.
+Run under pkgsrc-determined Java.
--Didea.ui.icons.svg.disk.cache=false part is obtained
-from: https://youtrack.jetbrains.com/issue/IDEA-323750 .
-
---- bin/idea.sh.orig 1970-01-21 07:13:44.000000000 +0000
+--- bin/idea.sh.orig 2025-08-19 03:07:10.444759052 +0000
+++ bin/idea.sh
-@@ -49,6 +49,7 @@ CONFIG_HOME="${XDG_CONFIG_HOME:-${HOME}/
+@@ -47,7 +47,7 @@ CONFIG_HOME="${XDG_CONFIG_HOME:-${HOME}/
+ # Locate a JRE installation directory command -v will be used to run the IDE.
+ # Try (in order): $IDEA_JDK, .../idea.jdk, .../jbr, $JDK_HOME, $JAVA_HOME, "java" in $PATH.
# ---------------------------------------------------------------------
- JRE=""
+-JRE=""
++JRE="@PKG_JAVA_HOME@"
-+IDEA_JDK=@PKG_JAVA_HOME@
# shellcheck disable=SC2154
if [ -n "$IDEA_JDK" ] && [ -x "$IDEA_JDK/bin/java" ]; then
- JRE="$IDEA_JDK"
-@@ -186,12 +187,16 @@ CLASS_PATH="$CLASS_PATH:$IDE_HOME/lib/ut
- IFS="$(printf '\n\t')"
- # shellcheck disable=SC2086
- exec "$JAVA_BIN" \
-+ -Xmx4096 -Xms4096 \
-+ -XX:-UseCompressedClassPointers \
-+ -XX:-UseCompressedOops \
- -classpath "$CLASS_PATH" \
- "-XX:ErrorFile=$HOME/java_error_in_idea_%p.log" \
- "-XX:HeapDumpPath=$HOME/java_error_in_idea_.hprof" \
- ${VM_OPTIONS} \
- "-Djb.vmOptionsFile=${USER_VM_OPTIONS_FILE:-${VM_OPTIONS_FILE}}" \
- ${IDE_PROPERTIES_PROPERTY} \
-+ -Didea.ui.icons.svg.disk.cache=false \
- "-Xbootclasspath/a:$IDE_HOME/lib/nio-fs.jar" -Djava.system.class.loader=com.intellij.util.lang.PathClassLoader -Didea.vendor.name=JetBrains -Didea.paths.selector=IdeaIC2025.2
"-Djna.boot.library.path=$IDE_HOME/lib/jna/amd64" -Djna.nosys=true -Djna.noclasspath=true "-Dpty4j.preferred.native.folder=$IDE_HOME/lib/pty4j" -Dio.netty.allocator.type=pooled
"-Dintellij.platform.runtime.repository.path=$IDE_HOME/modules/module-descriptors.dat" -Didea.platform.prefix=Idea -Dsplash=true -Daether.connector.resumeDownloads=false
-Dcompose.swing.render.on.graphics=true --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.ref=ALL-UNNAMED
--add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.nio.charset=ALL-UNNAMED
--add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.base/java.time=ALL-UNNAMED --add-opens=java.base
/java.util=ALL-UNNAMED --add-opens=java.base/java.util.concurrent=ALL-UNNAMED --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED
--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED --add-opens=java.base/jdk.internal.vm=ALL-UNNAMED --add-opens=java.base/sun.net.dns=ALL-UNNAMED
--add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/sun.nio.fs=ALL-UNNAMED --add-opens=java.base/sun.security.ssl=ALL-UNNAMED --add-opens=java.base/sun.security.util=ALL-UNNAMED
--add-opens=java.desktop/com.sun.java.swing=ALL-UNNAMED --add-opens=java.desktop/com.sun.java.swing.plaf.gtk=ALL-UNNAMED --add-opens=java.desktop/java.awt=ALL-UNNAMED
--add-opens=java.desktop/java.awt.dnd.peer=ALL-UNNAMED --add-opens=java.desktop/java.awt.event=ALL-UNNAMED --add-opens=java.desktop/java.awt.font=ALL-UNNAMED
--add-opens=java.desktop/java.awt.image=ALL-UNNAMED --add-opens=java.desktop/java.awt.peer=ALL-UNNAMED --add-opens=java.desktop/javax.swing=ALL-UNNAMED --add-opens=java.desktop/javax
.swing.plaf.basic=ALL-UNNAMED --add-opens=java.desktop/javax.swing.text=ALL-UNNAMED --add-opens=java.desktop/javax.swing.text.html=ALL-UNNAMED
--add-opens=java.desktop/javax.swing.text.html.parser=ALL-UNNAMED --add-opens=java.desktop/sun.awt=ALL-UNNAMED --add-opens=java.desktop/sun.awt.X11=ALL-UNNAMED
--add-opens=java.desktop/sun.awt.datatransfer=ALL-UNNAMED --add-opens=java.desktop/sun.awt.image=ALL-UNNAMED --add-opens=java.desktop/sun.font=ALL-UNNAMED
--add-opens=java.desktop/sun.java2d=ALL-UNNAMED --add-opens=java.desktop/sun.swing=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED
--add-opens=jdk.attach/sun.tools.attach=ALL-UNNAMED --add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-opens=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED
--add-opens=jdk.jdi/com.sun.tools.jdi=ALL-UNNAMED \
- com.intellij.idea.Main \
- "$@"
Home |
Main Index |
Thread Index |
Old Index