From nobody Sat Nov 02 16:18:10 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 4XgjZW2tPrz5cH8g; Sat, 02 Nov 2024 16:18:11 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XgjZW01X3z4Nsh; Sat, 2 Nov 2024 16:18:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730564291; 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=zOKDaBlXeSjEavkpxZlJo7TAj/3VngdmBhG5BC7mHNg=; b=nRv9nvbxjJKXS97JEpLpb/2JIhU2cREigScWxwb+XfxgrRmzj468LqF38qXTI/8g4up/9X M3Z9U2G7vQdPgVASZBfNRHNb/4B1JXuvYHByRf60Wa46ulFDnT5C/zducS/m84rC220WoQ ybfl4hs9eH8nhH9varoHRnoQ00776pErYYtow6D6VrRBciLaVSL0IjsPgPudk/O/cK4buE LnNk/SIceO37wQ6whtkyv1pfZaC3di5eL8VBR3voRflc3X35P+FlBS0jqsNrTIbiXPFArH dyrB1LJeZ4imjxa4XJLp/u5ow4xcOuOQurM5gF+1V4vtknTuHjzmJvwMZzJWhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730564291; 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=zOKDaBlXeSjEavkpxZlJo7TAj/3VngdmBhG5BC7mHNg=; b=O8sbertsmfa8Ym4ssD/QVZKmfU094ikpJ3fyLcumUBjqbsFfAL6VzOs48AgiNgJm0Hgk12 C81bhFlBgTcraJTv/54O1XN/08JWFgcSqZEak7nUY6uGSG6xIUNJ4+3TliFyXLDW/tvc88 1/Mt82rFK0mdp74cd8iNoIyfU0XqVCxofPoYk03yCmwI9E5fV0hBhuY+KgUA9IF8ctTR33 HsGGGHyh83ElnEuhFA+qj+fyZfWUeLhe2FcZQwiDERzs18+HwzqWzh9gQHl3D7vXhjwc9W PLauMNK+NQ5Nzf63znISsMctsLsp/EiUoJBUPKWg+lMe8oQhAwbhZBmfileVDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730564291; a=rsa-sha256; cv=none; b=d5YrYTcZE0lM5NizSvQtt9XcO1z/gatKrqDUsFYTzXK6PPhEok9XUSLC9G3tyn1E5H1rQt fqv4F3G3LKCzUi5luwj2JMovYZJj61U0UF5TiZSUkGWf/EL1NNWyfx7VhU0kIbnpzY8WRU VA9p/yYVkkNDKk0IWYpG5W4f7z9XvnrP5jjhYIpR3lcZp1MeKMj3MSOzZA1rtiPYj+2Xsn q5Xor9v+eZtm4jspqbF+DUKbCmq28G0hzN+4jhFbAUc5QL26qNiXqoLzPDqR4mQ67lR3a8 Uc9+Tn44XinW1VGz4jCVMowesvXonWkIEViNQFGxeFHvE7keWDH7ozzZEFiJcw== 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 4XgjZV6ccQz19p0; Sat, 2 Nov 2024 16:18:10 +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 4A2GIAbF061546; Sat, 2 Nov 2024 16:18:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A2GIAt6061543; Sat, 2 Nov 2024 16:18:10 GMT (envelope-from git) Date: Sat, 2 Nov 2024 16:18:10 GMT Message-Id: <202411021618.4A2GIAt6061543@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: "Jason E. Hale" Subject: git: 6e7368fd227c - 2024Q4 - devel/qtcreator: Really fix build with LLVM 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: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q4 X-Git-Reftype: branch X-Git-Commit: 6e7368fd227ccc89e79a86983396c31f06f3c0af Auto-Submitted: auto-generated The branch 2024Q4 has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=6e7368fd227ccc89e79a86983396c31f06f3c0af commit 6e7368fd227ccc89e79a86983396c31f06f3c0af Author: Jason E. Hale AuthorDate: 2024-11-02 15:54:46 +0000 Commit: Jason E. Hale CommitDate: 2024-11-02 16:17:34 +0000 devel/qtcreator: Really fix build with LLVM 19 Clang >= 19.1.0-rc1 enables C++17 relaxed template template argument matching by default. The workaround in qtcreator before this was the case is now causing build failures. Add upstream patch to fix build of the clang-format plugin with clang-format19. MFH: 2024Q4 (cherry picked from commit af073c18a31257e36538a52e2e7ebdf900e0d888) --- devel/qtcreator/Makefile | 3 +++ devel/qtcreator/distinfo | 4 +++- .../files/patch-src_libs_utils_algorithm.h | 26 ++++++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/devel/qtcreator/Makefile b/devel/qtcreator/Makefile index b83c70652f04..860dffa66d68 100644 --- a/devel/qtcreator/Makefile +++ b/devel/qtcreator/Makefile @@ -6,6 +6,9 @@ MASTER_SITES= QT/official_releases/qtcreator/${DISTVERSION:R}/${DISTVERSION} DISTNAME= qt-creator-opensource-src-${DISTVERSION} DIST_SUBDIR= KDE/Qt/qtcreator +PATCH_SITES= https://github.com/qt-creator/qt-creator/commit/ +PATCHFILES+= f175ec933f1c5c5d7a345edbaacc8ff90202aee2.patch:-p1 # clang-format19 fix; will be in qtcreator 15.0 + MAINTAINER= kde@FreeBSD.org COMMENT= C++ and QML IDE for Qt development WWW= https://qt-project.org/wiki/Category:Tools::QtCreator diff --git a/devel/qtcreator/distinfo b/devel/qtcreator/distinfo index b56d09982207..d71289b05176 100644 --- a/devel/qtcreator/distinfo +++ b/devel/qtcreator/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1727826035 +TIMESTAMP = 1730535650 SHA256 (KDE/Qt/qtcreator/qt-creator-opensource-src-14.0.2.tar.xz) = b2d2f878bb6928a8e6e30d87600bdd93cf404c2619a151c64bdcdc8cd0783892 SIZE (KDE/Qt/qtcreator/qt-creator-opensource-src-14.0.2.tar.xz) = 52423044 +SHA256 (KDE/Qt/qtcreator/f175ec933f1c5c5d7a345edbaacc8ff90202aee2.patch) = 5f4528f1b927c68a0a162a9f2c1b01d49387355eb6e5640dd2b2a8332d6383f9 +SIZE (KDE/Qt/qtcreator/f175ec933f1c5c5d7a345edbaacc8ff90202aee2.patch) = 1196 diff --git a/devel/qtcreator/files/patch-src_libs_utils_algorithm.h b/devel/qtcreator/files/patch-src_libs_utils_algorithm.h new file mode 100644 index 000000000000..cbe9421ff8bc --- /dev/null +++ b/devel/qtcreator/files/patch-src_libs_utils_algorithm.h @@ -0,0 +1,26 @@ +Fix build with LLVM >= 19.1.0-rc1. + +Clang >= 19.1.0-rc1 enables C++17 relaxed template template argument +matching by default. The workaround in qtcreator before this was the +case is now causing build failures. + +--- src/libs/utils/algorithm.h.orig 2024-09-27 01:17:49 UTC ++++ src/libs/utils/algorithm.h +@@ -258,7 +258,7 @@ Q_REQUIRED_RESULT decltype(auto) transform(SC &&contai + typename Result = std::decay_t>, + typename ResultContainer = C> + Q_REQUIRED_RESULT decltype(auto) transform(SC &&container, F function); +-#ifdef Q_CC_CLANG ++#if defined(Q_CC_CLANG) && !defined(__cpp_template_template_args) + // "Matching of template template-arguments excludes compatible templates" + // http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0522r0.html (P0522R0) + // in C++17 makes the above match e.g. C=std::vector even though that takes two +@@ -809,7 +809,7 @@ Q_REQUIRED_RESULT decltype(auto) transform(SC &&contai + return transform(std::forward(container), function); + } + +-#ifdef Q_CC_CLANG ++#if defined(Q_CC_CLANG) && !defined(__cpp_template_template_args) + template class C, // result container type + typename SC, // input container type + typename F, // function type