Bug 252946
| Summary: | java/intellij-ultimate: update to 2020.3.1 | ||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Matthias Gamsjager <mgamsjager> | ||||||||||||||
| Component: | Individual Port(s) | Assignee: | Fernando Apesteguía <fernape> | ||||||||||||||
| Status: | Closed Overcome By Events | ||||||||||||||||
| Severity: | Affects Only Me | CC: | andoriyu, fernape | ||||||||||||||
| Priority: | --- | Keywords: | needs-qa | ||||||||||||||
| Version: | Latest | Flags: | andoriyu:
maintainer-feedback+
|
||||||||||||||
| Hardware: | Any | ||||||||||||||||
| OS: | Any | ||||||||||||||||
| Attachments: |
|
||||||||||||||||
The patch does not apply cleanly: ... --- a/pkg-plist +++ b/pkg-plist @@ -1,4 +1,4 @@ -in/idea <---- This doesn't look right. +bin/idea ... ... Would you mind checking this? Thanks! Created attachment 221848 [details]
git patch for 2020.3.1
Updated patch
(In reply to Matthias Gamsjager from comment #2) Q/A: Extra line at the end of pkg-plist. Sorry I didn't catch it earlier Also, if at all possible, I would remove this comment: -# Based on the java/intellij port It wrecks havoc with linters :-) Thanks! Created attachment 221851 [details]
git patch for 2020.3.1
removed whitelines and comments
There was also an issue with the terminal which is fixed upstream: https://github.com/JetBrains/pty4j/pull/99 Should make it in time for 2021.1 If it is needed you would have to recompile pty4j-0.11.4 yourself and replace the .jar in the '/usr/local/share/intellij-ultimate/lib/' directory Any timeline on this? Bulk of the work is done except testing by others I can't apply the patch: java/intellij-ultimate$ patch -p1 -E < !:1 patch -p1 -E < ~/Downloads/intellij-ultimate-2020.3.1.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 8c8637b0d297de56bd2b1c314d52658f28ee93b1 Mon Sep 17 00:00:00 2001 |From: Matthias Gamsjager <mgamsjager@gmail.com> |Date: Sat, 23 Jan 2021 16:44:06 +0100 |Subject: [PATCH] 2020.3.1 | |--- | Makefile | 6 +- | distinfo | 6 +- | pkg-plist | 980 ++++++++++++++++++++++++++++-------------------------- | 3 files changed, 516 insertions(+), 476 deletions(-) | |diff --git a/Makefile b/Makefile |index 88c3936..9cabb70 100644 |--- a/Makefile |+++ b/Makefile -------------------------- Patching file Makefile using Plan A... patch: **** malformed patch at line 25: @@ -23,7 +23,7 @@ RUN_DEPENDS= intellij-fsnotifier>0:java/intellij-fsnotifier Mind you, the ports collection is still using subversion, not git (unlike src and docs) Ok I'll see that I can make a patch file that works Created attachment 222511 [details]
2020.3.1 no-prefix
Made a new patch with the --no-prefix flag. I tested the patch as you did `patch -p1 -E` Created attachment 222512 [details]
2020.3.1-no-prefix-no-whiteline
(In reply to Matthias Gamsjager from comment #11) 252946.patch: unified diff output text\012- diff output, ASCII text, with CRLF line terminators Can you get rid of those? Created attachment 222514 [details]
2020.3.1 LF
Of course the 1 change I make in Sublime in Windows changes the line feed. I updated the patch This PR is obsoleted. Thanks for the work though. ------------------------------------------------------------------------ r563786 | fernape | 2021-02-02 07:23:27 +0100 (mar. 02 de feb. de 2021) | 9 líneas java/intellij-ultimate: update to 2020.3.2 ChangeLog: https://confluence.jetbrains.com/display/IDEADEV/IntelliJ+IDEA+2020.3.2+%28203.7148.57+build%29+Release+Notes PR: 253151 Submitted by: ale@FreeBSD.org Approved by: andoriyu@gmail.com (maintainer) |
Created attachment 221843 [details] git patch for 2020.3.1 Included is a patch for the 2020.3.1 release