From owner-svn-ports-head@freebsd.org Mon Jan 18 08:34:44 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 93AA24E551D; Mon, 18 Jan 2021 08:34:44 +0000 (UTC) (envelope-from makc@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DK4pX3ncTz3Nrr; Mon, 18 Jan 2021 08:34:44 +0000 (UTC) (envelope-from makc@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 74E8C1104A; Mon, 18 Jan 2021 08:34:44 +0000 (UTC) (envelope-from makc@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 10I8Yi15038190; Mon, 18 Jan 2021 08:34:44 GMT (envelope-from makc@FreeBSD.org) Received: (from makc@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 10I8YhNC038186; Mon, 18 Jan 2021 08:34:43 GMT (envelope-from makc@FreeBSD.org) Message-Id: <202101180834.10I8YhNC038186@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: makc set sender to makc@FreeBSD.org using -f From: Max Brazhnikov Date: Mon, 18 Jan 2021 08:34:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r561902 - in head/x11-toolkits/swt: . files X-SVN-Group: ports-head X-SVN-Commit-Author: makc X-SVN-Commit-Paths: in head/x11-toolkits/swt: . files X-SVN-Commit-Revision: 561902 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Jan 2021 08:34:44 -0000 Author: makc Date: Mon Jan 18 08:34:43 2021 New Revision: 561902 URL: https://svnweb.freebsd.org/changeset/ports/561902 Log: x11-toolkits/swt: - Remove excessive patching, which also broke loading of swt libraries. - Add temporary patch to fix crash, when swt tries to load *.css files which are not shipped with the tarball. Reported by: Robin Dapp via email Added: head/x11-toolkits/swt/files/patch-org_eclipse_swt_graphics_Device.java (contents, props changed) Modified: head/x11-toolkits/swt/Makefile head/x11-toolkits/swt/files/patch-build.sh head/x11-toolkits/swt/files/patch-make_freebsd.mak Modified: head/x11-toolkits/swt/Makefile ============================================================================== --- head/x11-toolkits/swt/Makefile Mon Jan 18 08:21:27 2021 (r561901) +++ head/x11-toolkits/swt/Makefile Mon Jan 18 08:34:43 2021 (r561902) @@ -3,6 +3,7 @@ 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 @@ -23,7 +24,7 @@ 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} @@ -45,7 +46,6 @@ 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 Modified: head/x11-toolkits/swt/files/patch-build.sh ============================================================================== --- head/x11-toolkits/swt/files/patch-build.sh Mon Jan 18 08:21:27 2021 (r561901) +++ head/x11-toolkits/swt/files/patch-build.sh Mon Jan 18 08:34:43 2021 (r561902) @@ -67,7 +67,7 @@ # 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 Modified: head/x11-toolkits/swt/files/patch-make_freebsd.mak ============================================================================== --- head/x11-toolkits/swt/files/patch-make_freebsd.mak Mon Jan 18 08:21:27 2021 (r561901) +++ head/x11-toolkits/swt/files/patch-make_freebsd.mak Mon Jan 18 08:34:43 2021 (r561902) @@ -1,4 +1,4 @@ ---- 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 @@ -9,24 +9,7 @@ # 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) @@ -38,7 +21,7 @@ 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 @@ -54,7 +37,7 @@ 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 \ Added: head/x11-toolkits/swt/files/patch-org_eclipse_swt_graphics_Device.java ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/swt/files/patch-org_eclipse_swt_graphics_Device.java Mon Jan 18 08:34:43 2021 (r561902) @@ -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(); + } + + /**