update to 1.4.8-1

4 files changed, 66 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8329efa7571e..ef92ce0d529f 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.7
+	pkgver = 1.4.8
 	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.7
+	source = tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#tag=v1.4.8
 	source = libtgvoip::git+https://github.com/telegramdesktop/libtgvoip
 	source = variant::git+https://github.com/mapbox/variant
 	source = Catch::git+https://github.com/philsquared/Catch
@@ -46,8 +46,8 @@ pkgbase = telegram-desktop-systemqt-notoemoji
 	sha512sums = fa7042f370ae4e2e14d083395743cdee25bfedc39ab5273b5d1ab12fb074757cf76dab065f2abcb44cad018920e711142fbf24a2b9cd30f517c5a5b46d6a6182
 	sha512sums = b87414ceaae19185a8a5749cea1f6d9f3fc3c69b8dd729e3db8790cde00b987c3c827cd30baf0eac579d1884e34aa2f37bb90778c3c0bc9ca211d75a82891b9d
 	sha512sums = b20674f61ff6378749d1f59a6a0da194d33ccc786bd783f6ed62027924a3a8a8d27c9763bf376480432d6536896b0c7eeb8c495c5b8cefff7cf5fe84da50947e
-	sha512sums = 1bbca36ca1df9e3ef481224b82ccdeb797cf5f8ceb36ea181202c0db342bebcf802d191ee97cf36004ab992f6c23682d56c2c5bf1635ddd0432cd8adce441553
-	sha512sums = c05351aa9f6503daa6ef8b01adb73c7e71fd01377d833f47f826e184d78dd79628ce7c686ae23a40b7468adcd5af0af9ebce4783113957b6126892aca83c7712
+	sha512sums = 26158910692f37f2f340165a194c2c4a4aedc5da140d80f877fecb9a6f577b15a7083468ed53ec9a915e581794ed82dec2b2b3751c017a3cc32f9ed65066e3fe
+	sha512sums = a8f1708616a598fea3cb94e3b63b02a7b13b55abd129a5dc02ad502529f4ebe7a673b6a350b669290fd26135358d21e2e10bf4a11d88f58f0685b7c4ab515bc5
 	sha512sums = d60694dc701aa985b0e82a12c9732b945082470441c687b33167a94f94efcf253baf43bb7280ec160ba338485ee5c62de138e4804cae05f27cc5cf4298166d39
 
 pkgname = telegram-desktop-systemqt-notoemoji
diff --git a/PKGBUILD b/PKGBUILD
index 472233939a53..b106e43c2062 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@ _api_id='17349'
 _api_hash='344583e45741c457fe1862106095a5eb'
 
 pkgname=telegram-desktop-systemqt-notoemoji
-pkgver=1.4.7
+pkgver=1.4.8
 pkgrel=1
 pkgdesc='Official Telegram Desktop client (with noto emoji)'
 arch=('x86_64')
