Attachment #207254 for bug #240383

View | Details | Raw Unified | Return to bug 240383
Collapse All | Expand All

Lines 3-8 Link Here

(-)./Makefile (-2 / +3 lines)
3		3
4	PORTNAME= eclipse	4	PORTNAME= eclipse
5	PORTVERSION= 4.12	5	PORTVERSION= 4.12
		6	PORTREVISION= 1
6	CATEGORIES= java devel	7	CATEGORIES= java devel
7		8
8	# Update to git-tag on git.eclipse.org	9	# Update to git-tag on git.eclipse.org
Lines 37-44 Link Here
37	equinox/rt.equinox.p2	38	equinox/rt.equinox.p2
38	# Each Eclipse module has its own MASTER_SITE	39	# Each Eclipse module has its own MASTER_SITE
39	.for M in ${ECLIPSE_MODULES}	40	.for M in ${ECLIPSE_MODULES}
40	MASTER_SITES+= https://git.eclipse.org/c/${M}.git/snapshot/:${M:C/[\.\/]//g} \	41	MASTER_SITES+= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${PORTVERSION}/:${M:C/[\.\/]//g} \
41	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${PORTVERSION}/:${M:C/[\.\/]//g}	42	https://git.eclipse.org/c/${M}.git/snapshot/:${M:C/[\.\/]//g}
42	DISTFILES+= ${M:C/.*\///}-${ECLIPSE_SUFX}:${M:C/[\.\/]//g}	43	DISTFILES+= ${M:C/.*\///}-${ECLIPSE_SUFX}:${M:C/[\.\/]//g}
43	.endfor	44	.endfor
44		45




 		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

Return to bug 240383

Lines 159-164 Link Here

(-)./files/patch-eclipse.platform.swt (+12 lines)
159	if (osName.startsWith("Windows")) isWin32 = true;	159	if (osName.startsWith("Windows")) isWin32 = true;
160	IsLinux = isLinux; IsWin32 = isWin32;	160	IsLinux = isLinux; IsWin32 = isWin32;
161		161
		162	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
		163	--- 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
		164	+++ 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
		165	@@ -155,7 +155,7 @@
		166	* https://www.nczonline.net/blog/2009/01/05/what-determines-that-a-script-is-long-running/
		167	* https://stackoverflow.com/questions/3030024/maximum-execution-time-for-javascript
		168	*/
		169	- static final int ASYNC_EXEC_TIMEOUT_MS = 10000; // Webkit2.
		170	+ static final int ASYNC_EXEC_TIMEOUT_MS = 100; // Dirty hack for webkit issues on FreeBSD
		171
		172	static boolean bug522733FirstInstanceCreated = false; //Webkit2 workaround for Bug 522733
		173
162	diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf	174	diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf
163	--- eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf 0000-00-00 00:00:00.000000000 +0000	175	--- eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf 0000-00-00 00:00:00.000000000 +0000
164	+++ eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf 0000-00-00 00:00:00.000000000 +0000	176	+++ eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf 0000-00-00 00:00:00.000000000 +0000