Skip to content

Commit

Permalink
Remove direct Wayland usage
Browse files Browse the repository at this point in the history
  • Loading branch information
@ilya-fedin @john-preston
ilya-fedin authored and john-preston committed Apr 22, 2024
1 parent 621b01e commit a428df5
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 30 deletions.
3 changes: 0 additions & 3 deletions external/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,6 @@ add_checked_subdirectory(rnnoise)
add_checked_subdirectory(ton)
add_checked_subdirectory(variant)
add_checked_subdirectory(vpx)
if (LINUX AND NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
add_checked_subdirectory(wayland_client)
endif()
add_checked_subdirectory(webrtc)
if (LINUX AND NOT DESKTOP_APP_DISABLE_X11_INTEGRATION)
add_checked_subdirectory(xcb)
Expand Down
11 changes: 0 additions & 11 deletions external/qt/package.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,23 +39,12 @@ endif()
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Gui Widgets Network Svg REQUIRED)
find_package(Qt${QT_VERSION_MAJOR} OPTIONAL_COMPONENTS Quick QuickWidgets QUIET)

set(qt_version_6_5_or_greater 0)
if (QT_VERSION_MAJOR GREATER_EQUAL 6)
if (QT_VERSION_MAJOR GREATER 6 OR Qt6_VERSION_MINOR GREATER_EQUAL 5)
set(qt_version_6_5_or_greater 1)
endif()
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS OpenGL OpenGLWidgets REQUIRED)
endif()

# QtWaylandScanner cmake integration from Qt 6 is used
cmake_dependent_option(DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION "Disable all code for Wayland integration." OFF "LINUX; qt_version_6_5_or_greater" ON)

if (LINUX)
find_package(Qt${QT_VERSION_MAJOR} OPTIONAL_COMPONENTS DBus WaylandClient WaylandCompositor QUIET)

if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS WaylandClient REQUIRED)
endif()
endif()

set_property(GLOBAL PROPERTY AUTOGEN_SOURCE_GROUP "(gen)")
Expand Down
16 changes: 0 additions & 16 deletions external/wayland_client/CMakeLists.txt
View file

This file was deleted.

1 comment on commit a428df5

@mid-kid
Copy link
Contributor

@mid-kid mid-kid commented on a428df5 May 5, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately, we're encountering some semi-direct wayland usage:

https://github.com/desktop-app/lib_base/blob/f69758da1906b204c156ea6ad254eacd61210a42/base/platform/linux/base_linux_xdg_activation_token.cpp#L18
https://github.com/desktop-app/lib_ui/blob/aa39793a91f1186879c15c214a2671d78eab5085/ui/platform/linux/ui_utility_linux.cpp#L416
(https://bugs.gentoo.org/928451)

I wonder, would you consider a patch to avoid those?

Please sign in to comment.