@@ -51,8 +51,8 @@ sha512sums=('SKIP'
             'fa7042f370ae4e2e14d083395743cdee25bfedc39ab5273b5d1ab12fb074757cf76dab065f2abcb44cad018920e711142fbf24a2b9cd30f517c5a5b46d6a6182'
             'b87414ceaae19185a8a5749cea1f6d9f3fc3c69b8dd729e3db8790cde00b987c3c827cd30baf0eac579d1884e34aa2f37bb90778c3c0bc9ca211d75a82891b9d'
             'b20674f61ff6378749d1f59a6a0da194d33ccc786bd783f6ed62027924a3a8a8d27c9763bf376480432d6536896b0c7eeb8c495c5b8cefff7cf5fe84da50947e'
-            '1bbca36ca1df9e3ef481224b82ccdeb797cf5f8ceb36ea181202c0db342bebcf802d191ee97cf36004ab992f6c23682d56c2c5bf1635ddd0432cd8adce441553'
-            'c05351aa9f6503daa6ef8b01adb73c7e71fd01377d833f47f826e184d78dd79628ce7c686ae23a40b7468adcd5af0af9ebce4783113957b6126892aca83c7712'
+            '26158910692f37f2f340165a194c2c4a4aedc5da140d80f877fecb9a6f577b15a7083468ed53ec9a915e581794ed82dec2b2b3751c017a3cc32f9ed65066e3fe'
+            'a8f1708616a598fea3cb94e3b63b02a7b13b55abd129a5dc02ad502529f4ebe7a673b6a350b669290fd26135358d21e2e10bf4a11d88f58f0685b7c4ab515bc5'
             'd60694dc701aa985b0e82a12c9732b945082470441c687b33167a94f94efcf253baf43bb7280ec160ba338485ee5c62de138e4804cae05f27cc5cf4298166d39')
 
 prepare() {
@@ -66,6 +66,7 @@ prepare() {
     git config submodule.Telegram/ThirdParty/xxHash.url "$srcdir/xxHash"
     git submodule update
 
+    set -x
     patch -Np1 -i "$srcdir/tdesktop.patch"
     patch -Np1 -i "$srcdir/no-gtk2.patch"
 
@@ -77,6 +78,7 @@ prepare() {
     patch -Np1 -i "$srcdir/libtgvoip.patch"
 
     cp -vf "$srcdir/telegram-emoji-gen-${_emojiver#v}/telegram-noto-emoji/"*.webp "$srcdir/tdesktop/Telegram/Resources/emoji"
+    set +x
 }
 
 build() {
diff --git a/no-gtk2.patch b/no-gtk2.patch
index c510ef8b1c0d..29f3bb9b0d72 100644
--- a/no-gtk2.patch
+++ b/no-gtk2.patch
@@ -1,5 +1,5 @@
 diff --git a/Telegram/SourceFiles/platform/linux/linux_libs.cpp b/Telegram/SourceFiles/platform/linux/linux_libs.cpp
-index b2d12a838..77c6abf7d 100644
+index f8d74fee1..c9d059fa6 100644
 --- a/Telegram/SourceFiles/platform/linux/linux_libs.cpp
 +++ b/Telegram/SourceFiles/platform/linux/linux_libs.cpp
 @@ -240,24 +240,12 @@ void start() {
@@ -7,7 +7,7 @@ index b2d12a838..77c6abf7d 100644
  		}
  	}
 -	if (!gtkLoaded || !indicatorLoaded) {
--		if (loadLibrary(lib_indicator, "appindicator", 1)) {
+-		if (loadLibrary(lib_indicator, "ayatana-appindicator", 1) || loadLibrary(lib_indicator, "appindicator", 1)) {
 -			if (loadLibrary(lib_gtk, "gtk-x11-2.0", 0)) {
 -				gtkLoaded = indicatorLoaded = false;
 -				gtkLoaded = setupGtkBase(lib_gtk);
diff --git a/tdesktop.patch b/tdesktop.patch
index d0700d0b52e7..410fd4cee57c 100644
--- a/tdesktop.patch
+++ b/tdesktop.patch
@@ -1,13 +1,39 @@
+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 0554fa179..3ea027406 100644
+index 164e8d4f2..12319be14 100644
 --- a/Telegram/Resources/qrc/telegram_linux.qrc
 +++ b/Telegram/Resources/qrc/telegram_linux.qrc
-@@ -1,5 +1,4 @@
+@@ -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 d4bdadc17..8a420c74b 100644
 --- a/Telegram/SourceFiles/core/launcher.cpp
@@ -40,10 +66,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 6f93d69cd..df185d5a2 100644
+index 4834fee11..2e60a6513 100644
 --- a/Telegram/SourceFiles/platform/linux/linux_libs.h
 +++ b/Telegram/SourceFiles/platform/linux/linux_libs.h
-@@ -17,7 +17,7 @@ extern "C" {
+@@ -21,7 +21,7 @@ extern "C" {
  } // extern "C"
  
  #ifndef TDESKTOP_DISABLE_UNITY_INTEGRATION
@@ -171,10 +197,10 @@ index e29f348c8..122ff0f5d 100644
 -Q_IMPORT_PLUGIN(QHimePlatformInputContextPlugin)
  #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 bc4d3d57b..370e5fe85 100644
 --- a/Telegram/SourceFiles/ui/text/text.cpp
 +++ b/Telegram/SourceFiles/ui/text/text.cpp
-@@ -1750,11 +1750,11 @@ private:
+@@ -1760,11 +1760,11 @@ private:
  		if (item == -1)
  			return;
  
@@ -204,10 +230,10 @@ index 2959cec77..04ad00645 100644
  		CrashReports::ClearAnnotationRef("CrashString");
  	}
 diff --git a/Telegram/SourceFiles/ui/twidget.cpp b/Telegram/SourceFiles/ui/twidget.cpp
-index 71f318229..461f52278 100644
+index 0ccc63ed5..464921148 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
+@@ -245,9 +245,9 @@ void sendSynteticMouseEvent(QWidget *widget, QEvent::Type type, Qt::MouseButton
  			, button
  			, QGuiApplication::mouseButtons() | button
  			, QGuiApplication::keyboardModifiers()
@@ -242,7 +268,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 dd7779c7e..c5dd775e4 100644
+index ac7696e1d..07193cf19 100644
 --- a/Telegram/gyp/Telegram.gyp
 +++ b/Telegram/gyp/Telegram.gyp
 @@ -75,7 +75,6 @@
@@ -261,7 +287,7 @@ index dd7779c7e..c5dd775e4 100644
        'AL_ALEXT_PROTOTYPES',
        'TGVOIP_USE_CXX11_LIB',
        'XXH_INLINE_ALL',
-@@ -94,16 +92,8 @@
+@@ -96,16 +94,8 @@
      'include_dirs': [
        '<(src_loc)',
        '<(SHARED_INTERMEDIATE_DIR)',
@@ -465,7 +491,7 @@ index 17219fa2c..b00fd50ea 100644
        ],
        'cflags_c': [
 diff --git a/Telegram/gyp/telegram_linux.gypi b/Telegram/gyp/telegram_linux.gypi
-index 80259c687..5f33ff961 100644
+index dc0f4b90d..5f33ff961 100644
 --- a/Telegram/gyp/telegram_linux.gypi
 +++ b/Telegram/gyp/telegram_linux.gypi
 @@ -23,10 +23,11 @@
@@ -525,7 +551,7 @@ index 80259c687..5f33ff961 100644
  #      '<!(pkg-config 2> /dev/null --libs <@(pkgconfig_libs))',
      ],
      'cflags_cc': [
-@@ -90,16 +83,14 @@
+@@ -90,26 +83,15 @@
        },
      },
      'conditions': [
@@ -536,20 +562,30 @@ index 80259c687..5f33ff961 100644
          ],
        }], ['not_need_gtk!="True"', {
          '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 dee-1.0)',
 +          '<!(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)' ],
        }]
      ],
+   }]],
 diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt
-index a21f20b56..ffc1a1ef8 100644
+index 03c8a1335..77884c330 100644
 --- a/Telegram/gyp/telegram_sources.txt
 +++ b/Telegram/gyp/telegram_sources.txt
-@@ -761,14 +761,7 @@
+@@ -775,14 +775,7 @@
  <(emoji_suggestions_loc)/emoji_suggestions.cpp
  <(emoji_suggestions_loc)/emoji_suggestions.h
  
@@ -565,3 +601,6 @@ index a21f20b56..ffc1a1ef8 100644
  
  platforms: win
  <(res_loc)/winrc/Telegram.rc
+-- 
+2.19.2
+