[patch] telegram-desktop-2.4.6-no-wayland.patch

telegram-desktop-2.4.6-no-wayland.patch (text/plain), 6.01 KB, created by Attila Tóth on 2020-11-04 18:48:13 UTC

diff -urNp tdesktop-2.4.6-orig/cmake/external/qt/package.cmake tdesktop-2.4.6-dwok/cmake/external/qt/package.cmake
--- tdesktop-2.4.6-orig/cmake/external/qt/package.cmake	2020-10-30 11:16:23.000000000 +0100
+++ tdesktop-2.4.6-dwok/cmake/external/qt/package.cmake	2020-11-04 17:40:39.760400250 +0100
@@ -24,7 +24,7 @@ find_package(Qt5 COMPONENTS Core Gui Wid
 find_package(Qt5Gui COMPONENTS QWebpPlugin REQUIRED)
 
 if (LINUX)
-    find_package(Qt5 COMPONENTS WaylandClient REQUIRED)
+    find_package(Qt5 COMPONENTS WaylandClient QUIET)
     find_package(Qt5 OPTIONAL_COMPONENTS XkbCommonSupport QUIET)
 
     if (NOT DESKTOP_APP_USE_PACKAGED OR DESKTOP_APP_USE_PACKAGED_LAZY_PLATFORMTHEMES)
diff -urNp tdesktop-2.4.6-orig/Telegram/CMakeLists.txt tdesktop-2.4.6-dwok/Telegram/CMakeLists.txt
--- tdesktop-2.4.6-orig/Telegram/CMakeLists.txt	2020-11-02 11:54:30.000000000 +0100
+++ tdesktop-2.4.6-dwok/Telegram/CMakeLists.txt	2020-11-04 17:39:05.298939239 +0100
@@ -91,7 +91,7 @@ if (LINUX)
 
     if (DESKTOP_APP_USE_PACKAGED AND Qt5WaylandClient_VERSION VERSION_LESS 5.13.0)
         find_package(PkgConfig REQUIRED)
-        pkg_check_modules(WAYLAND_CLIENT REQUIRED wayland-client)
+        pkg_check_modules(WAYLAND_CLIENT wayland-client)
 
         target_include_directories(Telegram
         PRIVATE
diff -urNp tdesktop-2.4.6-orig/Telegram/SourceFiles/platform/linux/specific_linux.cpp tdesktop-2.4.6-dwok/Telegram/SourceFiles/platform/linux/specific_linux.cpp
--- tdesktop-2.4.6-orig/Telegram/SourceFiles/platform/linux/specific_linux.cpp	2020-11-02 11:54:30.000000000 +0100
+++ tdesktop-2.4.6-dwok/Telegram/SourceFiles/platform/linux/specific_linux.cpp	2020-11-04 18:10:34.484096694 +0100
@@ -28,9 +28,11 @@ https://github.com/telegramdesktop/tdesk
 #include <QtCore/QLibraryInfo>
 #include <QtGui/QWindow>
 
+#ifdef QT_WAYLANDCLIENT_LIB
 #include <private/qwaylanddisplay_p.h>
 #include <private/qwaylandwindow_p.h>
 #include <private/qwaylandshellsurface_p.h>
+#endif // QT_WAYLANDCLIENT_LIB
 
 #ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 #include <QtDBus/QDBusInterface>
@@ -43,9 +45,11 @@ https://github.com/telegramdesktop/tdesk
 #include <xcb/xcb.h>
 #include <xcb/screensaver.h>
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) && !defined DESKTOP_APP_QT_PATCHED
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) \
+	&& !defined DESKTOP_APP_QT_PATCHED \
+	&& __has_include(<wayland-client.h>)
 #include <wayland-client.h>
-#endif // Qt < 5.13 && !DESKTOP_APP_QT_PATCHED
+#endif // Qt < 5.13 && !DESKTOP_APP_QT_PATCHED && <wayland-client.h>
 
 #include <glib.h>
 
