testing/telegram-desktop: upgrade to 1.8.15

9 files changed, 178 insertions, 237 deletions

diff --git a/testing/telegram-desktop/0002-tdesktop.patch b/testing/telegram-desktop/0002-tdesktop.patch
index dbb86a665b..ca2435f23b 100644
--- a/testing/telegram-desktop/0002-tdesktop.patch
+++ b/testing/telegram-desktop/0002-tdesktop.patch
@@ -1,20 +1,21 @@
-diff --git a/Telegram/Resources/qrc/telegram_linux.qrc b/Telegram/Resources/qrc/telegram_linux.qrc
-index 0554fa179..3ea027406 100644
---- a/Telegram/Resources/qrc/telegram_linux.qrc
-+++ b/Telegram/Resources/qrc/telegram_linux.qrc
-@@ -1,5 +1,4 @@
+diff --git a/Telegram/Resources/qrc/linux.qrc b/Telegram/Resources/qrc/linux.qrc
+index 164e8d4f2..12319be14 100644
+--- a/Telegram/Resources/qrc/linux.qrc
++++ b/Telegram/Resources/qrc/linux.qrc
+@@ -1,6 +1,5 @@
  <RCC>
    <qresource prefix="/qt">
 -    <file alias="etc/qt.conf">../etc/qt_linux.conf</file>
    </qresource>
- </RCC>
+   <qresource prefix="/fc">
+     <file alias="fc-custom.conf">../fc-custom.conf</file>
 diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp
 index b1246588a..7f522cc86 100644
 --- a/Telegram/SourceFiles/core/launcher.cpp
 +++ b/Telegram/SourceFiles/core/launcher.cpp
