From nobody Tue Apr 18 21:51:51 2023 X-Original-To: dev-commits-ports-all@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 4Q1Hgr3HWRz45kbx; Tue, 18 Apr 2023 21:51:52 +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 4Q1Hgq5zZsz494C; Tue, 18 Apr 2023 21:51:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681854712; 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=jbQ4qAU2k3kNi/X9SKeBc36LWzggyQNrx4qc4HMS8pg=; b=k+9dVM1LgTAboK2TnF8TJ5J77NBNiS5BPvTeOBzbn5y+CEk0ER3G9oVXmJv4pWMU9bS9vB QlejEI25ydRN+i2rYknnuQ/sprPc4AhhiNo3VHl2c3rQWwytTxHnkfHJIpqAGc0bgrRI/h CQPvWsWteJY6w8u2Jh/32kunQJa//dtupDzkNUcX8wZMnddf5wI0u03C7bCprTZltVF8nQ dKgPUullOupGYOeeJ8yopK6X4m53AytQnNRqT7AM5mw+4NaMXmAEvI148ayhHFPpa84pop XrHU1RqjNqtxT+lHjBHrAM7z6JX6m8QplfMJrfq6XHbIuC5aWNsodiOKKCs2VQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681854712; 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=jbQ4qAU2k3kNi/X9SKeBc36LWzggyQNrx4qc4HMS8pg=; b=iw6oz/t6xY56v8CQFtdTkDCmvkDiGcLZPjJfQ4/ujQuh0ON1GpQzS3Wyoku4mxIp106Vv6 OUxyC0ssMaGHaEYLz0J8Y6xFfslE1zKHAPKbr7lcf+4Q+LBaeGQPiRB+dTRdtiaQDIuT/M M1gF82pV80FPf7tWPGBz8s+k5rTxfjxm9F9CRxPdpVuvOOpcPAZABBTgWcmOQ9e1budamn zf/ioZwGEXY68hoQU6UdFu2RY7nLbZ4/K0YAO9xNEdP51+Awj1M7ZJhpn826mf0Agati3/ CqThVt6Y8wdg4HIOTWwOdG3Uwv33hmjOzKXB+mt7RSE9bHy6BJRfLkAHC3eICQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681854712; a=rsa-sha256; cv=none; b=u6V7U47QlrlX1CkUOZmW0yFtelYpy6N9I28GaL0NatUg0JMnWjewO4+oaIiMG1ScsDazEr sKqjkY/zkUrrCbAlkdqZj2iikS7fo0TrYfgtACDFQaUHnh2avn6wyvx+13wCW4ddZbjKU9 09MvO5ql034qoy9JvVCNYCb0ueN8bLwLmeyNIWNHIUbI/vy+JZoaQTPuMyBRQowewCjNIJ 3J6g4UIoFlUeOMBklE2yWzExdNjazrpYn2G4cKDzZw1ibLJV0nzszbhj5ZPXW1tSAvk6Zt lhwNgw02QAgZEuq+ei6ig/+IDsKV4MY3O6Ur3vPcpHM+7M/N6L6RVIue0imnLg== 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 4Q1Hgq1YlKzTLV; Tue, 18 Apr 2023 21:51:51 +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 33ILpp4C060894; Tue, 18 Apr 2023 21:51:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33ILppL4060893; Tue, 18 Apr 2023 21:51:51 GMT (envelope-from git) Date: Tue, 18 Apr 2023 21:51:51 GMT Message-Id: <202304182151.33ILppL4060893@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: 2f310336b632 - main - devel/qt6-tools: fix build with clang 16 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2f310336b63295c34d536b823cc24bbbb3792ef0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=2f310336b63295c34d536b823cc24bbbb3792ef0 commit 2f310336b63295c34d536b823cc24bbbb3792ef0 Author: Eric Camachat AuthorDate: 2023-04-18 15:35:13 +0000 Commit: Adriaan de Groot CommitDate: 2023-04-18 21:51:41 +0000 devel/qt6-tools: fix build with clang 16 PR: 270450 --- ...patch-src_linguist_lupdate_lupdatepreprocessoraction.cpp | 13 +++++++++++++ .../patch-src_linguist_lupdate_lupdatepreprocessoraction.h | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/devel/qt6-tools/files/patch-src_linguist_lupdate_lupdatepreprocessoraction.cpp b/devel/qt6-tools/files/patch-src_linguist_lupdate_lupdatepreprocessoraction.cpp new file mode 100644 index 000000000000..12a42edec3f4 --- /dev/null +++ b/devel/qt6-tools/files/patch-src_linguist_lupdate_lupdatepreprocessoraction.cpp @@ -0,0 +1,13 @@ +--- src/linguist/lupdate/lupdatepreprocessoraction.cpp.orig 2022-12-12 17:11:50 UTC ++++ src/linguist/lupdate/lupdatepreprocessoraction.cpp +@@ -157,7 +157,9 @@ void LupdatePPCallbacks::SourceRangeSkipped(clang::Sou + void LupdatePPCallbacks::InclusionDirective(clang::SourceLocation /*hashLoc*/, + const clang::Token & /*includeTok*/, clang::StringRef /*fileName*/, bool /*isAngled*/, + clang::CharSourceRange /*filenameRange*/, +-#if (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(15,0,0)) ++#if (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(16,0,0)) ++ clang::OptionalFileEntryRef file, ++#elif (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(15,0,0)) + const clang::Optional file, + #else + const clang::FileEntry *file, diff --git a/devel/qt6-tools/files/patch-src_linguist_lupdate_lupdatepreprocessoraction.h b/devel/qt6-tools/files/patch-src_linguist_lupdate_lupdatepreprocessoraction.h new file mode 100644 index 000000000000..28caab3d3bda --- /dev/null +++ b/devel/qt6-tools/files/patch-src_linguist_lupdate_lupdatepreprocessoraction.h @@ -0,0 +1,13 @@ +--- src/linguist/lupdate/lupdatepreprocessoraction.h.orig 2022-12-12 17:11:50 UTC ++++ src/linguist/lupdate/lupdatepreprocessoraction.h +@@ -52,7 +52,9 @@ class LupdatePPCallbacks : public clang::PPCallbacks ( + void InclusionDirective(clang::SourceLocation /*hashLoc*/, const clang::Token &/*includeTok*/, + clang::StringRef /*fileName*/, bool /*isAngled*/, + clang::CharSourceRange /*filenameRange*/, +-#if (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(15,0,0)) ++#if (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(16,0,0)) ++ clang::OptionalFileEntryRef file, ++#elif (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(15,0,0)) + const clang::Optional file, + #else + const clang::FileEntry *file,