Attachment #234631 for bug #264626

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

Lines 26-32 SWT_VERSION= 4946r21 Link Here

(-)b/x11-toolkits/swt/Makefile (-2 lines)
26		26
27	MAKEFILE= make_freebsd.mak	27	MAKEFILE= make_freebsd.mak
28	MAKE_ENV= SWT_VERSION=${SWT_VERSION}	28	MAKE_ENV= SWT_VERSION=${SWT_VERSION}
29	PLIST_SUB= SWT_VERSION=${SWT_VERSION}
30		29
31	NO_WRKSUBDIR= yes	30	NO_WRKSUBDIR= yes
32		31
Lines 55-61 post-patch: Link Here
55		54
56	do-install:	55	do-install:
57	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}	56	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}
58	${INSTALL_LIB} ${WRKSRC}/libswt-*.so ${STAGEDIR}${PREFIX}/lib
59	${INSTALL_DATA} ${WRKSRC}/swt.jar ${STAGEDIR}${JAVAJARDIR}/	57	${INSTALL_DATA} ${WRKSRC}/swt.jar ${STAGEDIR}${JAVAJARDIR}/
60		58
61	.include <bsd.port.mk>	59	.include <bsd.port.mk>




			<fileset dir="${output.classes}">
				<exclude name="**/*.java"/>
				<exclude name="**/*.o"/>
				<exclude name="**/*.so"/>
			</fileset>
			<fileset dir="${basedir}">
				<include name="**/version.txt"/>
				<include name="**/*.properties"/>
				<include name="**/*.css"/>
				<include name="**/*.so"/>
			</fileset>
		</jar>
	</target>




--- make_freebsd.mak.orig	2022-06-07 13:41:41 UTC
+++ make_freebsd.mak
@@ -12,7 +12,7 @@
 #     IBM Corporation - initial API and implementation

 endif
 
 all: make_swt make_atk make_glx make_webkit
@@ -247,7 +249,8 @@ webkitgtk_custom.o: webkitgtk_custom.c
 make_webkit2extension: $(WEBKIT_EXTENSION_LIB)
 
 $(WEBKIT_EXTENSION_LIB) : webkitgtk_extension.o
-	$(CC) $(LFLAGS) -o $@ $^ $(WEBKIT_EXTENSION_LFLAGS)
+	mkdir -p $(WEBEXTENSION_DIR)
+	$(CC) $(LFLAGS) -o $(WEBEXTENSION_DIR)/$@ $^ $(WEBKIT_EXTENSION_LFLAGS)
 
 webkitgtk_extension.o : webkitgtk_extension.c
 	$(CC) $(CFLAGS) $(WEBKIT_EXTENSION_CFLAGS) ${SWT_PTR_CFLAGS} -fPIC -c $^

Lines 5-11 Link Here

(-)b/x11-toolkits/swt/files/patch-org_eclipse_swt_browser_WebKit.java (-1 / +1 lines)
5	* https://stackoverflow.com/questions/3030024/maximum-execution-time-for-javascript	5	* https://stackoverflow.com/questions/3030024/maximum-execution-time-for-javascript
6	*/	6	*/
7	- static final int ASYNC_EXEC_TIMEOUT_MS = 10000;	7	- static final int ASYNC_EXEC_TIMEOUT_MS = 10000;
8	+ static final int ASYNC_EXEC_TIMEOUT_MS = 100; // Dirty hack for webkit issues on FreeBSD	8	+ static final int ASYNC_EXEC_TIMEOUT_MS = 1000; // Dirty hack for webkit issues on FreeBSD
9		9
10	/** Workaround for bug 522733 */	10	/** Workaround for bug 522733 */
11	static boolean bug522733FirstInstanceCreated = false;	11	static boolean bug522733FirstInstanceCreated = false;

Added Link Here

