update to 1.5.1-1, sync with [community]

5 files changed, 110 insertions, 90 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ef92ce0d529f..82400f591944 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = telegram-desktop-systemqt-notoemoji
 	pkgdesc = Official Telegram Desktop client (with noto emoji)
-	pkgver = 1.4.8
+	pkgver = 1.5.1
 	pkgrel = 1
 	url = https://desktop.telegram.org/
 	arch = x86_64
@@ -21,7 +21,7 @@ pkgbase = telegram-desktop-systemqt-notoemoji
 	optdepends = libnotify: desktop notifications
 	provides = telegram-desktop
 	conflicts = telegram-desktop
-	source = tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#tag=v1.4.8
+	source = tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#tag=v1.5.1
 	source = libtgvoip::git+https://github.com/telegramdesktop/libtgvoip
 	source = variant::git+https://github.com/mapbox/variant
 	source = Catch::git+https://github.com/philsquared/Catch
@@ -35,6 +35,8 @@ pkgbase = telegram-desktop-systemqt-notoemoji
 	source = tdesktop.patch
 	source = no-gtk2.patch
 	source = libtgvoip.patch
+	source = demibold.patch
+	source = Use-system-wide-font.patch
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
@@ -46,9 +48,11 @@ pkgbase = telegram-desktop-systemqt-notoemoji
 	sha512sums = fa7042f370ae4e2e14d083395743cdee25bfedc39ab5273b5d1ab12fb074757cf76dab065f2abcb44cad018920e711142fbf24a2b9cd30f517c5a5b46d6a6182
 	sha512sums = b87414ceaae19185a8a5749cea1f6d9f3fc3c69b8dd729e3db8790cde00b987c3c827cd30baf0eac579d1884e34aa2f37bb90778c3c0bc9ca211d75a82891b9d
 	sha512sums = b20674f61ff6378749d1f59a6a0da194d33ccc786bd783f6ed62027924a3a8a8d27c9763bf376480432d6536896b0c7eeb8c495c5b8cefff7cf5fe84da50947e
-	sha512sums = 26158910692f37f2f340165a194c2c4a4aedc5da140d80f877fecb9a6f577b15a7083468ed53ec9a915e581794ed82dec2b2b3751c017a3cc32f9ed65066e3fe
+	sha512sums = d85caca626a11aab15d5d443912dd48b5b6797409ecd1d6b34618a77bd969c33170bcdee3b43f9c1acce1b91dc0fe3b1c3bdefb2d567a0e085ee924bcede83c2
 	sha512sums = a8f1708616a598fea3cb94e3b63b02a7b13b55abd129a5dc02ad502529f4ebe7a673b6a350b669290fd26135358d21e2e10bf4a11d88f58f0685b7c4ab515bc5
 	sha512sums = d60694dc701aa985b0e82a12c9732b945082470441c687b33167a94f94efcf253baf43bb7280ec160ba338485ee5c62de138e4804cae05f27cc5cf4298166d39
+	sha512sums = 6d0bac5aa4c4992b5400a9a9318f7a4e92d5eab961917cf0b05cdd251ab66a77c52ec8fbef246e8019606a7624d7b5420b87f8153e071e9724c7d2f5c94e47c0
+	sha512sums = ce6be003220267bac5483caf8302b492e1581892bc36d35a61236ebf9f9d766b8bd2159557a1c36256aa85f461797a38bfaae57b12da7a72101b21c0b17ed653
 
 pkgname = telegram-desktop-systemqt-notoemoji
 
diff --git a/PKGBUILD b/PKGBUILD
index b106e43c2062..d2d03588eb9f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,13 +5,8 @@
 # Thanks Nicholas Guriev <guriev-ns@ya.ru> for the patches!
 # https://github.com/mymedia2/tdesktop
 
-# Telegram API credentials. The defaults below are Telegram's test keys.
-# You may use you your own here for better API performance
-_api_id='17349'
-_api_hash='344583e45741c457fe1862106095a5eb'
-
 pkgname=telegram-desktop-systemqt-notoemoji
