Attachment 212285 Details for Bug 244585 – SWT 4.14 update

[patch] SWT 4.14 update

swt.patch (text/plain), 26.40 KB, created by huanghwh on 2020-03-09 14:08:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: huanghwh

Created: 2020-03-09 14:08:59 UTC

Size: 26.40 KB

patch

obsolete

>diff -uNr swt/Makefile swt414/Makefile
>--- swt/Makefile	2020-03-09 21:59:18.572571000 +0800
>+++ swt414/Makefile	2020-03-04 12:00:33.144659000 +0800
>@@ -1,77 +1,46 @@
> # Created by: Robert C. Noland III <rnoland@FreeBSD.org>
>-# $FreeBSD: head/x11-toolkits/swt/Makefile 518482 2019-11-26 21:46:12Z jkim $
>+# $FreeBSD: head/x11-toolkits/swt/Makefile 498679 2019-04-11 20:32:53Z antoine $
> 
> PORTNAME=	swt
>-DISTVERSION=	4.7.3a
>+DISTVERSION=	4.14
> CATEGORIES=	x11-toolkits devel java
>-MASTER_SITES=	http://archive.eclipse.org/eclipse/downloads/drops4/R-${DISTVERSION}-201803300640/
>+MASTER_SITES=	http://archive.eclipse.org/eclipse/downloads/drops4/R-${DISTVERSION}-201912100610/
> DISTNAME=	swt-${DISTVERSION}-${DIST_EXT}
>+DIST_EXT=	gtk-linux-x86_64
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Standard Widget Toolkit for Java
> 
> LICENSE=	EPL
> 
>-ONLY_FOR_ARCHS=	amd64 i386
>-BROKEN_i386=	missing distinfo
>+ONLY_FOR_ARCHS=	amd64
> 
>-USES=		gl gnome pkgconfig zip:infozip xorg
>+LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk3
>+USES=		gmake pkgconfig gnome zip:infozip
> 
>-SWT_VERSION=	4763
>+SWT_VERSION=	4930r7
> OUTPUT_JAR=	swt.jar
> 
>-USE_GL=		glu gl
>-USE_GNOME=	gtk20
>+USE_GNOME=	gtk30
> USE_JAVA=	yes
>-USE_XORG=	xtst
>+JAVA_VERSION=	1.8+
> JAVA_OS=	native
> USE_ANT=	yes
> MAKE_ARGS+=	-Doutput.jar=${OUTPUT_JAR}
>-MAKEFILE=	make_freebsd.mak
>+MAKEFILE=	make_linux.mak
> USE_LDCONFIG=	yes
> PLIST_SUB=	BUILD=${SWT_VERSION}
>-PLIST_FILES=	${JAVAJARDIR}/${OUTPUT_JAR} \
>-		lib/libswt-atk-gtk-${SWT_VERSION}.so \
>-		lib/libswt-awt-gtk-${SWT_VERSION}.so \
>-		lib/libswt-gtk-${SWT_VERSION}.so \
>-		lib/libswt-glx-gtk-${SWT_VERSION}.so \
>-		lib/libswt-pi-gtk-${SWT_VERSION}.so
>+PLIST_FILES=	${JAVAJARDIR}/${OUTPUT_JAR}
> 
> NO_WRKSUBDIR=	yes
> 
>-OPTIONS_DEFINE=	CAIRO
>-OPTIONS_DEFAULT=	CAIRO
>-
>-.include <bsd.port.options.mk>
>-
>-.if ${PORT_OPTIONS:MCAIRO}
>-LIB_DEPENDS+=	libcairo.so:graphics/cairo
>-PLIST_FILES+=	lib/libswt-cairo-gtk-${SWT_VERSION}.so
>-MAKE_CAIRO=	make_cairo
>-.endif
>-
>-MAKE_ENV+=	MAKE_CAIRO=${MAKE_CAIRO} \
>-		MAKE_MOZILLA=${MAKE_MOZILLA} \
>-		JAVA_HOME=${JAVA_HOME}
>-
>-.if (${ARCH} == "amd64")
>-DIST_EXT=	gtk-linux-x86_64
>-.else
>-DIST_EXT=	gtk-linux-x86
>-.endif
>-
> post-extract:
> 	@(cd ${WRKSRC} && ${UNZIP_CMD} -qo "*.zip")
> 	@${RM} ${WRKSRC}/*.o ${WRKSRC}/*.so ${WRKSRC}/*.jar
> 	@${CP} ${FILESDIR}/build.xml ${WRKSRC}/build.xml
> 
>-post-patch:
>-	${SED} -e 's|freebsd|dragonfly|g' ${WRKSRC}/make_freebsd.mak \
>-		> ${WRKSRC}/make_dragonfly.mak
>-
> do-install:
> 	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}
>-	${INSTALL_LIB} ${WRKSRC}/libswt-*.so ${STAGEDIR}${PREFIX}/lib
> 	${INSTALL_DATA} ${WRKSRC}/${OUTPUT_JAR} ${STAGEDIR}${JAVAJARDIR}/
> 
> .include <bsd.port.mk>
>diff -uNr swt/distinfo swt414/distinfo
>--- swt/distinfo	2020-03-09 21:59:18.554046000 +0800
>+++ swt414/distinfo	2020-03-01 08:40:30.589832000 +0800
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1530093075
>-SHA256 (swt-4.7.3a-gtk-linux-x86_64.zip) = 856005feff25de55f7d7b304d2cbed9dd24938c7b6d07ffd7413b8361a4753e3
>-SIZE (swt-4.7.3a-gtk-linux-x86_64.zip) = 6360885
>+TIMESTAMP = 1583023230
>+SHA256 (swt-4.14-gtk-linux-x86_64.zip) = 442fdae96b0a75ffe3d753fd3394113630766050cd2390e92a83ade17ceac08b
>+SIZE (swt-4.14-gtk-linux-x86_64.zip) = 3898527
>diff -uNr swt/files/build.xml swt414/files/build.xml
>--- swt/files/build.xml	2020-03-09 21:59:45.335749000 +0800
>+++ swt414/files/build.xml	2020-03-01 09:04:22.845760000 +0800
>@@ -9,14 +9,14 @@
>     Contributors:
>         IBM Corporation - initial API and implementation
>  -->
>-<project name="org.eclipse.swt.gtk.freebsd.x86_64" default="build.jar" basedir=".">
>+<project name="org.eclipse.swt.gtk.freebsd.amd64" default="build.jar" basedir=".">
> 
> 	<target name="init">
> 		<property name="ws" value="gtk"/>
> 		<property name="os" value="freebsd"/>
> 		<property name="destination" value="${basedir}"/>
>                 <property name="javac.verbose" value="false"/>
>-                <property name="javac.debug" value="off"/>
>+                <property name="javac.debug" value="on"/>
> 		<property name="input.srcdir" value="${basedir}/org"/>
> 		<property name="output.jar" value="${basedir}/swt.jar"/>
> 		<property name="output.classes" value="${basedir}/classes"/>
>@@ -38,12 +38,13 @@
> 			<fileset dir="${output.classes}">
> 				<exclude name="**/*.java"/>
> 				<exclude name="**/*.o"/>
>-				<exclude name="**/*.so"/>
> 				
> 				<exclude name="**/CVS/**"/>
> 			</fileset>
> 			<fileset dir="${basedir}">
> 				<include name="**/version.txt"/>
>+				<include name="**/*.css"/>
>+				<include name="**/*.so"/>
> 				<include name="**/*.properties"/>
> 			</fileset>
> 		</jar>
>diff -uNr swt/files/patch-OS.java swt414/files/patch-OS.java
>--- swt/files/patch-OS.java	2020-03-09 21:59:45.334754000 +0800
>+++ swt414/files/patch-OS.java	1970-01-01 08:00:00.000000000 +0800
>@@ -1,26 +0,0 @@
>---- org/eclipse/swt/internal/gtk/OS.java.orig	2018-03-01 07:35:24.000000000 +0100
>-+++ org/eclipse/swt/internal/gtk/OS.java	2018-06-27 11:17:53.291216000 +0200
>-@@ -20,19 +20,20 @@
>- 
>- public class OS extends C {
>- 	/** OS Constants */
>--	public static final boolean IsAIX, IsSunOS, IsLinux, IsHPUX, IsWin32, BIG_ENDIAN;
>-+	public static final boolean IsAIX, IsSunOS, IsLinux, IsHPUX, IsWin32, BIG_ENDIAN, IsFreeBSD;
>- 	static {
>- 
>- 		/* Initialize the OS flags and locale constants */
>- 		String osName = System.getProperty ("os.name");
>--		boolean isAIX = false, isSunOS = false, isLinux = false, isHPUX = false, isWin32 = false;
>-+		boolean isAIX = false, isSunOS = false, isLinux = false, isHPUX = false, isWin32 = false, isFreeBSD = false;
>- 		if (osName.equals ("Linux")) isLinux = true;
>- 		if (osName.equals ("AIX")) isAIX = true;
>- 		if (osName.equals ("Solaris")) isSunOS = true;
>- 		if (osName.equals ("SunOS")) isSunOS = true;
>- 		if (osName.equals ("HP-UX")) isHPUX = true;
>- 		if (osName.startsWith("Windows")) isWin32 = true;
>--		IsAIX = isAIX;  IsSunOS = isSunOS;  IsLinux = isLinux;  IsHPUX = isHPUX; IsWin32 = isWin32;
>-+		if (osName.equals ("FreeBSD")) isFreeBSD = true;
>-+		IsAIX = isAIX;  IsSunOS = isSunOS;  IsLinux = isLinux;  IsHPUX = isHPUX; IsWin32 = isWin32;  IsFreeBSD = isFreeBSD;
>- 
>- 		byte[] buffer = new byte[4];
>- 		long /*int*/ ptr = OS.malloc(4);
>diff -uNr swt/files/patch-build.sh swt414/files/patch-build.sh
>--- swt/files/patch-build.sh	2020-03-09 21:59:45.337628000 +0800
>+++ swt414/files/patch-build.sh	2020-03-01 09:03:47.634807000 +0800
>@@ -1,84 +1,67 @@
>---- build.sh.orig	2018-03-01 07:35:22.000000000 +0100
>-+++ build.sh	2018-06-27 11:24:43.371971000 +0200
>-@@ -115,9 +115,19 @@
>- 			fi
>- 		fi
>+--- build.sh.orig	2019-12-09 22:30:04 UTC
>++++ build.sh
>+@@ -72,7 +72,7 @@ echo -e "${RED}*** ${@}${NC}"
>+ 
>+ cd `dirname $0`
>+ 
>+-MAKE_TYPE=make
>++MAKE_TYPE=gmake
>+ 
>+ export CFLAGS='-O -Wall -fPIC'
>+ 
>+@@ -86,21 +86,14 @@ case $OS in
>+ 		MAKEFILE=make_win32.mak
>  		;;
>-+	"DragonFly")
>-+		SWT_OS=dragonfly
>-+		MAKEFILE=make_dragonfly.mak
>-+		if uname -p > /dev/null 2>&1; then
>-+			MODEL=`uname -p`
>-+		fi
>-+		;;
>- 	"FreeBSD")
>- 		SWT_OS=freebsd
>- 		MAKEFILE=make_freebsd.mak
>-+		if uname -p > /dev/null 2>&1; then
>-+			MODEL=`uname -p`
>-+		fi
>+ 	*)
>+-		SWT_OS=`uname -s | tr -s '[:upper:]' '[:lower:]'`
>++		SWT_OS=`uname -s | tr '[:upper:]' '[:lower:]'`
>+ 		MAKEFILE=make_linux.mak
>  		;;
>- 	"Windows_NT")
>- 		SWT_OS=win32
>-@@ -469,10 +479,10 @@
>+ esac
>  
>+ # Determine which CPU type we are building for
>+ if [ "${MODEL}" = "" ]; then
>+-	if uname -i > /dev/null 2>&1; then
>+-		MODEL=`uname -i`
>+-		if [ ${MODEL} = 'unknown' ]; then
>+-		  MODEL=`uname -m`
>+-		fi
>+-	else
>+ 		MODEL=`uname -m`
>+-	fi
>+ fi
>+ case $MODEL in
>+ 	"x86_64")
>+@@ -111,6 +104,11 @@ case $MODEL in
>+ 		SWT_ARCH=x86
>+ 		AWT_ARCH=i386
>+ 		;;
>++	"powerpc" | "powerpc64")
>++		SWT_ARCH=ppc64
>++		AWT_ARCH=ppc64
>++		MODEL=`uname -p`
>++		;;
>+ 	*)
>+ 		SWT_ARCH=$MODEL
>+ 		AWT_ARCH=$MODEL
>+@@ -194,7 +192,7 @@ esac
>  
>+ 
>  # For 64-bit CPUs, we have a switch
>--if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 'sparcv9'  -o ${MODEL} = 's390x' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' ]; then
>-+if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 'sparcv9'  -o ${MODEL} = 's390x' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64'  -o ${MODEL} = 'amd64' ]; then
>+-if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' ]; then
>++if [ ${MODEL} = 'amd64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' -o ${MODEL} = 'powerpc64' ]; then
>  	SWT_PTR_CFLAGS=-DJNI64
>  	if [ -d /lib64 ]; then
>--		XLIB64=-L/usr/X11R6/lib64
>-+		XLIB64=-L${LOCALBASE}/lib64
>- 		export XLIB64
>+ 		XLIB64=-L/usr/X11R6/lib64
>+@@ -205,6 +203,11 @@ if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ia64' -o ${MOD
>+ 		XLIB64="${XLIB64} -L/usr/lib64"
>+ 		SWT_LFLAGS=-m64
>+ 		export SWT_LFLAGS
>++	fi
>++	if [ ${SWT_OS} = "freebsd" ]
>++	then
>++		SWT_PTR_CFLAGS="${SWT_PTR_CFLAGS} -m64"
>++		export SWT_LFLAGS=-m64
>  	fi
>- 	if [ ${MODEL} = 'ppc64' -o ${MODEL} = 'ppc64le' ]; then
>-@@ -517,37 +527,24 @@
>- 	export SWT_LFLAGS SWT_PTR_CFLAGS
>+ 	export SWT_PTR_CFLAGS
>  fi
>- 
>--
>-+if [ x${MAKE_CAIRO} = "xmake_cairo" ]; then
>- if [ x`pkg-config --exists cairo && echo YES` = "xYES" ]; then
>- 	func_echo_plus "Cairo found, compiling SWT support for the cairo graphics library."
>- 	MAKE_CAIRO=make_cairo
>- else
>- 	func_echo_error "Cairo not found: Advanced graphics support using cairo will not be compiled."
>- fi
>-+fi
>- 
>--if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" -a ${SWT_OS} != 'solaris' ]; then
>--	if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then
>--		MOZILLA_INCLUDES=`pkg-config --cflags mozilla-xpcom`
>--		MOZILLA_LIBS=`pkg-config --libs mozilla-xpcom`
>--		export MOZILLA_INCLUDES
>--		export MOZILLA_LIBS
>--		MAKE_MOZILLA=make_mozilla
>--	elif [ x`pkg-config --exists firefox-xpcom && echo YES` = "xYES" ]; then
>--		MOZILLA_INCLUDES=`pkg-config --cflags firefox-xpcom`
>--		MOZILLA_LIBS=`pkg-config --libs firefox-xpcom`
>--		export MOZILLA_INCLUDES
>--		export MOZILLA_LIBS
>--		MAKE_MOZILLA=make_mozilla
>--	elif [ x`pkg-config --exists libxul && echo YES` = "xYES" ]; then
>--		XULRUNNER_INCLUDES=`pkg-config --cflags libxul`
>--		XULRUNNER_LIBS=`pkg-config --libs libxul`
>--		export XULRUNNER_INCLUDES
>--		export XULRUNNER_LIBS
>--		MAKE_MOZILLA=make_xulrunner
>--	else
>--		func_echo_error "None of the following libraries were found:  Mozilla/XPCOM, Firefox/XPCOM, or XULRunner/XPCOM:"
>--		func_echo_error "   >> Mozilla embedding support will not be compiled."
>--	fi
>-+if [ x${MAKE_MOZILLA} = "xmake_xulrunner" ]; then
>-+	echo "Using libxul for gecko support"
>-+	XULRUNNER_INCLUDES=`pkg-config --cflags libxul libxul-embedding`
>-+	XULRUNNER_LIBS=`pkg-config --libs libxul libxul-embedding`
>-+	export XULRUNNER_INCLUDES
>-+	export XULRUNNER_LIBS
>-+else
>-+	echo "None of the following libraries were found:  XULRunner/XPCOM"
>-+	echo "    *** Mozilla embedding support will not be compiled."
>- fi
>- 
>- # Find AWT if available
>diff -uNr swt/files/patch-make__linux.mak swt414/files/patch-make__linux.mak
>--- swt/files/patch-make__linux.mak	1970-01-01 08:00:00.000000000 +0800
>+++ swt414/files/patch-make__linux.mak	2020-03-01 09:03:47.637512000 +0800
>@@ -0,0 +1,46 @@
>+--- make_linux.mak.orig	2019-12-09 22:30:04 UTC
>++++ make_linux.mak
>+@@ -101,16 +101,18 @@ ATK_OBJECTS = swt.o atk.o atk_structs.o atk_custom.o a
>+ WEBKIT_OBJECTS = swt.o webkitgtk.o webkitgtk_structs.o webkitgtk_stats.o webkitgtk_custom.o
>+ GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
>+ 
>++port_prefix=`pkg-config --variable=prefix gtk+-3.0`
>+ CFLAGS := $(CFLAGS) \
>+ 		-DSWT_VERSION=$(SWT_VERSION) \
>+ 		$(NATIVE_STATS) \
>+ 		$(SWT_DEBUG) \
>+ 		$(SWT_WEBKIT_DEBUG) \
>+-		-DLINUX -DGTK \
>++		-DFREEBSD -DGTK \
>++		-I$(port_prefix)/include \
>+ 		-I$(JAVA_HOME)/include \
>+-		-I$(JAVA_HOME)/include/linux \
>++		-I$(JAVA_HOME)/include/freebsd \
>+ 		${SWT_PTR_CFLAGS}
>+-LFLAGS = -shared -fPIC ${SWT_LFLAGS}
>++LFLAGS = -shared -fPIC -m64 ${SWT_LFLAGS} -L$(port_prefix)/lib
>+ 
>+ ifndef NO_STRIP
>+ 	# -s = Remove all symbol table and relocation information from the executable.
>+@@ -217,7 +219,10 @@ webkitgtk_custom.o: webkitgtk_custom.c
>+ make_webkit2extension: $(WEBKIT_EXTENSION_LIB)
>+ 
>+ $(WEBKIT_EXTENSION_LIB) : webkitgtk_extension.o
>++	@-[ -d $(WEBEXTENSION_DIR) ] || mkdir -v $(WEBEXTENSION_DIR)  # If folder does not exist, make it.
>+ 	$(CC) $(LFLAGS) -o $@ $^ $(WEBKIT_EXTENSION_LFLAGS)
>++	-mv $(WEBKIT_EXTENSION_LIB) $(WEBEXTENSION_DIR)/
>++	
>+ 
>+ webkitgtk_extension.o : webkitgtk_extension.c
>+ 	$(CC) $(CFLAGS) $(WEBKIT_EXTENSION_CFLAGS) ${SWT_PTR_CFLAGS} -fPIC -c $^
>+@@ -253,10 +258,6 @@ install: all
>+ 	cp $(ALL_SWT_LIBS) $(OUTPUT_DIR)
>+ ifeq ($(BUILD_WEBKIT2EXTENSION),yes)
>+ 	@# Copy webextension into it's own folder, but create folder first.
>+-	@# CAREFULLY delete '.so' files inside webextension*. Then carefully remove the directories. 'rm -rf' seemed too risky of an approach.
>+-	@-[ "$$(ls -d $(OUTPUT_DIR)/$(WEBEXTENSION_BASE_DIR)*/*.so)" ] && rm -v `ls -d $(OUTPUT_DIR)/$(WEBEXTENSION_BASE_DIR)*/*.so`
>+-	@-[ "$$(ls -d $(OUTPUT_DIR)/$(WEBEXTENSION_BASE_DIR)*)" ] && rmdir -v `ls -d $(OUTPUT_DIR)/$(WEBEXTENSION_BASE_DIR)*`
>+-
>+ 	@# Copying webextension is not critical for build to succeed, thus we use '-'. SWT can still function without a webextension.
>+ 	@-[ -d $(OUTPUT_DIR)/$(WEBEXTENSION_DIR) ] || mkdir -v $(OUTPUT_DIR)/$(WEBEXTENSION_DIR)  # If folder does not exist, make it.
>+ 	-cp $(WEBKIT_EXTENSION_LIB) $(OUTPUT_DIR)/$(WEBEXTENSION_DIR)/
>diff -uNr swt/files/patch-make_freebsd.mak swt414/files/patch-make_freebsd.mak
>--- swt/files/patch-make_freebsd.mak	2020-03-09 21:59:45.333186000 +0800
>+++ swt414/files/patch-make_freebsd.mak	1970-01-01 08:00:00.000000000 +0800
>@@ -1,129 +0,0 @@
>---- make_freebsd.mak.orig	2018-03-01 07:35:22.000000000 +0100
>-+++ make_freebsd.mak	2018-06-27 11:33:21.105457000 +0200
>-@@ -9,7 +9,7 @@
>- #     IBM Corporation - initial API and implementation
>- #*******************************************************************************
>- 
>--# Makefile for creating SWT libraries for Linux GTK
>-+# Makefile for creating SWT libraries for FreeBSD GTK
>- 
>- include make_common.mak
>- 
>-@@ -43,7 +43,7 @@
>- 
>- # Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0)
>- GTKCFLAGS = `pkg-config --cflags gtk+-2.0 gtk+-unix-print-$(GTK_VERSION)`
>--GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L/usr/X11R6/lib $(XLIB64) -lXtst
>-+GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L$(LOCALBASE)/lib $(XLIB64) -lXtst
>- 
>- AWT_LFLAGS = -shared
>- AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt
>-@@ -51,7 +51,8 @@
>- ATKCFLAGS = `pkg-config --cflags atk gtk+-2.0 gtk+-unix-print-$(GTK_VERSION)`
>- ATKLIBS = `pkg-config --libs-only-L atk gtk+-2.0` -latk-1.0 -lgtk-x11-2.0
>- 
>--GLXLIBS = -L/usr/X11R6/lib -lGL -lGLU -lm
>-+GLXCFLAGS = -I$(LOCALBASE)/include
>-+GLXLIBS = -L$(LOCALBASE)/lib -lGL -lGLU -lm
>- 
>- # Uncomment for Native Stats tool
>- #NATIVE_STATS = -DNATIVE_STATS
>-@@ -70,14 +71,24 @@
>- 	-I$(JAVA_HOME)/include/freebsd \
>- 	${SWT_PTR_CFLAGS}
>- MOZILLALFLAGS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic
>--	
>-+MOZILLAEXCLUDES = -DNO__1XPCOMGlueShutdown \
>-+	-DNO__1XPCOMGlueStartup \
>-+	-DNO__1XPCOMGlueLoadXULFunctions \
>-+	-DNO_memmove__ILorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2I \
>-+	-DNO_memmove__JLorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2J \
>-+	-DNO_nsDynamicFunctionLoad_1sizeof \
>-+	-DNO__1Call__IIIIII \
>-+	-DNO__1Call__JJJJJI \
>-+	-DNO_nsDynamicFunctionLoad
>-+XULRUNNEREXCLUDES = -DNO__1NS_1InitXPCOM2
>-+
>- SWT_OBJECTS = swt.o c.o c_stats.o callback.o
>- AWT_OBJECTS = swt_awt.o
>- SWTPI_OBJECTS = swt.o os.o os_structs.o os_custom.o os_stats.o
>- CAIRO_OBJECTS = swt.o cairo.o cairo_structs.o cairo_stats.o
>- ATK_OBJECTS = swt.o atk.o atk_structs.o atk_custom.o atk_stats.o
>- MOZILLA_OBJECTS = swt.o xpcom.o xpcom_custom.o xpcom_structs.o xpcom_stats.o
>--XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomxul_stats.o xpcomxulglue.o xpcomxulglue_stats.o
>-+XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomxul_stats.o
>- XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o
>- GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
>- 
>-@@ -85,17 +96,18 @@
>- 		-DSWT_VERSION=$(SWT_VERSION) \
>- 		$(NATIVE_STATS) \
>- 		-DFREEBSD -DGTK \
>-+		-I$(LOCALBASE)/include \
>- 		-I$(JAVA_HOME)/include \
>- 		-I$(JAVA_HOME)/include/freebsd \
>- 		-fPIC \
>- 		${SWT_PTR_CFLAGS}
>- LFLAGS = -shared -fPIC
>- 
>--ifndef NO_STRIP
>--	AWT_LFLAGS := $(AWT_LFLAGS) -s
>--	MOZILLALFLAGS := $(MOZILLALFLAGS) -s
>--	LFLAGS := $(LFLAGS) -s
>--endif
>-+.ifndef NO_STRIP
>-+AWT_LFLAGS := $(AWT_LFLAGS) -s
>-+MOZILLALFLAGS := $(MOZILLALFLAGS) -s
>-+LFLAGS := $(LFLAGS) -s
>-+.endif
>- 
>- all: make_swt make_atk make_glx
>- 
>-@@ -173,16 +185,16 @@
>- 	$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
>- 
>- xpcom.o: xpcom.cpp
>--	$(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom.cpp
>-+	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp
>- 
>- xpcom_structs.o: xpcom_structs.cpp
>--	$(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_structs.cpp
>-+	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_structs.cpp
>- 	
>- xpcom_custom.o: xpcom_custom.cpp
>--	$(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_custom.cpp
>-+	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_custom.cpp
>- 
>- xpcom_stats.o: xpcom_stats.cpp
>--	$(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_stats.cpp
>-+	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_stats.cpp
>- 
>- #
>- # XULRunner lib
>-@@ -193,22 +205,16 @@
>- 	$(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
>- 
>- xpcomxul.o: xpcom.cpp
>--	$(CXX) -o xpcomxul.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom.cpp
>-+	$(CXX) -o xpcomxul.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom.cpp
>- 
>- xpcomxul_structs.o: xpcom_structs.cpp
>--	$(CXX) -o xpcomxul_structs.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom_structs.cpp
>-+	$(CXX) -o xpcomxul_structs.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_structs.cpp
>- 	
>- xpcomxul_custom.o: xpcom_custom.cpp
>--	$(CXX) -o xpcomxul_custom.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom_custom.cpp
>-+	$(CXX) -o xpcomxul_custom.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_custom.cpp
>- 
>- xpcomxul_stats.o: xpcom_stats.cpp
>--	$(CXX) -o xpcomxul_stats.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom_stats.cpp
>--
>--xpcomxulglue.o: xpcomglue.cpp
>--	$(CXX) -o xpcomxulglue.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcomglue.cpp
>--
>--xpcomxulglue_stats.o: xpcomglue_stats.cpp
>--	$(CXX) -o xpcomxulglue_stats.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcomglue_stats.cpp
>-+	$(CXX) -o xpcomxul_stats.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_stats.cpp
>- 
>- #
>- # XPCOMInit lib
>diff -uNr swt/files/patch-org_eclipse_swt_internal_Library.java swt414/files/patch-org_eclipse_swt_internal_Library.java
>--- swt/files/patch-org_eclipse_swt_internal_Library.java	1970-01-01 08:00:00.000000000 +0800
>+++ swt414/files/patch-org_eclipse_swt_internal_Library.java	2020-03-01 09:03:47.640143000 +0800
>@@ -0,0 +1,16 @@
>+--- org/eclipse/swt/internal/Library.java.orig	2019-12-09 22:30:06 UTC
>++++ org/eclipse/swt/internal/Library.java
>+@@ -69,12 +69,12 @@ static {
>+ static String arch() {
>+ 	String osArch = System.getProperty("os.arch"); //$NON-NLS-1$
>+ 	if (osArch.equals ("i386") || osArch.equals ("i686")) return "x86"; //$NON-NLS-1$ $NON-NLS-2$ $NON-NLS-3$
>+-	if (osArch.equals ("amd64")) return "x86_64"; //$NON-NLS-1$ $NON-NLS-2$
>+ 	return osArch;
>+ }
>+ 
>+ static String os() {
>+ 	String osName = System.getProperty("os.name"); //$NON-NLS-1$
>++	if (osName.equals ("FreeBSD")) return "freebsd"; //$NON-NLS-1$ $NON-NLS-2$
>+ 	if (osName.equals ("Linux")) return "linux"; //$NON-NLS-1$ $NON-NLS-2$
>+ 	if (osName.equals ("Mac OS X")) return "macosx"; //$NON-NLS-1$ $NON-NLS-2$
>+ 	if (osName.startsWith ("Win")) return "win32"; //$NON-NLS-1$ $NON-NLS-2$
>diff -uNr swt/files/patch-org_eclipse_swt_internal_gtk_OS.java swt414/files/patch-org_eclipse_swt_internal_gtk_OS.java
>--- swt/files/patch-org_eclipse_swt_internal_gtk_OS.java	1970-01-01 08:00:00.000000000 +0800
>+++ swt414/files/patch-org_eclipse_swt_internal_gtk_OS.java	2020-03-01 09:03:47.642855000 +0800
>@@ -0,0 +1,13 @@
>+--- org/eclipse/swt/internal/gtk/OS.java.orig	2019-12-09 22:30:06 UTC
>++++ org/eclipse/swt/internal/gtk/OS.java
>+@@ -60,8 +60,8 @@ public class OS extends C {
>+ 
>+ 		/* Initialize the OS flags and locale constants */
>+ 		String osName = System.getProperty ("os.name");
>+-		boolean isLinux = false, isWin32 = false;
>+-		if (osName.equals ("Linux")) isLinux = true;
>++		boolean isLinux = osName.equals ("Linux") || osName.equals ("FreeBSD");
>++		boolean isWin32 = false;
>+ 		if (osName.startsWith("Windows")) isWin32 = true;
>+ 		IsLinux = isLinux;  IsWin32 = isWin32;
>+ 
>diff -uNr swt/files/patch-org_eclipse_swt_internal_gtk_swt__functional__gtk__3__20.css swt414/files/patch-org_eclipse_swt_internal_gtk_swt__functional__gtk__3__20.css
>--- swt/files/patch-org_eclipse_swt_internal_gtk_swt__functional__gtk__3__20.css	1970-01-01 08:00:00.000000000 +0800
>+++ swt414/files/patch-org_eclipse_swt_internal_gtk_swt__functional__gtk__3__20.css	2020-03-01 09:03:47.645505000 +0800
>@@ -0,0 +1,17 @@
>+--- org/eclipse/swt/internal/gtk/swt_functional_gtk_3_20.css.orig	2020-03-01 01:03:01 UTC
>++++ org/eclipse/swt/internal/gtk/swt_functional_gtk_3_20.css
>+@@ -0,0 +1,13 @@
>++@binding-set SWTTreeViewBinding {
>++	bind "Left" { "expand-collapse-cursor-row" (0,0,0)};
>++	bind "Right" { "expand-collapse-cursor-row" (0,1,0)};
>++}
>++
>++treeview {
>++	-gtk-key-bindings: SWTTreeViewBinding;
>++}
>++
>++scrolledwindow undershoot.top, scrolledwindow undershoot.right,
>++	scrolledwindow undershoot.bottom, scrolledwindow undershoot.left {
>++	background-image: none;
>++}
>+\ No newline at end of file
>diff -uNr swt/files/patch-org_eclipse_swt_internal_gtk_swt__functional__gtk__pre__3__20.css swt414/files/patch-org_eclipse_swt_internal_gtk_swt__functional__gtk__pre__3__20.css
>--- swt/files/patch-org_eclipse_swt_internal_gtk_swt__functional__gtk__pre__3__20.css	1970-01-01 08:00:00.000000000 +0800
>+++ swt414/files/patch-org_eclipse_swt_internal_gtk_swt__functional__gtk__pre__3__20.css	2020-03-01 09:03:47.648830000 +0800
>@@ -0,0 +1,17 @@
>+--- org/eclipse/swt/internal/gtk/swt_functional_gtk_pre_3_20.css.orig	2020-03-01 01:03:01 UTC
>++++ org/eclipse/swt/internal/gtk/swt_functional_gtk_pre_3_20.css
>+@@ -0,0 +1,13 @@
>++/* These CSS fixes have 'functinal' impact, no visual impact. E.g allow keyboard navigation in trees etc.. */
>++.undershoot.top, .undershoot.right, .undershoot.bottom, .undershoot.lef	{
>++	background-image: none;
>++}
>++
>++@binding-set SWTTreeViewBinding {
>++	bind "Left" { "expand-collapse-cursor-row" (0,0,0)};
>++	bind "Right" {"expand-collapse-cursor-row" (0,1,0)};
>++}
>++
>++GtkTreeView {
>++	gtk-key-bindings: SWTTreeViewBinding;
>++}
>+\ No newline at end of file
>diff -uNr swt/files/patch-org_eclipse_swt_internal_gtk_swt__theming__fixes__gtk__3__20.css swt414/files/patch-org_eclipse_swt_internal_gtk_swt__theming__fixes__gtk__3__20.css
>--- swt/files/patch-org_eclipse_swt_internal_gtk_swt__theming__fixes__gtk__3__20.css	1970-01-01 08:00:00.000000000 +0800
>+++ swt414/files/patch-org_eclipse_swt_internal_gtk_swt__theming__fixes__gtk__3__20.css	2020-03-01 09:03:47.652572000 +0800
>@@ -0,0 +1,28 @@
>+--- org/eclipse/swt/internal/gtk/swt_theming_fixes_gtk_3_20.css.orig	2020-03-01 01:03:01 UTC
>++++ org/eclipse/swt/internal/gtk/swt_theming_fixes_gtk_3_20.css
>+@@ -0,0 +1,25 @@
>++toolbar {
>++	padding-top: 2px;
>++	padding-bottom: 2px;
>++}
>++
>++toolbar button {
>++	padding: 2px;
>++}
>++
>++toolbar button.popup {
>++	padding: 0px;
>++}
>++
>++toolbar toolbutton button {
>++	padding: 0px 0px 0px 0px;
>++}
>++
>++entry {
>++	min-height: 26px;
>++}
>++
>++tab {
>++	padding-left: 6px;
>++	padding-right: 6px;
>++}
>diff -uNr swt/files/patch-org_eclipse_swt_internal_gtk_swt__theming__fixes__gtk__3__24__5.css swt414/files/patch-org_eclipse_swt_internal_gtk_swt__theming__fixes__gtk__3__24__5.css
>--- swt/files/patch-org_eclipse_swt_internal_gtk_swt__theming__fixes__gtk__3__24__5.css	1970-01-01 08:00:00.000000000 +0800
>+++ swt414/files/patch-org_eclipse_swt_internal_gtk_swt__theming__fixes__gtk__3__24__5.css	2020-03-01 09:03:47.655399000 +0800
>@@ -0,0 +1,6 @@
>+--- org/eclipse/swt/internal/gtk/swt_theming_fixes_gtk_3_24_5.css.orig	2020-03-01 01:03:01 UTC
>++++ org/eclipse/swt/internal/gtk/swt_theming_fixes_gtk_3_24_5.css
>+@@ -0,0 +1,3 @@
>++button {
>++	padding: 4px 8px;
>++}
>diff -uNr swt/files/patch-org_eclipse_swt_internal_gtk_swt__theming__fixes__gtk__pre__3__20.css swt414/files/patch-org_eclipse_swt_internal_gtk_swt__theming__fixes__gtk__pre__3__20.css
>--- swt/files/patch-org_eclipse_swt_internal_gtk_swt__theming__fixes__gtk__pre__3__20.css	1970-01-01 08:00:00.000000000 +0800
>+++ swt414/files/patch-org_eclipse_swt_internal_gtk_swt__theming__fixes__gtk__pre__3__20.css	2020-03-01 09:03:47.658034000 +0800
>@@ -0,0 +1,19 @@
>+--- org/eclipse/swt/internal/gtk/swt_theming_fixes_gtk_pre_3_20.css.orig	2020-03-01 01:03:01 UTC
>++++ org/eclipse/swt/internal/gtk/swt_theming_fixes_gtk_pre_3_20.css
>+@@ -0,0 +1,15 @@
>++/* These have an impact on visual aspects of SWT. Padding etc.. 
>++   There should not be hard-coded color fixes because this can break dark variants of themes.
>++   Instead either use OS.setDarkThemePreferred() if your theme has dark version or style manually via api */
>++GtkToolbar {
>++	padding-top: 2px;
>++	padding-bottom: 2px;
>++}
>++
>++GtkToolbar GtkButton {
>++	padding: 2px 4px 2px 4px;
>++}
>++
>++GtkToolbar GtkMenuButton {
>++	padding: 1px 0px 1px 0px;
>++}
>+\ No newline at end of file
>diff -uNr swt/files/patch-os.c swt414/files/patch-os.c
>--- swt/files/patch-os.c	2020-03-09 21:59:45.336669000 +0800
>+++ swt414/files/patch-os.c	1970-01-01 08:00:00.000000000 +0800
>@@ -1,20 +0,0 @@
>---- os.c.orig	2008-12-31 16:16:39.000000000 -0500
>-+++ os.c	2008-12-31 16:20:29.000000000 -0500
>-@@ -18036,11 +18036,16 @@
>- 	jintLong rc = 0;
>- 	OS_NATIVE_ENTER(env, that, realpath_FUNC);
>- 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
>--	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
>-+	if (arg1) {
>-+	    if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
>-+	} else
>-+	    lparg1 = malloc(PATH_MAX);
>- 	rc = (jintLong)realpath((const char *)lparg0, (char *)lparg1);
>- fail:
>- 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
>- 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
>-+	if (!arg1 && lparg1 && rc == 0)
>-+	    free(lparg1);
>- 	OS_NATIVE_EXIT(env, that, realpath_FUNC);
>- 	return rc;
>- }

Actions: View | Diff

Attachments on bug 244585: 212135 | 212136 | 212285