From f46f655a0ee87221c4fe9689186a7ccfc990e45e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 24 May 2023 18:11:36 +0400
Subject: [PATCH] Revert "Disable xcb_xlib"

This reverts commit d1ff6e583dcb658e358ee8300715328d53a590be.

Otherwise HIME input is broken:
https://github.com/telegramdesktop/tdesktop/issues/26228
---
 .../platform/linux/specific_linux.cpp         | 22 -------------------
 Telegram/build/docker/centos_env/Dockerfile   |  1 -
 cmake                                         |  2 +-
 3 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index 1ea753fd36..6fd0d74780 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -50,20 +50,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <unistd.h>
 #include <dirent.h>
 #include <pwd.h>
-#include <dlfcn.h>
 
 #include <iostream>
 
 using namespace Platform;
 using Platform::internal::WaylandIntegration;
 
-#ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
-typedef struct _XDisplay Display;
-struct XErrorEvent;
-typedef int (*XErrorHandler)(Display*, XErrorEvent*);
-typedef XErrorHandler (*LPXSETERRORHANDLER)(XErrorHandler);
-#endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
-
 typedef GApplication TDesktopApplication;
 typedef GApplicationClass TDesktopApplicationClass;
 
@@ -840,20 +832,6 @@ void start() {
 			"except various functionality to not to work.");
 	}
 
-#ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
-	// tdesktop doesn't use xlib by itself,
-	// but some libraries it depends on may do
-	const auto XSetErrorHandler = reinterpret_cast<LPXSETERRORHANDLER>(
-		dlsym(RTLD_DEFAULT, "XSetErrorHandler"));
-
-	// Reset errors if any
-	(void) dlerror();
-
-	if (XSetErrorHandler) {
-		XSetErrorHandler([](Display *dpy, XErrorEvent *err) { return 0; });
-	}
-#endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
-
 	InstallLauncher();
 	LaunchGApplication();
 }
diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 94152c021d..36ebe4f30b 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -744,7 +744,6 @@ RUN git clone -b {{ QT_TAG }} --depth=1 https://code.qt.io/qt/qt5.git qt_{{ QT }
 		-qt-harfbuzz \
 		-qt-pcre \
 		-no-icu \
-		-no-feature-xcb-xlib \
 		-no-feature-xcb-sm \
 		-no-feature-egl-extension-platform-wayland \
 		-static \
diff --git a/cmake b/cmake
index cb7a966ad8..32e1044c51 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit cb7a966ad88c7a5eb0bceb4d0c52a2f0872fc4b2
+Subproject commit 32e1044c5198819dd470e3262275a9747dfd65de