diff options
Diffstat (limited to 'aur-fixes.diff')
| -rw-r--r-- | aur-fixes.diff | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/aur-fixes.diff b/aur-fixes.diff index 163aadc9ab39..2769acf40f95 100644 --- a/aur-fixes.diff +++ b/aur-fixes.diff @@ -44,14 +44,14 @@ index bc3dce6..07c5042 100644 extern f_gtk_init_check gtk_init_check; diff --git a/Telegram/SourceFiles/stdafx.cpp b/Telegram/SourceFiles/stdafx.cpp -index 06bd4af..173721b 100644 +index 06bd4af..755d97f 100644 --- a/Telegram/SourceFiles/stdafx.cpp +++ b/Telegram/SourceFiles/stdafx.cpp @@ -34,6 +34,7 @@ Q_IMPORT_PLUGIN(QGenericEnginePlugin) #elif defined Q_OS_LINUX // Q_OS_LINUX Q_IMPORT_PLUGIN(QWebpPlugin) Q_IMPORT_PLUGIN(QXcbIntegrationPlugin) -+//Q_IMPORT_PLUGIN(QWaylandIntegrationPlugin) ++Q_IMPORT_PLUGIN(QWaylandIntegrationPlugin) Q_IMPORT_PLUGIN(QConnmanEnginePlugin) Q_IMPORT_PLUGIN(QGenericEnginePlugin) Q_IMPORT_PLUGIN(QNetworkManagerEnginePlugin) @@ -86,7 +86,7 @@ index 5a49cd2..7cb3e88 100644 'sources': [ '<@(qrc_files)', diff --git a/Telegram/gyp/qt.gypi b/Telegram/gyp/qt.gypi -index 24ededb..01ca8a4 100644 +index 24ededb..cdb18f5 100644 --- a/Telegram/gyp/qt.gypi +++ b/Telegram/gyp/qt.gypi @@ -38,7 +38,6 @@ @@ -114,9 +114,9 @@ index 24ededb..01ca8a4 100644 - 'xcb-xfixes', - 'xcb-render', - 'xcb-static', -+ #'Qt5WaylandClient', -+ #'qwayland-generic', -+ #'qwayland-egl', ++ 'Qt5WaylandClient', ++ 'qwayland-generic', ++ 'qwayland-egl', ], }], ], @@ -128,7 +128,7 @@ index 24ededb..01ca8a4 100644 '<@(qt_libs_release)', '<(linux_lib_ssl)', '<(linux_lib_crypto)', -@@ -221,12 +209,31 @@ +@@ -221,12 +209,32 @@ 'gthread-2.0', 'glib-2.0', 'pthread', @@ -150,6 +150,7 @@ index 24ededb..01ca8a4 100644 + '<!(pkg-config 2> /dev/null --libs libjpeg)', + '<!(pkg-config 2> /dev/null --libs libwebp)', + '<!(pkg-config 2> /dev/null --libs xcb-shm xcb-xfixes xcb-render xcb-renderutil xcb-sync xcb-randr xcb-xinerama xcb-xkb xcb-icccm xcb-image xcb-shape xcb-keysyms xcb-util)', ++ '<!(pkg-config 2> /dev/null --libs wayland-client wayland-cursor)', + 'proxy', + 'GL', ], |