Bug 250084 - java/eclipse: update to 4.17
Summary: java/eclipse: update to 4.17
Status: New
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: freebsd-ports-bugs (Nobody)
URL: https://www.eclipse.org/eclipseide/20...
Keywords: needs-qa, patch
Depends on:
Blocks:
 
Reported: 2020-10-03 20:16 UTC by Jonathan Chen
Modified: 2020-10-07 18:05 UTC (History)
2 users (show)

See Also:


Attachments
4.17 update (115.42 KB, patch)
2020-10-03 20:16 UTC, Jonathan Chen
jonc: maintainer-approval+
Details | Diff
4.17 update (1) (115.55 KB, patch)
2020-10-07 03:42 UTC, Jonathan Chen
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Jonathan Chen 2020-10-03 20:16:50 UTC
Created attachment 218501 [details]
4.17 update

Update to 4.17
Release Notes: https://www.eclipse.org/eclipseide/2020-09/noteworthy/
Comment 1 Kurt Jaeger freebsd_committer 2020-10-04 18:58:18 UTC
testbuilds@work
Comment 2 Kurt Jaeger freebsd_committer 2020-10-05 06:29:10 UTC
fails in patch:

===>  FAILED Applying FreeBSD patch-eclipse.platform.swt
Comment 3 Jonathan Chen 2020-10-05 06:57:37 UTC
Can I view the build logs? It seems to work on my local build-harness.
Comment 4 Fernando Apesteguía freebsd_committer 2020-10-05 07:31:56 UTC
^Triage: If there is a changelog or release notes URL available for this version, please add it to the URL field.

Q/A: Would it be possible to regenerate the patches so they comply with the expected format?

Thanks!
Comment 6 Jonathan Chen 2020-10-05 19:41:19 UTC
(In reply to Kurt Jaeger from comment #5)

I reviewed the attached patch, and it looks good.

Looking at the logs, it appears that the "scripts/pre-patch" hasn't been updated? The patch-fragment for the update to the script is on line:1585 of the attached patch. Can you make sure that it has been applied correctly? in particular:

diff -ruN /usr/ports/java/eclipse/scripts/pre-patch ./scripts/pre-patch
--- /usr/ports/java/eclipse/scripts/pre-patch   2020-10-04 09:12:19.900287000 +1300
+++ ./scripts/pre-patch 2020-10-04 08:17:42.572860000 +1300
@@ -4,6 +4,7 @@
 #
 LINUX_DIRS="
    eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.*
+   eclipse.platform.swt.binaries/bundles/org.eclipse.swt.browser.chromium.gtk.linux.*
    eclipse.platform.resources/bundles/org.eclipse.core.filesystem.linux.*
    eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/unix/linux
    eclipse.platform.team/bundles/org.eclipse.core.net.linux.*
Comment 7 Kurt Jaeger freebsd_committer 2020-10-05 19:50:30 UTC
(In reply to Jonathan Chen from comment #6)
svn diff scripts/pre-patch

gives:
------------------
Index: scripts/pre-patch
===================================================================
--- scripts/pre-patch   (revision 551473)
+++ scripts/pre-patch   (working copy)
@@ -4,6 +4,7 @@
 #
 LINUX_DIRS="
        eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.*
+       eclipse.platform.swt.binaries/bundles/org.eclipse.swt.browser.chromium.gtk.linux.*
        eclipse.platform.resources/bundles/org.eclipse.core.filesystem.linux.*
        eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/unix/linux
        eclipse.platform.team/bundles/org.eclipse.core.net.linux.*
-------------------

so it looks that this patch is in the change set:

svn status reports:
M       Makefile
M       distinfo
A       files/cef-patch
M       files/patch-eclipse-platform-parent
M       files/patch-eclipse.pde.ui
M       files/patch-eclipse.platform.releng
M       files/patch-eclipse.platform.releng.tychoeclipsebuilder
M       files/patch-eclipse.platform.resources
M       files/patch-eclipse.platform.runtime
M       files/patch-eclipse.platform.swt
M       files/patch-eclipse.platform.swt.binaries
M       files/patch-eclipse.platform.text
M       files/patch-eclipse.platform.ui
M       files/patch-rt.equinox.framework
M       files/patch-rt.equinox.p2
M       scripts/pre-build
M       scripts/pre-patch
Comment 8 Jonathan Chen 2020-10-07 03:42:18 UTC
Created attachment 218580 [details]
4.17 update (1)

For some reason, the pre-patch isn't being run correctly on the test-build box. I've added diagnostic output to see what is happening.
Comment 9 Kurt Jaeger freebsd_committer 2020-10-07 17:44:22 UTC
(In reply to Jonathan Chen from comment #8)
Looks very similar to the last problem:

https://people.freebsd.org/~pi/logs/eclipse-cur-v2.txt
Comment 10 Jonathan Chen 2020-10-07 17:56:35 UTC
(In reply to Kurt Jaeger from comment #9)

I'm getting a 404 on the link with the latest log output.
Comment 11 Kurt Jaeger freebsd_committer 2020-10-07 18:05:55 UTC
(In reply to Kurt Jaeger from comment #9)
fixed.