Date: Wed, 18 Nov 2020 11:14:04 +0000 (UTC) From: Max Brazhnikov <makc@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r555629 - in head/x11-toolkits/swt: . files Message-ID: <202011181114.0AIBE4IG090641@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: makc Date: Wed Nov 18 11:14:04 2020 New Revision: 555629 URL: https://svnweb.freebsd.org/changeset/ports/555629 Log: x11-toolkits/swt: - Update to 4.11 which builds with modern JDK - Switch to GTK 3 (GTK 2 is not supported anymore) - Add option to build with Webkit support (off by default) - Update WWW PR: 238605 (based on) Submitted by: Thomas Merkel (tm@NetBSD.org) Added: head/x11-toolkits/swt/pkg-plist (contents, props changed) Modified: head/x11-toolkits/swt/Makefile head/x11-toolkits/swt/distinfo head/x11-toolkits/swt/files/patch-OS.java head/x11-toolkits/swt/files/patch-build.sh head/x11-toolkits/swt/files/patch-make_freebsd.mak head/x11-toolkits/swt/files/patch-os.c head/x11-toolkits/swt/pkg-descr Modified: head/x11-toolkits/swt/Makefile ============================================================================== --- head/x11-toolkits/swt/Makefile Wed Nov 18 10:54:03 2020 (r555628) +++ head/x11-toolkits/swt/Makefile Wed Nov 18 11:14:04 2020 (r555629) @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= swt -DISTVERSION= 4.7.3a +DISTVERSION= 4.11 CATEGORIES= x11-toolkits devel java -MASTER_SITES= https://archive.eclipse.org/eclipse/downloads/drops4/R-${DISTVERSION}-201803300640/ -DISTNAME= ${DISTNAME_${ARCH}} +MASTER_SITES= http://archive.eclipse.org/eclipse/downloads/drops4/R-${DISTVERSION}-201903070500/ +DISTNAME= ${PORTNAME}-${DISTVERSION}-gtk-linux-x86_64 MAINTAINER= makc@FreeBSD.org COMMENT= Standard Widget Toolkit for Java @@ -14,53 +14,40 @@ LICENSE= EPL ONLY_FOR_ARCHS= aarch64 amd64 i386 powerpc64 powerpc64le -USES= compiler:c++11-lang gl gnome pkgconfig zip:infozip xorg +USES= compiler:c++11-lang gl gmake gnome pkgconfig zip:infozip xorg USE_ANT= yes USE_GL= glu gl -USE_GNOME= gtk20 +USE_GNOME= gdkpixbuf2 gtk30 USE_JAVA= yes USE_XORG= xtst JAVA_OS= native -SWT_VERSION= 4763 +SWT_VERSION= 411 MAKEFILE= make_freebsd.mak +MAKE_ENV= SWT_VERSION=${SWT_VERSION} +PLIST_SUB= SWT_VERSION=${SWT_VERSION} -PLIST_FILES= ${JAVAJARDIR}/swt.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 - NO_WRKSUBDIR= yes -OPTIONS_DEFINE= CAIRO +OPTIONS_DEFINE= CAIRO WEBKIT OPTIONS_DEFAULT= CAIRO +OPTIONS_SUB= yes CAIRO_LIB_DEPENDS= libcairo.so:graphics/cairo -CAIRO_PLIST_FILES= lib/libswt-cairo-gtk-${SWT_VERSION}.so CAIRO_MAKE_ENV= MAKE_CAIRO=make_cairo -DISTNAME_aarch64= ${PORTNAME}-${DISTVERSION}-gtk-linux-x86_64 -DISTNAME_amd64= ${PORTNAME}-${DISTVERSION}-gtk-linux-x86_64 -DISTNAME_i386= ${PORTNAME}-${DISTVERSION}-gtk-linux-x86 -# The source code for x86_64 and ppc64 is identical, so prefer x86_64 tarball -# to save space and time -DISTNAME_powerpc64= ${PORTNAME}-${DISTVERSION}-gtk-linux-x86_64 -DISTNAME_powerpc64le= ${PORTNAME}-${DISTVERSION}-gtk-linux-x86_64 +WEBKIT_LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \ + libwebkit2gtk-4.0.so:www/webkit2-gtk3 +WEBKIT_MAKE_ENV= BUILD_WEBKIT2EXTENSION=yes +WEBKIT_MAKE_ENV_OFF= BUILD_WEBKIT2EXTENSION=no -.if ${.TARGETS:Mmakesum} -. for i in ${ONLY_FOR_ARCHS} -DISTFILES:= ${DISTNAME_${i}}${EXTRACT_SUFX} ${DISTFILES} -. endfor -.endif - 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 \ Modified: head/x11-toolkits/swt/distinfo ============================================================================== --- head/x11-toolkits/swt/distinfo Wed Nov 18 10:54:03 2020 (r555628) +++ head/x11-toolkits/swt/distinfo Wed Nov 18 11:14:04 2020 (r555629) @@ -1,5 +1,3 @@ -TIMESTAMP = 1590921567 -SHA256 (swt-4.7.3a-gtk-linux-x86.zip) = 1cf752f04b65e2cea92683142c5ee51f91de0f0a87898ca1903f3e16161d6556 -SIZE (swt-4.7.3a-gtk-linux-x86.zip) = 6182251 -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 Modified: head/x11-toolkits/swt/files/patch-OS.java ============================================================================== --- head/x11-toolkits/swt/files/patch-OS.java Wed Nov 18 10:54:03 2020 (r555628) +++ head/x11-toolkits/swt/files/patch-OS.java Wed Nov 18 11:14:04 2020 (r555629) @@ -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 04:31:06 UTC ++++ org/eclipse/swt/internal/gtk/OS.java +@@ -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); Modified: head/x11-toolkits/swt/files/patch-build.sh ============================================================================== --- head/x11-toolkits/swt/files/patch-build.sh Wed Nov 18 10:54:03 2020 (r555628) +++ head/x11-toolkits/swt/files/patch-build.sh Wed Nov 18 11:14:04 2020 (r555629) @@ -1,26 +1,44 @@ ---- build.sh.orig 2018-03-30 05:04:36 UTC +--- build.sh.orig 2019-03-07 02:31:04 UTC +++ build.sh -@@ -115,9 +115,19 @@ case $OS in - fi - fi +@@ -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 -@@ -149,6 +159,10 @@ case $MODEL in + esac + +@@ -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 + ;; +@@ -111,6 +111,10 @@ SWT_ARCH=x86 AWT_ARCH=i386 ;; @@ -31,65 +49,46 @@ *) SWT_ARCH=$MODEL AWT_ARCH=$MODEL -@@ -469,10 +483,10 @@ esac +@@ -156,7 +160,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 +@@ -194,10 +198,10 @@ # 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} == 'powerpc64' -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} = 'x86_64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' -o ${MODEL} = 'powerpc64' -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 +531,24 @@ if [ ${MODEL} = 'ppc' -a ${SWT_OS} = 'linux' ]; then + if [ ${MODEL} = 'ppc64le' ]; then +@@ -214,11 +218,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 +370,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 Modified: head/x11-toolkits/swt/files/patch-make_freebsd.mak ============================================================================== --- head/x11-toolkits/swt/files/patch-make_freebsd.mak Wed Nov 18 10:54:03 2020 (r555628) +++ head/x11-toolkits/swt/files/patch-make_freebsd.mak Wed Nov 18 11:14:04 2020 (r555629) @@ -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 12:13:00 UTC ++++ make_freebsd.mak +@@ -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 -@@ -43,7 +43,7 @@ +-SWT_VERSION=$(maj_ver)$(min_ver)r$(rev) + GTK_VERSION?=3.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) + + 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+-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 + 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 - 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 + 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 = -L/usr/X11R6/lib -lGL -lGLU -lm -+GLXCFLAGS = -I$(LOCALBASE)/include +-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 + 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 + all: make_swt make_atk make_glx make_webkit Modified: head/x11-toolkits/swt/files/patch-os.c ============================================================================== --- head/x11-toolkits/swt/files/patch-os.c Wed Nov 18 10:54:03 2020 (r555628) +++ head/x11-toolkits/swt/files/patch-os.c Wed Nov 18 11:14:04 2020 (r555629) @@ -1,5 +1,5 @@ ---- os.c.orig 2008-12-31 16:16:39.000000000 -0500 -+++ os.c 2008-12-31 16:20:29.000000000 -0500 +--- os.c.orig 2008-12-31 21:16:39 UTC ++++ os.c @@ -18036,11 +18036,16 @@ jintLong rc = 0; OS_NATIVE_ENTER(env, that, realpath_FUNC); Modified: head/x11-toolkits/swt/pkg-descr ============================================================================== --- head/x11-toolkits/swt/pkg-descr Wed Nov 18 10:54:03 2020 (r555628) +++ head/x11-toolkits/swt/pkg-descr Wed Nov 18 11:14:04 2020 (r555629) @@ -4,4 +4,4 @@ for the Eclipse platform in an operating system indepe This port provides SWT without requiring a full download and build of Eclipse. -WWW: http://www.eclipse.org/swt/ +WWW: https://www.eclipse.org/swt/ Added: head/x11-toolkits/swt/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/swt/pkg-plist Wed Nov 18 11:14:04 2020 (r555629) @@ -0,0 +1,9 @@ +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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202011181114.0AIBE4IG090641>