Index: head/x11-toolkits/swt/Makefile =================================================================== --- head/x11-toolkits/swt/Makefile (revision 561901) +++ head/x11-toolkits/swt/Makefile (revision 561902) @@ -1,61 +1,61 @@ # Created by: Robert C. Noland III # $FreeBSD$ PORTNAME= swt DISTVERSION= 4.11 +PORTREVISION= 1 CATEGORIES= x11-toolkits devel java 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 LICENSE= EPL ONLY_FOR_ARCHS= aarch64 amd64 i386 powerpc64 powerpc64le USES= compiler:c++11-lang gl gmake gnome pkgconfig zip:infozip xorg USE_ANT= yes USE_GL= glu gl USE_GNOME= gdkpixbuf2 gtk30 USE_JAVA= yes USE_XORG= xtst JAVA_OS= native -SWT_VERSION= 411 +SWT_VERSION= 4924r25 MAKEFILE= make_freebsd.mak MAKE_ENV= SWT_VERSION=${SWT_VERSION} PLIST_SUB= SWT_VERSION=${SWT_VERSION} NO_WRKSUBDIR= yes OPTIONS_DEFINE= CAIRO WEBKIT OPTIONS_DEFAULT= CAIRO OPTIONS_SUB= yes CAIRO_LIB_DEPENDS= libcairo.so:graphics/cairo CAIRO_MAKE_ENV= MAKE_CAIRO=make_cairo 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 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 do-install: @${MKDIR} ${STAGEDIR}${JAVAJARDIR} ${INSTALL_LIB} ${WRKSRC}/libswt-*.so ${STAGEDIR}${PREFIX}/lib ${INSTALL_DATA} ${WRKSRC}/swt.jar ${STAGEDIR}${JAVAJARDIR}/ .include Index: head/x11-toolkits/swt/files/patch-build.sh =================================================================== --- head/x11-toolkits/swt/files/patch-build.sh (revision 561901) +++ head/x11-toolkits/swt/files/patch-build.sh (revision 561902) @@ -1,98 +1,98 @@ --- build.sh.orig 2019-03-07 04:31: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,15 +86,15 @@ case $OS in 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 ;; esac # Determine which CPU type we are building for if [ "${MODEL}" = "" ]; then - if uname -i > /dev/null 2>&1; then - MODEL=`uname -i` + if uname -p > /dev/null 2>&1; then + MODEL=`uname -p` if [ ${MODEL} = 'unknown' ]; then MODEL=`uname -m` fi @@ -103,7 +103,7 @@ if [ "${MODEL}" = "" ]; then fi fi case $MODEL in - "x86_64") + "x86_64"|"amd64") SWT_ARCH=x86_64 AWT_ARCH=amd64 ;; @@ -111,6 +111,14 @@ case $MODEL in SWT_ARCH=x86 AWT_ARCH=i386 ;; + powerpc64) + SWT_ARCH=ppc64 + AWT_ARCH=ppc64 + ;; + powerpc64le) + SWT_ARCH=ppc64le + AWT_ARCH=ppc64le + ;; *) SWT_ARCH=$MODEL AWT_ARCH=$MODEL @@ -156,7 +164,7 @@ case $SWT_OS.$SWT_ARCH in # 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 +202,10 @@ esac # For 64-bit CPUs, we have a switch -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} = 'powerpc64le' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' ]; then ++if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'amd64' -o ${MODEL} = 's390x' -o ${MODEL} = 'powerpc64' -o ${MODEL} = 'powerpc64le' -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 +222,13 @@ if [ ${MODEL} = 'x86' -a ${SWT_OS} = 'linux' ]; then 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 # Find AWT if available @@ -364,4 +374,4 @@ elif [ "${GTK_VERSION}" = "4.0" ]; then 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 Index: head/x11-toolkits/swt/files/patch-make_freebsd.mak =================================================================== --- head/x11-toolkits/swt/files/patch-make_freebsd.mak (revision 561901) +++ head/x11-toolkits/swt/files/patch-make_freebsd.mak (revision 561902) @@ -1,82 +1,65 @@ ---- make_freebsd.mak.orig 2019-06-16 12:13:00 UTC +--- make_freebsd.mak.orig 2021-01-11 14:12:37 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 - --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 @@ +@@ -64,9 +64,9 @@ CAIROLIBS = `pkg-config --libs-only-L cairo` -lcairo # 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 @@ +@@ -75,12 +75,13 @@ AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt 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 -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 @@ +@@ -108,17 +109,18 @@ CFLAGS := $(CFLAGS) \ $(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 - 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 +LFLAGS := $(LFLAGS) -s endif all: make_swt make_atk make_glx make_webkit Index: head/x11-toolkits/swt/files/patch-org_eclipse_swt_graphics_Device.java =================================================================== --- head/x11-toolkits/swt/files/patch-org_eclipse_swt_graphics_Device.java (nonexistent) +++ head/x11-toolkits/swt/files/patch-org_eclipse_swt_graphics_Device.java (revision 561902) @@ -0,0 +1,11 @@ +--- org/eclipse/swt/graphics/Device.java.orig 2019-03-07 02:31:06 UTC ++++ org/eclipse/swt/graphics/Device.java +@@ -701,7 +701,7 @@ protected void init () { + } + systemFont = Font.gtk_new (this, defaultFont); + +- overrideThemeValues(); ++ //overrideThemeValues(); + } + + /** Property changes on: head/x11-toolkits/swt/files/patch-org_eclipse_swt_graphics_Device.java ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property