Attachment 205115 Details for Bug 238605 – swt-4.11 patch

[patch] swt-4.11 patch

swt-4.11.diff (text/plain), 18.49 KB, created by Thomas Merkel on 2019-06-16 12:20:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Merkel

Created: 2019-06-16 12:20:15 UTC

Size: 18.49 KB

patch

obsolete

>diff --git a/x11-toolkits/swt/Makefile b/x11-toolkits/swt/Makefile
>index 569b1dddfd5c..426be3f7d330 100644
>--- a/x11-toolkits/swt/Makefile
>+++ b/x11-toolkits/swt/Makefile
>@@ -2,9 +2,9 @@
> # $FreeBSD$
> 
> PORTNAME=	swt
>-DISTVERSION=	4.7.3a
>+DISTVERSION=	4.11
> 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}-201903070500/
> DISTNAME=	swt-${DISTVERSION}-${DIST_EXT}
> 
> MAINTAINER=	ports@FreeBSD.org
>@@ -15,13 +15,13 @@ LICENSE=	EPL
> ONLY_FOR_ARCHS=	amd64 i386
> BROKEN_i386=	missing distinfo
> 
>-USES=		gl gnome pkgconfig zip:infozip
>+USES=		gl gmake gnome pkgconfig zip:infozip
> 
>-SWT_VERSION=	4763
>+SWT_VERSION=	411
> OUTPUT_JAR=	swt.jar
> 
> USE_GL=		glu gl
>-USE_GNOME=	gtk20
>+USE_GNOME=	gtk30
> USE_JAVA=	yes
> USE_XORG=	xtst
> JAVA_VERSION=	1.6+
>@@ -36,10 +36,16 @@ PLIST_FILES=	${JAVAJARDIR}/${OUTPUT_JAR} \
> 		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
>+		lib/libswt-pi3-gtk-${SWT_VERSION}.so \
>+		lib/libswt-webkit-gtk-${SWT_VERSION}.so \
>+		lib/libswt-webkit2extension-gtk-${SWT_VERSION}.so
> 
> NO_WRKSUBDIR=	yes
> 
>+LIB_DEPENDS+=	libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
>+		libgdk_pixbuf-2.0.so:graphics/gdk-pixbuf2 \
>+		libsoup-2.4.so:devel/libsoup
>+
> OPTIONS_DEFINE=	CAIRO
> OPTIONS_DEFAULT=	CAIRO
> 
>@@ -52,8 +58,8 @@ MAKE_CAIRO=	make_cairo
> .endif
> 
> MAKE_ENV+=	MAKE_CAIRO=${MAKE_CAIRO} \
>-		MAKE_MOZILLA=${MAKE_MOZILLA} \
>-		JAVA_HOME=${JAVA_HOME}
>+		JAVA_HOME=${JAVA_HOME} \
>+		SWT_VERSION=${SWT_VERSION}
> 
> .if (${ARCH} == "amd64")
> DIST_EXT=	gtk-linux-x86_64
>@@ -65,10 +71,11 @@ post-extract:
> 	@(cd ${WRKSRC} && ${UNZIP_CMD} -qo "*.zip")
> 	@${RM} ${WRKSRC}/*.o ${WRKSRC}/*.so ${WRKSRC}/*.jar
> 	@${CP} ${FILESDIR}/build.xml ${WRKSRC}/build.xml
>+	@${CP} ${WRKSRC}/make_linux.mak ${WRKSRC}/make_freebsd.mak
> 
>-post-patch:
>-	${SED} -e 's|freebsd|dragonfly|g' ${WRKSRC}/make_freebsd.mak \
>-		> ${WRKSRC}/make_dragonfly.mak
>+#pre-patch:
>+#	${SED} -e 's|freebsd|dragonfly|g' ${WRKSRC}/make_freebsd.mak \
>+#		> ${WRKSRC}/make_dragonfly.mak
> 
> do-install:
> 	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}
>diff --git a/x11-toolkits/swt/distinfo b/x11-toolkits/swt/distinfo
>index 1a4155c09a62..37178b7cdd73 100644
>--- a/x11-toolkits/swt/distinfo
>+++ b/x11-toolkits/swt/distinfo
>@@ -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 = 1560677318
>+SHA256 (swt-4.11-gtk-linux-x86_64.zip) = 2ca4029a2154e8ded50a61f330d916dfc66cb749d4cfcc3e245730553268e663
>+SIZE (swt-4.11-gtk-linux-x86_64.zip) = 3889518
>diff --git a/x11-toolkits/swt/files/patch-OS.java b/x11-toolkits/swt/files/patch-OS.java
>index 5196adf37e14..2c74fdbfcd47 100644
>--- a/x11-toolkits/swt/files/patch-OS.java
>+++ b/x11-toolkits/swt/files/patch-OS.java
>@@ -1,26 +1,22 @@
>---- 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 @@
>- 
>+--- org/eclipse/swt/internal/gtk/OS.java.orig	2019-03-07 05:31:06.000000000 +0100
>++++ org/eclipse/swt/internal/gtk/OS.java	2019-06-16 12:10:12.002351000 +0200
>+@@ -53,15 +53,16 @@
>+  */
>  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;
>+-	public static final boolean IsLinux, IsWin32, BIG_ENDIAN;
>++	public static final boolean IsLinux, 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;
>+-		boolean isLinux = false, isWin32 = false;
>++		boolean isLinux = 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;
>+-		IsLinux = isLinux;  IsWin32 = isWin32;
> +		if (osName.equals ("FreeBSD")) isFreeBSD = true;
>-+		IsAIX = isAIX;  IsSunOS = isSunOS;  IsLinux = isLinux;  IsHPUX = isHPUX; IsWin32 = isWin32;  IsFreeBSD = isFreeBSD;
>++		IsLinux = isLinux;  IsWin32 = isWin32;  IsFreeBSD = isFreeBSD;
>  
>  		byte[] buffer = new byte[4];
>- 		long /*int*/ ptr = OS.malloc(4);
>+ 		long /*int*/ ptr = C.malloc(4);
>diff --git a/x11-toolkits/swt/files/patch-build.sh b/x11-toolkits/swt/files/patch-build.sh
>index 9b728e18d046..561d32e92e51 100644
>--- a/x11-toolkits/swt/files/patch-build.sh
>+++ b/x11-toolkits/swt/files/patch-build.sh
>@@ -1,84 +1,79 @@
>---- 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-03-07 05:31:04.000000000 +0100
>++++ build.sh	2019-06-16 12:48:36.702444000 +0200
>+@@ -72,7 +72,7 @@
>+ 
>+ cd `dirname $0`
>+ 
>+-MAKE_TYPE=make
>++MAKE_TYPE=gmake
>+ 
>+ export CFLAGS='-O -Wall -fPIC'
>+ 
>+@@ -86,8 +86,8 @@
>+ 		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:]'`
>+-		MAKEFILE=make_linux.mak
>++		SWT_OS=`uname -s | tr '[:upper:]' '[:lower:]'`
>++		MAKEFILE=make_${SWT_OS}.mak
>  		;;
>- 	"Windows_NT")
>- 		SWT_OS=win32
>-@@ -469,10 +479,10 @@
>- 
>+ 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
>+@@ -95,7 +95,7 @@
>+ if [ "${MODEL}" = "" ]; then
>+ 	if uname -i > /dev/null 2>&1; then
>+ 		MODEL=`uname -i`
>+-		if [ ${MODEL} = 'unknown' ]; then
>++		if [ ${MODEL} = 'unknown' ] || [ ${MODEL} = 'GENERIC' ]; then
>+ 		  MODEL=`uname -m`
>+ 		fi
>+ 	else
>+@@ -103,7 +103,7 @@
>+ 	fi
>+ fi
>+ case $MODEL in
>+-	"x86_64")
>++	"x86_64"|"amd64")
>+ 		SWT_ARCH=x86_64
>+ 		AWT_ARCH=amd64
>+ 		;;
>+@@ -156,7 +156,7 @@
>+ 				# Cross-platform method of finding JAVA_HOME.
>+ 				# Tested on Fedora 24 and Ubuntu 16
>+ 				DYNAMIC_JAVA_HOME=`readlink -f /usr/bin/java | sed "s:jre/::" | sed "s:bin/java::"`
>+-				if [ -a "${DYNAMIC_JAVA_HOME}include/jni.h" ]; then
>++				if [ -a "${DYNAMIC_JAVA_HOME}include/freebsd/jni.h" ]; then
>+                 	func_echo_plus "JAVA_HOME not set, but jni.h found, dynamically configured to $DYNAMIC_JAVA_HOME"
>+             		export JAVA_HOME="$DYNAMIC_JAVA_HOME"
>+                 else
>+@@ -197,7 +197,7 @@
>+ if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' ]; then
>  	SWT_PTR_CFLAGS=-DJNI64
>  	if [ -d /lib64 ]; then
> -		XLIB64=-L/usr/X11R6/lib64
> +		XLIB64=-L${LOCALBASE}/lib64
>  		export XLIB64
>  	fi
>- 	if [ ${MODEL} = 'ppc64' -o ${MODEL} = 'ppc64le' ]; then
>-@@ -517,37 +527,24 @@
>+ 	if [ ${MODEL} = 'ppc64le' ]; then
>+@@ -214,11 +214,13 @@
>  	export SWT_LFLAGS 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
>+@@ -364,4 +366,4 @@
>+ elif [ "${GTK_VERSION}" = "3.0" -o "${GTK_VERSION}" = "" ]; then
>+ 	export GTK_VERSION="3.0"
>+ 	func_build_gtk3 "$@"
>+-fi
>+\ No newline at end of file
>++fi
>diff --git a/x11-toolkits/swt/files/patch-make_freebsd.mak b/x11-toolkits/swt/files/patch-make_freebsd.mak
>index 10ea1aad6339..59ddb5c6693d 100644
>--- a/x11-toolkits/swt/files/patch-make_freebsd.mak
>+++ b/x11-toolkits/swt/files/patch-make_freebsd.mak
>@@ -1,129 +1,82 @@
>---- 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 @@
>+--- make_freebsd.mak.orig	2019-06-16 14:13:00.662279000 +0200
>++++ make_freebsd.mak	2019-06-16 14:13:42.907728000 +0200
>+@@ -12,7 +12,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
>+ # SWT debug flags for various SWT components.
>+ #SWT_WEBKIT_DEBUG = -DWEBKIT_DEBUG
>+@@ -26,7 +26,6 @@
>  
>-@@ -43,7 +43,7 @@
>+ include make_common.mak
>  
>- # 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
>+-SWT_VERSION=$(maj_ver)$(min_ver)r$(rev)
>+ GTK_VERSION?=3.0
>  
>- 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
>+ # Define the various shared libraries to be build.
>+@@ -56,7 +55,7 @@
>+ # Webkit extension lib has to be put into a separate folder and is treated differently from the other libraries.
>+ WEBKIT_EXTENSION_LIB = lib$(WEBKIT_EXTENSION_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
>+ WEBEXTENSION_BASE_DIR = webkitextensions
>+-WEBEXTENSION_DIR = $(WEBEXTENSION_BASE_DIR)$(maj_ver)$(min_ver)r$(rev)
>++WEBEXTENSION_DIR = $(WEBEXTENSION_BASE_DIR)$(SWT_VERSION)
>  
>--GLXLIBS = -L/usr/X11R6/lib -lGL -lGLU -lm
>-+GLXCFLAGS = -I$(LOCALBASE)/include
>+ CAIROCFLAGS = `pkg-config --cflags cairo`
>+ CAIROLIBS = `pkg-config --libs-only-L cairo` -lcairo
>+@@ -64,9 +63,9 @@
>+ # Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0)
>+ GTKCFLAGS = `pkg-config --cflags gtk+-$(GTK_VERSION) gtk+-unix-print-$(GTK_VERSION)`
>+ ifeq ($(GTK_VERSION), 4.0)
>+-GTKLIBS = `pkg-config --libs-only-L gtk+-$(GTK_VERSION) gthread-2.0` $(XLIB64) -L/usr/X11R6/lib -lgtk-4 -lcairo -lgthread-2.0
>++GTKLIBS = `pkg-config --libs-only-L gtk+-$(GTK_VERSION) gthread-2.0` $(XLIB64) -L$(LOCALBASE)/lib -lgtk-4 -lcairo -lgthread-2.0
>+ else
>+-GTKLIBS = `pkg-config --libs-only-L gtk+-$(GTK_VERSION) gthread-2.0` $(XLIB64) -L/usr/X11R6/lib -lgtk-3 -lgdk-3 -lcairo -lgthread-2.0
>++GTKLIBS = `pkg-config --libs-only-L gtk+-$(GTK_VERSION) gthread-2.0` $(XLIB64) -L$(LOCALBASE)/lib -lgtk-3 -lgdk-3 -lcairo -lgthread-2.0
>+ endif
>+ 
>+ AWT_LFLAGS = -shared ${SWT_LFLAGS} 
>+@@ -75,12 +74,13 @@
>+ ATKCFLAGS = `pkg-config --cflags atk gtk+-$(GTK_VERSION) gtk+-unix-print-$(GTK_VERSION)`
>+ ATKLIBS = `pkg-config --libs-only-L atk` -latk-1.0 
>+ 
>+-GLXLIBS = -lGL -lGLU -lm
> +GLXLIBS = -L$(LOCALBASE)/lib -lGL -lGLU -lm
>++GLXCFLAGS = -I$(LOCALBASE)/include
>  
>  # 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 \
>+-WEBKITLIBS = `pkg-config --libs-only-l gio-2.0`
>++WEBKITLIBS = `pkg-config --libs-only-l gio-2.0` $(XLIB64) -L$(LOCALBASE)/lib
>+ WEBKITCFLAGS = `pkg-config --cflags gio-2.0`
>+ 
>+ WEBKIT_EXTENSION_CFLAGS=`pkg-config --cflags gtk+-3.0 webkit2gtk-web-extension-4.0`
>+@@ -108,17 +108,18 @@
>+ 		$(SWT_WEBKIT_DEBUG) \
>+ 		-DLINUX -DGTK \
>  		-I$(JAVA_HOME)/include \
>- 		-I$(JAVA_HOME)/include/freebsd \
>- 		-fPIC \
>+-		-I$(JAVA_HOME)/include/linux \
>++		-I$(JAVA_HOME)/include/freebsd \
>++		-I$(LOCALBASE)/include \
>  		${SWT_PTR_CFLAGS}
>- LFLAGS = -shared -fPIC
>+ LFLAGS = -shared -fPIC ${SWT_LFLAGS}
>  
>--ifndef NO_STRIP
>+ ifndef NO_STRIP
>+-	# -s = Remove all symbol table and relocation information from the executable.
>+-	#      i.e, more efficent code, but removes debug information. Should not be used if you want to debug.
>+-	#      https://gcc.gnu.org/onlinedocs/gcc/Link-Options.html#Link-Options
>+-	#      http://stackoverflow.com/questions/14175040/effects-of-removing-all-symbol-table-and-relocation-information-from-an-executab
> -	AWT_LFLAGS := $(AWT_LFLAGS) -s
>--	MOZILLALFLAGS := $(MOZILLALFLAGS) -s
> -	LFLAGS := $(LFLAGS) -s
>--endif
>-+.ifndef NO_STRIP
>++# -s = Remove all symbol table and relocation information from the executable.
>++#      i.e, more efficent code, but removes debug information. Should not be used if you want to debug.
>++#      https://gcc.gnu.org/onlinedocs/gcc/Link-Options.html#Link-Options
>++#      http://stackoverflow.com/questions/14175040/effects-of-removing-all-symbol-table-and-relocation-information-from-an-executab
> +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
>+ endif
>  
>- #
>- # XPCOMInit lib
>+ all: make_swt make_atk make_glx make_webkit

Actions: View | Diff

Attachments on bug 238605: 205115