Attachment #205115 for bug #238605

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




# $FreeBSD$

PORTNAME=	swt
DISTVERSION=	4.11
CATEGORIES=	x11-toolkits devel java
MASTER_SITES=	http://archive.eclipse.org/eclipse/downloads/drops4/R-${DISTVERSION}-201903070500/
DISTNAME=	swt-${DISTVERSION}-${DIST_EXT}

MAINTAINER=	ports@FreeBSD.org

ONLY_FOR_ARCHS=	amd64 i386
BROKEN_i386=	missing distinfo

USES=		gl gmake gnome pkgconfig zip:infozip

SWT_VERSION=	411
OUTPUT_JAR=	swt.jar

USE_GL=		glu gl
USE_GNOME=	gtk30
USE_JAVA=	yes
USE_XORG=	xtst
JAVA_VERSION=	1.6+

		lib/libswt-awt-gtk-${SWT_VERSION}.so \
		lib/libswt-gtk-${SWT_VERSION}.so \
		lib/libswt-glx-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


.endif

MAKE_ENV+=	MAKE_CAIRO=${MAKE_CAIRO} \
		JAVA_HOME=${JAVA_HOME} \
		SWT_VERSION=${SWT_VERSION}

.if (${ARCH} == "amd64")
DIST_EXT=	gtk-linux-x86_64

	@(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

#pre-patch:
#	${SED} -e 's|freebsd|dragonfly|g' ${WRKSRC}/make_freebsd.mak \
#		> ${WRKSRC}/make_dragonfly.mak

do-install:
	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}

Lines 1-3 Link Here

(-)b/x11-toolkits/swt/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1530093075	1	TIMESTAMP = 1560677318
2	SHA256 (swt-4.7.3a-gtk-linux-x86_64.zip) = 856005feff25de55f7d7b304d2cbed9dd24938c7b6d07ffd7413b8361a4753e3	2	SHA256 (swt-4.11-gtk-linux-x86_64.zip) = 2ca4029a2154e8ded50a61f330d916dfc66cb749d4cfcc3e245730553268e663
3	SIZE (swt-4.7.3a-gtk-linux-x86_64.zip) = 6360885	3	SIZE (swt-4.11-gtk-linux-x86_64.zip) = 3889518




--- 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 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 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;
-		IsLinux = isLinux;  IsWin32 = isWin32;
+		if (osName.equals ("FreeBSD")) isFreeBSD = true;
+		IsLinux = isLinux;  IsWin32 = isWin32;  IsFreeBSD = isFreeBSD;
 
 		byte[] buffer = new byte[4];
 		long /*int*/ ptr = C.malloc(4);




--- 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
 		;;
 	*)
-		SWT_OS=`uname -s | tr -s '[:upper:]' '[:lower:]'`
-		MAKEFILE=make_linux.mak
+		SWT_OS=`uname -s | tr '[:upper:]' '[:lower:]'`
+		MAKEFILE=make_${SWT_OS}.mak
+		fi
+		;;
 	"FreeBSD")
 		SWT_OS=freebsd
 		MAKEFILE=make_freebsd.mak
+		if uname -p > /dev/null 2>&1; then
+			MODEL=`uname -p`
+		fi
 		;;
 esac
 		SWT_OS=win32
@@ -469,10 +479,10 @@
 
 
@@ -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} = '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




--- 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
 
 # SWT debug flags for various SWT components.
 #SWT_WEBKIT_DEBUG = -DWEBKIT_DEBUG
@@ -26,7 +26,6 @@
 
 include make_common.mak
 
-SWT_VERSION=$(maj_ver)$(min_ver)r$(rev)
 GTK_VERSION?=3.0
-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
 
 # 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)
 
 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
 
-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/linux \
+		-I$(JAVA_HOME)/include/freebsd \
+		-I$(LOCALBASE)/include \
 		${SWT_PTR_CFLAGS}
 LFLAGS = -shared -fPIC ${SWT_LFLAGS}
 
 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
+# -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
 
 all: make_swt make_atk make_glx make_webkit
 # XPCOMInit lib

