git: 4e47ba0f76bb - 2024Q4 - devel/qt6-base: Fix warnings with LLVM 19
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 06 Dec 2024 04:56:35 UTC
The branch 2024Q4 has been updated by jhale:
URL: https://cgit.FreeBSD.org/ports/commit/?id=4e47ba0f76bbcad646bca290e7a846927b0fe5ed
commit 4e47ba0f76bbcad646bca290e7a846927b0fe5ed
Author: Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2024-12-05 09:10:36 +0000
Commit: Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2024-12-06 04:56:18 +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
(cherry picked from commit bfa2bdb1bbeea3e6377255d5bf530daed004bf72)
---
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 <typename In> constexpr auto to_Qt(In in) noe
+@@ -197,6 +197,7 @@ template <typename In> 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 <typename In> 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 <typename In> constexpr auto to_Qt(In in) noe
+@@ -225,6 +226,7 @@ template <typename In> 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 <typename In> 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)