(-)b/x11-toolkits/swt/files/patch-org_eclipse_swt_graphics_Image.java (+11 lines)
1	--- org/eclipse/swt/graphics/Image.java.orig 2022-06-12 01:50:34 UTC
2	+++ org/eclipse/swt/graphics/Image.java
3	@@ -1246,7 +1246,7 @@ void init(int width, int height) {
4	if (surface == 0) SWT.error(SWT.ERROR_NO_HANDLES);
5	// When we create a blank image we need to set it to 100 in GTK3 as we draw using 100% scale.
6	// Cairo will take care of scaling for us when image needs to be scaled.
7	- if (DPIUtil.useCairoAutoScale()) {
8	+ if (false) {
9	currentDeviceZoom = 100;
10	Cairo.cairo_surface_set_device_scale(surface, 1f, 1f);
11	} else {

Lines 1-9 Link Here

(-)b/x11-toolkits/swt/pkg-plist (-8 lines)
1	lib/libswt-atk-gtk-%%SWT_VERSION%%.so
2	lib/libswt-awt-gtk-%%SWT_VERSION%%.so
3	%%CAIRO%%lib/libswt-cairo-gtk-%%SWT_VERSION%%.so
4	lib/libswt-glx-gtk-%%SWT_VERSION%%.so
5	lib/libswt-gtk-%%SWT_VERSION%%.so
6	lib/libswt-pi3-gtk-%%SWT_VERSION%%.so
7	lib/libswt-webkit-gtk-%%SWT_VERSION%%.so
8	%%WEBKIT%%lib/libswt-webkit2extension-gtk-%%SWT_VERSION%%.so
9	%%JAVAJARDIR%%/swt.jar	1	%%JAVAJARDIR%%/swt.jar

Return to bug 264626

Lines 38-49 Link Here

(-)b/x11-toolkits/swt/files/build.xml (-1 / +1 lines)
38	<fileset dir="${output.classes}">	38	<fileset dir="${output.classes}">
39	<exclude name="*/.java"/>	39	<exclude name="*/.java"/>
40	<exclude name="*/.o"/>	40	<exclude name="*/.o"/>
41	<exclude name="*/.so"/>
42	</fileset>	41	</fileset>
43	<fileset dir="${basedir}">	42	<fileset dir="${basedir}">
44	<include name="**/version.txt"/>	43	<include name="**/version.txt"/>
45	<include name="*/.properties"/>	44	<include name="*/.properties"/>
46	<include name="*/.css"/>	45	<include name="*/.css"/>
		46	<include name="*/.so"/>
47	</fileset>	47	</fileset>
48	</jar>	48	</jar>
49	</target>	49	</target>

Lines 1-4 Link Here

(-)b/x11-toolkits/swt/files/patch-make_freebsd.mak (-1 / +11 lines)
1	--- make_freebsd.mak.orig 2021-07-27 10:18:21 UTC	1	--- make_freebsd.mak.orig 2022-06-07 13:41:41 UTC
2	+++ make_freebsd.mak	2	+++ make_freebsd.mak
3	@@ -12,7 +12,7 @@	3	@@ -12,7 +12,7 @@
4	# IBM Corporation - initial API and implementation	4	# IBM Corporation - initial API and implementation
Lines 68-70 Link Here
68	endif	68	endif
69		69
70	all: make_swt make_atk make_glx make_webkit	70	all: make_swt make_atk make_glx make_webkit
		71	@@ -247,7 +249,8 @@ webkitgtk_custom.o: webkitgtk_custom.c
		72	make_webkit2extension: $(WEBKIT_EXTENSION_LIB)
		73
		74	$(WEBKIT_EXTENSION_LIB) : webkitgtk_extension.o
		75	- $(CC) $(LFLAGS) -o $@ $^ $(WEBKIT_EXTENSION_LFLAGS)
		76	+ mkdir -p $(WEBEXTENSION_DIR)
		77	+ $(CC) $(LFLAGS) -o $(WEBEXTENSION_DIR)/$@ $^ $(WEBKIT_EXTENSION_LFLAGS)
		78
		79	webkitgtk_extension.o : webkitgtk_extension.c
		80	$(CC) $(CFLAGS) $(WEBKIT_EXTENSION_CFLAGS) ${SWT_PTR_CFLAGS} -fPIC -c $^