Bug 264400 - java/eclipse: update to 4.21
Summary: java/eclipse: update to 4.21
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Kurt Jaeger
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2022-06-01 22:17 UTC by Jonathan Chen
Modified: 2022-06-05 08:13 UTC (History)
3 users (show)

See Also:


Attachments
git-diff for 4.21 (234.05 KB, patch)
2022-06-01 22:17 UTC, Jonathan Chen
jonc: maintainer-approval+
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Jonathan Chen 2022-06-01 22:17:04 UTC
Created attachment 234382 [details]
git-diff for 4.21

Update to 4.21.

This release is 1.5 years overdue and 6 months out-of-date, but is an important interim step to the 4.24 release due in June 2022.

This port works for amd64. I am unable to test for powerpc64 and powerpc64le architectures.
Comment 1 Jonathan Chen 2022-06-01 22:19:56 UTC
Please add massive thanks to Patrick Mackinlay who resolved the 2 critical bugs preventing update from coming out sooner.
Comment 2 Kurt Jaeger freebsd_committer freebsd_triage 2022-06-02 12:36:14 UTC
testbuild on 13.1amd was fine, other testbuilds@work
Comment 3 Kurt Jaeger freebsd_committer freebsd_triage 2022-06-03 10:06:04 UTC
testbuilds are fine
Comment 4 commit-hook freebsd_committer freebsd_triage 2022-06-03 10:09:19 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a0c13b4a90b805807864f484d8ade07906198dbf

commit a0c13b4a90b805807864f484d8ade07906198dbf
Author:     Jonathan Chen <jonc@chen.org.nz>
AuthorDate: 2022-06-03 10:06:36 +0000
Commit:     Kurt Jaeger <pi@FreeBSD.org>
CommitDate: 2022-06-03 10:06:36 +0000

    java/eclipse: update 4.16 -> 4.21

    This release is 1.5 years overdue and 6 months out-of-date, but is
    an important interim step to the 4.24 release due in June 2022.

    Massive thanks go to Patrick Mackinlay who resolved the 2 critical
    bugs preventing update from coming out sooner!

    Author: Jonathan Chen <jonc@chen.org.nz>
    PR:     264400

 java/eclipse/Makefile                              |  30 +-
 java/eclipse/Makefile.plugins                      |   1 +
 java/eclipse/distinfo                              | 108 ++--
 java/eclipse/files/cef-patch (new)                 |  24 +
 java/eclipse/files/eclipse.in                      |   9 +
 java/eclipse/files/patch-eclipse-platform-parent   |  39 +-
 java/eclipse/files/patch-eclipse.pde.build         |   4 +-
 java/eclipse/files/patch-eclipse.pde.ui            |   7 +-
 java/eclipse/files/patch-eclipse.platform.releng   |  70 ++-
 ...tch-eclipse.platform.releng.tychoeclipsebuilder | 283 ++++++-----
 .../eclipse/files/patch-eclipse.platform.resources | 152 +++++-
 java/eclipse/files/patch-eclipse.platform.runtime  |   6 +-
 java/eclipse/files/patch-eclipse.platform.swt      | 560 ++++++++++++++++-----
 .../files/patch-eclipse.platform.swt.binaries      | 214 ++++++--
 java/eclipse/files/patch-eclipse.platform.team     | 184 ++++---
 java/eclipse/files/patch-eclipse.platform.text     |   2 +-
 java/eclipse/files/patch-eclipse.platform.ua       |  15 +-
 java/eclipse/files/patch-eclipse.platform.ui       | 101 ++--
 java/eclipse/files/patch-rt.equinox.bundles        | 153 +++---
 java/eclipse/files/patch-rt.equinox.framework      | 271 ++++++----
 java/eclipse/files/patch-rt.equinox.p2             |  42 +-
 java/eclipse/scripts/pre-build                     |   2 +-
 java/eclipse/scripts/pre-patch                     |   8 +-
 23 files changed, 1486 insertions(+), 799 deletions(-)
Comment 5 Vladimir Druzenko freebsd_committer freebsd_triage 2022-06-03 16:56:22 UTC
"BUILD_DEPENDS=  git:devel/git@lite" conflicts with installed devel/git@default.
Comment 6 Jonathan Chen 2022-06-04 23:38:29 UTC
(In reply to VVD from comment #5)

Looks like you've got "git" installed. Uninstall it, and then build your port.

If you're doing lots of builds, I would suggest that you use a port builder like 'poudriere' or 'synth' to build the port in an isolated environment. Otherwise you will encounter this issue quite a lot.
Comment 7 Vladimir Druzenko freebsd_committer freebsd_triage 2022-06-05 08:13:51 UTC
(In reply to Jonathan Chen from comment #6)
> Looks like you've got "git" installed. Uninstall it, and then build your port.
I said exactly that. And this is an error in port.

> If you're doing lots of builds, I would suggest that you use a port builder like 'poudriere' or 'synth' to build the port in an isolated environment. Otherwise you will encounter this issue quite a lot.
Ports must build on live systems.
If devel/git@lite installed and port have "BUILD_DEPENDS=  git:devel/git", then it use installed devel/git@lite without try to install git:devel/git. But not back.