Attachment 206788 Details for Bug 239787 – intellij-ultimate.diff

[patch] intellij-ultimate.diff

intellij-ultimate.diff (text/plain), 4.85 KB, created by Dmitry Wagin on 2019-08-22 13:18:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Wagin

Created: 2019-08-22 13:18:46 UTC

Size: 4.85 KB

patch

obsolete

>Index: java/intellij-ultimate/Makefile
>===================================================================
>--- java/intellij-ultimate/Makefile	(revision 509596)
>+++ java/intellij-ultimate/Makefile	(working copy)
>@@ -5,6 +5,7 @@
> 
> PORTNAME=	intellij-ultimate
> PORTVERSION=	2019.2
>+PORTREVISION=	1
> CATEGORIES=	java devel
> MASTER_SITES=	https://download-cf.jetbrains.com/idea/
> DISTNAME=	ideaIU-${PORTVERSION}-no-jbr
>@@ -18,13 +19,12 @@
> LICENSE_TEXT=	See: https://www.jetbrains.com/store/license.html
> LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
> 
>-RUN_DEPENDS=	intellij-fsnotifier>0:java/intellij-fsnotifier \
>-		intellij-pty4j>0:java/intellij-pty4j
>+RUN_DEPENDS=	intellij-fsnotifier>0:java/intellij-fsnotifier
> 
> USES=		python:run shebangfix
> 
> USE_JAVA=	yes
>-JAVA_VERSION=	1.8+
>+JAVA_VERSION=	8+
> 
> SHEBANG_FILES=	bin/printenv.py bin/restart.py \
> 		plugins/spy-js/server/node_modules/node-uuid/benchmark/bench.sh \
>@@ -32,12 +32,12 @@
> 		plugins/spy-js/server/proxy-osx.sh
> 
> NO_ARCH=	yes
>+NO_ARCH_IGNORE=	libjansi.so
> NO_BUILD=	yes
> 
> WRKSRC=		${WRKDIR}/idea-IU-192.5728.98
> 
> SUB_FILES=	idea idea.desktop pkg-message
>-SUB_LIST=	DATADIR=${DATADIR}
> CONFLICTS=	intellij-20*
> 
> do-install:
>@@ -45,12 +45,15 @@
> 	@${RM} -r ${WRKSRC}/bin/fsnotifier \
> 		${WRKSRC}/bin/fsnotifier-arm \
> 		${WRKSRC}/bin/fsnotifier64 \
>+		${WRKSRC}/lib/pty4j-native \
> 		${WRKSRC}/plugins/android/lib/libwebp \
>-		${WRKSRC}/plugins/maven/lib/maven3/lib/jansi-native \
> 		${WRKSRC}/plugins/performanceTesting/bin
>-# Remove the bundled native Pty4J support libraries, they are replaced
>-# by java/intellij-pty4j
>-	@${RM} -r ${WRKSRC}/lib/pty4j-native
>+# Remove bundled linux, osx, windows Jansi library
>+	@${RM} -r ${WRKSRC}/plugins/maven/lib/maven3/lib/jansi-native/linux32 \
>+		${WRKSRC}/plugins/maven/lib/maven3/lib/jansi-native/linux64 \
>+		${WRKSRC}/plugins/maven/lib/maven3/lib/jansi-native/osx \
>+		${WRKSRC}/plugins/maven/lib/maven3/lib/jansi-native/windows32 \
>+		${WRKSRC}/plugins/maven/lib/maven3/lib/jansi-native/windows64
> # Remove bundled linux JetBrains Runtime and OpenJDK
> 	@${RM} -r ${WRKSRC}/jbr ${WRKSRC}/jre64
> 	${MKDIR} ${STAGEDIR}${DATADIR}
>@@ -57,11 +60,16 @@
> 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} \
> 		"! -name *\.so ! -name *\.dll ! -name *\.dylib ! -name *\.pdb ! -name *\.sh")
> 	@(cd ${WRKSRC} && ${COPYTREE_BIN} . ${STAGEDIR}${DATADIR} "-name *\.sh")
>+	@(cd ${WRKSRC} && ${COPYTREE_BIN} plugins/maven/lib/maven3/lib/jansi-native ${STAGEDIR}${DATADIR} "-name *\.so")
>+	@${STRIP_CMD} ${STAGEDIR}${DATADIR}/plugins/maven/lib/maven3/lib/jansi-native/freebsd32/libjansi.so
>+	@${STRIP_CMD} ${STAGEDIR}${DATADIR}/plugins/maven/lib/maven3/lib/jansi-native/freebsd64/libjansi.so
> 	${INSTALL_SCRIPT} ${WRKDIR}/idea ${STAGEDIR}${PREFIX}/bin/idea
> 	${INSTALL_MAN} ${FILESDIR}/idea.1 ${STAGEDIR}${PREFIX}/man/man1
> 	${INSTALL_DATA} ${WRKDIR}/idea.desktop ${STAGEDIR}${PREFIX}/share/applications/
> # Use fsnotifier replacement provided by java/intellij-fsnotifier
> 	${ECHO} "idea.filewatcher.executable.path=${PREFIX}/intellij/bin/fsnotifier" >> ${STAGEDIR}${DATADIR}/bin/idea.properties
>+# Fix "Typeahead timeout is exceeded" error
>+	${ECHO} "action.aware.typeAhead=false" >> ${STAGEDIR}${DATADIR}/bin/idea.properties
> # Fix slow render
> 	${ECHO} "-Dsun.java2d.xrender=false" >> ${STAGEDIR}${DATADIR}/bin/idea.vmoptions
> 	${ECHO} "-Dsun.java2d.xrender=false" >> ${STAGEDIR}${DATADIR}/bin/idea64.vmoptions
>Index: java/intellij-ultimate/files/pkg-message.in
>===================================================================
>--- java/intellij-ultimate/files/pkg-message.in	(revision 509596)
>+++ java/intellij-ultimate/files/pkg-message.in	(working copy)
>@@ -3,8 +3,8 @@
>   message: <<EOM
> There is a native (faster) file watching support backed by kqueue which is
> enabled by default.  If you encounter problems with watching large
>-trees, you can disable it by appending the following property into
>-%%DATADIR%%/bin/idea.properties:
>+trees, you can disable it by adding the following property via the menu
>+entry Help -> Edit Custom Properties...
> 
>       idea.filewatcher.disabled=true
> EOM
>Index: java/intellij-ultimate/pkg-plist
>===================================================================
>--- java/intellij-ultimate/pkg-plist	(revision 509596)
>+++ java/intellij-ultimate/pkg-plist	(working copy)
>@@ -10303,6 +10303,9 @@
> %%DATADIR%%/plugins/maven/lib/maven3/lib/guice-4.2.1-no_aop.jar
> %%DATADIR%%/plugins/maven/lib/maven3/lib/j2objc-annotations-1.1.jar
> %%DATADIR%%/plugins/maven/lib/maven3/lib/jansi-1.17.1.jar
>+%%DATADIR%%/plugins/maven/lib/maven3/lib/jansi-native/README.txt
>+%%DATADIR%%/plugins/maven/lib/maven3/lib/jansi-native/freebsd32/libjansi.so
>+%%DATADIR%%/plugins/maven/lib/maven3/lib/jansi-native/freebsd64/libjansi.so
> %%DATADIR%%/plugins/maven/lib/maven3/lib/javax.inject-1.jar
> %%DATADIR%%/plugins/maven/lib/maven3/lib/jcl-over-slf4j-1.7.25.jar
> %%DATADIR%%/plugins/maven/lib/maven3/lib/jcl-over-slf4j.license

Actions: View | Diff

Attachments on bug 239787: 206456 | 206677 | 206785 | 206788 | 206790