@@ -66,7 +70,9 @@ extern "C" {
 
 using namespace Platform;
 using Platform::File::internal::EscapeShell;
+#ifdef QT_WAYLANDCLIENT_LIB
 using QtWaylandClient::QWaylandWindow;
+#endif // QT_WAYLANDCLIENT_LIB
 
 namespace Platform {
 namespace {
@@ -312,6 +318,7 @@ uint XCBMoveResizeFromEdges(Qt::Edges ed
 	return 0;
 }
 
+#ifdef QT_WAYLANDCLIENT_LIB
 #if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) && !defined DESKTOP_APP_QT_PATCHED
 enum wl_shell_surface_resize WlResizeFromEdges(Qt::Edges edges) {
 	if (edges == (Qt::TopEdge | Qt::LeftEdge))
@@ -334,6 +341,7 @@ enum wl_shell_surface_resize WlResizeFro
 	return WL_SHELL_SURFACE_RESIZE_NONE;
 }
 #endif // Qt < 5.13 && !DESKTOP_APP_QT_PATCHED
+#endif // QT_WAYLANDCLIENT_LIB
 
 bool StartXCBMoveResize(QWindow *window, int edges) {
 	const auto connection = base::Platform::XCB::GetConnectionFromQt();
@@ -428,6 +436,7 @@ bool ShowXCBWindowMenu(QWindow *window)
 }
 
 bool StartWaylandMove(QWindow *window) {
+#ifdef QT_WAYLANDCLIENT_LIB
 	// There are startSystemMove on Qt 5.15
 #if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) && !defined DESKTOP_APP_QT_PATCHED
 	if (const auto waylandWindow = static_cast<QWaylandWindow*>(
@@ -439,11 +448,13 @@ bool StartWaylandMove(QWindow *window) {
 		}
 	}
 #endif // Qt < 5.15 && !DESKTOP_APP_QT_PATCHED
+#endif // QT_WAYLANDCLIENT_LIB
 
 	return false;
 }
 
 bool StartWaylandResize(QWindow *window, Qt::Edges edges) {
+#ifdef QT_WAYLANDCLIENT_LIB
 	// There are startSystemResize on Qt 5.15
 #if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) && !defined DESKTOP_APP_QT_PATCHED
 	if (const auto waylandWindow = static_cast<QWaylandWindow*>(
@@ -461,11 +472,13 @@ bool StartWaylandResize(QWindow *window,
 		}
 	}
 #endif // Qt < 5.15 && !DESKTOP_APP_QT_PATCHED
+#endif // QT_WAYLANDCLIENT_LIB
 
 	return false;
 }
 
 bool ShowWaylandWindowMenu(QWindow *window) {
+#ifdef QT_WAYLANDCLIENT_LIB
 #if QT_VERSION >= QT_VERSION_CHECK(5, 13, 0) || defined DESKTOP_APP_QT_PATCHED
 	if (const auto waylandWindow = static_cast<QWaylandWindow*>(
 		window->handle())) {
@@ -476,6 +489,7 @@ bool ShowWaylandWindowMenu(QWindow *wind
 		}
 	}
 #endif // Qt >= 5.13 || DESKTOP_APP_QT_PATCHED
+#endif // QT_WAYLANDCLIENT_LIB
 
 	return false;
 }
@@ -846,27 +860,39 @@ bool SkipTaskbarSupported() {
 }
 
 bool StartSystemMove(QWindow *window) {
+#ifdef QT_WAYLANDCLIENT_LIB
 	if (IsWayland()) {
 		return StartWaylandMove(window);
 	} else {
 		return StartXCBMoveResize(window, 16);
 	}
+#else // QT_WAYLANDCLIENT_LIB
+	return StartXCBMoveResize(window, 16);
+#endif // QT_WAYLANDCLIENT_LIB
 }
 
 bool StartSystemResize(QWindow *window, Qt::Edges edges) {
+#ifdef QT_WAYLANDCLIENT_LIB
 	if (IsWayland()) {
 		return StartWaylandResize(window, edges);
 	} else {
 		return StartXCBMoveResize(window, edges);
 	}
+#else // QT_WAYLANDCLIENT_LIB
+	return StartXCBMoveResize(window, edges);
+#endif // QT_WAYLANDCLIENT_LIB
 }
 
 bool ShowWindowMenu(QWindow *window) {
+#ifdef QT_WAYLANDCLIENT_LIB
 	if (IsWayland()) {
 		return ShowWaylandWindowMenu(window);
 	} else {
 		return ShowXCBWindowMenu(window);
 	}
+#else // QT_WAYLANDCLIENT_LIB
+	return ShowXCBWindowMenu(window);
+#endif // QT_WAYLANDCLIENT_LIB
 }
 
 bool SetWindowExtents(QWindow *window, const QMargins &extents) {
@@ -1086,9 +1112,11 @@ void start() {
 		"this may lead to font issues.");
 #endif // DESKTOP_APP_USE_PACKAGED_FONTS
 
+#ifdef QT_WAYLANDCLIENT_LIB
 	if (AreQtPluginsBundled()) {
 		qputenv("QT_WAYLAND_DECORATION", "material");
 	}
+#endif // QT_WAYLANDCLIENT_LIB
 
 	if (AreQtPluginsBundled()
 		// it is handled by Qt for flatpak and snap