From 35befb2b3c93672d7cced2645dae829ca039f0e8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 7 Nov 2019 09:36:07 +0300
Subject: [PATCH] Fix snapcraft build.

---
 Telegram/gyp/helpers |  2 +-
 snap/snapcraft.yaml  | 14 ++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/Telegram/gyp/helpers b/Telegram/gyp/helpers
index 6c8965430..c5ecf9612 160000
--- a/Telegram/gyp/helpers
+++ b/Telegram/gyp/helpers
@@ -1 +1 @@
-Subproject commit 6c8965430be14476168adc53efce554a5535be73
+Subproject commit c5ecf9612d8d0ac41891a694d4c787abed66fc2b
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 1adc7047f..1ce38168b 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -308,16 +308,14 @@ parts:
       - xutils-dev
       - bison
       - python-xcbgen
-    configflags:
-      - --disable-x11
     prime: [-./*]
 
   qt:
     plugin: qtbuilder
-    qt-version: 5.6.2
+    qt-version: 5.12.5
     qt-source-git: https://code.qt.io/qt/qt5.git
     qt-submodules: ['qtbase', 'qtimageformats']
-    qt-patches-path: Telegram/Patches
+    qt-patches-base-url: https://raw.githubusercontent.com/desktop-app/patches/master
     qt-extra-plugins:
       - platforminputcontexts:
         - https://github.com/telegramdesktop/fcitx.git
@@ -336,6 +334,7 @@ parts:
       - libpulse-dev
       - libssl-dev
       - libx11-xcb-dev
+      - libxcb-xkb-dev
       - libxcb-icccm4-dev
       - libxcb-image0-dev
       - libxcb-keysyms1-dev
@@ -356,14 +355,13 @@ parts:
       - -qt-zlib
       - -qt-libpng
       - -qt-libjpeg
-      - -qt-freetype
       - -qt-harfbuzz
       - -qt-pcre
       - -qt-xcb
-      - -qt-xkbcommon-x11
-      - -no-gstreamer
-      - -no-gtkstyle
+      - -no-gtk
       - -no-mirclient
+      - -system-freetype
+      - -fontconfig
       - -no-opengl
       - -static
       - -dbus-runtime