Allow disabling wayland integration for Qt6 builds Upstream has removed the required toggle for wayland integration, and instead is forcing it when qt has been built with USE=wayland. I'm not certain keeping patching it like this is feasible in the long term. A method of disabling QT_FEATURE_wayland should be more appropriate. https://bugs.gentoo.org/928451 https://github.com/desktop-app/cmake_helpers/commit/a428df5440e76a726abc30924766ac7da0cb381c Rebased for 7.0.3: upstream dropped DESKTOP_APP_DISABLE_X11_INTEGRATION, so the new option is anchored on DESKTOP_APP_LOTTIE_USE_CACHE instead. Also guards the new SetForeignTransientParent() wayland branch in ui_utility_linux.cpp. diff -Naur orig/cmake/options.cmake new/cmake/options.cmake --- tdesktop-7.0.3-orig/cmake/options.cmake +++ tdesktop-7.0.3-full/cmake/options.cmake @@ -15,6 +15,13 @@ QT_DEPRECATED_WARNINGS_SINCE=0x051500 ) +if (DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) + target_compile_definitions(common_options + INTERFACE + DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION + ) +endif() + if (WIN32) include(cmake/options_win.cmake) elseif (APPLE) diff -Naur orig/cmake/variables.cmake new/cmake/variables.cmake --- tdesktop-7.0.3-orig/cmake/variables.cmake +++ tdesktop-7.0.3-full/cmake/variables.cmake @@ -32,6 +32,7 @@ option(DESKTOP_APP_TEST_APPS "Build test apps, development only." OFF) option(DESKTOP_APP_LOTTIE_DISABLE_RECOLORING "Disable recoloring of lottie animations." OFF) option(DESKTOP_APP_LOTTIE_USE_CACHE "Use caching in lottie animations." ON) +cmake_dependent_option(DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION "Disable all code for Wayland integration." OFF LINUX ON) cmake_dependent_option(DESKTOP_APP_USE_ALLOCATION_TRACER "Use simple allocation tracer." OFF LINUX OFF) option(DESKTOP_APP_USE_PACKAGED_FONTS "Use preinstalled fonts instead of bundled patched ones." OFF) option(DESKTOP_APP_USE_PACKAGED_RLOTTIE "Find rlottie using CMake instead of bundled patched one." OFF) diff -Naur orig/Telegram/lib_base/base/platform/linux/base_info_linux.cpp new/Telegram/lib_base/base/platform/linux/base_info_linux.cpp --- tdesktop-7.0.3-orig/Telegram/lib_base/base/platform/linux/base_info_linux.cpp +++ tdesktop-7.0.3-full/Telegram/lib_base/base/platform/linux/base_info_linux.cpp @@ -331,7 +331,7 @@ } static const bool result = #if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0) -#if defined QT_FEATURE_wayland && QT_CONFIG(wayland) +#if !defined DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION && defined QT_FEATURE_wayland && QT_CONFIG(wayland) qApp->nativeInterface() #else // wayland false diff -Naur orig/Telegram/lib_base/base/platform/linux/base_linux_xdg_activation_token.cpp new/Telegram/lib_base/base/platform/linux/base_linux_xdg_activation_token.cpp --- tdesktop-7.0.3-orig/Telegram/lib_base/base/platform/linux/base_linux_xdg_activation_token.cpp +++ tdesktop-7.0.3-full/Telegram/lib_base/base/platform/linux/base_linux_xdg_activation_token.cpp @@ -15,7 +15,7 @@ namespace base::Platform { void RunWithXdgActivationToken(Fn callback) { -#if defined QT_FEATURE_wayland && QT_CONFIG(wayland) +#if !defined DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION && defined QT_FEATURE_wayland && QT_CONFIG(wayland) const auto window = QGuiApplication::focusWindow(); if (!window) { callback({}); diff -Naur orig/Telegram/lib_ui/ui/platform/linux/ui_utility_linux.cpp new/Telegram/lib_ui/ui/platform/linux/ui_utility_linux.cpp --- tdesktop-7.0.3-orig/Telegram/lib_ui/ui/platform/linux/ui_utility_linux.cpp +++ tdesktop-7.0.3-full/Telegram/lib_ui/ui/platform/linux/ui_utility_linux.cpp @@ -203,7 +203,7 @@ reinterpret_cast(&xev)))); } -#if defined QT_FEATURE_wayland && QT_CONFIG(wayland) +#if !defined DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION && defined QT_FEATURE_wayland && QT_CONFIG(wayland) constexpr auto kWaylandMarshalFlagDestroy = uint32_t(1); const auto kWaylandImportedObjectName = u"_td_wayland_foreign_imported"_q; @@ -659,7 +659,7 @@ void SetForeignTransientParent( not_null widget, const ForeignParent &parent) { -#if defined QT_FEATURE_wayland && QT_CONFIG(wayland) +#if !defined DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION && defined QT_FEATURE_wayland && QT_CONFIG(wayland) if (::Platform::IsWayland()) { const auto window = widget->windowHandle(); if (!window) { @@ -724,7 +724,7 @@ } bool WindowMarginsSupported() { -#if defined QT_FEATURE_wayland && QT_CONFIG(wayland) +#if !defined DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION && defined QT_FEATURE_wayland && QT_CONFIG(wayland) static const auto WaylandResult = [] { using namespace QNativeInterface::Private; QWindow window; @@ -749,7 +749,7 @@ } void SetWindowMargins(not_null widget, const QMargins &margins) { -#if defined QT_FEATURE_wayland && QT_CONFIG(wayland) +#if !defined DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION && defined QT_FEATURE_wayland && QT_CONFIG(wayland) using namespace QNativeInterface::Private; const auto window = not_null(widget->windowHandle()); const auto platformWindow = not_null(window->handle()); @@ -769,7 +769,7 @@ } void ShowWindowMenu(not_null widget, const QPoint &point) { -#if defined QT_FEATURE_wayland && QT_CONFIG(wayland) +#if !defined DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION && defined QT_FEATURE_wayland && QT_CONFIG(wayland) if (::Platform::IsWayland()) { ShowWaylandWindowMenu(widget, point); return; diff -Naur orig/Telegram/lib_ui/ui/widgets/popup_menu.cpp new/Telegram/lib_ui/ui/widgets/popup_menu.cpp --- tdesktop-7.0.3-orig/Telegram/lib_ui/ui/widgets/popup_menu.cpp +++ tdesktop-7.0.3-full/Telegram/lib_ui/ui/widgets/popup_menu.cpp @@ -906,7 +906,7 @@ 0), _padding.top() - _topShift); auto r = screen ? screen->availableGeometry() : QRect(); -#if QT_VERSION >= QT_VERSION_CHECK(6, 11, 0) && defined QT_FEATURE_wayland && QT_CONFIG(wayland) +#if QT_VERSION >= QT_VERSION_CHECK(6, 11, 0) && !defined DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION && defined QT_FEATURE_wayland && QT_CONFIG(wayland) using namespace QNativeInterface::Private; if (const auto native = windowHandle()->nativeInterface()) { diff -Naur orig/Telegram/lib_ui/ui/widgets/tooltip.cpp new/Telegram/lib_ui/ui/widgets/tooltip.cpp --- tdesktop-7.0.3-orig/Telegram/lib_ui/ui/widgets/tooltip.cpp +++ tdesktop-7.0.3-full/Telegram/lib_ui/ui/widgets/tooltip.cpp @@ -115,7 +115,7 @@ p.setX(m.x() - (s.width() / 2)); } -#if QT_VERSION >= QT_VERSION_CHECK(6, 11, 0) && defined QT_FEATURE_wayland && QT_CONFIG(wayland) +#if QT_VERSION >= QT_VERSION_CHECK(6, 11, 0) && !defined DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION && defined QT_FEATURE_wayland && QT_CONFIG(wayland) using namespace QNativeInterface::Private; create(); if (const auto native