From nobody Thu Dec 19 10:33:52 2024 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 4YDRjY018Rz5h0ST; Thu, 19 Dec 2024 10:33: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YDRjX6Qyxz4L1c; Thu, 19 Dec 2024 10:33:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734604432; 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=8A4r1OdUvv5z59g51b0M5UZUnGyw4cFfFMvRm4ue9qU=; b=BoXp6M1ZCXqZEFu4TKBsl5a+DJa27aAnBzEVKM4JeEFCgq9YNqovV7Zd2cDwkUlViIJuJK amGuShwU8AsFSe/mcncxFlbmjZPFPi6ftt2bZr1mKNEY66jDyEbGXBxddVykpkiAnega3n EoQx7px8cchTJa5i+0LCSFio54xdiTz3kX/nmAQOSS1ardC5FR5RRXwR8I/NuzByPEpPnd uEyo9QGZvH3HHQxj11fJGwXRPDCcXceudvw9fgDbPpeMkkLElUdvbBSIp/CFivFH2IS/zq T0RzSYBM/Fq19rd9sBoy0qRljZ4bJ8q7GnKn0q6gLJSG2dZHoOMGbjhArP7rVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734604432; 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=8A4r1OdUvv5z59g51b0M5UZUnGyw4cFfFMvRm4ue9qU=; b=TA7SjgohtzjN5/kOYDZ7FapR1oZuQ0h/AtuDN6XAvlHpbc3HS4tqf1lL03pMrLLlEVooFq qPXAFFzQElFxwQMK4C6azNRP8iIjGnY1yVFQlgmDvKScEd2sDL13HvzP6VxKQewIDInzBp i11hcE0D2Ww6bXEpi8+9PuK0K/DEIMm1e9fRMAgC9QlQcsDKKShfM9njHxSoz6z9JJkPfa r7YMagOCusIuPvfQydEmLY/kmUrH6s5i5AAA0SwIS/zsqeR5NZsyhMckbgMrDaXG8zGxJq 51mvlu9m7aoDY1OclU03O4//1l/zeLW3V+EUgnI5CbC9oXIL/lfryJVVLP5FYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734604432; a=rsa-sha256; cv=none; b=oJZHzvHyUTu0ureRYEFXpGrb24PG04PoaNMiht1o+6mZSj1ew9Nf7pRrGz/gDNql8usFFa IN7bTUti/AVMocRtT0Mc2hq6s4c1ovR5361SW/qh3Bkfb9LNwmmCC2pmI4H8QwtpZcHybs RcTrEIaWOif7MSfh1rDTFLW4NCxA8J4zmiExdAlwFaANKwjledU+hpY4lW8sddg4Y/Ykwf Gt1ClNUWipYWTrdBk+0QVJY9VH0KtLqXTYmOwGDExOvohPpITACEUhTXD7RYj+USmOFczR zfKsyJ6Stjocc2lEH1JrqB3nl4LkoF9m1xrxKaEshX8kC5GO5yOFyDqolBZ/5w== 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 4YDRjX62TwzqqD; Thu, 19 Dec 2024 10:33:52 +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 4BJAXqwF054779; Thu, 19 Dec 2024 10:33:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BJAXqip054776; Thu, 19 Dec 2024 10:33:52 GMT (envelope-from git) Date: Thu, 19 Dec 2024 10:33:52 GMT Message-Id: <202412191033.4BJAXqip054776@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: 112c19906b2b - main - devel/qtcreator: Fix build with Qt 6.7.3 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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/main X-Git-Reftype: branch X-Git-Commit: 112c19906b2b70a7e34fdeaa020ccf0fd0353560 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=112c19906b2b70a7e34fdeaa020ccf0fd0353560 commit 112c19906b2b70a7e34fdeaa020ccf0fd0353560 Author: Jason E. Hale AuthorDate: 2024-12-19 10:24:46 +0000 Commit: Jason E. Hale CommitDate: 2024-12-19 10:33:47 +0000 devel/qtcreator: Fix build with Qt 6.7.3 This update was tested against Qt 6.8.1, but there was some unforseen breakage with Qt 6.7.3 still in main. Consolidate two local patches into a single patch from upstream. Reported by: pkg-fallout --- devel/qtcreator/Makefile | 3 +++ devel/qtcreator/distinfo | 4 +++- .../patch-src_libs_sqlite_sqlitebasestatement.h | 13 ----------- .../files/patch-src_libs_utils_algorithm.h | 26 ---------------------- 4 files changed, 6 insertions(+), 40 deletions(-) diff --git a/devel/qtcreator/Makefile b/devel/qtcreator/Makefile index fd89b65fc54b..b5d3a38f5078 100644 --- a/devel/qtcreator/Makefile +++ b/devel/qtcreator/Makefile @@ -5,6 +5,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= 0e9943dd671877adbe13c9316bded21ac762e4dd.patch:-p1 # Fix build with LLVM 19 + 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 523b73d2868b..b907e9265f69 100644 --- a/devel/qtcreator/distinfo +++ b/devel/qtcreator/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1734242208 +TIMESTAMP = 1734596168 SHA256 (KDE/Qt/qtcreator/qt-creator-opensource-src-15.0.0.tar.xz) = 23b1c6b478ca760997ecddd4c728f0da280b0696008a9bddd9a1068f16d48f72 SIZE (KDE/Qt/qtcreator/qt-creator-opensource-src-15.0.0.tar.xz) = 53254544 +SHA256 (KDE/Qt/qtcreator/0e9943dd671877adbe13c9316bded21ac762e4dd.patch) = 469e93983b09ac5f339a943318e1f29f899955779bac88e303656cf8e07790be +SIZE (KDE/Qt/qtcreator/0e9943dd671877adbe13c9316bded21ac762e4dd.patch) = 3095 diff --git a/devel/qtcreator/files/patch-src_libs_sqlite_sqlitebasestatement.h b/devel/qtcreator/files/patch-src_libs_sqlite_sqlitebasestatement.h deleted file mode 100644 index 7803d35ac358..000000000000 --- a/devel/qtcreator/files/patch-src_libs_sqlite_sqlitebasestatement.h +++ /dev/null @@ -1,13 +0,0 @@ ---- src/libs/sqlite/sqlitebasestatement.h.orig 2024-10-30 22:45:51 UTC -+++ src/libs/sqlite/sqlitebasestatement.h -@@ -412,9 +412,7 @@ class StatementImplementation : public BaseStatement ( - BaseSqliteResultRange(BaseSqliteResultRange &) = delete; - BaseSqliteResultRange &operator=(BaseSqliteResultRange &) = delete; - -- BaseSqliteResultRange(BaseSqliteResultRange &&other) -- : m_statement{std::move(other.resetter)} -- {} -+ BaseSqliteResultRange(BaseSqliteResultRange &&other) = delete; - BaseSqliteResultRange &operator=(BaseSqliteResultRange &&) = delete; - - iterator begin() & { return iterator{m_statement}; } diff --git a/devel/qtcreator/files/patch-src_libs_utils_algorithm.h b/devel/qtcreator/files/patch-src_libs_utils_algorithm.h deleted file mode 100644 index 426257524d84..000000000000 --- a/devel/qtcreator/files/patch-src_libs_utils_algorithm.h +++ /dev/null @@ -1,26 +0,0 @@ -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-11-27 10:00:22 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 -@@ -833,7 +833,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