Return to bug 238605

Lines 2-10 Link Here

(-)b/x11-toolkits/swt/Makefile (-11 / +18 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= swt	4	PORTNAME= swt
5	DISTVERSION= 4.7.3a	5	DISTVERSION= 4.11
6	CATEGORIES= x11-toolkits devel java	6	CATEGORIES= x11-toolkits devel java
7	MASTER_SITES= http://archive.eclipse.org/eclipse/downloads/drops4/R-${DISTVERSION}-201803300640/	7	MASTER_SITES= http://archive.eclipse.org/eclipse/downloads/drops4/R-${DISTVERSION}-201903070500/
8	DISTNAME= swt-${DISTVERSION}-${DIST_EXT}	8	DISTNAME= swt-${DISTVERSION}-${DIST_EXT}
9		9
10	MAINTAINER= ports@FreeBSD.org	10	MAINTAINER= ports@FreeBSD.org
Lines 15-27 LICENSE= EPL Link Here
15	ONLY_FOR_ARCHS= amd64 i386	15	ONLY_FOR_ARCHS= amd64 i386
16	BROKEN_i386= missing distinfo	16	BROKEN_i386= missing distinfo
17		17
18	USES= gl gnome pkgconfig zip:infozip	18	USES= gl gmake gnome pkgconfig zip:infozip
19		19
20	SWT_VERSION= 4763	20	SWT_VERSION= 411
21	OUTPUT_JAR= swt.jar	21	OUTPUT_JAR= swt.jar
22		22
23	USE_GL= glu gl	23	USE_GL= glu gl
24	USE_GNOME= gtk20	24	USE_GNOME= gtk30
25	USE_JAVA= yes	25	USE_JAVA= yes
26	USE_XORG= xtst	26	USE_XORG= xtst
27	JAVA_VERSION= 1.6+	27	JAVA_VERSION= 1.6+
Lines 36-45 PLIST_FILES= ${JAVAJARDIR}/${OUTPUT_JAR} \ Link Here
36	lib/libswt-awt-gtk-${SWT_VERSION}.so \	36	lib/libswt-awt-gtk-${SWT_VERSION}.so \
37	lib/libswt-gtk-${SWT_VERSION}.so \	37	lib/libswt-gtk-${SWT_VERSION}.so \
38	lib/libswt-glx-gtk-${SWT_VERSION}.so \	38	lib/libswt-glx-gtk-${SWT_VERSION}.so \
39	lib/libswt-pi-gtk-${SWT_VERSION}.so	39	lib/libswt-pi3-gtk-${SWT_VERSION}.so \
		40	lib/libswt-webkit-gtk-${SWT_VERSION}.so \
		41	lib/libswt-webkit2extension-gtk-${SWT_VERSION}.so
40		42
41	NO_WRKSUBDIR= yes	43	NO_WRKSUBDIR= yes
42		44
		45	LIB_DEPENDS+= libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
		46	libgdk_pixbuf-2.0.so:graphics/gdk-pixbuf2 \
		47	libsoup-2.4.so:devel/libsoup
		48
43	OPTIONS_DEFINE= CAIRO	49	OPTIONS_DEFINE= CAIRO
44	OPTIONS_DEFAULT= CAIRO	50	OPTIONS_DEFAULT= CAIRO
45		51
Lines 52-59 MAKE_CAIRO= make_cairo Link Here
52	.endif	58	.endif
53		59
54	MAKE_ENV+= MAKE_CAIRO=${MAKE_CAIRO} \	60	MAKE_ENV+= MAKE_CAIRO=${MAKE_CAIRO} \
55	MAKE_MOZILLA=${MAKE_MOZILLA} \	61	JAVA_HOME=${JAVA_HOME} \
56	JAVA_HOME=${JAVA_HOME}	62	SWT_VERSION=${SWT_VERSION}
57		63
58	.if (${ARCH} == "amd64")	64	.if (${ARCH} == "amd64")
59	DIST_EXT= gtk-linux-x86_64	65	DIST_EXT= gtk-linux-x86_64
Lines 65-74 post-extract: Link Here
65	@(cd ${WRKSRC} && ${UNZIP_CMD} -qo "*.zip")	71	@(cd ${WRKSRC} && ${UNZIP_CMD} -qo "*.zip")
66	@${RM} ${WRKSRC}/.o ${WRKSRC}/.so ${WRKSRC}/*.jar	72	@${RM} ${WRKSRC}/.o ${WRKSRC}/.so ${WRKSRC}/*.jar
67	@${CP} ${FILESDIR}/build.xml ${WRKSRC}/build.xml	73	@${CP} ${FILESDIR}/build.xml ${WRKSRC}/build.xml
		74	@${CP} ${WRKSRC}/make_linux.mak ${WRKSRC}/make_freebsd.mak
68		75
69	post-patch:	76	#pre-patch:
70	${SED} -e 's\|freebsd\|dragonfly\|g' ${WRKSRC}/make_freebsd.mak \	77	# ${SED} -e 's\|freebsd\|dragonfly\|g' ${WRKSRC}/make_freebsd.mak \
71	> ${WRKSRC}/make_dragonfly.mak	78	# > ${WRKSRC}/make_dragonfly.mak
72		79
73	do-install:	80	do-install:
74	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}	81	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}

Lines 1-26 Link Here

(-)b/x11-toolkits/swt/files/patch-OS.java (-15 / +11 lines)
1	--- org/eclipse/swt/internal/gtk/OS.java.orig 2018-03-01 07:35:24.000000000 +0100	1	--- org/eclipse/swt/internal/gtk/OS.java.orig 2019-03-07 05:31:06.000000000 +0100
2	+++ org/eclipse/swt/internal/gtk/OS.java 2018-06-27 11:17:53.291216000 +0200	2	+++ org/eclipse/swt/internal/gtk/OS.java 2019-06-16 12:10:12.002351000 +0200
3	@@ -20,19 +20,20 @@	3	@@ -53,15 +53,16 @@
4		4	*/
5	public class OS extends C {	5	public class OS extends C {
6	/** OS Constants */	6	/** OS Constants */
7	- public static final boolean IsAIX, IsSunOS, IsLinux, IsHPUX, IsWin32, BIG_ENDIAN;	7	- public static final boolean IsLinux, IsWin32, BIG_ENDIAN;
8	+ public static final boolean IsAIX, IsSunOS, IsLinux, IsHPUX, IsWin32, BIG_ENDIAN, IsFreeBSD;	8	+ public static final boolean IsLinux, IsWin32, BIG_ENDIAN, IsFreeBSD;
9	static {	9	static {
10		10
11	/* Initialize the OS flags and locale constants */	11	/* Initialize the OS flags and locale constants */
12	String osName = System.getProperty ("os.name");	12	String osName = System.getProperty ("os.name");
13	- boolean isAIX = false, isSunOS = false, isLinux = false, isHPUX = false, isWin32 = false;	13	- boolean isLinux = false, isWin32 = false;
14	+ boolean isAIX = false, isSunOS = false, isLinux = false, isHPUX = false, isWin32 = false, isFreeBSD = false;	14	+ boolean isLinux = false, isWin32 = false, isFreeBSD = false;
15	if (osName.equals ("Linux")) isLinux = true;	15	if (osName.equals ("Linux")) isLinux = true;
16	if (osName.equals ("AIX")) isAIX = true;
17	if (osName.equals ("Solaris")) isSunOS = true;
18	if (osName.equals ("SunOS")) isSunOS = true;
19	if (osName.equals ("HP-UX")) isHPUX = true;
20	if (osName.startsWith("Windows")) isWin32 = true;	16	if (osName.startsWith("Windows")) isWin32 = true;
21	- IsAIX = isAIX; IsSunOS = isSunOS; IsLinux = isLinux; IsHPUX = isHPUX; IsWin32 = isWin32;	17	- IsLinux = isLinux; IsWin32 = isWin32;
22	+ if (osName.equals ("FreeBSD")) isFreeBSD = true;	18	+ if (osName.equals ("FreeBSD")) isFreeBSD = true;
23	+ IsAIX = isAIX; IsSunOS = isSunOS; IsLinux = isLinux; IsHPUX = isHPUX; IsWin32 = isWin32; IsFreeBSD = isFreeBSD;	19	+ IsLinux = isLinux; IsWin32 = isWin32; IsFreeBSD = isFreeBSD;
24		20
25	byte[] buffer = new byte[4];	21	byte[] buffer = new byte[4];
26	long /int/ ptr = OS.malloc(4);	22	long /int/ ptr = C.malloc(4);

Lines 1-84 Link Here

(-)b/x11-toolkits/swt/files/patch-build.sh (-62 / +57 lines)
1	--- build.sh.orig 2018-03-01 07:35:22.000000000 +0100	1	--- build.sh.orig 2019-03-07 05:31:04.000000000 +0100
2	+++ build.sh 2018-06-27 11:24:43.371971000 +0200	2	+++ build.sh 2019-06-16 12:48:36.702444000 +0200
3	@@ -115,9 +115,19 @@	3	@@ -72,7 +72,7 @@
4	fi	4
5	fi	5	cd `dirname $0`
		6
		7	-MAKE_TYPE=make
		8	+MAKE_TYPE=gmake
		9
		10	export CFLAGS='-O -Wall -fPIC'
		11
		12	@@ -86,8 +86,8 @@
		13	MAKEFILE=make_win32.mak
6	;;	14	;;
7	+ "DragonFly")	15	*)
8	+ SWT_OS=dragonfly	16	- SWT_OS=`uname -s \| tr -s '[:upper:]' '[:lower:]'`
9	+ MAKEFILE=make_dragonfly.mak	17	- MAKEFILE=make_linux.mak
10	+ if uname -p > /dev/null 2>&1; then	18	+ SWT_OS=`uname -s \| tr '[:upper:]' '[:lower:]'`
11	+ MODEL=`uname -p`	19	+ MAKEFILE=make_${SWT_OS}.mak
12	+ fi
13	+ ;;
14	"FreeBSD")
15	SWT_OS=freebsd
16	MAKEFILE=make_freebsd.mak
17	+ if uname -p > /dev/null 2>&1; then
18	+ MODEL=`uname -p`
19	+ fi
20	;;	20	;;
21	"Windows_NT")	21	esac
22	SWT_OS=win32
23	@@ -469,10 +479,10 @@
24
25		22
26	# For 64-bit CPUs, we have a switch	23	@@ -95,7 +95,7 @@
27	-if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 'sparcv9' -o ${MODEL} = 's390x' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' ]; then	24	if [ "${MODEL}" = "" ]; then
28	+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	25	if uname -i > /dev/null 2>&1; then
		26	MODEL=`uname -i`
		27	- if [ ${MODEL} = 'unknown' ]; then
		28	+ if [ ${MODEL} = 'unknown' ] \|\| [ ${MODEL} = 'GENERIC' ]; then
		29	MODEL=`uname -m`
		30	fi
		31	else
		32	@@ -103,7 +103,7 @@
		33	fi
		34	fi
		35	case $MODEL in
		36	- "x86_64")
		37	+ "x86_64"\|"amd64")
		38	SWT_ARCH=x86_64
		39	AWT_ARCH=amd64
		40	;;
		41	@@ -156,7 +156,7 @@
		42	# Cross-platform method of finding JAVA_HOME.
		43	# Tested on Fedora 24 and Ubuntu 16
		44	DYNAMIC_JAVA_HOME=`readlink -f /usr/bin/java \| sed "s:jre/::" \| sed "s:bin/java::"`
		45	- if [ -a "${DYNAMIC_JAVA_HOME}include/jni.h" ]; then
		46	+ if [ -a "${DYNAMIC_JAVA_HOME}include/freebsd/jni.h" ]; then
		47	func_echo_plus "JAVA_HOME not set, but jni.h found, dynamically configured to $DYNAMIC_JAVA_HOME"
		48	export JAVA_HOME="$DYNAMIC_JAVA_HOME"
		49	else
		50	@@ -197,7 +197,7 @@
		51	if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' ]; then
