upgpkg

9 files changed, 527 insertions, 609 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1b913a29a087..ba0c3995edf2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Wed Feb 22 13:34:06 UTC 2017
+# Sun Apr  2 10:57:26 UTC 2017
 pkgbase = telegram-desktop-systemqt
 	pkgdesc = Experimental build of Telegram Desktop (using system Qt)
-	pkgver = 1.0.14
+	pkgver = 1.0.27
 	pkgrel = 1
 	url = https://desktop.telegram.org/
 	install = telegram-desktop.install
@@ -29,26 +29,16 @@ pkgbase = telegram-desktop-systemqt
 	optdepends = libappindicator-gtk3: AppIndicator tray icon
 	provides = telegram-desktop
 	conflicts = telegram-desktop
-	source = tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#tag=v1.0.14
+	source = tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#tag=v1.0.27
 	source = telegramdesktop.desktop
 	source = tg.protocol
-	source = Avoid-depending-on-static-libraries.patch
-	source = Fix-desktop-integration-issues.patch
-	source = Flags-for-precompiled-header-and-MOC.patch
-	source = Fix-rcc-path.patch
-	source = Use-gtk3-headers.patch
-	source = Reduce-number-of-libraries.patch
 	source = CMakeLists.inj
+	source = aur-build-fixes.patch
 	sha256sums = SKIP
 	sha256sums = 41c22fae6ae757936741e63aec3d0f17cafe86b2d6153cdd1d01a5581e871f17
 	sha256sums = d4cdad0d091c7e47811d8a26d55bbee492e7845e968c522e86f120815477e9eb
-	sha256sums = 197159eca70fc4a3d55548842d3218bcd67394cb869f08825d8fc12cf7b050f8
-	sha256sums = 4e1938a5ddfcf8ac57bafa5f9ce80413665ac3b0ccd3c1853fe8f0835b91f468
-	sha256sums = 952c7590cb05354c70037745d980fa97c36e36f96a1fa7d0db29a5c6a1d8dbd1
-	sha256sums = cf4dbb293afdbfd226861a00a42790a15b23bea296eccf35853d104e07ea345a
-	sha256sums = 5f3ac7c08df0293bed626293dbfb6040764abf28899db7681572cfb1d8bcaa6e
-	sha256sums = 0442af5365a31de5a8e15de8a94f5c1192775fc4460b74c4045da99e548f045a
 	sha256sums = 7a06af83609168a8eaec59a65252caa41dcd0ecc805225886435eb65073e9c82
+	sha256sums = 82b2458e8ad5b316b9f9748c27fbe65e867ea3c29d78d1442e293a282eba63a0
 
 pkgname = telegram-desktop-systemqt
 
