svn commit: r511553 - in head/java/eclipse: . files

[Kurt Jaeger]

Author: pi
Date: Sun Sep  8 07:27:31 2019
New Revision: 511553
URL: https://svnweb.freebsd.org/changeset/ports/511553

Log:
  java/eclipse: usablity patch for webkit2-gtk3 issues
  
  - usability patch for PR:238844 (not a fix, but keeps Eclipse usable)
  - use github.com servers in preference to git.eclipse.org for distfiles
  
  PR:		240383
  Submitted by:	Jonathan Chen <jonc at chen.org.nz> (maintainer)

Modified:
  head/java/eclipse/Makefile
  head/java/eclipse/files/patch-eclipse.platform.swt

Modified: head/java/eclipse/Makefile
==============================================================================
--- head/java/eclipse/Makefile	Sun Sep  8 06:47:43 2019	(r511552)
+++ head/java/eclipse/Makefile	Sun Sep  8 07:27:31 2019	(r511553)
@@ -3,6 +3,7 @@
 
 PORTNAME=	eclipse
 PORTVERSION=	4.12
+PORTREVISION=	1
 CATEGORIES=	java devel
 
 # Update to git-tag on git.eclipse.org
@@ -37,8 +38,8 @@ ECLIPSE_MODULES=jdt/eclipse.jdt \
 		equinox/rt.equinox.p2
 # Each Eclipse module has its own MASTER_SITE
 .for M in ${ECLIPSE_MODULES}
-MASTER_SITES+=	https://git.eclipse.org/c/${M}.git/snapshot/:${M:C/[\.\/]//g} \
-		https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${PORTVERSION}/:${M:C/[\.\/]//g}
+MASTER_SITES+=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${PORTVERSION}/:${M:C/[\.\/]//g} \
+		https://git.eclipse.org/c/${M}.git/snapshot/:${M:C/[\.\/]//g}
 DISTFILES+=	${M:C/.*\///}-${ECLIPSE_SUFX}:${M:C/[\.\/]//g}
 .endfor
 

Modified: head/java/eclipse/files/patch-eclipse.platform.swt
==============================================================================
--- head/java/eclipse/files/patch-eclipse.platform.swt	Sun Sep  8 06:47:43 2019	(r511552)
+++ head/java/eclipse/files/patch-eclipse.platform.swt	Sun Sep  8 07:27:31 2019	(r511553)
@@ -159,6 +159,18 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/
  		if (osName.startsWith("Windows")) isWin32 = true;
  		IsLinux = isLinux;  IsWin32 = isWin32;
  
+diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java
+--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java	0000-00-00 00:00:00.000000000 +0000
++++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java	0000-00-00 00:00:00.000000000 +0000
+@@ -155,7 +155,7 @@
+ 	 * https://www.nczonline.net/blog/2009/01/05/what-determines-that-a-script-is-long-running/
+ 	 * https://stackoverflow.com/questions/3030024/maximum-execution-time-for-javascript
+ 	 */
+-	static final int ASYNC_EXEC_TIMEOUT_MS = 10000; // Webkit2.
++	static final int ASYNC_EXEC_TIMEOUT_MS = 100; // Dirty hack for webkit issues on FreeBSD
+ 
+ 	static boolean bug522733FirstInstanceCreated = false; //Webkit2 workaround for Bug 522733
+ 
 diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf
 --- eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf	0000-00-00 00:00:00.000000000 +0000
 +++ eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf	0000-00-00 00:00:00.000000000 +0000