git: f5a1f1d5ee0a - main - net-im/telegram-desktop: fix build with clang <19 (+)
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 15 Mar 2025 11:39:07 UTC
The branch main has been updated by fluffy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=f5a1f1d5ee0afa2637886e9d7ca0910b694d971e
commit f5a1f1d5ee0afa2637886e9d7ca0910b694d971e
Author: Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2025-03-15 11:36:51 +0000
Commit: Dima Panov <fluffy@FreeBSD.org>
CommitDate: 2025-03-15 11:36:51 +0000
net-im/telegram-desktop: fix build with clang <19 (+)
Problematic part of code was adjusted upstream so remove local extrapatch
PR: 285359
---
net-im/telegram-desktop/Makefile | 5 +----
...apatch-Telegram_lib__base_base_qt_qt__compare.h | 24 ----------------------
2 files changed, 1 insertion(+), 28 deletions(-)
diff --git a/net-im/telegram-desktop/Makefile b/net-im/telegram-desktop/Makefile
index b1ad0c3256dd..f34cc89abcb9 100644
--- a/net-im/telegram-desktop/Makefile
+++ b/net-im/telegram-desktop/Makefile
@@ -1,5 +1,6 @@
PORTNAME= telegram-desktop
DISTVERSION= 5.12.3
+PORTREVISION= 1
CATEGORIES= net-im
MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${DISTVERSION}/
DISTNAME= tdesktop-${DISTVERSION}-full
@@ -110,10 +111,6 @@ CMAKE_ARGS+= -DCMAKE_CC_COMPILER_LAUNCHER="${LOCALBASE}/bin/ccache" \
-DCMAKE_CXX_COMPILER_LAUNCHER="${LOCALBASE}/bin/ccache"
.endif
-.if ${OPSYS} == FreeBSD && ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 190
-EXTRA_PATCHES= ${PATCHDIR}/extrapatch-Telegram_lib__base_base_qt_qt__compare.h
-.endif
-
post-extract:
# Some of the third-party components already built, and
# can be safely removed
diff --git a/net-im/telegram-desktop/files/extrapatch-Telegram_lib__base_base_qt_qt__compare.h b/net-im/telegram-desktop/files/extrapatch-Telegram_lib__base_base_qt_qt__compare.h
deleted file mode 100644
index f0f35866069e..000000000000
--- a/net-im/telegram-desktop/files/extrapatch-Telegram_lib__base_base_qt_qt__compare.h
+++ /dev/null
@@ -1,24 +0,0 @@
-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<=>(