From nobody Mon Aug 12 19:46:58 2024 X-Original-To: dev-commits-ports-branches@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 4WjQ5G3fGJz5T1Qc; Mon, 12 Aug 2024 19:46:58 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WjQ5G2Wz3z4Mgg; Mon, 12 Aug 2024 19:46:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723492018; 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=SCysQO/vjjV/+huMpxVfbFO6d70cYO3LrQD6ENduqgE=; b=qyJ+rc8Y1izoEygXYRTT85YBn9BdZBo77bb8FzONSp3bMOX2F+PWhyAxAk+PSQulecJT+1 lN1qcYLUsHLkL3jHMN7o/majgP0HI95GE4uKoAkMBJabz+Mi30fU/I4y/9Sj6SysBBZFa2 eOnhQRIhZ9aaq2PId3q5FdPmMyfVOAFkAGezf1wU/nSuX+pEfE8XH456qJZuY3jOlKd1a8 zEae9laIwYOr5TcotjdVEPF0tDnYbRVpIjAHGu9FllZi+ivSn4fPfXxQme8BEc/K/jgbYo EplNgsysqAauXbUehc2rdh0n71XpqoYiO+4PmG3rliOGZ/erC7tbD0eU22byPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723492018; a=rsa-sha256; cv=none; b=qJZg0cA2BXhBXtjTMBo74YU88P1Va2/U/y/sLi8S+wQnNYz1Uy6eJKljRJy7X/H74W3a9z P9/ZGErqXl79KLYceHTuH+8PwNLjeXcGZ8dYf2RIKsPpe60/WphWAM2S5GoC2mcVv3TDAk XGU47MnZdc+naz4A8VQ5LqniKAT2hnri2d95iWpgqYU3k4JGUwv09ARkAWZTg5kU9c6zcr JcdK9CVndq8Yz6XvblNrjSIzzmYkMeZxf4IKF7KIoekwne7pVEyZtDVtIoKGQXCeN+ciTI ZQEcpL/UJhM58H95DtH/wout7Ko2gK4pJyDg/ewOf45tdLCv0ra/zCg7uNulhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723492018; 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=SCysQO/vjjV/+huMpxVfbFO6d70cYO3LrQD6ENduqgE=; b=JmA8nC1L3c4wI4PrqL8R4Vz+Iblk6yCjlOZqwqww8NkRGNNX1RkP2rT99gUEAPiYyT7509 MTX8Y1Y53mens/y+bD0XjYVGTWuvPRM6poqbqRDCv2d88YnDZZ5KDnjkW5KM3/YpG0K5xf wUjhLhift/g9cHZypmdVhGLebiC8VslT1WM0ohlbNIPJ4Nj369tTauUlvpvLrlzMdJSkQk iqYsHIuPZCSn/jPET+oIFOKN+dR0Ebh9rfYEhyou+H+3ZWqccGfx1QPNlXufoPQ/pEoFNf SqkRaonoNQ4+cXBzlLlUZd/1OhIxci0oFLhX1NxB1VTGhPxxlXzRhwGGBSsuDg== 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 4WjQ5G1rMzzgJ6; Mon, 12 Aug 2024 19:46:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47CJkwoI034466; Mon, 12 Aug 2024 19:46:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47CJkwB0034463; Mon, 12 Aug 2024 19:46:58 GMT (envelope-from git) Date: Mon, 12 Aug 2024 19:46:58 GMT Message-Id: <202408121946.47CJkwB0034463@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dimitry Andric Subject: git: 94cfb4eb0e34 - 2024Q3 - www/webkit2-gtk3: fix build with clang 19 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q3 X-Git-Reftype: branch X-Git-Commit: 94cfb4eb0e3479f0a905b4261e69845a6ab6534f Auto-Submitted: auto-generated The branch 2024Q3 has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=94cfb4eb0e3479f0a905b4261e69845a6ab6534f commit 94cfb4eb0e3479f0a905b4261e69845a6ab6534f Author: Dimitry Andric AuthorDate: 2024-08-10 11:50:00 +0000 Commit: Dimitry Andric CommitDate: 2024-08-12 19:43:36 +0000 www/webkit2-gtk3: fix build with clang 19 Clang 19 now implements CWG 96 [1], which requires a template argument list after a 'template' keyword, resulting in errors similar to: /wrkdirs/usr/ports/www/webkit2-gtk3/work/webkitgtk-2.34.6/Source/JavaScriptCore/assembler/AbstractMacroAssembler.h:974:65: error: a template argument list is expected after a name prefixed by the template keyword [-Wmissing-template-arg-list-after-template-kw] 974 | AssemblerType::repatchCompact(dataLabelCompact.template dataLocation(), value); | ^ In these cases, appending "<>" is enough to satisfy the constraint. Upstream has committed a fix to their main branch [2], but since some code has moved around, and other functions have been removed, it does not apply cleanly to 2.34.6. Therefore, apply only the necessary fixes manually for now. [1] https://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#96 [2] https://github.com/WebKit/WebKit/commit/62b6e2db547e PR: 280728 Approved by: fluffy (maintainer) MFH: 2024Q3 (cherry picked from commit 743cdc3096083c022157d3da0291a878f1f8b58b) --- ...vaScriptCore_assembler_AbstractMacroAssembler.h | 11 +++++ .../patch-Source_JavaScriptCore_llint_LLIntData.h | 56 ++++++++++++++++++++++ .../patch-Source_JavaScriptCore_runtime_JSCast.h | 20 ++++++++ 3 files changed, 87 insertions(+) diff --git a/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_AbstractMacroAssembler.h b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_AbstractMacroAssembler.h new file mode 100644 index 000000000000..9e70156211dd --- /dev/null +++ b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_AbstractMacroAssembler.h @@ -0,0 +1,11 @@ +--- Source/JavaScriptCore/assembler/AbstractMacroAssembler.h.orig 2021-10-21 08:52:07 UTC ++++ Source/JavaScriptCore/assembler/AbstractMacroAssembler.h +@@ -971,7 +971,7 @@ class AbstractMacroAssembler : public AbstractMacroAss + template + static void repatchCompact(CodeLocationDataLabelCompact dataLabelCompact, int32_t value) + { +- AssemblerType::repatchCompact(dataLabelCompact.template dataLocation(), value); ++ AssemblerType::repatchCompact(dataLabelCompact.template dataLocation<>(), value); + } + + template diff --git a/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_llint_LLIntData.h b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_llint_LLIntData.h new file mode 100644 index 000000000000..614316d74a1f --- /dev/null +++ b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_llint_LLIntData.h @@ -0,0 +1,56 @@ +--- Source/JavaScriptCore/llint/LLIntData.h.orig 2021-10-21 08:52:07 UTC ++++ Source/JavaScriptCore/llint/LLIntData.h +@@ -217,7 +217,7 @@ ALWAYS_INLINE LLIntCode getCodeFunctionPtr(OpcodeID op + #if COMPILER(MSVC) + return reinterpret_cast(getCodePtr(opcodeID).executableAddress()); + #else +- return reinterpret_cast(getCodePtr(opcodeID).template executableAddress()); ++ return reinterpret_cast(getCodePtr(opcodeID).template executableAddress<>()); + #endif + } + +@@ -227,7 +227,7 @@ ALWAYS_INLINE LLIntCode getWide16CodeFunctionPtr(Opcod + #if COMPILER(MSVC) + return reinterpret_cast(getWide16CodePtr(opcodeID).executableAddress()); + #else +- return reinterpret_cast(getWide16CodePtr(opcodeID).template executableAddress()); ++ return reinterpret_cast(getWide16CodePtr(opcodeID).template executableAddress<>()); + #endif + } + +@@ -237,7 +237,7 @@ ALWAYS_INLINE LLIntCode getWide32CodeFunctionPtr(Opcod + #if COMPILER(MSVC) + return reinterpret_cast(getWide32CodePtr(opcodeID).executableAddress()); + #else +- return reinterpret_cast(getWide32CodePtr(opcodeID).template executableAddress()); ++ return reinterpret_cast(getWide32CodePtr(opcodeID).template executableAddress<>()); + #endif + } + +@@ -328,7 +328,7 @@ ALWAYS_INLINE LLIntCode getCodeFunctionPtr(WasmOpcodeI + #if COMPILER(MSVC) + return reinterpret_cast(getCodePtr(opcodeID).executableAddress()); + #else +- return reinterpret_cast(getCodePtr(opcodeID).template executableAddress()); ++ return reinterpret_cast(getCodePtr(opcodeID).template executableAddress<>()); + #endif + } + +@@ -338,7 +338,7 @@ ALWAYS_INLINE LLIntCode getWide16CodeFunctionPtr(WasmO + #if COMPILER(MSVC) + return reinterpret_cast(getWide16CodePtr(opcodeID).executableAddress()); + #else +- return reinterpret_cast(getWide16CodePtr(opcodeID).template executableAddress()); ++ return reinterpret_cast(getWide16CodePtr(opcodeID).template executableAddress<>()); + #endif + } + +@@ -348,7 +348,7 @@ ALWAYS_INLINE LLIntCode getWide32CodeFunctionPtr(WasmO + #if COMPILER(MSVC) + return reinterpret_cast(getWide32CodePtr(opcodeID).executableAddress()); + #else +- return reinterpret_cast(getWide32CodePtr(opcodeID).template executableAddress()); ++ return reinterpret_cast(getWide32CodePtr(opcodeID).template executableAddress<>()); + #endif + } + diff --git a/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_runtime_JSCast.h b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_runtime_JSCast.h new file mode 100644 index 000000000000..94af6690b9b3 --- /dev/null +++ b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_runtime_JSCast.h @@ -0,0 +1,20 @@ +--- Source/JavaScriptCore/runtime/JSCast.h.orig 2021-10-21 08:52:07 UTC ++++ Source/JavaScriptCore/runtime/JSCast.h +@@ -171,7 +171,7 @@ bool inherits(VM& vm, From* from) + bool inherits(VM& vm, From* from) + { + using Dispatcher = InheritsTraits; +- return Dispatcher::template inherits(vm, from); ++ return Dispatcher::template inherits<>(vm, from); + } + + } // namespace JSCastingHelpers +@@ -180,7 +180,7 @@ To jsDynamicCast(VM& vm, From* from) + To jsDynamicCast(VM& vm, From* from) + { + using Dispatcher = JSCastingHelpers::InheritsTraits::type>::type>; +- if (LIKELY(Dispatcher::template inherits(vm, from))) ++ if (LIKELY(Dispatcher::template inherits<>(vm, from))) + return static_cast(from); + return nullptr; + }