-pkgver=1.4.8
+pkgver=1.5.1
 pkgrel=1
 pkgdesc='Official Telegram Desktop client (with noto emoji)'
 arch=('x86_64')
@@ -39,6 +34,8 @@ source=(
     "tdesktop.patch"
     "no-gtk2.patch"
     "libtgvoip.patch"
+    "demibold.patch"
+    "Use-system-wide-font.patch"
 )
 sha512sums=('SKIP'
             'SKIP'
@@ -51,9 +48,11 @@ sha512sums=('SKIP'
             'fa7042f370ae4e2e14d083395743cdee25bfedc39ab5273b5d1ab12fb074757cf76dab065f2abcb44cad018920e711142fbf24a2b9cd30f517c5a5b46d6a6182'
             'b87414ceaae19185a8a5749cea1f6d9f3fc3c69b8dd729e3db8790cde00b987c3c827cd30baf0eac579d1884e34aa2f37bb90778c3c0bc9ca211d75a82891b9d'
             'b20674f61ff6378749d1f59a6a0da194d33ccc786bd783f6ed62027924a3a8a8d27c9763bf376480432d6536896b0c7eeb8c495c5b8cefff7cf5fe84da50947e'
-            '26158910692f37f2f340165a194c2c4a4aedc5da140d80f877fecb9a6f577b15a7083468ed53ec9a915e581794ed82dec2b2b3751c017a3cc32f9ed65066e3fe'
+            'd85caca626a11aab15d5d443912dd48b5b6797409ecd1d6b34618a77bd969c33170bcdee3b43f9c1acce1b91dc0fe3b1c3bdefb2d567a0e085ee924bcede83c2'
             'a8f1708616a598fea3cb94e3b63b02a7b13b55abd129a5dc02ad502529f4ebe7a673b6a350b669290fd26135358d21e2e10bf4a11d88f58f0685b7c4ab515bc5'
-            'd60694dc701aa985b0e82a12c9732b945082470441c687b33167a94f94efcf253baf43bb7280ec160ba338485ee5c62de138e4804cae05f27cc5cf4298166d39')
+            'd60694dc701aa985b0e82a12c9732b945082470441c687b33167a94f94efcf253baf43bb7280ec160ba338485ee5c62de138e4804cae05f27cc5cf4298166d39'
+            '6d0bac5aa4c4992b5400a9a9318f7a4e92d5eab961917cf0b05cdd251ab66a77c52ec8fbef246e8019606a7624d7b5420b87f8153e071e9724c7d2f5c94e47c0'
+            'ce6be003220267bac5483caf8302b492e1581892bc36d35a61236ebf9f9d766b8bd2159557a1c36256aa85f461797a38bfaae57b12da7a72101b21c0b17ed653')
 
 prepare() {
     cd "$srcdir/tdesktop"
@@ -69,6 +68,8 @@ prepare() {
     set -x
     patch -Np1 -i "$srcdir/tdesktop.patch"
     patch -Np1 -i "$srcdir/no-gtk2.patch"
+    patch -R -Np1 -i "$srcdir/demibold.patch"
+    patch -Np1 -i "$srcdir/Use-system-wide-font.patch"
 
     # speed up builds: disable debugging information and use parallel LTO
     sed "s/@NPROC@/$(nproc)/g" "$srcdir/build-time-optimize.patch.in" >"$srcdir/build-time-optimize.patch"
@@ -84,13 +85,21 @@ prepare() {
 build() {
     cd "$srcdir/tdesktop"
     export LANG=en_US.UTF-8
-    export GYP_DEFINES="TDESKTOP_DISABLE_CRASH_REPORTS,TDESKTOP_DISABLE_AUTOUPDATE,TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME"
+    export GYP_DEFINES="TDESKTOP_DISABLE_CRASH_REPORTS,TDESKTOP_DISABLE_AUTOUPDATE,TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME,TDESKTOP_DISABLE_DESKTOP_FILE_GENERATION"
     export EXTRA_FLAGS="-Winvalid-pch"
     export CPPFLAGS="$CPPFLAGS $EXTRA_FLAGS"
     export CXXFLAGS="$CXXFLAGS $EXTRA_FLAGS"
+
+    # Telegram requires us to set API_ID and API_HASH for some reason but they do not provide a way to receive a pair
+    # See https://github.com/telegramdesktop/tdesktop/commit/65b2db216033aa08b7bc846df27843e566f08981 and
+    # https://github.com/telegramdesktop/tdesktop/issues/4717
+    # The official API_ID seems to be 2040 while the API_HASH is "b18441a1ff607e10a989891a5462e627".
+    # We're going to use the defaults for now but might at some point use the official ones from the official binaries as noted above.
+
     gyp \
+        -Dapi_id=17349 \
+        -Dapi_hash=344583e45741c457fe1862106095a5eb \
         -Dbuild_defines=${GYP_DEFINES} \
-        -Dapi_id=${_api_id} -Dapi_hash=${_api_hash} \
         -Gconfig=Release \
         --depth=Telegram/gyp --generator-output=../.. -Goutput_dir=out Telegram/gyp/Telegram.gyp --format=cmake
     NUM=$((`wc -l < out/Release/CMakeLists.txt` - 2))
diff --git a/Use-system-wide-font.patch b/Use-system-wide-font.patch
new file mode 100644
index 000000000000..c89222986bc3
--- /dev/null
+++ b/Use-system-wide-font.patch
@@ -0,0 +1,34 @@
+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>
+   <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() {
+ 	}
+ 	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"));
+ 
+ #ifdef Q_OS_WIN
+ 	// Attempt to workaround a strange font bug with Open Sans Semibold not loading.
diff --git a/demibold.patch b/demibold.patch
new file mode 100644
index 000000000000..e5963f577c19
--- /dev/null
+++ b/demibold.patch
@@ -0,0 +1,27 @@
+commit 310c68a744ae8163c96b88944d96a6f6b14b3cdf
+Author: John Preston <johnprestonmail@gmail.com>
+Date:   Wed Dec 5 14:42:19 2018 +0400
+
+    Disable DemiBold fallback for Semibold.
+    
+    This reverts changes from commit 089c4ceb30.
+    
+    There were complaints that Persian font becomes unreadable :(
+
+diff --git a/Telegram/SourceFiles/ui/style/style_core_font.cpp b/Telegram/SourceFiles/ui/style/style_core_font.cpp
+index a2ab5f89f..d268a71e1 100644
+--- a/Telegram/SourceFiles/ui/style/style_core_font.cpp
++++ b/Telegram/SourceFiles/ui/style/style_core_font.cpp
+@@ -58,9 +58,9 @@ FontData::FontData(int size, uint32 flags, int family, Font *other)
+ 
+ 	f.setPixelSize(size);
+ 	if (_flags & FontBold) {
+-		f.setBold(_flags & FontBold);
+-	} else if (fontFamilies[family] == "Open Sans Semibold") {
+-		f.setWeight(QFont::DemiBold);
++		f.setBold(true);
++	//} else if (fontFamilies[family] == "Open Sans Semibold") {
++	//	f.setWeight(QFont::DemiBold);
+ 	}
+ 	f.setItalic(_flags & FontItalic);
+ 	f.setUnderline(_flags & FontUnderline);
diff --git a/tdesktop.patch b/tdesktop.patch
index 410fd4cee57c..68e9afc27245 100644
--- a/tdesktop.patch
+++ b/tdesktop.patch
@@ -1,39 +1,13 @@
-From 1d382bc490484b6515ff599def7150f4a6e7386c Mon Sep 17 00:00:00 2001
-From: Allen Wild <allenwild93@gmail.com>
-Date: Sat, 8 Dec 2018 15:30:09 -0500
-Subject: [PATCH] tdesktop.patch
-
----
- Telegram/Resources/qrc/telegram_linux.qrc     |  1 -
- Telegram/SourceFiles/core/launcher.cpp        | 12 ++-
- .../SourceFiles/platform/linux/linux_libs.h   |  2 +-
- Telegram/SourceFiles/qt_functions.cpp         | 94 +++++++++++++++++++
- Telegram/SourceFiles/qt_static_plugins.cpp    |  9 --
- Telegram/SourceFiles/ui/text/text.cpp         |  6 +-
- Telegram/SourceFiles/ui/text/text_block.cpp   |  3 +
- Telegram/SourceFiles/ui/twidget.cpp           |  4 +-
- Telegram/gyp/PrecompiledHeader.cmake          |  4 +-
- Telegram/gyp/Telegram.gyp                     | 12 +--
- Telegram/gyp/qt.gypi                          | 64 +++----------
- Telegram/gyp/qt_moc.gypi                      |  2 +-
- Telegram/gyp/qt_rcc.gypi                      |  2 +-
- Telegram/gyp/settings_linux.gypi              |  4 +-
- Telegram/gyp/telegram_linux.gypi              | 50 ++++------
- Telegram/gyp/telegram_sources.txt             |  9 +-
- 16 files changed, 150 insertions(+), 128 deletions(-)
- create mode 100644 Telegram/SourceFiles/qt_functions.cpp
-
 diff --git a/Telegram/Resources/qrc/telegram_linux.qrc b/Telegram/Resources/qrc/telegram_linux.qrc
-index 164e8d4f2..12319be14 100644
+index 0554fa179..3ea027406 100644
 --- a/Telegram/Resources/qrc/telegram_linux.qrc
 +++ b/Telegram/Resources/qrc/telegram_linux.qrc
-@@ -1,6 +1,5 @@
+@@ -1,5 +1,4 @@
  <RCC>
    <qresource prefix="/qt">
 -    <file alias="etc/qt.conf">../etc/qt_linux.conf</file>
    </qresource>
-   <qresource prefix="/fc">
-     <file alias="fc-custom.conf">../fc-custom.conf</file>
+ </RCC>
 diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp
 index d4bdadc17..8a420c74b 100644
 --- a/Telegram/SourceFiles/core/launcher.cpp
@@ -66,10 +40,10 @@ index d4bdadc17..8a420c74b 100644
  
  	DEBUG_LOG(("Telegram finished, result: %1").arg(result));
 diff --git a/Telegram/SourceFiles/platform/linux/linux_libs.h b/Telegram/SourceFiles/platform/linux/linux_libs.h
-index 4834fee11..2e60a6513 100644
+index 6f93d69cd..df185d5a2 100644
 --- a/Telegram/SourceFiles/platform/linux/linux_libs.h
 +++ b/Telegram/SourceFiles/platform/linux/linux_libs.h
-@@ -21,7 +21,7 @@ extern "C" {
+@@ -17,7 +17,7 @@ extern "C" {
  } // extern "C"
  
  #ifndef TDESKTOP_DISABLE_UNITY_INTEGRATION
@@ -179,10 +153,10 @@ index 000000000..4a722b8d7
 +        flags |= QTextItem::StrikeOut;
 +}
 diff --git a/Telegram/SourceFiles/qt_static_plugins.cpp b/Telegram/SourceFiles/qt_static_plugins.cpp
-index e29f348c8..122ff0f5d 100644
+index a757d085f..122ff0f5d 100644
 --- a/Telegram/SourceFiles/qt_static_plugins.cpp
 +++ b/Telegram/SourceFiles/qt_static_plugins.cpp
-@@ -15,13 +15,4 @@ Q_IMPORT_PLUGIN(QWebpPlugin)
+@@ -15,14 +15,4 @@ Q_IMPORT_PLUGIN(QWebpPlugin)
  Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin)
  Q_IMPORT_PLUGIN(QGenericEnginePlugin)
  #elif defined Q_OS_LINUX // Q_OS_WIN | Q_OS_MAC
@@ -195,12 +169,13 @@ index e29f348c8..122ff0f5d 100644
 -Q_IMPORT_PLUGIN(QIbusPlatformInputContextPlugin)
 -Q_IMPORT_PLUGIN(QFcitxPlatformInputContextPlugin)
 -Q_IMPORT_PLUGIN(QHimePlatformInputContextPlugin)
+-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 bc4d3d57b..370e5fe85 100644
+index 944f58479..887c1982f 100644
 --- a/Telegram/SourceFiles/ui/text/text.cpp
 +++ b/Telegram/SourceFiles/ui/text/text.cpp
-@@ -1760,11 +1760,11 @@ private:
+@@ -1750,11 +1750,11 @@ private:
  		if (item == -1)
  			return;
  
@@ -230,10 +205,10 @@ index 2959cec77..04ad00645 100644
  		CrashReports::ClearAnnotationRef("CrashString");
  	}
 diff --git a/Telegram/SourceFiles/ui/twidget.cpp b/Telegram/SourceFiles/ui/twidget.cpp
-index 0ccc63ed5..464921148 100644
+index 71f318229..461f52278 100644
 --- a/Telegram/SourceFiles/ui/twidget.cpp
 +++ b/Telegram/SourceFiles/ui/twidget.cpp
-@@ -245,9 +245,9 @@ void sendSynteticMouseEvent(QWidget *widget, QEvent::Type type, Qt::MouseButton
+@@ -233,9 +233,9 @@ void sendSynteticMouseEvent(QWidget *widget, QEvent::Type type, Qt::MouseButton
  			, button
  			, QGuiApplication::mouseButtons() | button
  			, QGuiApplication::keyboardModifiers()
@@ -268,7 +243,7 @@ index a0e1e0489..223113081 100644
          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 ac7696e1d..07193cf19 100644
+index 1cab5ae29..465e8276a 100644
 --- a/Telegram/gyp/Telegram.gyp
 +++ b/Telegram/gyp/Telegram.gyp
 @@ -75,7 +75,6 @@
@@ -287,7 +262,7 @@ index ac7696e1d..07193cf19 100644
        'AL_ALEXT_PROTOTYPES',
        'TGVOIP_USE_CXX11_LIB',
        'XXH_INLINE_ALL',
-@@ -96,16 +94,8 @@
+@@ -94,16 +92,8 @@
      'include_dirs': [
        '<(src_loc)',
        '<(SHARED_INTERMEDIATE_DIR)',
@@ -462,7 +437,7 @@ index f5624a82b..1129a95c5 100644
        '-no-compress',
        '<(RULE_INPUT_PATH)',
 diff --git a/Telegram/gyp/settings_linux.gypi b/Telegram/gyp/settings_linux.gypi
-index 17219fa2c..b00fd50ea 100644
+index 17219fa2c..6853b5c3e 100644
 --- a/Telegram/gyp/settings_linux.gypi
 +++ b/Telegram/gyp/settings_linux.gypi
 @@ -11,7 +11,6 @@
@@ -473,15 +448,6 @@ index 17219fa2c..b00fd50ea 100644
            '-W',
            '-fPIC',
            '-Wno-unused-variable',
-@@ -43,7 +42,7 @@
-               'sources': [ '__Wrong_Official_Build_Target_<(official_build_target)_' ],
-             }],
-           ],
--        }], [ '"<!(uname -p)" == "x86_64"', {
-+        }], [ '"<!(uname -m)" == "x86_64"', {
-           # 32 bit version can't be linked with debug info or LTO,
-           # virtual memory exhausted :(
-           'cflags_c': [ '-g' ],
 @@ -60,7 +59,6 @@
        ],
        'defines': [
@@ -491,7 +457,7 @@ index 17219fa2c..b00fd50ea 100644
        ],
        'cflags_c': [
 diff --git a/Telegram/gyp/telegram_linux.gypi b/Telegram/gyp/telegram_linux.gypi
-index dc0f4b90d..5f33ff961 100644
+index ffe0e5a96..bd2ed758f 100644
 --- a/Telegram/gyp/telegram_linux.gypi
 +++ b/Telegram/gyp/telegram_linux.gypi
 @@ -23,10 +23,11 @@
@@ -515,7 +481,7 @@ index dc0f4b90d..5f33ff961 100644
        '/usr/local/lib',
        '<(linux_path_ffmpeg)/lib',
        '<(linux_path_openal)/lib',
-@@ -43,25 +45,16 @@
+@@ -43,26 +45,16 @@
        '<(linux_path_breakpad)/lib',
      ],
      'libraries': [
@@ -524,6 +490,7 @@ index dc0f4b90d..5f33ff961 100644
 -      'ibusplatforminputcontextplugin',
 -      'fcitxplatforminputcontextplugin',
 -      'himeplatforminputcontextplugin',
+-      'nimfplatforminputcontextplugin',
 -      'liblzma.a',
 -      'libopenal.a',
 -      'libavformat.a',
@@ -551,14 +518,7 @@ index dc0f4b90d..5f33ff961 100644
  #      '<!(pkg-config 2> /dev/null --libs <@(pkgconfig_libs))',
      ],
      'cflags_cc': [
-@@ -90,26 +83,15 @@
-       },
-     },
-     'conditions': [
--      [ '"<!(uname -p)" != "x86_64"', {
-+      [ '"<!(uname -m)" != "x86_64"', {
-         'ldflags': [
-           '-Wl,-wrap,__divmoddi4',
+@@ -97,9 +89,8 @@
          ],
        }], ['not_need_gtk!="True"', {
          'cflags_cc': [
@@ -568,24 +528,13 @@ index dc0f4b90d..5f33ff961 100644
 +          '<!(pkg-config 2> /dev/null --cflags appindicator3-0.1)',
 +          '<!(pkg-config 2> /dev/null --cflags gtk+-3.0)',
          ],
--      }], ['<!(pkg-config ayatana-appindicator3-0.1; echo $?) == 0', {
--        'cflags_cc': [ '<!(pkg-config --cflags ayatana-appindicator3-0.1)' ],
--        'defines': [ 'TDESKTOP_USE_AYATANA_INDICATORS' ],
--      }], ['<!(pkg-config ayatana-appindicator-0.1; echo $?) == 0', {
--        'cflags_cc': [ '<!(pkg-config --cflags ayatana-appindicator-0.1)' ],
--        'defines': [ 'TDESKTOP_USE_AYATANA_INDICATORS' ],
--      }], ['<!(pkg-config appindicator3-0.1; echo $?) == 0', {
--        'cflags_cc': [ '<!(pkg-config --cflags appindicator3-0.1)' ],
--      }], ['<!(pkg-config appindicator-0.1; echo $?) == 0', {
--        'cflags_cc': [ '<!(pkg-config --cflags appindicator-0.1)' ],
-       }]
-     ],
-   }]],
+       }], ['<!(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 03c8a1335..77884c330 100644
+index f02296c8a..46bd016dd 100644
 --- a/Telegram/gyp/telegram_sources.txt
 +++ b/Telegram/gyp/telegram_sources.txt
-@@ -775,14 +775,7 @@
+@@ -755,14 +755,7 @@
  <(emoji_suggestions_loc)/emoji_suggestions.cpp
  <(emoji_suggestions_loc)/emoji_suggestions.h
  
@@ -601,6 +550,3 @@ index 03c8a1335..77884c330 100644
  
  platforms: win
  <(res_loc)/winrc/Telegram.rc
--- 
-2.19.2
-