diff --git a/Avoid-depending-on-static-libraries.patch b/Avoid-depending-on-static-libraries.patch
deleted file mode 100644
index afb0232f5e4d..000000000000
--- a/Avoid-depending-on-static-libraries.patch
+++ /dev/null
@@ -1,353 +0,0 @@
-Description: Eliminates dependencies from static Qt and other libraries
-Author: Nicholas Guriev <guriev-ns@ya.ru>
-Last-Update: 2017-01-31
-
-diff --git a/Telegram/SourceFiles/main.cpp b/Telegram/SourceFiles/main.cpp
-index 0c31e9b..3f9c0e4 100644
---- a/Telegram/SourceFiles/main.cpp
-+++ b/Telegram/SourceFiles/main.cpp
-@@ -45,6 +45,11 @@ int main(int argc, char *argv[]) {
- 	Logs::start(); // must be started before Platform is started
- 	Platform::start(); // must be started before QApplication is created
-
-+	// I don't know why path is not in QT_PLUGIN_PATH by default
-+	QCoreApplication::addLibraryPath("/usr/lib/qt/plugins");
-+	// without this Telegram doesn't start on Ubuntu 17.04 due GTK errors
-+	setenv("QT_STYLE_OVERRIDE", "qwerty", false);
-+
- 	int result = 0;
- 	{
- 		Application app(argc, argv);
-diff --git a/Telegram/SourceFiles/platform/linux/linux_libs.h b/Telegram/SourceFiles/platform/linux/linux_libs.h
-index 1ecae70..e835c31 100644
---- a/Telegram/SourceFiles/platform/linux/linux_libs.h
-+++ b/Telegram/SourceFiles/platform/linux/linux_libs.h
-@@ -29,7 +29,7 @@ extern "C" {
- } // extern "C"
- 
- #ifndef TDESKTOP_DISABLE_UNITY_INTEGRATION
--#include <unity/unity/unity.h>
-+typedef void UnityLauncherEntry;
- #endif // !TDESKTOP_DISABLE_UNITY_INTEGRATION
- 
- namespace Platform {
-diff --git a/Telegram/SourceFiles/stdafx.cpp b/Telegram/SourceFiles/stdafx.cpp
-index 3cc98b8..7afd662 100644
---- a/Telegram/SourceFiles/stdafx.cpp
-+++ b/Telegram/SourceFiles/stdafx.cpp
-@@ -16,28 +16,70 @@ In addition, as a special exception, the copyright holders give permission
- to link the code of portions of this program with the OpenSSL library.
- 
- Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
--Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
-+Copyright (c) 2009-2017 Various Qt Authors
- */
- #include "stdafx.h"
--#include <QtCore/QtPlugin>
--
--#ifdef Q_OS_WINRT
--//Q_IMPORT_PLUGIN(QWinRTIntegrationPlugin)
--//Q_IMPORT_PLUGIN(QWbmpPlugin)
--#elif defined Q_OS_WIN // Q_OS_WINRT
--Q_IMPORT_PLUGIN(QWebpPlugin)
--Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)
--#elif defined Q_OS_MAC // Q_OS_WIN
--Q_IMPORT_PLUGIN(QWebpPlugin)
--Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin)
--Q_IMPORT_PLUGIN(QGenericEnginePlugin)
--#elif defined Q_OS_LINUX // Q_OS_LINUX
--Q_IMPORT_PLUGIN(QWebpPlugin)
--Q_IMPORT_PLUGIN(QXcbIntegrationPlugin)
--Q_IMPORT_PLUGIN(QConnmanEnginePlugin)
--Q_IMPORT_PLUGIN(QGenericEnginePlugin)
--Q_IMPORT_PLUGIN(QNetworkManagerEnginePlugin)
--Q_IMPORT_PLUGIN(QComposePlatformInputContextPlugin)
--Q_IMPORT_PLUGIN(QIbusPlatformInputContextPlugin)
--Q_IMPORT_PLUGIN(QFcitxPlatformInputContextPlugin)
--#endif
-+
-+/* This file contains some code from Qt source to ensure successful build.
-+ * TODO: find a dynamic library with these symbols.
-+ */
-+
-+/* Debian maintainer: this function is taken from qfiledialog.cpp */
-+/*
-+    Makes a list of filters from ;;-separated text.
-+    Used by the mac and windows implementations
-+*/
-+QStringList qt_make_filter_list(const QString &filter)
-+{
-+    QString f(filter);
-+
-+    if (f.isEmpty())
-+        return QStringList();
-+
-+    QString sep(QLatin1String(";;"));
-+    int i = f.indexOf(sep, 0);
-+    if (i == -1) {
-+        if (f.indexOf(QLatin1Char('\n'), 0) != -1) {
-+            sep = QLatin1Char('\n');
-+            i = f.indexOf(sep, 0);
-+        }
-+    }
-+
-+    return f.split(sep);
-+}
-+
-+/* Debian maintainer: this constructor is taken from qtextengine.cpp for TextPainter::drawLine */
-+QTextItemInt::QTextItemInt(const QGlyphLayout &g, QFont *font, const QChar *chars_, int numChars, QFontEngine *fe, const QTextCharFormat &format)
-+    : flags(0), justified(false), underlineStyle(QTextCharFormat::NoUnderline), charFormat(format),
-+      num_chars(numChars), chars(chars_), logClusters(0), f(font),  glyphs(g), fontEngine(fe)
-+{
-+}
-+
-+/* Debian maintainer: this method is also taken from qtextengine.cpp */
-+// Fix up flags and underlineStyle with given info
-+void QTextItemInt::initWithScriptItem(const QScriptItem &si)
-+{
-+    // explicitly initialize flags so that initFontAttributes can be called
-+    // multiple times on the same TextItem
-+    flags = 0;
-+    if (si.analysis.bidiLevel %2)
-+        flags |= QTextItem::RightToLeft;
-+    ascent = si.ascent;
-+    descent = si.descent;
-+
-+    if (charFormat.hasProperty(QTextFormat::TextUnderlineStyle)) {
-+        underlineStyle = charFormat.underlineStyle();
-+    } else if (charFormat.boolProperty(QTextFormat::FontUnderline)
-+               || f->d->underline) {
-+        underlineStyle = QTextCharFormat::SingleUnderline;
-+    }
-+
-+    // compat
-+    if (underlineStyle == QTextCharFormat::SingleUnderline)
-+        flags |= QTextItem::Underline;
-+
-+    if (f->d->overline || charFormat.fontOverline())
-+        flags |= QTextItem::Overline;
-+    if (f->d->strikeOut || charFormat.fontStrikeOut())
-+        flags |= QTextItem::StrikeOut;
-+}
-diff --git a/Telegram/SourceFiles/ui/text/text_block.cpp b/Telegram/SourceFiles/ui/text/text_block.cpp
-index d7597f8..3a50097 100644
---- a/Telegram/SourceFiles/ui/text/text_block.cpp
-+++ b/Telegram/SourceFiles/ui/text/text_block.cpp
-@@ -335,7 +335,7 @@ TextBlock::TextBlock(const style::font &font, const QString &str, QFixed minResi
- 		SignalHandlers::setCrashAnnotationRef("CrashString", &part);
- 
- 		QStackTextEngine engine(part, blockFont->f);
--		QTextLayout layout(&engine);
-+		QTextLayout layout(part, blockFont->f);
- 		layout.beginLayout();
- 		layout.createLine();
- 
-diff --git a/Telegram/gyp/Telegram.gyp b/Telegram/gyp/Telegram.gyp
-index 2503f1e..92415ea 100644
---- a/Telegram/gyp/Telegram.gyp
-+++ b/Telegram/gyp/Telegram.gyp
-@@ -79,20 +80,16 @@
-     ],
- 
-     'defines': [
--      'AL_LIBTYPE_STATIC',
-       '<!@(python -c "for s in \'<(build_defines)\'.split(\',\'): print(s)")',
-+      'TDESKTOP_DISABLE_AUTOUPDATE',
-+      'TDESKTOP_DISABLE_CRASH_REPORTS',
-+      'TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME',
-     ],
- 
-     'include_dirs': [
-       '<(src_loc)',
-       '<(SHARED_INTERMEDIATE_DIR)',
--      '<(libs_loc)/breakpad/src',
--      '<(libs_loc)/lzma/C',
--      '<(libs_loc)/libexif-0.6.20',
--      '<(libs_loc)/zlib-1.2.8',
--      '<(libs_loc)/ffmpeg',
--      '<(libs_loc)/openal-soft/include',
--      '<(minizip_loc)',
-+      '/usr/include/minizip',
-       '<(sp_media_key_tap_loc)',
-     ],
-     'sources': [
-@@ -631,13 +625,6 @@
-       }],
-       [ '"<(build_win)" != "1"', {
-         'sources': [
--          '<(minizip_loc)/crypt.h',
--          '<(minizip_loc)/ioapi.c',
--          '<(minizip_loc)/ioapi.h',
--          '<(minizip_loc)/zip.c',
--          '<(minizip_loc)/zip.h',
--          '<(minizip_loc)/unzip.c',
--          '<(minizip_loc)/unzip.h',
-         ],
-         'sources!': [
-           '<(src_loc)/pspecific_win.cpp',
-diff --git a/Telegram/gyp/qt.gypi b/Telegram/gyp/qt.gypi
-index 24ededb..0cfd178 100644
---- a/Telegram/gyp/qt.gypi
-+++ b/Telegram/gyp/qt.gypi
-@@ -27,21 +27,18 @@
-               [ 'build_macold', {
-                 'qt_version%': '5.3.2',
-               }, {
--                'qt_version%': '5.6.2',
-+                'qt_version%': '5.8.0',
-               }]
-             ],
-           },
-           'qt_libs': [
--            'qwebp',
-             'Qt5PrintSupport',
--            'Qt5PlatformSupport',
-             'Qt5Network',
-             'Qt5Widgets',
-             'Qt5Gui',
--            'qtharfbuzzng',
-           ],
-           'qt_version%': '<(qt_version)',
--          'linux_path_qt%': '/usr/local/tdesktop/Qt-<(qt_version)',
-+          'linux_path_qt%': '/usr/lib/qt',
-         },
-         'qt_version%': '<(qt_version)',
-         'qt_loc_unix': '<(linux_path_qt)',
-@@ -79,19 +77,14 @@
-             ],
-           }],
-           [ 'build_linux', {
--            'qt_lib_prefix': 'lib',
--            'qt_lib_debug_postfix': '.a',
--            'qt_lib_release_postfix': '.a',
-+            'qt_lib_prefix': '',
-+            'qt_lib_debug_postfix': '',
-+            'qt_lib_release_postfix': '',
-             'qt_libs': [
--              'qxcb',
-               'Qt5XcbQpa',
--              'qconnmanbearer',
--              'qgenericbearer',
--              'qnmbearer',
-               '<@(qt_libs)',
-               'Qt5DBus',
-               'Qt5Core',
--              'qtpcre',
-               'Xi',
-               'Xext',
-               'Xfixes',
-@@ -103,7 +96,6 @@
-               'xcb-shm',
-               'xcb-xfixes',
-               'xcb-render',
--              'xcb-static',
-             ],
-           }],
-         ],
-@@ -130,9 +122,9 @@
-     ],
- 
-     'linux_path_xkbcommon%': '/usr/local',
--    'linux_lib_ssl%': '/usr/local/ssl/lib/libssl.a',
--    'linux_lib_crypto%': '/usr/local/ssl/lib/libcrypto.a',
--    'linux_lib_icu%': '/usr/lib/libicutu.a /usr/lib/libicui18n.a /usr/lib/libicuuc.a /usr/lib/libicudata.a',
-+    'linux_lib_ssl%': 'ssl',
-+    'linux_lib_crypto%': 'crypto',
-+    'linux_lib_icu%': 'icutu icui18n icuuc icudata',
-   },
- 
-   'configurations': {
-@@ -181,13 +173,13 @@
-   },
- 
-   'include_dirs': [
--    '<(qt_loc)/include',
--    '<(qt_loc)/include/QtCore',
--    '<(qt_loc)/include/QtGui',
--    '<(qt_loc)/include/QtCore/<(qt_version)',
--    '<(qt_loc)/include/QtGui/<(qt_version)',
--    '<(qt_loc)/include/QtCore/<(qt_version)/QtCore',
--    '<(qt_loc)/include/QtGui/<(qt_version)/QtGui',
-+    '/usr/include/qt',
-+    '/usr/include/qt/QtCore',
-+    '/usr/include/qt/QtGui',
-+    '/usr/include/qt/QtCore/<(qt_version)/',
-+    '/usr/include/qt/QtGui/<(qt_version)/',
-+    '/usr/include/qt/QtCore/<(qt_version)/QtCore',
-+    '/usr/include/qt/QtGui/<(qt_version)/QtGui',
-   ],
-   'library_dirs': [
-     '<(qt_loc)/lib',
-@@ -208,7 +200,7 @@
-         '<(qt_loc)/plugins/platforminputcontexts',
-       ],
-       'libraries': [
--        '<(linux_path_xkbcommon)/lib/libxkbcommon.a',
-+        'xkbcommon',
-         '<@(qt_libs_release)',
-         '<(linux_lib_ssl)',
-         '<(linux_lib_crypto)',
-@@ -226,7 +218,6 @@
-         '<(qt_loc)/mkspecs/linux-g++',
-       ],
-       'ldflags': [
--        '-static-libstdc++',
-         '-pthread',
-         '-g',
-         '-rdynamic',
-diff --git a/Telegram/gyp/settings_linux.gypi b/Telegram/gyp/settings_linux.gypi
-index 3356b97..20b4732 100644
---- a/Telegram/gyp/settings_linux.gypi
-+++ b/Telegram/gyp/settings_linux.gypi
-@@ -60,7 +60,6 @@
-       ],
-       'defines': [
-         '_REENTRANT',
--        'QT_STATICPLUGIN',
-         'QT_PLUGIN',
-       ],
-       'cflags': [
-diff --git a/Telegram/gyp/telegram_linux.gypi b/Telegram/gyp/telegram_linux.gypi
-index b42e744..29386a9 100644
---- a/Telegram/gyp/telegram_linux.gypi
-+++ b/Telegram/gyp/telegram_linux.gypi
-@@ -50,24 +50,21 @@
-       '<(linux_path_breakpad)/lib',
-     ],
-     'libraries': [
--      'breakpad_client',
--      'composeplatforminputcontextplugin',
--      'ibusplatforminputcontextplugin',
--      'fcitxplatforminputcontextplugin',
--      'liblzma.a',
--      'libopenal.a',
--      'libavformat.a',
--      'libavcodec.a',
--      'libswresample.a',
--      'libswscale.a',
--      'libavutil.a',
--      'libopus.a',
--      'libva-x11.a',
--      'libva-drm.a',
--      'libva.a',
--      'libvdpau.a',
--      'libdrm.a',
--      'libz.a',
-+      'lzma',
-+      'openal',
-+      'avformat',
-+      'avcodec',
-+      'swresample',
-+      'swscale',
-+      'avutil',
-+      'opus',
-+      'va-x11',
-+      'va-drm',
-+      'va',
-+      'vdpau',
-+      'drm',
-+      'z',
-+      'minizip',
- #      '<!(pkg-config 2> /dev/null --libs <@(pkgconfig_libs))',
-     ],
-     'cflags_cc': [
diff --git a/Fix-desktop-integration-issues.patch b/Fix-desktop-integration-issues.patch
deleted file mode 100644
index 374c581a77f2..000000000000
--- a/Fix-desktop-integration-issues.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Description: Fix some problems with desktop integration which relate to names of the binaries
-Author: Nicholas Guriev <guriev-ns@ya.ru>
-Last-Update: 2017-01-26
-
-diff --git a/Telegram/SourceFiles/pspecific_linux.cpp b/Telegram/SourceFiles/pspecific_linux.cpp
-index 8b21afe..258b5bd 100644
---- a/Telegram/SourceFiles/pspecific_linux.cpp
-+++ b/Telegram/SourceFiles/pspecific_linux.cpp
-@@ -505,7 +505,7 @@ void psRegisterCustomScheme() {
- 			s << "Exec=" << escapeShell(QFile::encodeName(cExeDir() + cExeName())) << " -- %u\n";
- 			s << "Icon=telegram\n";
- 			s << "Terminal=false\n";
--			s << "StartupWMClass=Telegram\n";
-+			s << "StartupWMClass=TelegramDesktop\n";
- 			s << "Type=Application\n";
- 			s << "Categories=Network;\n";
- 			s << "MimeType=x-scheme-handler/tg;\n";
-@@ -572,7 +572,7 @@ bool _execUpdater(bool update = true, const QString &crashreport = QString()) {
- 	static const int MaxLen = 65536, MaxArgsCount = 128;
- 
- 	char path[MaxLen] = {0};
--	QByteArray data(QFile::encodeName(cExeDir() + "Updater"));
-+	QByteArray data(QFile::encodeName(cExeDir() + (update ? "Updater" : gExeName)));
- 	memcpy(path, data.constData(), data.size());
- 
- 	char *args[MaxArgsCount] = {0}, p_noupdate[] = "-noupdate", p_autostart[] = "-autostart", p_debug[] = "-debug", p_tosettings[] = "-tosettings", p_key[] = "-key", p_path[] = "-workpath", p_startintray[] = "-startintray", p_testmode[] = "-testmode", p_crashreport[] = "-crashreport";
-diff --git a/lib/xdg/telegramdesktop.desktop b/lib/xdg/telegramdesktop.desktop
-index 35a5c61..da7a35a 100644
---- a/lib/xdg/telegramdesktop.desktop
-+++ b/lib/xdg/telegramdesktop.desktop
-@@ -4,9 +4,9 @@ Version=1.0
- Name=Telegram Desktop
- Comment=Official desktop version of Telegram messaging app
- Exec=/usr/bin/telegram-desktop -- %u
--Icon=telegram-desktop
-+Icon=telegram
- Terminal=false
--StartupWMClass=Telegram
-+StartupWMClass=TelegramDesktop
- Type=Application
- Categories=Network;
- MimeType=x-scheme-handler/tg;
diff --git a/Fix-rcc-path.patch b/Fix-rcc-path.patch
deleted file mode 100644
index 76a7719aee84..000000000000
--- a/Fix-rcc-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Telegram/gyp/qt_rcc.gypi b/Telegram/gyp/qt_rcc.gypi
-index eebc6967..19a346fe 100644
---- a/Telegram/gyp/qt_rcc.gypi
-+++ b/Telegram/gyp/qt_rcc.gypi
-@@ -28,7 +28,7 @@
-       '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/qrc/qrc_<(RULE_INPUT_ROOT).cpp',
-     ],
-     'action': [
--      '<(qt_loc)/bin/rcc<(exe_ext)',
-+      '/usr/bin/rcc',
-       '-name', '<(RULE_INPUT_ROOT)',
-       '-no-compress',
-       '<(RULE_INPUT_PATH)',
diff --git a/Flags-for-precompiled-header-and-MOC.patch b/Flags-for-precompiled-header-and-MOC.patch
deleted file mode 100644
index 558d0fbed0e8..000000000000
--- a/Flags-for-precompiled-header-and-MOC.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Description: Specify preprocessor and compiler flags for precompiled header and Qt object files
-Author: Nicholas Guriev <guriev-ns@ya.ru>
-Last-Update: 2017-01-26
-
-diff --git a/Telegram/gyp/qt.gypi b/Telegram/gyp/qt.gypi
-index 24ededb..0cfd178 100644
---- a/Telegram/gyp/qt.gypi
-+++ b/Telegram/gyp/qt.gypi
-@@ -241,11 +231,12 @@
-       '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/moc/moc_<(RULE_INPUT_ROOT).cpp',
-     ],
-     'action': [
--      '<(qt_loc)/bin/moc<(exe_ext)',
-+      '/usr/bin/moc',
- 
-       # Silence "Note: No relevant classes found. No output generated."
-       '--no-notes',
- 
-+      '<!@(echo $CPPFLAGS | grep -Po "[-]([IDU]\s*\S*|E)")',
-       '<!@(python -c "for s in \'<@(_defines)\'.split(\' \'): print(\'-D\' + s)")',
-       # '<!@(python -c "for s in \'<@(_include_dirs)\'.split(\' \'): print(\'-I\' + s)")',
-       '<(RULE_INPUT_PATH)',
-diff --git a/Telegram/gyp/PrecompiledHeader.cmake b/Telegram/gyp/PrecompiledHeader.cmake
-index fc189e4..30becec 100644
---- a/Telegram/gyp/PrecompiledHeader.cmake
-+++ b/Telegram/gyp/PrecompiledHeader.cmake
-@@ -112,7 +112,7 @@ function(add_precompiled_header _target _input)
-       set(_compiler_FLAGS "@${_pch_c_flags_file}")
-       add_custom_command(
-         OUTPUT "${_output_c}"
--        COMMAND "${CMAKE_C_COMPILER}" ${_compiler_FLAGS} -x c-header -o "${_output_c}" -c "${_pchfile}"
-+        COMMAND "${CMAKE_C_COMPILER}" "$(C_DEFINES)" "$(C_INCLUDES)" "$(C_FLAGS)" -x c-header -o "${_output_c}" -c "${_pchfile}"
-         DEPENDS "${_pchfile}" "${_pch_c_flags_file}"
-         IMPLICIT_DEPENDS C "${_pch_header}"
-         COMMENT "Precompiling ${_name} for ${_target} (C)")
-@@ -123,7 +123,7 @@ function(add_precompiled_header _target _input)
-       set(_compiler_FLAGS "@${_pch_cpp_flags_file}")
-       add_custom_command(
-         OUTPUT "${_output_cxx}"
--        COMMAND "${CMAKE_CXX_COMPILER}" ${_compiler_FLAGS} -x c++-header -o "${_output_cxx}" -c "${_pchfile}"
-+        COMMAND "${CMAKE_CXX_COMPILER}" "$(CXX_DEFINES)" "$(CXX_INCLUDES)" "$(CXX_FLAGS)" -x c++-header -o "${_output_cxx}" -c "${_pchfile}"
-         DEPENDS "${_pchfile}" "${_pch_cpp_flags_file}"
-         IMPLICIT_DEPENDS CXX "${_pch_header}"
-         COMMENT "Precompiling ${_name} for ${_target} (C++)")
diff --git a/PKGBUILD b/PKGBUILD
index e5bf618999b0..4aa795d09d4c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # https://github.com/mymedia2/tdesktop
 
 pkgname=telegram-desktop-systemqt
-pkgver=1.0.14
+pkgver=1.0.27
 pkgrel=1
 pkgdesc='Experimental build of Telegram Desktop (using system Qt)'
 arch=('i686' 'x86_64')
@@ -20,39 +20,27 @@ source=(
     "tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#tag=v$pkgver"
     "telegramdesktop.desktop"
     "tg.protocol"
-    "Avoid-depending-on-static-libraries.patch"
-    "Fix-desktop-integration-issues.patch"
-    "Flags-for-precompiled-header-and-MOC.patch"
-    "Fix-rcc-path.patch"
-    "Use-gtk3-headers.patch"
-    "Reduce-number-of-libraries.patch"
     "CMakeLists.inj"
+    "aur-build-fixes.patch"
 )
 sha256sums=('SKIP'
             '41c22fae6ae757936741e63aec3d0f17cafe86b2d6153cdd1d01a5581e871f17'
             'd4cdad0d091c7e47811d8a26d55bbee492e7845e968c522e86f120815477e9eb'
-            '197159eca70fc4a3d55548842d3218bcd67394cb869f08825d8fc12cf7b050f8'
-            '4e1938a5ddfcf8ac57bafa5f9ce80413665ac3b0ccd3c1853fe8f0835b91f468'
-            '952c7590cb05354c70037745d980fa97c36e36f96a1fa7d0db29a5c6a1d8dbd1'
-            'cf4dbb293afdbfd226861a00a42790a15b23bea296eccf35853d104e07ea345a'
-            '5f3ac7c08df0293bed626293dbfb6040764abf28899db7681572cfb1d8bcaa6e'
-            '0442af5365a31de5a8e15de8a94f5c1192775fc4460b74c4045da99e548f045a'
-            '7a06af83609168a8eaec59a65252caa41dcd0ecc805225886435eb65073e9c82')
+            '7a06af83609168a8eaec59a65252caa41dcd0ecc805225886435eb65073e9c82'
+            '82b2458e8ad5b316b9f9748c27fbe65e867ea3c29d78d1442e293a282eba63a0')
 
 prepare() {
     cd "$srcdir/tdesktop"
-    git apply "$srcdir/Avoid-depending-on-static-libraries.patch"
-    git apply "$srcdir/Fix-desktop-integration-issues.patch"
-    git apply "$srcdir/Flags-for-precompiled-header-and-MOC.patch"
-    git apply "$srcdir/Fix-rcc-path.patch"
-    git apply "$srcdir/Use-gtk3-headers.patch"
-    git apply "$srcdir/Reduce-number-of-libraries.patch"
+    git apply "../aur-build-fixes.patch"
 }
 
 build() {
     cd "$srcdir/tdesktop"
-    export EXTRA_CPPFLAGS="-DTDESKTOP_DISABLE_AUTOUPDATE -DTDESKTOP_DISABLE_CRASH_REPORTS -DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME"
-    export CPPFLAGS="$CPPFLAGS $EXTRA_CPPFLAGS"
+    export LANG=en_US.UTF-8
+    export GYP_DEFINES="TDESKTOP_DISABLE_CRASH_REPORTS,TDESKTOP_DISABLE_AUTOUPDATE,TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME"
+    export EXTRA_FLAGS="-DTDESKTOP_DISABLE_AUTOUPDATE -DTDESKTOP_DISABLE_CRASH_REPORTS -DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME -Winvalid-pch"
+    export CPPFLAGS="$CPPFLAGS $EXTRA_FLAGS"
+    export CXXFLAGS="$CXXFLAGS $EXTRA_FLAGS"
     gyp \
         -Gconfig=Release \
         --depth=Telegram/gyp --generator-output=../.. -Goutput_dir=out Telegram/gyp/Telegram.gyp --format=cmake
diff --git a/Reduce-number-of-libraries.patch b/Reduce-number-of-libraries.patch
deleted file mode 100644
index a782e1c730c4..000000000000
--- a/Reduce-number-of-libraries.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-Description: Remove linking of unused libraries
-Author: Nicholas Guriev <guriev-ns@ya.ru>
-Last-Update: 2017-02-18
-
-diff --git a/Telegram/gyp/Telegram.gyp b/Telegram/gyp/Telegram.gyp
-index 603264b..830df69 100644
---- a/Telegram/gyp/Telegram.gyp
-+++ b/Telegram/gyp/Telegram.gyp
-@@ -76,7 +76,6 @@
-       'codegen.gyp:codegen_style',
-       'codegen.gyp:codegen_numbers',
-       'codegen.gyp:MetaLang',
--      'utils.gyp:Updater',
-     ],
- 
-     'defines': [
-diff --git a/Telegram/gyp/qt.gypi b/Telegram/gyp/qt.gypi
-index 1db05de..d322153 100644
---- a/Telegram/gyp/qt.gypi
-+++ b/Telegram/gyp/qt.gypi
-@@ -32,6 +32,5 @@
-             ],
-           },
-           'qt_libs': [
--            'Qt5PrintSupport',
-             'Qt5Network',
-             'Qt5Widgets',
-@@ -81,21 +80,8 @@
-             'qt_lib_debug_postfix': '',
-             'qt_lib_release_postfix': '',
-             'qt_libs': [
--              'Qt5XcbQpa',
-               '<@(qt_libs)',
--              'Qt5DBus',
-               'Qt5Core',
--              'Xi',
--              'Xext',
--              'Xfixes',
--              'SM',
--              'ICE',
--              'fontconfig',
--              'expat',
--              'freetype',
--              'xcb-shm',
--              'xcb-xfixes',
--              'xcb-render',
-             ],
-           }],
-         ],
-@@ -120,11 +106,6 @@
-         'qt_loc': '<(qt_loc_unix)',
-       }],
-     ],
--
--    'linux_path_xkbcommon%': '/usr/local',
--    'linux_lib_ssl%': 'ssl',
--    'linux_lib_crypto%': 'crypto',
--    'linux_lib_icu%': 'icutu icui18n icuuc icudata',
-   },
- 
-   'configurations': {
-@@ -200,17 +181,9 @@
-         '<(qt_loc)/plugins/platforminputcontexts',
-       ],
-       'libraries': [
--        'xkbcommon',
-         '<@(qt_libs_release)',
--        '<(linux_lib_ssl)',
--        '<(linux_lib_crypto)',
--        '<!@(python -c "for s in \'<(linux_lib_icu)\'.split(\' \'): print(s)")',
--        'xcb',
-+        'crypto',
-         'X11',
--        'X11-xcb',
--        'dbus-1',
--        'dl',
--        'gthread-2.0',
-         'glib-2.0',
-         'pthread',
-       ],
-diff --git a/Telegram/gyp/telegram_linux.gypi b/Telegram/gyp/telegram_linux.gypi
-index 29386a9..63d26e4 100644
---- a/Telegram/gyp/telegram_linux.gypi
-+++ b/Telegram/gyp/telegram_linux.gypi
-@@ -50,19 +50,12 @@
-       '<(linux_path_breakpad)/lib',
-     ],
-     'libraries': [
--      'lzma',
-       'openal',
-       'avformat',
-       'avcodec',
-       'swresample',
-       'swscale',
-       'avutil',
--      'opus',
--      'va-x11',
--      'va-drm',
--      'va',
--      'vdpau',
--      'drm',
-       'z',
-       'minizip',
- #      '<!(pkg-config 2> /dev/null --libs <@(pkgconfig_libs))',
diff --git a/Use-gtk3-headers.patch b/Use-gtk3-headers.patch
deleted file mode 100644
index f124dc31c653..000000000000
--- a/Use-gtk3-headers.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/Telegram/gyp/telegram_linux.gypi b/Telegram/gyp/telegram_linux.gypi
-index 29386a9b..06dd1abc 100644
---- a/Telegram/gyp/telegram_linux.gypi
-+++ b/Telegram/gyp/telegram_linux.gypi
-@@ -68,9 +68,8 @@
- #      '<!(pkg-config 2> /dev/null --libs <@(pkgconfig_libs))',
-     ],
-     'cflags_cc': [
--      '<!(pkg-config 2> /dev/null --cflags appindicator-0.1)',
--      '<!(pkg-config 2> /dev/null --cflags gtk+-2.0)',
--      '<!(pkg-config 2> /dev/null --cflags glib-2.0)',
-+      '<!(pkg-config 2> /dev/null --cflags appindicator3-0.1)',
-+      '<!(pkg-config 2> /dev/null --cflags gtk+-3.0)',
-       '<!(pkg-config 2> /dev/null --cflags dee-1.0)',
-     ],
-     'configurations': {
diff --git a/aur-build-fixes.patch b/aur-build-fixes.patch
new file mode 100644
index 000000000000..6e6d361811c9
--- /dev/null
+++ b/aur-build-fixes.patch
@@ -0,0 +1,512 @@
+diff --git a/Telegram/SourceFiles/main.cpp b/Telegram/SourceFiles/main.cpp
+index 6cd942ec..d8ce29b9 100644
+--- a/Telegram/SourceFiles/main.cpp
++++ b/Telegram/SourceFiles/main.cpp
+@@ -23,9 +23,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
+ #include "storage/localstorage.h"
+ 
+ int main(int argc, char *argv[]) {
+-#ifndef Q_OS_MAC // Retina display support is working fine, others are not.
++#if !defined(Q_OS_MAC) && QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
++	// Retina display support is working fine, others are not.
+ 	QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling, true);
+-#endif // Q_OS_MAC
++#endif // not defined Q_OS_MAC and QT_VERSION >= 5.6.0
+ 	QCoreApplication::setApplicationName(qsl("TelegramDesktop"));
+ 
+ 	settingsParseArgs(argc, argv);
+@@ -39,6 +40,11 @@ int main(int argc, char *argv[]) {
+ 	Logs::start(); // must be started before Platform is started
+ 	Platform::start(); // must be started before QApplication is created
+ 
++	// I don't know why path is not in QT_PLUGIN_PATH by default
++	QCoreApplication::addLibraryPath("/usr/lib/qt/plugins");
++	// without this Telegram doesn't start on Ubuntu 17.04 due GTK errors
++	setenv("QT_STYLE_OVERRIDE", "qwerty", false);
++
+ 	int result = 0;
+ 	{
+ 		Application app(argc, argv);
+diff --git a/Telegram/SourceFiles/platform/linux/linux_libs.h b/Telegram/SourceFiles/platform/linux/linux_libs.h
+index a8bf969c..75593540 100644
+--- a/Telegram/SourceFiles/platform/linux/linux_libs.h
++++ b/Telegram/SourceFiles/platform/linux/linux_libs.h
+@@ -29,7 +29,7 @@ extern "C" {
+ } // extern "C"
+ 
+ #ifndef TDESKTOP_DISABLE_UNITY_INTEGRATION
+-#include <unity/unity/unity.h>
++typedef void UnityLauncherEntry;
+ #endif // !TDESKTOP_DISABLE_UNITY_INTEGRATION
+ 
+ namespace Platform {
+diff --git a/Telegram/SourceFiles/qt_functions.cpp b/Telegram/SourceFiles/qt_functions.cpp
+new file mode 100644
+index 00000000..4a722b8d
+--- /dev/null
++++ b/Telegram/SourceFiles/qt_functions.cpp
+@@ -0,0 +1,94 @@
++/****************************************************************************
++**
++** Copyright (C) 2015 The Qt Company Ltd.
++** Contact: http://www.qt.io/licensing/
++**
++** This file contains some parts of the Qt Toolkit.
++**
++** $QT_BEGIN_LICENSE:LGPL21$
++** Commercial License Usage
++** Licensees holding valid commercial Qt licenses may use this file in
++** accordance with the commercial license agreement provided with the
++** Software or, alternatively, in accordance with the terms contained in
++** a written agreement between you and The Qt Company. For licensing terms
++** and conditions see http://www.qt.io/terms-conditions. For further
++** information use the contact form at http://www.qt.io/contact-us.
++**
++** GNU Lesser General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU Lesser
++** General Public License version 2.1 or version 3 as published by the Free
++** Software Foundation and appearing in the file LICENSE.LGPLv21 and
++** LICENSE.LGPLv3 included in the packaging of this file. Please review the
++** following information to ensure the GNU Lesser General Public License
++** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
++** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
++**
++** As a special exception, The Qt Company gives you certain additional
++** rights. These rights are described in The Qt Company LGPL Exception
++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
++**
++** $QT_END_LICENSE$
++**
++****************************************************************************/
++
++/* TODO: find a dynamic library with these symbols. */
++
++/* Debian maintainer: this function is taken from qfiledialog.cpp */
++/*
++    Makes a list of filters from ;;-separated text.
++    Used by the mac and windows implementations
++*/
++QStringList qt_make_filter_list(const QString &filter)
++{
++    QString f(filter);
++
++    if (f.isEmpty())
++        return QStringList();
++
++    QString sep(QLatin1String(";;"));
++    int i = f.indexOf(sep, 0);
++    if (i == -1) {
++        if (f.indexOf(QLatin1Char('\n'), 0) != -1) {
++            sep = QLatin1Char('\n');
++            i = f.indexOf(sep, 0);
++        }
++    }
++
++    return f.split(sep);
++}
++
++/* Debian maintainer: this constructor is taken from qtextengine.cpp for TextPainter::drawLine */
++QTextItemInt::QTextItemInt(const QGlyphLayout &g, QFont *font, const QChar *chars_, int numChars, QFontEngine *fe, const QTextCharFormat &format)
++    : flags(0), justified(false), underlineStyle(QTextCharFormat::NoUnderline), charFormat(format),
++      num_chars(numChars), chars(chars_), logClusters(0), f(font),  glyphs(g), fontEngine(fe)
++{
++}
++
++/* Debian maintainer: this method is also taken from qtextengine.cpp */
++// Fix up flags and underlineStyle with given info
++void QTextItemInt::initWithScriptItem(const QScriptItem &si)
++{
++    // explicitly initialize flags so that initFontAttributes can be called
++    // multiple times on the same TextItem
++    flags = 0;
++    if (si.analysis.bidiLevel %2)
++        flags |= QTextItem::RightToLeft;
++    ascent = si.ascent;
++    descent = si.descent;
++
++    if (charFormat.hasProperty(QTextFormat::TextUnderlineStyle)) {
++        underlineStyle = charFormat.underlineStyle();
++    } else if (charFormat.boolProperty(QTextFormat::FontUnderline)
++               || f->d->underline) {
++        underlineStyle = QTextCharFormat::SingleUnderline;
++    }
++
++    // compat
++    if (underlineStyle == QTextCharFormat::SingleUnderline)
++        flags |= QTextItem::Underline;
++
++    if (f->d->overline || charFormat.fontOverline())
++        flags |= QTextItem::Overline;
++    if (f->d->strikeOut || charFormat.fontStrikeOut())
++        flags |= QTextItem::StrikeOut;
++}
+diff --git a/Telegram/SourceFiles/qt_static_plugins.cpp b/Telegram/SourceFiles/qt_static_plugins.cpp
+index 1d4896a6..f2f876b3 100644
+--- a/Telegram/SourceFiles/qt_static_plugins.cpp
++++ b/Telegram/SourceFiles/qt_static_plugins.cpp
+@@ -28,12 +28,4 @@ Q_IMPORT_PLUGIN(QWebpPlugin)
+ Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin)
+ Q_IMPORT_PLUGIN(QGenericEnginePlugin)
+ #elif defined Q_OS_LINUX // Q_OS_WIN | Q_OS_MAC
+-Q_IMPORT_PLUGIN(QWebpPlugin)
+-Q_IMPORT_PLUGIN(QXcbIntegrationPlugin)
+-Q_IMPORT_PLUGIN(QConnmanEnginePlugin)
+-Q_IMPORT_PLUGIN(QGenericEnginePlugin)
+-Q_IMPORT_PLUGIN(QNetworkManagerEnginePlugin)
+-Q_IMPORT_PLUGIN(QComposePlatformInputContextPlugin)
+-Q_IMPORT_PLUGIN(QIbusPlatformInputContextPlugin)
+-Q_IMPORT_PLUGIN(QFcitxPlatformInputContextPlugin)
+ #endif // Q_OS_WIN | Q_OS_MAC | Q_OS_LINUX
+diff --git a/Telegram/SourceFiles/ui/text/text.cpp b/Telegram/SourceFiles/ui/text/text.cpp
+index 0188d70c..960fc062 100644
+--- a/Telegram/SourceFiles/ui/text/text.cpp
++++ b/Telegram/SourceFiles/ui/text/text.cpp
+@@ -1692,11 +1692,11 @@ private:
+ 		if (item == -1)
+ 			return;
+ 
+-#ifdef OS_MAC_OLD
++#if defined(OS_MAC_OLD) || QT_VERSION < QT_VERSION_CHECK(5, 6, 0)
+ 		auto end = _e->findItem(line.from + line.length - 1);
+-#else // OS_MAC_OLD
++#else
+ 		auto end = _e->findItem(line.from + line.length - 1, item);
+-#endif // OS_MAC_OLD
++#endif
+ 
+ 		int blockIndex = _lineStartBlock;
+ 		ITextBlock *currentBlock = _t->_blocks[blockIndex];
+diff --git a/Telegram/SourceFiles/ui/text/text_block.cpp b/Telegram/SourceFiles/ui/text/text_block.cpp
+index f89644e1..35230cfc 100644
+--- a/Telegram/SourceFiles/ui/text/text_block.cpp
++++ b/Telegram/SourceFiles/ui/text/text_block.cpp
+@@ -330,7 +330,7 @@ TextBlock::TextBlock(const style::font &font, const QString &str, QFixed minResi
+ 		SignalHandlers::setCrashAnnotationRef("CrashString", &part);
+ 
+ 		QStackTextEngine engine(part, blockFont->f);
+-		QTextLayout layout(&engine);
++		QTextLayout layout(part, blockFont->f);
+ 		layout.beginLayout();
+ 		layout.createLine();
+ 
+diff --git a/Telegram/SourceFiles/ui/twidget.cpp b/Telegram/SourceFiles/ui/twidget.cpp
+index abfcd27e..1e1049b2 100644
+--- a/Telegram/SourceFiles/ui/twidget.cpp
++++ b/Telegram/SourceFiles/ui/twidget.cpp
+@@ -107,9 +107,9 @@ void sendSynteticMouseEvent(QWidget *widget, QEvent::Type type, Qt::MouseButton
+ 			, button
+ 			, QGuiApplication::mouseButtons() | button
+ 			, QGuiApplication::keyboardModifiers()
+-#ifndef OS_MAC_OLD
++#if !defined(OS_MAC_OLD) && QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+ 			, Qt::MouseEventSynthesizedByApplication
+-#endif // OS_MAC_OLD
++#endif
+ 		);
+ 		ev.setTimestamp(getms());
+ 		QGuiApplication::sendEvent(windowHandle, &ev);
+diff --git a/Telegram/gyp/PrecompiledHeader.cmake b/Telegram/gyp/PrecompiledHeader.cmake
+index 5d6830e9..c3f08d3f 100644
+--- a/Telegram/gyp/PrecompiledHeader.cmake
++++ b/Telegram/gyp/PrecompiledHeader.cmake
+@@ -112,7 +112,7 @@ function(add_precompiled_header _target _input)
+       set(_compiler_FLAGS "@${_pch_c_flags_file}")
+       add_custom_command(
+         OUTPUT "${_output_c}"
+-        COMMAND "${CMAKE_C_COMPILER}" ${_compiler_FLAGS} -x c-header -o "${_output_c}" -c "${_pchfile}"
++        COMMAND "${CMAKE_C_COMPILER}" "$(C_DEFINES)" "$(C_INCLUDES)" "$(C_FLAGS)" -x c-header -o "${_output_c}" -c "${_pchfile}"
+         DEPENDS "${_pchfile}" "${_pch_c_flags_file}"
+         IMPLICIT_DEPENDS C "${_pch_header}"
+         COMMENT "Precompiling ${_name} for ${_target} (C)")
+@@ -123,7 +123,7 @@ function(add_precompiled_header _target _input)
+       set(_compiler_FLAGS "@${_pch_cpp_flags_file}")
+       add_custom_command(
+         OUTPUT "${_output_cxx}"
+-        COMMAND "${CMAKE_CXX_COMPILER}" ${_compiler_FLAGS} -x c++-header -o "${_output_cxx}" -c "${_pchfile}"
++        COMMAND "${CMAKE_CXX_COMPILER}" "$(CXX_DEFINES)" "$(CXX_INCLUDES)" "$(CXX_FLAGS)" -x c++-header -o "${_output_cxx}" -c "${_pchfile}"
+         DEPENDS "${_pchfile}" "${_pch_cpp_flags_file}"
+         IMPLICIT_DEPENDS CXX "${_pch_header}"
+         COMMENT "Precompiling ${_name} for ${_target} (C++)")
+diff --git a/Telegram/gyp/Telegram.gyp b/Telegram/gyp/Telegram.gyp
+index fb22932c..f4743e15 100644
+--- a/Telegram/gyp/Telegram.gyp
++++ b/Telegram/gyp/Telegram.gyp
+@@ -77,24 +77,16 @@
+       'codegen.gyp:codegen_style',
+       'codegen.gyp:codegen_numbers',
+       'codegen.gyp:MetaLang',
+-      'utils.gyp:Updater',
+     ],
+ 
+     'defines': [
+-      'AL_LIBTYPE_STATIC',
+       '<!@(python -c "for s in \'<(build_defines)\'.split(\',\'): print(s)")',
+     ],
+ 
+     'include_dirs': [
+       '<(src_loc)',
+       '<(SHARED_INTERMEDIATE_DIR)',
+-      '<(libs_loc)/breakpad/src',
+-      '<(libs_loc)/lzma/C',
+-      '<(libs_loc)/libexif-0.6.20',
+-      '<(libs_loc)/zlib-1.2.8',
+-      '<(libs_loc)/ffmpeg',
+-      '<(libs_loc)/openal-soft/include',
+-      '<(minizip_loc)',
++      '/usr/include/minizip',
+       '<(sp_media_key_tap_loc)',
+       '<(submodules_loc)/GSL/include',
+       '<(submodules_loc)/variant/include',
+diff --git a/Telegram/gyp/qt.gypi b/Telegram/gyp/qt.gypi
+index a3212210..213723c5 100644
+--- a/Telegram/gyp/qt.gypi
++++ b/Telegram/gyp/qt.gypi
+@@ -27,25 +27,21 @@
+               [ 'build_macold', {
+                 'qt_version%': '5.3.2',
+               }, {
+-                'qt_version%': '5.6.2',
++                'qt_version%': '5.8.0',
+               }]
+             ],
+           },
+           'qt_libs': [
+-            'qwebp',
+-            'Qt5PrintSupport',
+-            'Qt5PlatformSupport',
+             'Qt5Network',
+             'Qt5Widgets',
+             'Qt5Gui',
+-            'qtharfbuzzng',
+           ],
+           'qt_version%': '<(qt_version)',
+           'conditions': [
+             [ 'build_macold', {
+               'linux_path_qt%': '/usr/local/macold/Qt-<(qt_version)',
+             }, {
+-              'linux_path_qt%': '/usr/local/tdesktop/Qt-<(qt_version)',
++              'linux_path_qt%': '/usr/lib/qt',
+             }]
+           ]
+         },
+@@ -85,31 +81,12 @@
+             ],
+           }],
+           [ 'build_linux', {
+-            'qt_lib_prefix': 'lib',
+-            'qt_lib_debug_postfix': '.a',
+-            'qt_lib_release_postfix': '.a',
++            'qt_lib_prefix': '',
++            'qt_lib_debug_postfix': '',
++            'qt_lib_release_postfix': '',
+             'qt_libs': [
+-              'qxcb',
+-              'Qt5XcbQpa',
+-              'qconnmanbearer',
+-              'qgenericbearer',
+-              'qnmbearer',
+               '<@(qt_libs)',
+-              'Qt5DBus',
+               'Qt5Core',
+-              'qtpcre',
+-              'Xi',
+-              'Xext',
+-              'Xfixes',
+-              'SM',
+-              'ICE',
+-              'fontconfig',
+-              'expat',
+-              'freetype',
+-              'xcb-shm',
+-              'xcb-xfixes',
+-              'xcb-render',
+-              'xcb-static',
+             ],
+           }],
+         ],
+@@ -139,11 +116,6 @@
+     # '<!@(python <(DEPTH)/list_sources.py [sources] <(qt_moc_list_sources_arg))'
+     # where [sources] contains all your source files
+     'qt_moc_list_sources_arg': '--moc-prefix SHARED_INTERMEDIATE_DIR/<(_target_name)/moc/moc_',
+-
+-    'linux_path_xkbcommon%': '/usr/local',
+-    'linux_lib_ssl%': '/usr/local/ssl/lib/libssl.a',
+-    'linux_lib_crypto%': '/usr/local/ssl/lib/libcrypto.a',
+-    'linux_lib_icu%': '/usr/lib/libicutu.a /usr/lib/libicui18n.a /usr/lib/libicuuc.a /usr/lib/libicudata.a',
+   },
+ 
+   'configurations': {
+@@ -192,13 +164,13 @@
+   },
+ 
+   'include_dirs': [
+-    '<(qt_loc)/include',
+-    '<(qt_loc)/include/QtCore',
+-    '<(qt_loc)/include/QtGui',
+-    '<(qt_loc)/include/QtCore/<(qt_version)',
+-    '<(qt_loc)/include/QtGui/<(qt_version)',
+-    '<(qt_loc)/include/QtCore/<(qt_version)/QtCore',
+-    '<(qt_loc)/include/QtGui/<(qt_version)/QtGui',
++    '/usr/include/qt',
++    '/usr/include/qt/QtCore',
++    '/usr/include/qt/QtGui',
++    '/usr/include/qt/QtCore/<(qt_version)/',
++    '/usr/include/qt/QtGui/<(qt_version)/',
++    '/usr/include/qt/QtCore/<(qt_version)/QtCore',
++    '/usr/include/qt/QtGui/<(qt_version)/QtGui',
+   ],
+   'library_dirs': [
+     '<(qt_loc)/lib',
+@@ -219,17 +191,9 @@
+         '<(qt_loc)/plugins/platforminputcontexts',
+       ],
+       'libraries': [
+-        '<(linux_path_xkbcommon)/lib/libxkbcommon.a',
+         '<@(qt_libs_release)',
+-        '<(linux_lib_ssl)',
+-        '<(linux_lib_crypto)',
+-        '<!@(python -c "for s in \'<(linux_lib_icu)\'.split(\' \'): print(s)")',
+-        'xcb',
++        'crypto',
+         'X11',
+-        'X11-xcb',
+-        'dbus-1',
+-        'dl',
+-        'gthread-2.0',
+         'glib-2.0',
+         'pthread',
+       ],
+@@ -237,7 +201,6 @@
+         '<(qt_loc)/mkspecs/linux-g++',
+       ],
+       'ldflags': [
+-        '-static-libstdc++',
+         '-pthread',
+         '-g',
+         '-rdynamic',
+@@ -259,11 +222,12 @@
+       '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/moc/moc_<(RULE_INPUT_ROOT).cpp',
+     ],
+     'action': [
+-      '<(qt_loc)/bin/moc<(exe_ext)',
++      '/usr/bin/moc',
+ 
+       # Silence "Note: No relevant classes found. No output generated."
+       '--no-notes',
+ 
++      '<!@(echo $CPPFLAGS | grep -Po "[-]([IDU]\s*\S*|E)")',
+       '<!@(python -c "for s in \'<@(_defines)\'.split(\' \'): print(\'-D\' + s)")',
+       # '<!@(python -c "for s in \'<@(_include_dirs)\'.split(\' \'): print(\'-I\' + s)")',
+       '<(RULE_INPUT_PATH)',
+diff --git a/Telegram/gyp/qt_rcc.gypi b/Telegram/gyp/qt_rcc.gypi
+index eebc6967..19a346fe 100644
+--- a/Telegram/gyp/qt_rcc.gypi
++++ b/Telegram/gyp/qt_rcc.gypi
+@@ -28,7 +28,7 @@
+       '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/qrc/qrc_<(RULE_INPUT_ROOT).cpp',
+     ],
+     'action': [
+-      '<(qt_loc)/bin/rcc<(exe_ext)',
++      '/usr/bin/rcc',
+       '-name', '<(RULE_INPUT_ROOT)',
+       '-no-compress',
+       '<(RULE_INPUT_PATH)',
+diff --git a/Telegram/gyp/settings_linux.gypi b/Telegram/gyp/settings_linux.gypi
+index fde88dcd..ca149b85 100644
+--- a/Telegram/gyp/settings_linux.gypi
++++ b/Telegram/gyp/settings_linux.gypi
+@@ -25,7 +25,6 @@
+           '-pipe',
+           '-g',
+           '-Wall',
+-          '-Werror',
+           '-W',
+           '-fPIC',
+           '-Wno-unused-variable',
+@@ -61,7 +60,6 @@
+       ],
+       'defines': [
+         '_REENTRANT',
+-        'QT_STATICPLUGIN',
+         'QT_PLUGIN',
+       ],
+       'cflags_c': [
+diff --git a/Telegram/gyp/telegram_linux.gypi b/Telegram/gyp/telegram_linux.gypi
+index b42e7443..71e39897 100644
+--- a/Telegram/gyp/telegram_linux.gypi
++++ b/Telegram/gyp/telegram_linux.gypi
+@@ -35,12 +35,14 @@
+       'linux_path_breakpad%': '<(libs_loc)/breakpad',
+     },
+     'include_dirs': [
++      '/usr/include/openssl-1.0',
+       '/usr/local/include',
+       '<(linux_path_ffmpeg)/include',
+       '<(linux_path_openal)/include',
+       '<(linux_path_breakpad)/include/breakpad',
+     ],
+     'library_dirs': [
++      '/usr/lib/openssl-1.0',
+       '/usr/local/lib',
+       '<(linux_path_ffmpeg)/lib',
+       '<(linux_path_openal)/lib',
+@@ -50,30 +52,19 @@
+       '<(linux_path_breakpad)/lib',
+     ],
+     'libraries': [
+-      'breakpad_client',
+-      'composeplatforminputcontextplugin',
+-      'ibusplatforminputcontextplugin',
+-      'fcitxplatforminputcontextplugin',
+-      'liblzma.a',
+-      'libopenal.a',
+-      'libavformat.a',
+-      'libavcodec.a',
+-      'libswresample.a',
+-      'libswscale.a',
+-      'libavutil.a',
+-      'libopus.a',
+-      'libva-x11.a',
+-      'libva-drm.a',
+-      'libva.a',
+-      'libvdpau.a',
+-      'libdrm.a',
+-      'libz.a',
++      'openal',
++      'avformat',
++      'avcodec',
++      'swresample',
++      'swscale',
++      'avutil',
++      'z',
++      'minizip',
+ #      '<!(pkg-config 2> /dev/null --libs <@(pkgconfig_libs))',
+     ],
+     'cflags_cc': [
+       '<!(pkg-config 2> /dev/null --cflags appindicator-0.1)',
+-      '<!(pkg-config 2> /dev/null --cflags gtk+-2.0)',
+-      '<!(pkg-config 2> /dev/null --cflags glib-2.0)',
++      '<!(pkg-config 2> /dev/null --cflags gtk+-3.0)',
+       '<!(pkg-config 2> /dev/null --cflags dee-1.0)',
+     ],
+     'configurations': {
+diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt
+index 01f08e35..51c72634 100644
+--- a/Telegram/gyp/telegram_sources.txt
++++ b/Telegram/gyp/telegram_sources.txt
+@@ -511,14 +511,7 @@
+ <(src_loc)/structs.cpp
+ <(src_loc)/structs.h
+ 
+-platforms: !win
+-<(minizip_loc)/crypt.h
+-<(minizip_loc)/ioapi.c
+-<(minizip_loc)/ioapi.h
+-<(minizip_loc)/zip.c
+-<(minizip_loc)/zip.h
+-<(minizip_loc)/unzip.c
+-<(minizip_loc)/unzip.h
++<(src_loc)/qt_functions.cpp
+ 
+ platforms: mac
+ <(sp_media_key_tap_loc)/SPMediaKeyTap.m