From 0ad18c81829c77da4ce115928db776d0d4723cb7 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 21 Apr 2024 01:02:30 +0400
Subject: [PATCH] Get rid of direct Wayland usage
This should get rid of a very nasty vector of misbehaving and quite a lot of code which is boilerplate over Wayland protocols at the price of losing support of niche features
Most of things served by xcb code on X11 is served by portal code on Wayland, hopefully this tendention will continue and we will be fine just with glib which provides D-Bus and other basic APIs
---
.github/workflows/linux.yml | 1 -
.gitmodules | 6 ------
Telegram/ThirdParty/wayland | 1 -
Telegram/ThirdParty/wayland-protocols | 1 -
Telegram/lib_base | 2 +-
cmake | 2 +-
6 files changed, 2 insertions(+), 11 deletions(-)
delete mode 160000 Telegram/ThirdParty/wayland
delete mode 160000 Telegram/ThirdParty/wayland-protocols
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 4eaf2ec22..8020e46c5 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -49,7 +49,6 @@ jobs:
defines:
- ""
- "DESKTOP_APP_DISABLE_X11_INTEGRATION"
- - "DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION"
env:
UPLOAD_ARTIFACT: "true"
diff --git a/.gitmodules b/.gitmodules
index dfc92dbf1..91f154826 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -82,9 +82,6 @@
[submodule "Telegram/ThirdParty/dispatch"]
path = Telegram/ThirdParty/dispatch
url = https://github.com/apple/swift-corelibs-libdispatch
-[submodule "Telegram/ThirdParty/wayland-protocols"]
- path = Telegram/ThirdParty/wayland-protocols
- url = https://github.com/gitlab-freedesktop-mirrors/wayland-protocols.git
[submodule "Telegram/ThirdParty/kimageformats"]
path = Telegram/ThirdParty/kimageformats
url = https://github.com/KDE/kimageformats.git
@@ -94,9 +91,6 @@
[submodule "Telegram/ThirdParty/cld3"]
path = Telegram/ThirdParty/cld3
url = https://github.com/google/cld3.git
-[submodule "Telegram/ThirdParty/wayland"]
- path = Telegram/ThirdParty/wayland
- url = https://github.com/gitlab-freedesktop-mirrors/wayland.git
[submodule "Telegram/ThirdParty/libprisma"]
path = Telegram/ThirdParty/libprisma
url = https://github.com/desktop-app/libprisma.git
diff --git a/Telegram/ThirdParty/wayland b/Telegram/ThirdParty/wayland
deleted file mode 160000
index b2649cb3e..000000000
--- a/Telegram/ThirdParty/wayland
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b2649cb3ee6bd70828a17e50beb16591e6066288
diff --git a/Telegram/ThirdParty/wayland-protocols b/Telegram/ThirdParty/wayland-protocols
deleted file mode 160000
index 4624cfaaf..000000000
--- a/Telegram/ThirdParty/wayland-protocols
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4624cfaaf563cd7be5e2e2087c8de6d3a48ea867
diff --git a/Telegram/lib_base b/Telegram/lib_base
index 3d1ea724a..d5a6bfced 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit 3d1ea724a80c3e3a431a88a653d24f4f418eaea8
+Subproject commit d5a6bfced0b1fa35c4f601816313d02e6ecb7cde
diff --git a/cmake b/cmake
index 621b01ec9..a428df544 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 621b01ec9bd7f953223147daf59ab4c850cb3c40
+Subproject commit a428df5440e76a726abc30924766ac7da0cb381c