From nobody Fri Dec 06 04:55:38 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 4Y4JqH0Fj4z5gJGr; Fri, 06 Dec 2024 04:55:39 +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 4Y4JqG3Zslz4K81; Fri, 6 Dec 2024 04:55:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733460938; 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=qKj3onDjQ5gGIshb5jqc9WCNaaircce7c2LXEHqwsSY=; b=XY37FXV2CxLJlJwpvMgCC/8DvunYmuRe1nxp3Hn9BvWAszigBE2Wa+mXVdwSNSfsEN6D3D IFPVfK3+OjavB1WtN1ffqJgAgYCsenz6ziyEIsuEyYE9aJ5Ku0nWWRMRjAkBit05/qAnz5 vNqNbM3qO290HP3vEDnkOy9kKIGJ5Frxn3l0iUccwGTH/OJ/YFL0b8spALrAXnVdyuw6nZ h+sU5n1e6Fq0JLOFMSD6xZ7trAFYRu4qB+R/oghldQn29ks4LxUYEu2WwwRdEPvpOKYotR cLN/MYD3+HIxvZ34R5+vtMVnO1K54EMv83c3l/1jU/mytmOkZfkCNvsCgBmfTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733460938; 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=qKj3onDjQ5gGIshb5jqc9WCNaaircce7c2LXEHqwsSY=; b=KWPVRtKAr9noHJzSMX0eqJrklIIr354tXUj4GshH5iNWwrcqJeewSncgrZZRfx4xqsKz0J /o9FXQGsa6mzbi06LldIQue90qDcR/Sn2Wb5t9KYSxXyTvisFeNMscS+UgltnGLn8X8OvS 6t5eggSzcDOjcePmpSaRYjecQkZuwsSIODhWkForLGwxtUD4EPUk6noCiSXw5ic2pqohjb qSW1r2ckejEmwgqDJIW+OG+5iy30184hLk84nYE2ZGsIc45kQtTio1uvIXjnSNMo0d7vLZ Goc8w4hRC9mcLuRYyVWUQA0phr5PMtJ2zDg30WLhTkZYxOX5ZttsihU8xsyy9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733460938; a=rsa-sha256; cv=none; b=ARZKAAr4CfsGJCzHfoJhE8xQgXEWZ9LcaxzJVqxo0/1e+6cpM2Lgye5RooLPnaLvSmeds4 Rgz727Sp6XlQFdRKYadU7u1vdtzJM/2jEo/nA2V3WnvDZYYjoldyTj36c9gZzI89j3lKR0 vxXrjm8AS1bg2aHLA0DEPYHgJD8UxpuRHPPAL6NCdhTQmBzHGljyf91qFwxOZioCnQCq5b o/T0iE1Ybwm9tkVsRGI8LBtzo429iaZuDEGcMxmDRHPazbDpCzIC2jvvaPeNaPNYnZEkjS UltvqROBd/ap0fp1jSGYr+1xSU/Ii9tentU6qeVjpy+y9Ci+kNS4MZLDVE2PVg== 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 4Y4JqG2z1zzNlh; Fri, 6 Dec 2024 04:55:38 +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 4B64tcQn015768; Fri, 6 Dec 2024 04:55:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B64tcJm015765; Fri, 6 Dec 2024 04:55:38 GMT (envelope-from git) Date: Fri, 6 Dec 2024 04:55:38 GMT Message-Id: <202412060455.4B64tcJm015765@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: bfa2bdb1bbee - main - devel/qt6-base: Fix warnings with LLVM 19 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: bfa2bdb1bbeea3e6377255d5bf530daed004bf72 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=bfa2bdb1bbeea3e6377255d5bf530daed004bf72 commit bfa2bdb1bbeea3e6377255d5bf530daed004bf72 Author: Jason E. Hale AuthorDate: 2024-12-05 09:10:36 +0000 Commit: Jason E. Hale CommitDate: 2024-12-06 04:55:24 +0000 devel/qt6-base: Fix warnings with LLVM 19 Pushing and popping the pragma within the qcomparehelpers macros doesn't seem to be working anymore with LLVM 19. Unwrap the pragma until a better solution can be found. This should get www/dooble building again on CURRENT and suppress many useless warnings in other ports. MFH: 2024Q4 --- devel/qt6-base/Makefile | 2 +- .../patch-src_corelib_global_qcomparehelpers.h | 28 +++------------------- 2 files changed, 4 insertions(+), 26 deletions(-) diff --git a/devel/qt6-base/Makefile b/devel/qt6-base/Makefile index 0272d24ca2f7..e4ebeebc9040 100644 --- a/devel/qt6-base/Makefile +++ b/devel/qt6-base/Makefile @@ -1,6 +1,6 @@ PORTNAME= base DISTVERSION= ${QT6_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt6- diff --git a/devel/qt6-base/files/patch-src_corelib_global_qcomparehelpers.h b/devel/qt6-base/files/patch-src_corelib_global_qcomparehelpers.h index f28c5a926a13..420a902bd19c 100644 --- a/devel/qt6-base/files/patch-src_corelib_global_qcomparehelpers.h +++ b/devel/qt6-base/files/patch-src_corelib_global_qcomparehelpers.h @@ -7,43 +7,21 @@ qcompare.h that upstream suppresses for GCC. /usr/local/include/qt6/QtCore/qcomparehelpers.h:211:43: note: expanded from macro 'QT_DECLARE_ORDERING_HELPER_TEMPLATE' 211 | { return compareThreeWay(lhs, rhs) >= 0; } ---- src/corelib/global/qcomparehelpers.h.orig 2024-01-22 10:20:09 UTC +--- src/corelib/global/qcomparehelpers.h.orig 2024-09-16 09:24:52 UTC +++ src/corelib/global/qcomparehelpers.h -@@ -197,6 +197,8 @@ template constexpr auto to_Qt(In in) noe +@@ -197,6 +197,7 @@ template constexpr auto to_Qt(In in) noe { return !comparesEqual(rhs, lhs); } #define QT_DECLARE_ORDERING_HELPER_TEMPLATE(OrderingType, LeftType, RightType, Constexpr) \ -+ QT_WARNING_PUSH \ + QT_WARNING_DISABLE_CLANG("-Wzero-as-null-pointer-constant") \ friend Constexpr bool operator<(LeftType const &lhs, RightType const &rhs) \ noexcept(noexcept(compareThreeWay(lhs, rhs))) \ { return compareThreeWay(lhs, rhs) < 0; } \ -@@ -208,7 +210,8 @@ template constexpr auto to_Qt(In in) noe - { return compareThreeWay(lhs, rhs) <= 0; } \ - friend Constexpr bool operator>=(LeftType const &lhs, RightType const &rhs) \ - noexcept(noexcept(compareThreeWay(lhs, rhs))) \ -- { return compareThreeWay(lhs, rhs) >= 0; } -+ { return compareThreeWay(lhs, rhs) >= 0; } \ -+ QT_WARNING_POP - - #define QT_DECLARE_ORDERING_HELPER_PARTIAL(LeftType, RightType, Constexpr) \ - QT_DECLARE_ORDERING_HELPER_TEMPLATE(Qt::partial_ordering, LeftType, RightType, Constexpr) -@@ -225,6 +228,8 @@ template constexpr auto to_Qt(In in) noe +@@ -225,6 +226,7 @@ template constexpr auto to_Qt(In in) noe // Helpers for reversed ordering, using the existing compareThreeWay() function. #define QT_DECLARE_REVERSED_ORDERING_HELPER_TEMPLATE(OrderingType, LeftType, RightType, Constexpr) \ -+ QT_WARNING_PUSH \ + QT_WARNING_DISABLE_CLANG("-Wzero-as-null-pointer-constant") \ friend Constexpr bool operator<(RightType const &lhs, LeftType const &rhs) \ noexcept(noexcept(compareThreeWay(rhs, lhs))) \ { return compareThreeWay(rhs, lhs) > 0; } \ -@@ -236,7 +241,8 @@ template constexpr auto to_Qt(In in) noe - { return compareThreeWay(rhs, lhs) >= 0; } \ - friend Constexpr bool operator>=(RightType const &lhs, LeftType const &rhs) \ - noexcept(noexcept(compareThreeWay(rhs, lhs))) \ -- { return compareThreeWay(rhs, lhs) <= 0; } -+ { return compareThreeWay(rhs, lhs) <= 0; } \ -+ QT_WARNING_POP - - #define QT_DECLARE_REVERSED_ORDERING_HELPER_PARTIAL(LeftType, RightType, Constexpr) \ - QT_DECLARE_REVERSED_ORDERING_HELPER_TEMPLATE(Qt::partial_ordering, LeftType, RightType, Constexpr)