Attachment 234631 Details for Bug 264626 – swt.diff

[patch] swt.diff

swt.diff (text/plain), 4.22 KB, created by huanghwh on 2022-06-12 07:37:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: huanghwh

Created: 2022-06-12 07:37:58 UTC

Size: 4.22 KB

patch

obsolete

>diff --git a/x11-toolkits/swt/Makefile b/x11-toolkits/swt/Makefile
>index 6be4bf028df8..f7e943d08515 100644
>--- a/x11-toolkits/swt/Makefile
>+++ b/x11-toolkits/swt/Makefile
>@@ -26,7 +26,6 @@ SWT_VERSION=	4946r21
> 
> MAKEFILE=	make_freebsd.mak
> MAKE_ENV=	SWT_VERSION=${SWT_VERSION}
>-PLIST_SUB=	SWT_VERSION=${SWT_VERSION}
> 
> NO_WRKSUBDIR=	yes
> 
>@@ -55,7 +54,6 @@ post-patch:
> 
> do-install:
> 	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}
>-	${INSTALL_LIB} ${WRKSRC}/libswt-*.so ${STAGEDIR}${PREFIX}/lib
> 	${INSTALL_DATA} ${WRKSRC}/swt.jar ${STAGEDIR}${JAVAJARDIR}/
> 
> .include <bsd.port.mk>
>diff --git a/x11-toolkits/swt/files/build.xml b/x11-toolkits/swt/files/build.xml
>index 7411f76da48b..d2531a412ab1 100644
>--- a/x11-toolkits/swt/files/build.xml
>+++ b/x11-toolkits/swt/files/build.xml
>@@ -38,12 +38,12 @@
> 			<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>
>diff --git a/x11-toolkits/swt/files/patch-make_freebsd.mak b/x11-toolkits/swt/files/patch-make_freebsd.mak
>index bc82f853ab8b..f19f8c58ee66 100644
>--- a/x11-toolkits/swt/files/patch-make_freebsd.mak
>+++ b/x11-toolkits/swt/files/patch-make_freebsd.mak
>@@ -1,4 +1,4 @@
>---- make_freebsd.mak.orig	2021-07-27 10:18:21 UTC
>+--- make_freebsd.mak.orig	2022-06-07 13:41:41 UTC
> +++ make_freebsd.mak
> @@ -12,7 +12,7 @@
>  #     IBM Corporation - initial API and implementation
>@@ -68,3 +68,13 @@
>  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 $^
>diff --git a/x11-toolkits/swt/files/patch-org_eclipse_swt_browser_WebKit.java b/x11-toolkits/swt/files/patch-org_eclipse_swt_browser_WebKit.java
>index 463512a1c9b2..5aedcd7675c1 100644
>--- a/x11-toolkits/swt/files/patch-org_eclipse_swt_browser_WebKit.java
>+++ b/x11-toolkits/swt/files/patch-org_eclipse_swt_browser_WebKit.java
>@@ -5,7 +5,7 @@
>  	 * https://stackoverflow.com/questions/3030024/maximum-execution-time-for-javascript
>  	 */
> -	static final int ASYNC_EXEC_TIMEOUT_MS = 10000;
>-+	static final int ASYNC_EXEC_TIMEOUT_MS = 100; // Dirty hack for webkit issues on FreeBSD
>++	static final int ASYNC_EXEC_TIMEOUT_MS = 1000; // Dirty hack for webkit issues on FreeBSD
>  
>  	/** Workaround for bug 522733 */
>  	static boolean bug522733FirstInstanceCreated = false;
>diff --git a/x11-toolkits/swt/files/patch-org_eclipse_swt_graphics_Image.java b/x11-toolkits/swt/files/patch-org_eclipse_swt_graphics_Image.java
>new file mode 100644
>index 000000000000..6312ff7a2832
>--- /dev/null
>+++ b/x11-toolkits/swt/files/patch-org_eclipse_swt_graphics_Image.java
>@@ -0,0 +1,11 @@
>+--- org/eclipse/swt/graphics/Image.java.orig	2022-06-12 01:50:34 UTC
>++++ org/eclipse/swt/graphics/Image.java
>+@@ -1246,7 +1246,7 @@ void init(int width, int height) {
>+ 	if (surface == 0) SWT.error(SWT.ERROR_NO_HANDLES);
>+ 	// When we create a blank image we need to set it to 100 in GTK3 as we draw using 100% scale.
>+ 	// Cairo will take care of scaling for us when image needs to be scaled.
>+-	if (DPIUtil.useCairoAutoScale()) {
>++	if (false) {
>+ 		currentDeviceZoom = 100;
>+ 		Cairo.cairo_surface_set_device_scale(surface, 1f, 1f);
>+ 	} else {
>diff --git a/x11-toolkits/swt/pkg-plist b/x11-toolkits/swt/pkg-plist
>index 0bd8700b4762..15ec990cd850 100644
>--- a/x11-toolkits/swt/pkg-plist
>+++ b/x11-toolkits/swt/pkg-plist
>@@ -1,9 +1 @@
>-lib/libswt-atk-gtk-%%SWT_VERSION%%.so
>-lib/libswt-awt-gtk-%%SWT_VERSION%%.so
>-%%CAIRO%%lib/libswt-cairo-gtk-%%SWT_VERSION%%.so
>-lib/libswt-glx-gtk-%%SWT_VERSION%%.so
>-lib/libswt-gtk-%%SWT_VERSION%%.so
>-lib/libswt-pi3-gtk-%%SWT_VERSION%%.so
>-lib/libswt-webkit-gtk-%%SWT_VERSION%%.so
>-%%WEBKIT%%lib/libswt-webkit2extension-gtk-%%SWT_VERSION%%.so
> %%JAVAJARDIR%%/swt.jar

Actions: View | Diff

Attachments on bug 264626: 234631 | 234737 | 234738 | 234739