Attachment 233886 Details for Bug 263947 – 2022.1.1 git-diff

[patch] 2022.1.1 git-diff

pycharm-ce.diff (text/plain), 4.76 KB, created by Jonathan Chen on 2022-05-12 22:36:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Chen

Created: 2022-05-12 22:36:27 UTC

Size: 4.76 KB

patch

obsolete

>diff --git a/devel/pycharm-ce/Makefile b/devel/pycharm-ce/Makefile
>index d595d2bd3a..159f272d2c 100644
>--- a/devel/pycharm-ce/Makefile
>+++ b/devel/pycharm-ce/Makefile
>@@ -1,8 +1,7 @@
> # Created by: Boris Samorodov <bsam@FreeBSD.org>
> 
> PORTNAME=	pycharm-ce
>-PORTVERSION=	2022.1
>-PORTREVISION=	1
>+PORTVERSION=	2022.1.1
> CATEGORIES=	devel java python
> MASTER_SITES=	https://download.jetbrains.com/python/ \
> 		http://download.jetbrains.com/python/
>@@ -30,27 +29,28 @@ NO_BUILD=	yes
> SUB_FILES+=	pkg-message pycharm ${PORTNAME}.desktop
> SUB_LIST+=	IDEA_HOME=${IDEA_HOME}
> 
>-do-install:
>-	@${MKDIR} ${STAGEDIR}${DATADIR}
>-	@${TAR} -czf - -C ${WRKSRC} . | ${TAR} xzf - -C ${STAGEDIR}${DATADIR}
>-# Linux/Windows/OS X only so remove them
>-	@${RM} ${STAGEDIR}${DATADIR}/bin/*fsnotifier* ${STAGEDIR}${DATADIR}/bin/*.so ${STAGEDIR}${DATADIR}/bin/repair
>-	@${FIND} ${STAGEDIR}${DATADIR}/plugins -name '*.so' -delete
>-	@${RM} -r ${STAGEDIR}${DATADIR}/plugins/cwm-plugin/quiche-native
>+# Remove non-native binaries
>+post-extract:
>+	@${RM} ${WRKSRC}/bin/*fsnotifier* ${WRKSRC}/bin/*.so ${WRKSRC}/bin/repair
>+	@${FIND} ${WRKSRC}/plugins -name '*.so' -delete
>+	@${RM} -r ${WRKSRC}/plugins/cwm-plugin/quiche-native
>+	@${RM} -r ${WRKSRC}/plugins/python-ce/helpers/pydev/pydevd_attach_to_process
> # Remove the bundled native Pty4J support libraries, they are replaced
> # by java/intellij-pty4j
>-	@${RM} -r ${STAGEDIR}${DATADIR}/lib/pty4j-native
>+	@${RM} -r ${WRKSRC}/lib/pty4j-native
>+	@${RM} ${WRKSRC}/lib/pty4j-0.5.jar
> # Remove bundled linux-only JRE
>-	@${RM} -r ${STAGEDIR}${DATADIR}/jbr
>-	@${RM} -r ${STAGEDIR}${DATADIR}/plugins/python-ce/helpers/pydev/pydevd_attach_to_process
>-	@${RM} ${STAGEDIR}${DATADIR}/lib/pty4j-0.5.jar
>-	${INSTALL_SCRIPT} ${WRKDIR}/pycharm ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
>-	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications/
>-	#cd ${WRKSRC}/lib && ${JAVA_HOME}/bin/jar xf icons.jar
>+	@${RM} -r ${WRKSRC}/jbr
> # TODO: Remove and enable fsnotifier when devel/libinotify is fixed
> # Disable filewatcher warning message on IDEA startup
>-	${ECHO} "idea.filewatcher.disabled=true" >> ${STAGEDIR}${DATADIR}/bin/idea.properties
>+	${ECHO} "idea.filewatcher.disabled=true" >> ${WRKSRC}/bin/idea.properties
> # Use fsnotifier replacement provided by java/intellij-fsnotifier
>-	${ECHO} "idea.filewatcher.executable.path=${IDEA_HOME}/bin/fsnotifier" >> ${STAGEDIR}${DATADIR}/bin/idea.properties
>+	${ECHO} "idea.filewatcher.executable.path=${IDEA_HOME}/bin/fsnotifier" >> ${WRKSRC}/bin/idea.properties
>+
>+do-install:
>+	@${MKDIR} ${STAGEDIR}${DATADIR}
>+	cd "${WRKSRC}" && ${FIND} . | ${CPIO} -pdum -R root:wheel ${STAGEDIR}${DATADIR}
>+	${INSTALL_SCRIPT} ${WRKDIR}/pycharm ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
>+	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}
> 
> .include <bsd.port.mk>
>diff --git a/devel/pycharm-ce/distinfo b/devel/pycharm-ce/distinfo
>index 516e365192..8df19d2dc4 100644
>--- a/devel/pycharm-ce/distinfo
>+++ b/devel/pycharm-ce/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1650236060
>-SHA256 (pycharm-community-2022.1.tar.gz) = 35d857df0ac4bd76caba60ac329c9183594be142094d0592f2afa40534be85eb
>-SIZE (pycharm-community-2022.1.tar.gz) = 540005306
>+TIMESTAMP = 1652391396
>+SHA256 (pycharm-community-2022.1.1.tar.gz) = 10d25ec698c4de4b07344e9f5ab4faef17f93e2a28711858d0e7232c5031d813
>+SIZE (pycharm-community-2022.1.1.tar.gz) = 540338511
>diff --git a/devel/pycharm-ce/pkg-plist b/devel/pycharm-ce/pkg-plist
>index 1331f14b8a..423162d5de 100644
>--- a/devel/pycharm-ce/pkg-plist
>+++ b/devel/pycharm-ce/pkg-plist
>@@ -32,7 +32,7 @@ share/applications/pycharm-ce.desktop
> %%DATADIR%%/lib/asm-commons-7.1.jar
> %%DATADIR%%/lib/asm-tree-7.1.jar
> %%DATADIR%%/lib/asm-util-7.1.jar
>-%%DATADIR%%/lib/build-marker-PC-221.5080.212
>+%%DATADIR%%/lib/build-marker-PC-221.5591.52
> %%DATADIR%%/lib/byte-buddy-agent.jar
> %%DATADIR%%/lib/cds/classesLogAgent.jar
> %%DATADIR%%/lib/dbus-java-3.2.1.jar
>@@ -155,8 +155,8 @@ share/applications/pycharm-ce.desktop
> %%DATADIR%%/plugins/platform-images/lib/platform-images.jar
> %%DATADIR%%/plugins/properties/lib/properties.jar
> %%DATADIR%%/plugins/pycharm-community-sharedIndexes-bundled/lib/pycharm-community-sharedIndexes-bundled.jar
>-%%DATADIR%%/plugins/pycharm-community-sharedIndexes-bundled/python-sdk/python-sdk-5577605471ec-af0249357b51.ijx
>-%%DATADIR%%/plugins/pycharm-community-sharedIndexes-bundled/python-sdk/python-sdk-5577605471ec-af0249357b51.txt
>+%%DATADIR%%/plugins/pycharm-community-sharedIndexes-bundled/python-sdk/python-sdk-3e6af03bb868-af0249357b51.ijx
>+%%DATADIR%%/plugins/pycharm-community-sharedIndexes-bundled/python-sdk/python-sdk-3e6af03bb868-af0249357b51.txt
> %%DATADIR%%/plugins/python-ce/helpers/MathJax/MathJax.js
> %%DATADIR%%/plugins/python-ce/helpers/MathJax/config/TeX-AMS_HTML-full.js
> %%DATADIR%%/plugins/python-ce/helpers/MathJax/config/local/local.js

Flags:

jonc: maintainer-approval+

Actions: View | Diff

Attachments on bug 263947: 233885 | 233886