29	SWT_PTR_CFLAGS=-DJNI64	52	SWT_PTR_CFLAGS=-DJNI64
30	if [ -d /lib64 ]; then	53	if [ -d /lib64 ]; then
31	- XLIB64=-L/usr/X11R6/lib64	54	- XLIB64=-L/usr/X11R6/lib64
32	+ XLIB64=-L${LOCALBASE}/lib64	55	+ XLIB64=-L${LOCALBASE}/lib64
33	export XLIB64	56	export XLIB64
34	fi	57	fi
35	if [ ${MODEL} = 'ppc64' -o ${MODEL} = 'ppc64le' ]; then	58	if [ ${MODEL} = 'ppc64le' ]; then
36	@@ -517,37 +527,24 @@	59	@@ -214,11 +214,13 @@
37	export SWT_LFLAGS SWT_PTR_CFLAGS	60	export SWT_LFLAGS SWT_PTR_CFLAGS
38	fi	61	fi
39		62
40	-
41	+if [ x${MAKE_CAIRO} = "xmake_cairo" ]; then	63	+if [ x${MAKE_CAIRO} = "xmake_cairo" ]; then
42	if [ x`pkg-config --exists cairo && echo YES` = "xYES" ]; then	64	if [ x`pkg-config --exists cairo && echo YES` = "xYES" ]; then
43	func_echo_plus "Cairo found, compiling SWT support for the cairo graphics library."	65	func_echo_plus "Cairo found, compiling SWT support for the cairo graphics library."
44	MAKE_CAIRO=make_cairo	66	MAKE_CAIRO=make_cairo
45	else	67	else
46	func_echo_error "Cairo not found: Advanced graphics support using cairo will not be compiled."	68	func_echo_error "Cairo not found: Advanced graphics support using cairo will not be compiled."
47	fi
48	+fi	69	+fi
49
50	-if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" -a ${SWT_OS} != 'solaris' ]; then
51	- if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then
52	- MOZILLA_INCLUDES=`pkg-config --cflags mozilla-xpcom`
53	- MOZILLA_LIBS=`pkg-config --libs mozilla-xpcom`
54	- export MOZILLA_INCLUDES
55	- export MOZILLA_LIBS
56	- MAKE_MOZILLA=make_mozilla
57	- elif [ x`pkg-config --exists firefox-xpcom && echo YES` = "xYES" ]; then
58	- MOZILLA_INCLUDES=`pkg-config --cflags firefox-xpcom`
59	- MOZILLA_LIBS=`pkg-config --libs firefox-xpcom`
60	- export MOZILLA_INCLUDES
61	- export MOZILLA_LIBS
62	- MAKE_MOZILLA=make_mozilla
63	- elif [ x`pkg-config --exists libxul && echo YES` = "xYES" ]; then
64	- XULRUNNER_INCLUDES=`pkg-config --cflags libxul`
65	- XULRUNNER_LIBS=`pkg-config --libs libxul`
66	- export XULRUNNER_INCLUDES
67	- export XULRUNNER_LIBS
68	- MAKE_MOZILLA=make_xulrunner
69	- else
70	- func_echo_error "None of the following libraries were found: Mozilla/XPCOM, Firefox/XPCOM, or XULRunner/XPCOM:"
71	- func_echo_error " >> Mozilla embedding support will not be compiled."
72	- fi
73	+if [ x${MAKE_MOZILLA} = "xmake_xulrunner" ]; then
74	+ echo "Using libxul for gecko support"
75	+ XULRUNNER_INCLUDES=`pkg-config --cflags libxul libxul-embedding`
76	+ XULRUNNER_LIBS=`pkg-config --libs libxul libxul-embedding`
77	+ export XULRUNNER_INCLUDES
78	+ export XULRUNNER_LIBS
79	+else
80	+ echo "None of the following libraries were found: XULRunner/XPCOM"
81	+ echo " *** Mozilla embedding support will not be compiled."
82	fi	70	fi
83		71
84	# Find AWT if available	72	# Find AWT if available
		73	@@ -364,4 +366,4 @@
		74	elif [ "${GTK_VERSION}" = "3.0" -o "${GTK_VERSION}" = "" ]; then
		75	export GTK_VERSION="3.0"
		76	func_build_gtk3 "$@"
		77	-fi
		78	\ No newline at end of file
		79	+fi

