From nobody Wed Nov 09 18:57:01 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4N6vMx3x3qz4V3Wj; Wed, 9 Nov 2022 18:57:01 +0000 (UTC) (envelope-from git@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 4N6vMx3Hm9z3QRy; Wed, 9 Nov 2022 18:57:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668020221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IIRwvpI3dcNmVMEDZfMWmtFb6xaG2L8CfEA1CARBUxg=; b=XE76gE80Aw21KyH1OtF94jQEE+JaB3fF42AeiecY+EFmFGkvkh3jkQUtBzE7XbcQu0y2h3 NoS8nzgW9SME3mvscEZnEtghhR/ajT+wpc+ZqMbmKgQPJ4Bf/VcSvjTeCzJi5qnmSjtVaU lVRTNniHKQCbtuH3bmRXlNIYqgeTjZ7/eGYwPWEfMxAZttyM40XWcdvzGm6SVlfovqsNp7 Yl3+l84YJiB83ZI1yCvOonULapvnL0h5M+47JZXITLQAUD3LwpnODdvznykhyy05IOieST ZfUR3MduyXTc3JtJxrZZwWUrK5pMUnx9E55IKBkrHUfK3KzTtP4UfyrGK264Iw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668020221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IIRwvpI3dcNmVMEDZfMWmtFb6xaG2L8CfEA1CARBUxg=; b=WgslFM0846WvxVh93y+76+0Y6nOBB6Gg2wRhwhMutSWP48xrlS3dAsLanUETqeh3WsKeWl LtJADvUtpIFXkieN4SaVfrM9TDClMOqDGkt7ssDO56Zm8lNeDERqCBSdv/XCqIkkcayRBa +a3SK3nDTeIDCa1eJUuUUC+Al41YpPP0ZufjYkNBcrZ0prRmyPu1dvbnsOzXYV5Szm5FRA cX4/r7XWukNHt4iShwWFjVCdxVWparABIzgeXtPjKTjhLG3kwpHmc/lgdFqhp3FNela+CH dhZ89gKv1ZJaTK5qU8XXv8nw8UBhkLwiaRy8wO5KTAT3RgU0MZXJqFM6AdKQpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668020221; a=rsa-sha256; cv=none; b=cr0EwL8wOM7v7v9t1gaqOTGPhMwiH21/E7kXHa6ywPyfydlUi7qvbsIdhKVVGMRe5dMrIv LdPgMKdnxId70tds7qK7ka6VWr9PkSUj7kN/yDLeD9Ts751aYmT/rsFQP1pzt3WwMUKS9a /ubMnNsocX4D0I7OwB7Umg9juB8Xk7NsOzyteIHb7gG8oydfGM4G6iGnUb1imsFto5xC2y Kn2iZhDfWL3YwPjakoXZBl3cqwCmUjOo50oJ51qc295d6ODNd8iOnPmRPyiS1a170CftWf HHMjecVwlh0QECuu36vyCpXlIancVnnBMB6N8SD/0Bw5mfMqzkyqfaRD3efOxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4N6vMx25brzXGM; Wed, 9 Nov 2022 18:57:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2A9Iv1Gq026959; Wed, 9 Nov 2022 18:57:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A9Iv1Nr026958; Wed, 9 Nov 2022 18:57:01 GMT (envelope-from git) Date: Wed, 9 Nov 2022 18:57:01 GMT Message-Id: <202211091857.2A9Iv1Nr026958@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Max Brazhnikov Subject: git: 8630a2a43b0b - main - x11-toolkits/swt: fix build with OpenJDK debug enabled List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: makc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8630a2a43b0b883813694548fe5783f11ad7330f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by makc: URL: https://cgit.FreeBSD.org/ports/commit/?id=8630a2a43b0b883813694548fe5783f11ad7330f commit 8630a2a43b0b883813694548fe5783f11ad7330f Author: Max Brazhnikov AuthorDate: 2022-11-09 18:56:22 +0000 Commit: Max Brazhnikov CommitDate: 2022-11-09 18:56:22 +0000 x11-toolkits/swt: fix build with OpenJDK debug enabled PR: 265747 Submitted by: chadf at triularity.org --- x11-toolkits/swt/files/patch-build.sh | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/x11-toolkits/swt/files/patch-build.sh b/x11-toolkits/swt/files/patch-build.sh index 19afc49f5095..e8c4eb342bfc 100644 --- a/x11-toolkits/swt/files/patch-build.sh +++ b/x11-toolkits/swt/files/patch-build.sh @@ -1,4 +1,4 @@ ---- build.sh.orig 2021-06-11 17:24:22 UTC +--- build.sh.orig 2021-09-06 06:22:24 UTC +++ build.sh @@ -72,7 +72,7 @@ echo -e "${RED}*** ${@}${NC}" @@ -62,7 +62,7 @@ export XLIB64 fi if [ ${MODEL} = 'ppc64le' ]; then -@@ -163,11 +171,13 @@ if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64le' -o ${ +@@ -163,18 +171,20 @@ if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64le' -o ${ export SWT_PTR_CFLAGS fi @@ -72,10 +72,18 @@ MAKE_CAIRO=make_cairo else func_echo_error "Cairo not found: Advanced graphics support using cairo will not be compiled." -+fi fi ++fi # Find AWT if available + if [ ${SWT_OS} = 'win32' ]; then + AWT_LIB_EXPR="jawt.dll" + else +- AWT_LIB_EXPR="libjawt.*" ++ AWT_LIB_EXPR="libjawt.so" + fi + + if [ -z "${AWT_LIB_PATH}" ]; 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"