-@@ -59,6 +60,19 @@ int Launcher::exec() {
+@@ -272,6 +272,19 @@ int Launcher::exec() {
  	Logs::start(this); // must be started before Platform is started
- 	Platform::start(); // must be started before QApplication is created
+ 	Platform::start(); // must be started before Sandbox is created
  
 +	// I don't know why path is not in QT_PLUGIN_PATH by default
 +	QCoreApplication::addLibraryPath("/usr/lib/qt5/plugins");
@@ -152,10 +153,10 @@ index a757d085f..122ff0f5d 100644
 -Q_IMPORT_PLUGIN(NimfInputContextPlugin)
  #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 944f58479..887c1982f 100644
+index 7891995be..eaeb52b35 100644
 --- a/Telegram/SourceFiles/ui/text/text.cpp
 +++ b/Telegram/SourceFiles/ui/text/text.cpp
-@@ -1750,11 +1750,11 @@ private:
+@@ -1968,11 +1968,11 @@ private:
  		if (item == -1)
  			return;
  
@@ -171,37 +172,21 @@ index 944f58479..887c1982f 100644
  		auto blockIndex = _lineStartBlock;
  		auto currentBlock = _t->_blocks[blockIndex].get();
 diff --git a/Telegram/SourceFiles/ui/text/text_block.cpp b/Telegram/SourceFiles/ui/text/text_block.cpp
-index 2959cec77..04ad00645 100644
+index 29173c5c2..b47a53d76 100644
 --- a/Telegram/SourceFiles/ui/text/text_block.cpp
 +++ b/Telegram/SourceFiles/ui/text/text_block.cpp
-@@ -332,6 +332,9 @@ TextBlock::TextBlock(const style::font &font, const QString &str, QFixed minResi
+@@ -334,6 +334,9 @@ TextBlock::TextBlock(const style::font &font, const QString &str, QFixed minResi
  
  		QStackTextEngine engine(part, blockFont->f);
  		BlockParser parser(&engine, this, minResizeWidth, _from, part);
 +		QTextLayout layout(part, blockFont->f);
 +		layout.beginLayout();
 +		layout.createLine();
- 
- 		CrashReports::ClearAnnotationRef("CrashString");
  	}
-diff --git a/Telegram/SourceFiles/ui/twidget.cpp b/Telegram/SourceFiles/ui/twidget.cpp
-index 71f318229..461f52278 100644
---- a/Telegram/SourceFiles/ui/twidget.cpp
-+++ b/Telegram/SourceFiles/ui/twidget.cpp
-@@ -233,9 +233,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 a0e1e0489..223113081 100644
+index dfe1193be..0b13fc098 100644
 --- a/Telegram/gyp/PrecompiledHeader.cmake
 +++ b/Telegram/gyp/PrecompiledHeader.cmake
 @@ -114,7 +114,7 @@ function(add_precompiled_header _target _input)
@@ -222,48 +207,30 @@ index a0e1e0489..223113081 100644
          DEPENDS "${_pchfile}" "${_pch_cpp_flags_file}"
          IMPLICIT_DEPENDS CXX "${_pch_header}"
          COMMENT "Precompiling header ${_name} for ${_target} (C++)")
-diff --git a/Telegram/gyp/Telegram.gyp b/Telegram/gyp/Telegram.gyp
-index 1cab5ae29..465e8276a 100644
---- a/Telegram/gyp/Telegram.gyp
-+++ b/Telegram/gyp/Telegram.gyp
-@@ -75,7 +75,6 @@
-       'codegen.gyp:codegen_numbers',
-       'codegen.gyp:codegen_style',
-       'tests/tests.gyp:tests',
--      'utils.gyp:Updater',
-       '../ThirdParty/libtgvoip/libtgvoip.gyp:libtgvoip',
-       'crl.gyp:crl',
-       'lib_base.gyp:lib_base',
-@@ -84,7 +83,6 @@
-     ],
- 
-     'defines': [
--      'AL_LIBTYPE_STATIC',
-       'AL_ALEXT_PROTOTYPES',
-       'TGVOIP_USE_CXX11_LIB',
-       'XXH_INLINE_ALL',
-@@ -94,16 +92,8 @@
-     'include_dirs': [
-       '<(src_loc)',
-       '<(SHARED_INTERMEDIATE_DIR)',
--      '<(libs_loc)/breakpad/src',
--      '<(libs_loc)/lzma/C',
--      '<(libs_loc)/zlib',
--      '<(libs_loc)/ffmpeg',
--      '<(libs_loc)/openal-soft/include',
--      '<(libs_loc)/opus/include',
--      '<(libs_loc)/range-v3/include',
--      '<(minizip_loc)',
--      '<(sp_media_key_tap_loc)',
-       '<(emoji_suggestions_loc)',
-+      '/usr/include/minizip',
-       '<(submodules_loc)/GSL/include',
-       '<(submodules_loc)/variant/include',
-       '<(submodules_loc)/crl/src',
-diff --git a/Telegram/gyp/qt.gypi b/Telegram/gyp/qt.gypi
+diff --git a/Telegram/gyp/common/linux.gypi b/Telegram/gyp/common/linux.gypi
+index cdcdef1dc..667fbb7f3 100644
+--- a/Telegram/gyp/common/linux.gypi
++++ b/Telegram/gyp/common/linux.gypi
+@@ -11,7 +11,6 @@
+         'linux_common_flags': [
+           '-pipe',
+           '-Wall',
+-          '-Werror',
+           '-W',
+           '-fPIC',
+           '-Wno-unused-variable',
+@@ -86,7 +85,6 @@
+       ],
+       'defines': [
+         '_REENTRANT',
+-        'QT_STATICPLUGIN',
+         'QT_PLUGIN',
+       ],
+       'cflags_c': [
+diff --git a/Telegram/gyp/modules/qt.gypi b/Telegram/gyp/modules/qt.gypi
 index 0b783ec21..3f917765a 100644
---- a/Telegram/gyp/qt.gypi
-+++ b/Telegram/gyp/qt.gypi
+--- a/Telegram/gyp/modules/qt.gypi
++++ b/Telegram/gyp/modules/qt.gypi
 @@ -14,25 +14,21 @@
                [ 'build_macold', {
                  'qt_version%': '5.3.2',
@@ -390,11 +357,11 @@ index 0b783ec21..3f917765a 100644
          '-pthread',
          '-rdynamic',
        ],
-diff --git a/Telegram/gyp/qt_moc.gypi b/Telegram/gyp/qt_moc.gypi
-index 464d3c818..f350da8f3 100644
---- a/Telegram/gyp/qt_moc.gypi
-+++ b/Telegram/gyp/qt_moc.gypi
-@@ -12,7 +12,7 @@
+diff --git a/Telegram/gyp/modules/qt_moc.gypi b/Telegram/gyp/modules/qt_moc.gypi
+index ebee90a15..75424d4bb 100644
+--- a/Telegram/gyp/modules/qt_moc.gypi
++++ b/Telegram/gyp/modules/qt_moc.gypi
+@@ -15,7 +15,7 @@
        '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/moc/moc_<(RULE_INPUT_ROOT).cpp',
      ],
      'action': [
@@ -403,10 +370,10 @@ index 464d3c818..f350da8f3 100644
  
        # Silence "Note: No relevant classes found. No output generated."
        '--no-notes',
-diff --git a/Telegram/gyp/qt_rcc.gypi b/Telegram/gyp/qt_rcc.gypi
+diff --git a/Telegram/gyp/modules/qt_rcc.gypi b/Telegram/gyp/modules/qt_rcc.gypi
 index f5624a82b..1129a95c5 100644
---- a/Telegram/gyp/qt_rcc.gypi
-+++ b/Telegram/gyp/qt_rcc.gypi
+--- a/Telegram/gyp/modules/qt_rcc.gypi
++++ b/Telegram/gyp/modules/qt_rcc.gypi
 @@ -15,7 +15,7 @@
        '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/qrc/qrc_<(RULE_INPUT_ROOT).cpp',
      ],
@@ -416,89 +383,53 @@ index f5624a82b..1129a95c5 100644
        '-name', '<(RULE_INPUT_ROOT)',
        '-no-compress',
        '<(RULE_INPUT_PATH)',
-diff --git a/Telegram/gyp/settings_linux.gypi b/Telegram/gyp/settings_linux.gypi
-index 17219fa2c..6853b5c3e 100644
---- a/Telegram/gyp/settings_linux.gypi
-+++ b/Telegram/gyp/settings_linux.gypi
-@@ -11,7 +11,6 @@
-         'linux_common_flags': [
-           '-pipe',
-           '-Wall',
--          '-Werror',
-           '-W',
-           '-fPIC',
-           '-Wno-unused-variable',
-@@ -60,7 +59,6 @@
+diff --git a/Telegram/gyp/telegram/linux.gypi b/Telegram/gyp/telegram/linux.gypi
+index 385f2b89f..f3ddf7e83 100644
+--- a/Telegram/gyp/telegram/linux.gypi
++++ b/Telegram/gyp/telegram/linux.gypi
+@@ -19,27 +19,21 @@
+         #'xkbcommon',
        ],
-       'defines': [
-         '_REENTRANT',
--        'QT_STATICPLUGIN',
-         'QT_PLUGIN',
-       ],
-       'cflags_c': [
-diff --git a/Telegram/gyp/telegram_linux.gypi b/Telegram/gyp/telegram_linux.gypi
-index ffe0e5a96..bd2ed758f 100644
---- a/Telegram/gyp/telegram_linux.gypi
-+++ b/Telegram/gyp/telegram_linux.gypi
-@@ -23,10 +23,11 @@
-       'linux_path_va%': '/usr/local',
-       'linux_path_vdpau%': '/usr/local',
-       'linux_path_breakpad%': '/usr/local',
--      'linux_path_opus_include%': '<(libs_loc)/opus/include',
-+      'linux_path_opus_include%': '/usr/include/opus',
-       'linux_path_range%': '/usr/local',
      },
-     'include_dirs': [
-+      '/usr/include/openssl',
-       '/usr/local/include',
-       '<(linux_path_ffmpeg)/include',
-       '<(linux_path_openal)/include',
-@@ -35,6 +36,7 @@
-       '<(linux_path_range)/include',
-     ],
-     'library_dirs': [
++    'library_dirs': [
++      '/usr/lib',
 +      '/usr/lib/openssl',
-       '/usr/local/lib',
-       '<(linux_path_ffmpeg)/lib',
-       '<(linux_path_openal)/lib',
-@@ -43,26 +45,16 @@
-       '<(linux_path_breakpad)/lib',
-     ],
++    ],
      'libraries': [
--      'breakpad_client',
--      'composeplatforminputcontextplugin',
--      'ibusplatforminputcontextplugin',
--      'fcitxplatforminputcontextplugin',
--      'himeplatforminputcontextplugin',
--      'nimfplatforminputcontextplugin',
--      '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',
-+      'minizip',
-+      'opus',
-+      'z',
-+      'lzma',
+-      '-lbreakpad_client',
+-      '-lcomposeplatforminputcontextplugin',
+-      '-libusplatforminputcontextplugin',
+-      '-lfcitxplatforminputcontextplugin',
+-      '-lhimeplatforminputcontextplugin',
+-      '-lnimfplatforminputcontextplugin',
+-      '-llzma',
+       '-lopenal',
+       '-lavformat',
+       '-lavcodec',
+       '-lswresample',
+       '-lswscale',
+       '-lavutil',
++      '-lminizip',
+       '-lopus',
+-      '-lva-x11',
+-      '-lva-drm',
+-      '-lva',
+-      '-lvdpau',
+-      '-ldrm',
+       '-lz',
++      '-llzma',
  #      '<!(pkg-config 2> /dev/null --libs <@(pkgconfig_libs))',
      ],
      'cflags_cc': [
-@@ -97,9 +89,8 @@
+@@ -51,7 +45,6 @@
+       '-Wl,-wrap,secure_getenv',
+       '-Wl,-wrap,clock_gettime',
+       '-Wl,--no-as-needed,-lrt',
+-      '-Wl,-Bstatic',
+     ],
+     'configurations': {
+       'Release': {
+@@ -75,9 +68,8 @@
          ],
        }], ['not_need_gtk!="True"', {
          'cflags_cc': [
@@ -510,13 +441,13 @@ index ffe0e5a96..bd2ed758f 100644
          ],
        }], ['<!(pkg-config ayatana-appindicator3-0.1; echo $?) == 0', {
          'cflags_cc': [ '<!(pkg-config --cflags ayatana-appindicator3-0.1)' ],
-diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt
-index f02296c8a..46bd016dd 100644
---- a/Telegram/gyp/telegram_sources.txt
-+++ b/Telegram/gyp/telegram_sources.txt
-@@ -755,14 +755,7 @@
- <(emoji_suggestions_loc)/emoji_suggestions.cpp
- <(emoji_suggestions_loc)/emoji_suggestions.h
+diff --git a/Telegram/gyp/telegram/sources.txt b/Telegram/gyp/telegram/sources.txt
+index 38d9d0e64..459919abf 100644
+--- a/Telegram/gyp/telegram/sources.txt
++++ b/Telegram/gyp/telegram/sources.txt
+@@ -863,14 +863,7 @@
+ <(src_loc)/settings.cpp
+ <(src_loc)/settings.h
  
 -platforms: !win
 -<(minizip_loc)/crypt.h
@@ -530,4 +461,6 @@ index f02296c8a..46bd016dd 100644
  
  platforms: win
  <(res_loc)/winrc/Telegram.rc
+--
+2.23.0
 
diff --git a/testing/telegram-desktop/0005-system-wide-fonts.patch b/testing/telegram-desktop/0005-system-wide-fonts.patch
index c89222986b..0c21acc83f 100644
--- a/testing/telegram-desktop/0005-system-wide-fonts.patch
+++ b/testing/telegram-desktop/0005-system-wide-fonts.patch
@@ -1,34 +1,33 @@
-Description: Remove links to packaged Open Sans font
- This makes Telegram Desktop use system-wide fonts.
- Warnings about non-existent fonts in resources are also disabled.
-Author: Nicholas Guriev <guriev-ns@ya.ru>
-Bug-Debian: https://bugs.debian.org/890341
-Last-Update: Sat, 31 Mar 2018 14:36:39 +0300
-
---- a/Telegram/Resources/qrc/telegram.qrc
-+++ b/Telegram/Resources/qrc/telegram.qrc
-@@ -42,9 +42,6 @@
-     <file alias="js/script.js">../export_html/js/script.js</file>
-   </qresource>
+diff --git a/Telegram/Resources/qrc/fonts.qrc b/Telegram/Resources/qrc/fonts.qrc
+index 233b8d572..122d89140 100644
+--- a/Telegram/Resources/qrc/fonts.qrc
++++ b/Telegram/Resources/qrc/fonts.qrc
+@@ -1,7 +1,4 @@
+ <RCC>
    <qresource prefix="/gui">
 -    <file alias="fonts/OpenSans-Regular.ttf">../fonts/OpenSans-Regular.ttf</file>
 -    <file alias="fonts/OpenSans-Bold.ttf">../fonts/OpenSans-Bold.ttf</file>
 -    <file alias="fonts/OpenSans-Semibold.ttf">../fonts/OpenSans-Semibold.ttf</file>
-     <file alias="art/bg.jpg">../art/bg.jpg</file>
-     <file alias="art/bg_initial.jpg">../art/bg_initial.jpg</file>
-     <file alias="art/logo_256.png">../art/logo_256.png</file>
---- a/Telegram/SourceFiles/ui/twidget.cpp
-+++ b/Telegram/SourceFiles/ui/twidget.cpp
-@@ -70,9 +70,9 @@ void Start() {
+   </qresource>
+ </RCC>
+diff --git a/Telegram/SourceFiles/ui/style/style_core_font.cpp b/Telegram/SourceFiles/ui/style/style_core_font.cpp
+index 22ccfea7e..36f271f93 100644
+--- a/Telegram/SourceFiles/ui/style/style_core_font.cpp
++++ b/Telegram/SourceFiles/ui/style/style_core_font.cpp
+@@ -84,9 +84,9 @@ void StartFonts() {
  	}
  	Started = true;
  
--	auto regular = LoadCustomFont(qsl(":/gui/fonts/OpenSans-Regular.ttf"), qsl("Open Sans"));
--	auto bold = LoadCustomFont(qsl(":/gui/fonts/OpenSans-Bold.ttf"), qsl("Open Sans"), style::internal::FontBold);
--	auto semibold = LoadCustomFont(qsl(":/gui/fonts/OpenSans-Semibold.ttf"), qsl("Open Sans Semibold"));
-+	auto regular = ValidateFont(qsl("Open Sans"));
-+	auto bold = ValidateFont(qsl("Open Sans"), style::internal::FontBold);
-+	auto semibold = ValidateFont(qsl("Open Sans Semibold"));
+-	auto regular = LoadCustomFont(":/gui/fonts/OpenSans-Regular.ttf", "Open Sans");
+-	auto bold = LoadCustomFont(":/gui/fonts/OpenSans-Bold.ttf", "Open Sans", style::internal::FontBold);
+-	auto semibold = LoadCustomFont(":/gui/fonts/OpenSans-Semibold.ttf", "Open Sans Semibold");
++        auto regular = ValidateFont("Open Sans");
++        auto bold = ValidateFont("Open Sans", style::internal::FontBold);
++        auto semibold = ValidateFont("Open Sans Semibold");
  
  #ifdef Q_OS_WIN
  	// Attempt to workaround a strange font bug with Open Sans Semibold not loading.
+-- 
+2.23.0
+
+
diff --git a/testing/telegram-desktop/0009-lz4.patch b/testing/telegram-desktop/0009-lz4.patch
index e87097abec..7bd0d2524d 100644
--- a/testing/telegram-desktop/0009-lz4.patch
+++ b/testing/telegram-desktop/0009-lz4.patch
@@ -33,3 +33,16 @@ index ada149e..870f4e6 100644
        '<(submodules_loc)/variant/include',
        '<(submodules_loc)/crl/src',
 
+diff --git a/Telegram/gyp/telegram/linux.gypi b/Telegram/gyp/telegram/linux.gypi
+index 9349c68..087c424 100644
+--- a/Telegram/gyp/telegram/linux.gypi
++++ b/Telegram/gyp/telegram/linux.gypi
+@@ -34,6 +34,7 @@
+       '-lopus',
+       '-lz',
+       '-llzma',
++	  '-llz4',
+ #      '<!(pkg-config 2> /dev/null --libs <@(pkgconfig_libs))',
+     ],
+     'cflags_cc': [
+
diff --git a/testing/telegram-desktop/0013-lz4.patch b/testing/telegram-desktop/0013-lz4.patch
deleted file mode 100644
index f7426ebe7e..0000000000
--- a/testing/telegram-desktop/0013-lz4.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Telegram/gyp/telegram_linux.gypi b/Telegram/gyp/telegram_linux.gypi
-index bd2ed75..cd0bc59 100644
---- a/Telegram/gyp/telegram_linux.gypi
-+++ b/Telegram/gyp/telegram_linux.gypi
-@@ -55,6 +55,7 @@
-       'opus',
-       'z',
-       'lzma',
-+	  'lz4',
- #      '<!(pkg-config 2> /dev/null --libs <@(pkgconfig_libs))',
-     ],
-     'cflags_cc': [
-
diff --git a/testing/telegram-desktop/0014-clock_gettime.patch b/testing/telegram-desktop/0014-clock_gettime.patch
index 5458c8c327..6b74352928 100644
--- a/testing/telegram-desktop/0014-clock_gettime.patch
+++ b/testing/telegram-desktop/0014-clock_gettime.patch
@@ -1,7 +1,7 @@
-diff --git a/Telegram/gyp/qt.gypi b/Telegram/gyp/qt.gypi
+diff --git a/Telegram/gyp/modules/qt.gypi b/Telegram/gyp/modules/qt.gypi
 index c7dff28..c674dc0 100644
---- a/Telegram/gyp/qt.gypi
-+++ b/Telegram/gyp/qt.gypi
+--- a/Telegram/gyp/modules/qt.gypi
++++ b/Telegram/gyp/modules/qt.gypi
 @@ -176,14 +176,10 @@
    ],
    'conditions': [
@@ -17,11 +17,11 @@ index c7dff28..c674dc0 100644
          '<@(qt_libs_release)',
          '-lcrypto',
          '-lX11',
-diff --git a/Telegram/gyp/telegram_linux.gypi b/Telegram/gyp/telegram_linux.gypi
-index cd0bc59..5eb5ae9 100644
---- a/Telegram/gyp/telegram_linux.gypi
-+++ b/Telegram/gyp/telegram_linux.gypi
-@@ -63,9 +63,6 @@
+diff --git a/Telegram/gyp/telegram/linux.gypi b/Telegram/gyp/telegram/linux.gypi
+index f3ddf7e..9349c68 100644
+--- a/Telegram/gyp/telegram/linux.gypi
++++ b/Telegram/gyp/telegram/linux.gypi
+@@ -41,9 +41,6 @@
        '-Wno-maybe-uninitialized',
      ],
      'ldflags': [
@@ -31,7 +31,7 @@ index cd0bc59..5eb5ae9 100644
        '-Wl,--no-as-needed,-lrt',
      ],
      'configurations': {
-@@ -85,9 +82,6 @@
+@@ -63,9 +60,6 @@
      },
      'conditions': [
        [ '"<!(uname -p)" != "x86_64"', {
diff --git a/testing/telegram-desktop/0016-no-gtk2.patch b/testing/telegram-desktop/0016-no-gtk2.patch
index 12317a8847..e60038d0e8 100644
--- a/testing/telegram-desktop/0016-no-gtk2.patch
+++ b/testing/telegram-desktop/0016-no-gtk2.patch
@@ -1,8 +1,8 @@
 diff --git a/Telegram/SourceFiles/platform/linux/linux_libs.cpp b/Telegram/SourceFiles/platform/linux/linux_libs.cpp
-index f8d74fee1..c9d059fa6 100644
+index 5071d63d1..671d0e661 100644
 --- a/Telegram/SourceFiles/platform/linux/linux_libs.cpp
 +++ b/Telegram/SourceFiles/platform/linux/linux_libs.cpp
-@@ -240,24 +240,12 @@ void start() {
+@@ -243,24 +243,12 @@ void start() {
  			indicatorLoaded = setupAppIndicator(lib_indicator);
  		}
  	}
@@ -27,4 +27,6 @@ index f8d74fee1..c9d059fa6 100644
  	}
  
  	if (gtkLoaded) {
+-- 
+2.23.0
 
diff --git a/testing/telegram-desktop/APKBUILD b/testing/telegram-desktop/APKBUILD
index 55faee72fe..b4b40334aa 100644
--- a/testing/telegram-desktop/APKBUILD
+++ b/testing/telegram-desktop/APKBUILD
@@ -2,7 +2,7 @@
 # Contributor: Leo <thinkabit.ukim@gmail.com>
 # TODO(Leo): remove pulseaudio dep, use system xxhash
 pkgname=telegram-desktop
-pkgver=1.8.8
+pkgver=1.8.15
 # https://github.com/telegramdesktop/tdesktop/blob/v$pkgver/docs/building-cmake.md
 _catch2_commit=5ca44b68721833ae3731802ed99af67c6f38a53a
 _gsl_commit=d846fe50a3f0bb7767c7e087a05f4be95f4da0ec
@@ -11,7 +11,7 @@ _libtgvoip_commit=d4a0f719ffd8d29e88474f67abc9fc862661c3b9
 _rlottie_commit=589db026ec211bc4979e3bffe074f6e48ce7cedc
 _variant_commit=550ac2f159ca883d360c196149b466955c77a573
 _xxhash_commit=7cc9639699f64b750c0b82333dced9ea77e8436e
-pkgrel=1
+pkgrel=0
 pkgdesc="Telegram Desktop messaging app"
 options="!check" # Requires Catch2 to be packaged.
 url="https://desktop.telegram.org/"
@@ -19,6 +19,7 @@ arch="all !s390x" # ARM are failing due to range-v3
 license="GPL-3.0-or-later WITH OpenSSL"
 depends="qt5-qtimageformats libappindicator"
 makedepends="
+	dos2unix
 	gyp
 	grep
 	cmake
@@ -64,10 +65,10 @@ source="
 	0006-ppc64le-enable-arch.patch
 	0009-lz4.patch
 	0010-libtgvoip.patch
-	0013-lz4.patch
 	0014-clock_gettime.patch
 	0015-revert-headers.patch
 	0016-no-gtk2.patch
+	minizip-includes.patch
 	"
 builddir="$srcdir/tdesktop-$pkgver"
 
@@ -92,25 +93,14 @@ prepare() {
 	cd "$builddir/Telegram/ThirdParty"
 	rm -rf minizip lz4 # we have these system-wide
 
+	dos2unix "$builddir/.appveyor/install.bat"
+
 	default_prepare
 
+	unix2dos "$builddir/.appveyor/install.bat"
+
 	# disable static-qt for rlottie
 	sed "/RLOTTIE_WITH_STATIC_QT/d" -i "$builddir/Telegram/gyp/lib_rlottie.gyp"
-
-	# fix C++ ranges::sized_iterator_range
-	sed -e "s/ranges::make_iterator_range/ranges::subrange/g" \
-		-i "$builddir/Telegram/SourceFiles/data/data_channel.cpp" \
-		-i "$builddir/Telegram/SourceFiles/chat_helpers/emoji_keywords.cpp" \
-		-i "$builddir/Telegram/SourceFiles/media/streaming/media_streaming_reader.cpp" \
-		-i "$builddir/Telegram/SourceFiles/ui/widgets/input_fields.cpp" \
-		-i "$builddir/Telegram/SourceFiles/ui/text/text_entity.cpp"
-
-	sed -e "s/make_iterator_range/ranges::subrange/g" \
-		-i "$builddir/Telegram/SourceFiles/history/history_inner_widget.cpp"
-
-	sed -e "/int remainder = 0;/a inline bool operator==(const PercentCounterItem &o) const { return !(*this < o) && !(o < *this);}" \
-		-i "$builddir/Telegram/SourceFiles/history/view/media/history_view_poll.cpp"
-
 }
 
 build() {
@@ -155,7 +145,7 @@ package() {
 	done
 }
 
-sha512sums="8410f8ea31c4e5604c3f9e8965431ec9cf68ec3366da22bb1fc5e745d7518cb49374072ecb70d347714f3f2fefdf882dc05e14ccd4a883b5a96eacf0a87e1c53  telegram-desktop-1.8.8.tar.gz
+sha512sums="d31fbcc6737a4a00c0d17b000d82cb9c7038aae19a2ea2692a6707623cf83ccd0327d6ff06e4a330a0197073ca9a63b90ebb3d046312b74aaeec318571767a6d  telegram-desktop-1.8.15.tar.gz
 14eaadcb4ec25e7d603d3965f8dc003f0509bc215916e0f5e092564c76d2a440a8edc9e5e61ae279c0b18edffaa401df6aedc766c1e7355357bfb1c95e2b5f50  libtgvoip-d4a0f719ffd8d29e88474f67abc9fc862661c3b9.tar.gz
 83560cb0c39b6a4781e916c6081ad2728296e1b19760ca1b6426a8431fb6d7093760a882c539dd77152f5892fe081b1795af6366ea91385bb10aba6adf27170f  GSL-d846fe50a3f0bb7767c7e087a05f4be95f4da0ec.tar.gz
 537ce0a1731274da63a5be063311f7113c1391081e43970663a994b82a7b2e860302406c2931184789661d86343b2c60064c7014b73dc42799573f5b93bc12ff  variant-550ac2f159ca883d360c196149b466955c77a573.tar.gz
@@ -163,16 +153,16 @@ cfe28a69cff822fab8ebb4379b105e3d69e610614359ba7b6b91cbf676c23067f75d34f259500ab7
 60f2020b103fc2090d3c89f9ba5aeeba5be2d9e01f1954a4abbd7fdfe8ca64c28e86ead1646292bd9b5cb8beb9cb25d8ab077405ebe286007a437ea969ec4a0a  rlottie-589db026ec211bc4979e3bffe074f6e48ce7cedc.tar.gz
 5b151e0a8c4594b19258a8aade7132521ffbdc97233c9d4a0e5cb2ea31eb9cb3ee51769884a8a08ab821571215ff32854bd76d2929e3b4c14a39e56657109dd6  Catch2-5ca44b68721833ae3731802ed99af67c6f38a53a.tar.gz
 cada36066c14ed735f8f45a2d1e0c2d1bdb564dc18154aaabc12552d41065426d88cdeb8a67b8e697678b01f2e415c0a6caf428baa591d013739d7ac95048d4d  xxhash-7cc9639699f64b750c0b82333dced9ea77e8436e.tar.gz
-c81d82c65fb78e4832aaaa0aff3d33a1f235f0f213a115a8f7aded79f249f5724b3fb8f4cc1493fb06848a7ae4568bfd875a34f4f4c757a7a12c10d1f3603103  CMakeLists.inj
+5361828c11d3653552db28d4695891766468a7b785611da5b33a8865e953a9e2c0dac79601bf2b2098f496bdccfdf4d8ede45d466e0187c18b23336d8e5dfddf  CMakeLists.inj
 74e8adfe9cb6c224b12fb653798be1abb55cff40f326a9542e5ae23fb82b57a117b5f74dc8a2af80efcd8e261bbbc46c8e5c10fdb6a55ae3196429fd67afd183  0001-musl.patch
-06da4b11ecbaba1f7c46e0afed97abc4b9817349492d947834d40e9e81a4dde43a5223721a6350f5fb34df0997d6ee0ae50558e0899c2ccccfabce5bbb7ddf90  0002-tdesktop.patch
+d9812a06ae4cf3599e74a77ff23b94519cf1469c0ace5dade886f8cddeb0a72e037e82ab6bc61aa587702329a4521ed296173f8b5cf771430021e172c53885f3  0002-tdesktop.patch
 6289d5a3eb224ebb05ab64e23ca3d081e617d905cec07edbba423265dc617548005eeb643ce5dfb2fcef9ac774e9f7b64150729bd894ca0e94af0e2aea9c823b  0003-fix-missing-use-of-pch.patch
 8de8c0508177da5fcac4f2dcee4d8baef4b99f74f1dca296567bc3689a6bd17a47c1c945df504abc8811b82a687010d0709503c7c32e47d2ebb1cf0e374c80c5  0004-xdg.patch
-ce6be003220267bac5483caf8302b492e1581892bc36d35a61236ebf9f9d766b8bd2159557a1c36256aa85f461797a38bfaae57b12da7a72101b21c0b17ed653  0005-system-wide-fonts.patch
+0a6104710a2d98ba38b97e0a35c08f17d86ece05090d89d9de17b88652bcf6035c13cff31f48f94d9caa4e80bfb9d87448c88ce4c282ff972312daf819f7437d  0005-system-wide-fonts.patch
 3647ad5fff6326ba9c75fa98189a08c0909af8d1c2b704c8c62fd9da6603f5162af3176c37daa67eb5896bebe3814bf1fd66b9e93c78cbd9b439e472d0db4b44  0006-ppc64le-enable-arch.patch
-d4ef17600e095b753bcbc4df0078cc025dd235056a8f4946183fc5416e0452bceac020badda60221b98b410261c5aaef72d18e8abc82781257e8075a133908f6  0009-lz4.patch
+d1fc59b573c857a64607a8d08e916ab668facd01404cabe1c7ea451e272133c8819c79b71635df9a23292a8c1c0ebd4d8b95ffe6cbcaaf831726b8af18486bab  0009-lz4.patch
 7d5642672f42f435e206acd047a20b7e38346ed95548f16c0059913546e4e4f54a58927fccb8c1da8e43b6a691bbce2a9608d0db032774d7874d4800e7202d53  0010-libtgvoip.patch
-aaff642634f42ba017ac94a2c2cd7df595d0a304a62f5f46dbec82e2c88c00a8cfd6346b2809013228f47f301aedf94e10e77197eebefa26b6df81267e8b1a64  0013-lz4.patch
-ab6ef737712cbc934a908aabb57332a4d207c223f50f0108668b8c3c9fd07cd840845ef99c0dc18dca2139f476fcb0309f99058af710ffaf1272023d1d2f1ab4  0014-clock_gettime.patch
+e1a3c7c7d593dc50b234202e9fdf5ff145a105b828a8373d4e52009c395e26b10faa58bb028a44aaf122debe1ed60a7e66033687fac686f13c4455084da986df  0014-clock_gettime.patch
 d564ee17a610864b1708f7ad1050804e24921b8bb3c4da9713f804b3738ba63d6ee0e594b3fe7c28d0fb9a082a22021b1c7f2b60498265bbca08e89775a4f60a  0015-revert-headers.patch
-b5ecc802ea8cf7e33b29d6d63496537a83e9410ed95288446d783ab2899f7e499fbd02663705b1b85381760468063f6852ae212b141863304e7f71b9dcaa7149  0016-no-gtk2.patch"
+117b0c2bae3d3d3aa94d41382621be4e05c3314a2831dba59e1bcfb443e7b8ff4bcd0403544fa0cb6def85b444146bf59eef9da25f96b041d3ce8f5429b4a867  0016-no-gtk2.patch
+99e3e72a93473b45f2912ed1c553662506c5e332c949b5e879965309bcdf6f8735836a51a0f72ebec617f1afd9cad615cc62dfd57a584d79a0d421066167c3d9  minizip-includes.patch"
diff --git a/testing/telegram-desktop/CMakeLists.inj b/testing/telegram-desktop/CMakeLists.inj
index e929497334..169bf20d2f 100644
--- a/testing/telegram-desktop/CMakeLists.inj
+++ b/testing/telegram-desktop/CMakeLists.inj
@@ -12,6 +12,7 @@ add_precompiled_header(lib_base ../../Telegram/SourceFiles/base/base_pch.h)
 add_precompiled_header(lib_export ../../Telegram/SourceFiles/export/export_pch.h)
 add_precompiled_header(lib_storage ../../Telegram/SourceFiles/storage/storage_pch.h)
 add_precompiled_header(lib_mtproto ../../Telegram/SourceFiles/mtproto/mtp_pch.h)
+add_precompiled_header(lib_ui ../../Telegram/SourceFiles/ui/ui_pch.h)
 
 # You can discover new PCHs using this link:
 # https://github.com/telegramdesktop/tdesktop/search?q=pch_header&unscoped_q=pch_header
diff --git a/testing/telegram-desktop/minizip-includes.patch b/testing/telegram-desktop/minizip-includes.patch
new file mode 100644
index 0000000000..49d814d920
--- /dev/null
+++ b/testing/telegram-desktop/minizip-includes.patch
@@ -0,0 +1,16 @@
+diff --git a/Telegram/SourceFiles/base/zlib_help.h b/Telegram/SourceFiles/base/zlib_help.h
+index 8c0147c..bca4c72 100644
+--- a/Telegram/SourceFiles/base/zlib_help.h
++++ b/Telegram/SourceFiles/base/zlib_help.h
+@@ -10,8 +10,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+ */
+ #pragma once
+ 
+-#include "zip.h"
+-#include "unzip.h"
++#include "minizip/zip.h"
++#include "minizip/unzip.h"
+ #include "logs.h"
+ 
+ #ifdef small
+