Lines 1-129 Link Here

(-)b/x11-toolkits/swt/files/patch-make_freebsd.mak (-106 / +59 lines)
1	--- make_freebsd.mak.orig 2018-03-01 07:35:22.000000000 +0100	1	--- make_freebsd.mak.orig 2019-06-16 14:13:00.662279000 +0200
2	+++ make_freebsd.mak 2018-06-27 11:33:21.105457000 +0200	2	+++ make_freebsd.mak 2019-06-16 14:13:42.907728000 +0200
3	@@ -9,7 +9,7 @@	3	@@ -12,7 +12,7 @@
4	# IBM Corporation - initial API and implementation	4	# IBM Corporation - initial API and implementation
5	#*******************************************************************************	5	#*******************************************************************************
6		6
7	-# Makefile for creating SWT libraries for Linux GTK	7	-# Makefile for creating SWT libraries for Linux GTK
8	+# Makefile for creating SWT libraries for FreeBSD GTK	8	+# Makefile for creating SWT libraries for FreeBSD GTK
9		9
10	include make_common.mak	10	# SWT debug flags for various SWT components.
		11	#SWT_WEBKIT_DEBUG = -DWEBKIT_DEBUG
		12	@@ -26,7 +26,6 @@
11		13
12	@@ -43,7 +43,7 @@	14	include make_common.mak
13		15
14	# Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0)	16	-SWT_VERSION=$(maj_ver)$(min_ver)r$(rev)
15	GTKCFLAGS = `pkg-config --cflags gtk+-2.0 gtk+-unix-print-$(GTK_VERSION)`	17	GTK_VERSION?=3.0
16	-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
17	+GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L$(LOCALBASE)/lib $(XLIB64) -lXtst
18		18
19	AWT_LFLAGS = -shared	19	# Define the various shared libraries to be build.
20	AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt	20	@@ -56,7 +55,7 @@
21	@@ -51,7 +51,8 @@	21	# Webkit extension lib has to be put into a separate folder and is treated differently from the other libraries.
22	ATKCFLAGS = `pkg-config --cflags atk gtk+-2.0 gtk+-unix-print-$(GTK_VERSION)`	22	WEBKIT_EXTENSION_LIB = lib$(WEBKIT_EXTENSION_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
23	ATKLIBS = `pkg-config --libs-only-L atk gtk+-2.0` -latk-1.0 -lgtk-x11-2.0	23	WEBEXTENSION_BASE_DIR = webkitextensions
		24	-WEBEXTENSION_DIR = $(WEBEXTENSION_BASE_DIR)$(maj_ver)$(min_ver)r$(rev)
		25	+WEBEXTENSION_DIR = $(WEBEXTENSION_BASE_DIR)$(SWT_VERSION)
24		26
25	-GLXLIBS = -L/usr/X11R6/lib -lGL -lGLU -lm	27	CAIROCFLAGS = `pkg-config --cflags cairo`
26	+GLXCFLAGS = -I$(LOCALBASE)/include	28	CAIROLIBS = `pkg-config --libs-only-L cairo` -lcairo
		29	@@ -64,9 +63,9 @@
		30	# Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0)
		31	GTKCFLAGS = `pkg-config --cflags gtk+-$(GTK_VERSION) gtk+-unix-print-$(GTK_VERSION)`
		32	ifeq ($(GTK_VERSION), 4.0)
		33	-GTKLIBS = `pkg-config --libs-only-L gtk+-$(GTK_VERSION) gthread-2.0` $(XLIB64) -L/usr/X11R6/lib -lgtk-4 -lcairo -lgthread-2.0
		34	+GTKLIBS = `pkg-config --libs-only-L gtk+-$(GTK_VERSION) gthread-2.0` $(XLIB64) -L$(LOCALBASE)/lib -lgtk-4 -lcairo -lgthread-2.0
		35	else
		36	-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
		37	+GTKLIBS = `pkg-config --libs-only-L gtk+-$(GTK_VERSION) gthread-2.0` $(XLIB64) -L$(LOCALBASE)/lib -lgtk-3 -lgdk-3 -lcairo -lgthread-2.0
		38	endif
		39
		40	AWT_LFLAGS = -shared ${SWT_LFLAGS}
		41	@@ -75,12 +74,13 @@
		42	ATKCFLAGS = `pkg-config --cflags atk gtk+-$(GTK_VERSION) gtk+-unix-print-$(GTK_VERSION)`
		43	ATKLIBS = `pkg-config --libs-only-L atk` -latk-1.0
		44
		45	-GLXLIBS = -lGL -lGLU -lm
27	+GLXLIBS = -L$(LOCALBASE)/lib -lGL -lGLU -lm	46	+GLXLIBS = -L$(LOCALBASE)/lib -lGL -lGLU -lm
		47	+GLXCFLAGS = -I$(LOCALBASE)/include
28		48
29	# Uncomment for Native Stats tool	49	# Uncomment for Native Stats tool
30	#NATIVE_STATS = -DNATIVE_STATS	50	#NATIVE_STATS = -DNATIVE_STATS
31	@@ -70,14 +71,24 @@
32	-I$(JAVA_HOME)/include/freebsd \
33	${SWT_PTR_CFLAGS}
34	MOZILLALFLAGS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic
35	-
36	+MOZILLAEXCLUDES = -DNO__1XPCOMGlueShutdown \
37	+ -DNO__1XPCOMGlueStartup \
38	+ -DNO__1XPCOMGlueLoadXULFunctions \
39	+ -DNO_memmove__ILorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2I \
40	+ -DNO_memmove__JLorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2J \
41	+ -DNO_nsDynamicFunctionLoad_1sizeof \
42	+ -DNO__1Call__IIIIII \
43	+ -DNO__1Call__JJJJJI \
44	+ -DNO_nsDynamicFunctionLoad
45	+XULRUNNEREXCLUDES = -DNO__1NS_1InitXPCOM2
46	+
47	SWT_OBJECTS = swt.o c.o c_stats.o callback.o
48	AWT_OBJECTS = swt_awt.o
49	SWTPI_OBJECTS = swt.o os.o os_structs.o os_custom.o os_stats.o
50	CAIRO_OBJECTS = swt.o cairo.o cairo_structs.o cairo_stats.o
51	ATK_OBJECTS = swt.o atk.o atk_structs.o atk_custom.o atk_stats.o
52	MOZILLA_OBJECTS = swt.o xpcom.o xpcom_custom.o xpcom_structs.o xpcom_stats.o
53	-XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomxul_stats.o xpcomxulglue.o xpcomxulglue_stats.o
54	+XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomxul_stats.o
55	XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o
56	GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
57		51
58	@@ -85,17 +96,18 @@	52	-WEBKITLIBS = `pkg-config --libs-only-l gio-2.0`
59	-DSWT_VERSION=$(SWT_VERSION) \	53	+WEBKITLIBS = `pkg-config --libs-only-l gio-2.0` $(XLIB64) -L$(LOCALBASE)/lib
60	$(NATIVE_STATS) \	54	WEBKITCFLAGS = `pkg-config --cflags gio-2.0`
61	-DFREEBSD -DGTK \	55
62	+ -I$(LOCALBASE)/include \	56	WEBKIT_EXTENSION_CFLAGS=`pkg-config --cflags gtk+-3.0 webkit2gtk-web-extension-4.0`
		57	@@ -108,17 +108,18 @@
		58	$(SWT_WEBKIT_DEBUG) \
		59	-DLINUX -DGTK \
63	-I$(JAVA_HOME)/include \	60	-I$(JAVA_HOME)/include \
64	-I$(JAVA_HOME)/include/freebsd \	61	- -I$(JAVA_HOME)/include/linux \
65	-fPIC \	62	+ -I$(JAVA_HOME)/include/freebsd \
		63	+ -I$(LOCALBASE)/include \
66	${SWT_PTR_CFLAGS}	64	${SWT_PTR_CFLAGS}
67	LFLAGS = -shared -fPIC	65	LFLAGS = -shared -fPIC ${SWT_LFLAGS}
68		66
69	-ifndef NO_STRIP	67	ifndef NO_STRIP
		68	- # -s = Remove all symbol table and relocation information from the executable.
		69	- # i.e, more efficent code, but removes debug information. Should not be used if you want to debug.
		70	- # https://gcc.gnu.org/onlinedocs/gcc/Link-Options.html#Link-Options
		71	- # http://stackoverflow.com/questions/14175040/effects-of-removing-all-symbol-table-and-relocation-information-from-an-executab
70	- AWT_LFLAGS := $(AWT_LFLAGS) -s	72	- AWT_LFLAGS := $(AWT_LFLAGS) -s
71	- MOZILLALFLAGS := $(MOZILLALFLAGS) -s
72	- LFLAGS := $(LFLAGS) -s	73	- LFLAGS := $(LFLAGS) -s
73	-endif	74	+# -s = Remove all symbol table and relocation information from the executable.
74	+.ifndef NO_STRIP	75	+# i.e, more efficent code, but removes debug information. Should not be used if you want to debug.
		76	+# https://gcc.gnu.org/onlinedocs/gcc/Link-Options.html#Link-Options
		77	+# http://stackoverflow.com/questions/14175040/effects-of-removing-all-symbol-table-and-relocation-information-from-an-executab
75	+AWT_LFLAGS := $(AWT_LFLAGS) -s	78	+AWT_LFLAGS := $(AWT_LFLAGS) -s
76	+MOZILLALFLAGS := $(MOZILLALFLAGS) -s
77	+LFLAGS := $(LFLAGS) -s	79	+LFLAGS := $(LFLAGS) -s
78	+.endif	80	endif
79
80	all: make_swt make_atk make_glx
81
82	@@ -173,16 +185,16 @@
83	$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
84
85	xpcom.o: xpcom.cpp
86	- $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom.cpp
87	+ $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp
88
89	xpcom_structs.o: xpcom_structs.cpp
90	- $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_structs.cpp
91	+ $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_structs.cpp
92
93	xpcom_custom.o: xpcom_custom.cpp
94	- $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_custom.cpp
95	+ $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_custom.cpp
96
97	xpcom_stats.o: xpcom_stats.cpp
98	- $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_stats.cpp
99	+ $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_stats.cpp
100
101	#
102	# XULRunner lib
103	@@ -193,22 +205,16 @@
104	$(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
105
106	xpcomxul.o: xpcom.cpp
107	- $(CXX) -o xpcomxul.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom.cpp
108	+ $(CXX) -o xpcomxul.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom.cpp
109
110	xpcomxul_structs.o: xpcom_structs.cpp
111	- $(CXX) -o xpcomxul_structs.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom_structs.cpp
112	+ $(CXX) -o xpcomxul_structs.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_structs.cpp
113
114	xpcomxul_custom.o: xpcom_custom.cpp
115	- $(CXX) -o xpcomxul_custom.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom_custom.cpp
116	+ $(CXX) -o xpcomxul_custom.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_custom.cpp
117
118	xpcomxul_stats.o: xpcom_stats.cpp
119	- $(CXX) -o xpcomxul_stats.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom_stats.cpp
120	-
121	-xpcomxulglue.o: xpcomglue.cpp
122	- $(CXX) -o xpcomxulglue.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcomglue.cpp
123	-
124	-xpcomxulglue_stats.o: xpcomglue_stats.cpp
125	- $(CXX) -o xpcomxulglue_stats.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcomglue_stats.cpp
126	+ $(CXX) -o xpcomxul_stats.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_stats.cpp
127		81
128	#	82	all: make_swt make_atk make_glx make_webkit
129	# XPCOMInit lib