git: 829ad207d6f0 - main - net-im/telegram-desktop: Fix build with Qt 6.8.x
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 17 Dec 2024 06:09:03 UTC
The branch main has been updated by jhale:
URL: https://cgit.FreeBSD.org/ports/commit/?id=829ad207d6f0c6981ab9d036d42c173f6c62c470
commit 829ad207d6f0c6981ab9d036d42c173f6c62c470
Author: Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2024-12-17 05:40:22 +0000
Commit: Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2024-12-17 05:54:06 +0000
net-im/telegram-desktop: Fix build with Qt 6.8.x
Revert commit [1] in lib_base that breaks the build.
[1] https://github.com/desktop-app/lib_base/commit/601c20431cc3f91de01e1b13a033e0a41cd36353111
PR: 283290
---
.../patch-Telegram_lib__base_base_qt_qt__compare.h | 24 ++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_qt_qt__compare.h b/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_qt_qt__compare.h
new file mode 100644
index 000000000000..f0f35866069e
--- /dev/null
+++ b/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_qt_qt__compare.h
@@ -0,0 +1,24 @@
+Fix build with Qt 6.8.x. This reverts [1].
+
+/wrkdirs/usr/ports/net-im/telegram-desktop/work-qt6/tdesktop-5.9.0-full/Telegram/SourceFiles/payments/ui/payments_reaction_box.cpp:45:10:
+note: defaulted 'operator<=>' is implicitly deleted because there is no viable three-way comparison function for member 'name'
+ 45 | QString name;
+
+[1] https://github.com/desktop-app/lib_base/commit/601c20431cc3f91de01e1b13a033e0a41cd36353
+
+--- Telegram/lib_base/base/qt/qt_compare.h.orig 2024-11-05 09:17:02 UTC
++++ Telegram/lib_base/base/qt/qt_compare.h
+@@ -21,13 +21,11 @@ template <typename P>
+ return a.get() <=> b.get();
+ }
+
+-#if QT_VERSION < QT_VERSION_CHECK(6, 8, 0)
+ [[nodiscard]] inline std::strong_ordering operator<=>(
+ const QString &a,
+ const QString &b) noexcept {
+ return a.compare(b) <=> 0;
+ }
+-#endif // Qt < 6.8.0
+
+ template <typename T>
+ [[nodiscard]] inline std::strong_ordering operator<=>(