From 70bf328e7deae6c863863e5e39d0d7af0fba279b Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 29 Apr 2021 10:36:27 +0400 Subject: [PATCH] Load wayland-client dynamically and provide functions. --- Telegram/SourceFiles/platform/linux/specific_linux.cpp | 5 +++++ Telegram/lib_base | 2 +- Telegram/lib_webview | 2 +- cmake | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp index 7ea7d2a1a..8e3eea6dc 100644 --- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp @@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/platform/base_platform_info.h" #include "base/platform/linux/base_linux_glibmm_helper.h" #include "base/platform/linux/base_linux_gtk_integration.h" +#include "base/platform/linux/base_linux_wayland_integration.h" #include "platform/linux/linux_desktop_environment.h" #include "platform/linux/linux_gtk_integration.h" #include "platform/linux/linux_wayland_integration.h" @@ -756,6 +757,10 @@ void start() { integration->load(); } + if (IsWayland() && !base::Platform::ResolveWayland()) { + g_warning("Could not load wayland-client dynamically."); + } + #ifdef DESKTOP_APP_USE_PACKAGED_RLOTTIE g_warning( "Application has been built with foreign rlottie, " diff --git a/Telegram/lib_base b/Telegram/lib_base index 356daf59b..613cfe6d8 160000 --- a/Telegram/lib_base +++ b/Telegram/lib_base @@ -1 +1 @@ -Subproject commit 356daf59b35b2086cf5527e1c255557967fbb0af +Subproject commit 613cfe6d80c6c416571596f8a27da1550495d5e0 diff --git a/Telegram/lib_webview b/Telegram/lib_webview index 91c0e6664..0b4100d7c 160000 --- a/Telegram/lib_webview +++ b/Telegram/lib_webview @@ -1 +1 @@ -Subproject commit 91c0e6664db4a444d630e3a0101f599a92df1dd9 +Subproject commit 0b4100d7cecc4e748c51f3f51ebfd1392ec3978a diff --git a/cmake b/cmake index 52ccf5e17..d1a7e08aa 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 52ccf5e17ab1bd7b352346c43706dc5e53bd19ca +Subproject commit d1a7e08aa044c2ace3c6b17ddf83cf971b31c46a