git: 44172d86be84 - main - net-im/telegram-desktop: Fix build with Qt 6.9
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 27 Apr 2025 03:13:04 UTC
The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=44172d86be84ef4ab791a3f13b1721e619ee0dbe commit 44172d86be84ef4ab791a3f13b1721e619ee0dbe Author: Jason E. Hale <jhale@FreeBSD.org> AuthorDate: 2025-04-27 03:06:01 +0000 Commit: Jason E. Hale <jhale@FreeBSD.org> CommitDate: 2025-04-27 03:09:38 +0000 net-im/telegram-desktop: Fix build with Qt 6.9 With hat: kde@ PR: 286051 --- ..._platform_linux_base__linux__xdp__utilities.cpp | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_linux_base__linux__xdp__utilities.cpp b/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_linux_base__linux__xdp__utilities.cpp new file mode 100644 index 000000000000..25db4543f4ef --- /dev/null +++ b/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_linux_base__linux__xdp__utilities.cpp @@ -0,0 +1,30 @@ +Fix build with Qt >= 6.9.0 + +Backported from: https://github.com/desktop-app/lib_base/pull/268 + +--- Telegram/lib_base/base/platform/linux/base_linux_xdp_utilities.cpp.orig 2025-02-25 06:14:47 UTC ++++ Telegram/lib_base/base/platform/linux/base_linux_xdp_utilities.cpp +@@ -16,7 +16,11 @@ + #if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) + #include <qpa/qplatformintegration.h> + #include <private/qguiapplication_p.h> ++#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0) ++#include <private/qdesktopunixservices_p.h> ++#else // Qt >= 6.9.0 + #include <private/qgenericunixservices_p.h> ++#endif // Qt < 6.9.0 + #endif // Qt >= 6.5.0 + + #include <sstream> +@@ -39,7 +43,10 @@ std::string ParentWindowID(QWindow *window) { + } + + #if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) +- if (const auto services = dynamic_cast<QGenericUnixServices*>( ++#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0) ++ using QDesktopUnixServices = QGenericUnixServices; ++#endif // Qt < 6.9.0 ++ if (const auto services = dynamic_cast<QDesktopUnixServices*>( + QGuiApplicationPrivate::platformIntegration()->services())) { + return services->portalWindowIdentifier(window).toStdString(); + }