mirror of
https://github.com/AyuGram/AyuGramDesktop.git
synced 2025-04-15 21:57:10 +02:00
Revert "Disable xcb_xlib"
This reverts commit d1ff6e583d
.
Otherwise HIME input is broken:
https://github.com/telegramdesktop/tdesktop/issues/26228
This commit is contained in:
parent
04a3a50e74
commit
f46f655a0e
3 changed files with 1 additions and 24 deletions
|
@ -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();
|
||||
}
|
||||
|
|
|
@ -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 \
|
||||
|
|
2
cmake
2
cmake
|
@ -1 +1 @@
|
|||
Subproject commit cb7a966ad88c7a5eb0bceb4d0c52a2f0872fc4b2
|
||||
Subproject commit 32e1044c5198819dd470e3262275a9747dfd65de
|
Loading…
Add table
Reference in a new issue