From 99297d62eb0dd749d01a36523cfe87ffed1e59b8 Mon Sep 17 00:00:00 2001
From: Max Brazhnikov <makc@FreeBSD.org>
Date: Tue, 27 Jul 2021 14:45:29 +0300
Subject: x11-toolkits/swt: Update to 4.20

- WEBKIT implies CAIRO, since it needs libcairo anyway.
---
 x11-toolkits/swt/files/patch-build.sh | 29 ++++++++---------------------
 1 file changed, 8 insertions(+), 21 deletions(-)

(limited to 'x11-toolkits/swt/files/patch-build.sh')

diff --git a/x11-toolkits/swt/files/patch-build.sh b/x11-toolkits/swt/files/patch-build.sh
index 9536139667d3..19afc49f5095 100644
--- a/x11-toolkits/swt/files/patch-build.sh
+++ b/x11-toolkits/swt/files/patch-build.sh
@@ -1,4 +1,4 @@
---- build.sh.orig	2019-03-07 04:31:04 UTC
+--- build.sh.orig	2021-06-11 17:24:22 UTC
 +++ build.sh
 @@ -72,7 +72,7 @@ echo -e "${RED}*** ${@}${NC}"
  
@@ -29,7 +29,7 @@
  		if [ ${MODEL} = 'unknown' ]; then
  		  MODEL=`uname -m`
  		fi
-@@ -103,7 +103,7 @@ if [ "${MODEL}" = "" ]; then
+@@ -103,10 +103,18 @@ if [ "${MODEL}" = "" ]; then
  	fi
  fi
  case $MODEL in
@@ -38,10 +38,6 @@
  		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
@@ -53,21 +49,12 @@
  	*)
  		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	
+@@ -148,10 +156,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} = 'amd64' -o ${MODEL} = 's390x' -o ${MODEL} = 'powerpc64' -o ${MODEL} = 'powerpc64le' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' ]; then
+-if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' ]; then
++if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'amd64' -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
@@ -75,8 +62,8 @@
  		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
+@@ -163,11 +171,13 @@ if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64le' -o ${
+ 	export SWT_PTR_CFLAGS
  fi
  
 +if [ x${MAKE_CAIRO} = "xmake_cairo" ]; then
@@ -89,7 +76,7 @@
  fi
  
  # Find AWT if available
-@@ -364,4 +374,4 @@ elif [ "${GTK_VERSION}" = "4.0" ]; then
+@@ -332,4 +342,4 @@ elif [ "${GTK_VERSION}" = "4.0" ]; then
  elif [ "${GTK_VERSION}" = "3.0" -o "${GTK_VERSION}" = "" ]; then
  	export GTK_VERSION="3.0"
  	func_build_gtk3 "$@"
-- 
cgit v1.2.3