From e901d3111fd9557c1b7d945334b933e98d672a8d Mon Sep 17 00:00:00 2001
From: Francesco Marinucci <franzmari@chakralinux.org>
Date: Wed, 13 Feb 2019 19:14:10 +0100
Subject: [PATCH] telegram-desktop: another attempt to build, update to 1.5.15,
 see #87

---
 telegram-desktop/PKGBUILD       |  6 ++---
 telegram-desktop/qt5.patch      | 42 +++++++++++++++++++++++++++++++++
 telegram-desktop/tdesktop.patch | 19 +++------------
 3 files changed, 48 insertions(+), 19 deletions(-)

diff --git a/telegram-desktop/PKGBUILD b/telegram-desktop/PKGBUILD
index b54ab9ea3..c42c937a7 100644
--- a/telegram-desktop/PKGBUILD
+++ b/telegram-desktop/PKGBUILD
@@ -1,7 +1,7 @@
 # Contributions from ArchLinux https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/telegram-desktop
 
 pkgname=telegram-desktop
-pkgver=1.5.8
+pkgver=1.5.15
 pkgrel=1
 pkgdesc='Official Telegram Desktop client'
 arch=('x86_64')
@@ -38,11 +38,11 @@ sha512sums=('SKIP'
             'SKIP'
             'b87414ceaae19185a8a5749cea1f6d9f3fc3c69b8dd729e3db8790cde00b987c3c827cd30baf0eac579d1884e34aa2f37bb90778c3c0bc9ca211d75a82891b9d'
             'b20674f61ff6378749d1f59a6a0da194d33ccc786bd783f6ed62027924a3a8a8d27c9763bf376480432d6536896b0c7eeb8c495c5b8cefff7cf5fe84da50947e'
-            'fd5c57e1db20a23577ce107370a83b2dcb5e21227444ef8a2aab1aea06acf78bbd81e2b28fbd4010f5e7e61659ca1935051045488bf70f4d701e47a1eed618a4'
+            '0784a00b7dcf12d1662cd2fdc410b4e578fd80a6c6329edfc0090442e112eb9fd8a392e9f7bcbb2780d9403448898c53cd5d4d38025c40c4fbe1a8aabfd10b84'
             'd60694dc701aa985b0e82a12c9732b945082470441c687b33167a94f94efcf253baf43bb7280ec160ba338485ee5c62de138e4804cae05f27cc5cf4298166d39'
             '6d0bac5aa4c4992b5400a9a9318f7a4e92d5eab961917cf0b05cdd251ab66a77c52ec8fbef246e8019606a7624d7b5420b87f8153e071e9724c7d2f5c94e47c0'
             'ce6be003220267bac5483caf8302b492e1581892bc36d35a61236ebf9f9d766b8bd2159557a1c36256aa85f461797a38bfaae57b12da7a72101b21c0b17ed653'
-            'a75ffd88e165c1a50206aa08688b795550ebdb6ca8f0218bfb7a7929fd8f29ab8661cedee82d83534528a2f9069a8ad47dd6860d9e096d7fc5ea8974cd80f146')
+            '11909c65dd54b7b0d7023075c1786c100808eed7177602b105f5b53cddf1b0ed91cb94ccaca55115471dc050ffa9b47d13b3ab0d2dd9e15daab84828a5d09e81')
 
 prepare() {
     cd "$srcdir/tdesktop"
diff --git a/telegram-desktop/qt5.patch b/telegram-desktop/qt5.patch
index f7b660da0..ff2b59a1b 100644
--- a/telegram-desktop/qt5.patch
+++ b/telegram-desktop/qt5.patch
@@ -1,3 +1,44 @@
+--- a/Telegram/gyp/qt.gypi	2019-02-13 18:51:38.000000000 +0100
++++ b/Telegram/gyp/qt.gypi	2019-02-13 18:58:01.481532583 +0100
+@@ -14,7 +14,7 @@
+               [ 'build_macold', {
+                 'qt_version%': '5.3.2',
+               }, {
+-                'qt_version%': '<!(echo /usr/include/qt/QtCore/*/ | grep -Po "\d+\.\d+\.\d+")',
++                'qt_version%': '<!(echo /usr/include/qt5/QtCore/*/ | grep -Po "\d+\.\d+\.\d+")',
+               }]
+             ],
+           },
+@@ -28,7 +28,7 @@
+             [ 'build_macold', {
+               'linux_path_qt%': '/usr/local/macold/Qt-<(qt_version)',
+             }, {
+-              'linux_path_qt%': '/usr/lib/qt',
++              'linux_path_qt%': '/usr/lib/qt5',
+             }]
+           ]
+         },
+@@ -153,13 +153,13 @@
+ 
+   'include_dirs': [
+     '/usr/include/qt',
+-    '/usr/include/qt/QtCore',
+-    '/usr/include/qt/QtGui',
+-    '/usr/include/qt/QtDBus',
+-    '/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',
++    '/usr/include/qt5/QtCore',
++    '/usr/include/qt5/QtGui',
++    '/usr/include/qt5/QtDBus',
++    '/usr/include/qt5/QtCore/<(qt_version)',
++    '/usr/include/qt5/QtGui/<(qt_version)',
++    '/usr/include/qt5/QtCore/<(qt_version)/QtCore',
++    '/usr/include/qt5/QtGui/<(qt_version)/QtGui',
+   ],
+   'library_dirs': [
+     '<(qt_loc)/lib',
 --- a/Telegram/SourceFiles/base/base_pch.h	2018-12-31 10:53:16.232898792 +0100
 +++ b/Telegram/SourceFiles/base/base_pch.h	2018-12-31 11:02:13.163096099 +0100
 @@ -6,13 +6,13 @@
@@ -71,3 +112,4 @@
  
  #include <crl/crl.h>
  #include <rpl/rpl.h>
+
diff --git a/telegram-desktop/tdesktop.patch b/telegram-desktop/tdesktop.patch
index d6c8e7374..c976d6438 100644
--- a/telegram-desktop/tdesktop.patch
+++ b/telegram-desktop/tdesktop.patch
@@ -14,12 +14,12 @@ index d4bdadc17..8a420c74b 100644
 +++ b/Telegram/SourceFiles/core/launcher.cpp
 @@ -39,9 +39,10 @@ void Launcher::init() {
  
- 	QCoreApplication::setApplicationName(qsl("TelegramDesktop"));
+ 	QApplication::setApplicationName(qsl("TelegramDesktop"));
  
 -#ifndef OS_MAC_OLD
 +#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);
+ 	QApplication::setAttribute(Qt::AA_DisableHighDpiScaling, true);
 -#endif // OS_MAC_OLD
 +#endif // not defined Q_OS_MAC and QT_VERSION >= 5.6.0
  
@@ -39,19 +39,6 @@ index d4bdadc17..8a420c74b 100644
  	auto result = executeApplication();
  
  	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 6f93d69cd..df185d5a2 100644
---- a/Telegram/SourceFiles/platform/linux/linux_libs.h
-+++ b/Telegram/SourceFiles/platform/linux/linux_libs.h
-@@ -17,7 +17,7 @@ extern "C" {
- } // extern "C"
- 
- #ifndef TDESKTOP_DISABLE_UNITY_INTEGRATION
--#include <unity/unity/unity.h>
-+typedef void UnityLauncherEntry;
- #endif // !TDESKTOP_DISABLE_UNITY_INTEGRATION
- #endif // !TDESKTOP_DISABLE_GTK_INTEGRATION
-
 diff --git a/Telegram/SourceFiles/qt_functions.cpp b/Telegram/SourceFiles/qt_functions.cpp
 new file mode 100644
 index 000000000..4a722b8d7
@@ -289,7 +276,7 @@ index 0b783ec21..3f917765a 100644
                  'qt_version%': '5.3.2',
                }, {
 -                'qt_version%': '5.6.2',
-+                'qt_version%': '<!(echo /usr/include/qt5/QtCore/*/ | grep -Po "\d+\.\d+\.\d+")',
++                'qt_version%': '<!(echo /usr/include/qt/QtCore/*/ | grep -Po "\d+\.\d+\.\d+")',
                }]
              ],
            },