update to 1.4.0-1

  * add xxHash submodule
  * rebase patches (clean up line offsets but no conflicts)

5 files changed, 20 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d8db205d9073..4bc6515e1edd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = telegram-desktop-systemqt-notoemoji
 	pkgdesc = Official Telegram Desktop client (with noto emoji)
-	pkgver = 1.3.15
+	pkgver = 1.4.0
 	pkgrel = 1
 	url = https://desktop.telegram.org/
 	arch = x86_64
@@ -21,12 +21,13 @@ 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.3.15
+	source = tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#tag=v1.4.0
 	source = libtgvoip::git+https://github.com/telegramdesktop/libtgvoip
 	source = variant::git+https://github.com/mapbox/variant
 	source = GSL::git+https://github.com/Microsoft/GSL.git
 	source = Catch::git+https://github.com/philsquared/Catch
 	source = crl::git+https://github.com/telegramdesktop/crl.git
+	source = xxHash::git+https://github.com/Cyan4973/xxHash.git
 	source = https://s3.amazonaws.com/aur-telegram-desktop-notoemoji/noto-emoji-v1.tar.xz
 	source = build-time-optimize.patch.in
 	source = tg.protocol
@@ -40,12 +41,13 @@ pkgbase = telegram-desktop-systemqt-notoemoji
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
+	sha512sums = SKIP
 	sha512sums = 376a4860e37b0f60892f362e954f976a563c632579167003b4aacbb24b6fea6aabb4e6952baf6d1a546b961936935cc49cf0e0ce9570320245b6bb326cb149e5
 	sha512sums = fa7042f370ae4e2e14d083395743cdee25bfedc39ab5273b5d1ab12fb074757cf76dab065f2abcb44cad018920e711142fbf24a2b9cd30f517c5a5b46d6a6182
 	sha512sums = b87414ceaae19185a8a5749cea1f6d9f3fc3c69b8dd729e3db8790cde00b987c3c827cd30baf0eac579d1884e34aa2f37bb90778c3c0bc9ca211d75a82891b9d
 	sha512sums = 95f6fe5e39a8c376280be93c93d92511c2bc5d6172e85059aa2e7e5adce86aa47003c97230f7cfa4076f2189dc0364da2d789d1f02b70824792cc082cfab0175
-	sha512sums = 251c01424e74a5dce0a70bf4640f1b806017590f5c6db06a07bb7c83b793024a06b7d5e172a01854af44dd34af586096d74129db8c9456f1b766cce65366a9b4
-	sha512sums = 7a37e0ca582145a56a411585aec0bc94889dc18a80cc038d2efa237e19eebf8b67d56825e068be88f7566b08316ce068d7f20c25729caa33d0e9d6c370325025
+	sha512sums = aab565816649f0157ff69636fd92ed434f30bd72554fc86db3151855de04e67b2d9ff8ff9735ed50f05510ea16dee79e134c9b26652e89522b4ffa8dddf09bcf
+	sha512sums = c05351aa9f6503daa6ef8b01adb73c7e71fd01377d833f47f826e184d78dd79628ce7c686ae23a40b7468adcd5af0af9ebce4783113957b6126892aca83c7712
 	sha512sums = d60694dc701aa985b0e82a12c9732b945082470441c687b33167a94f94efcf253baf43bb7280ec160ba338485ee5c62de138e4804cae05f27cc5cf4298166d39
 
 pkgname = telegram-desktop-systemqt-notoemoji
diff --git a/.gitignore b/.gitignore
index adf2d4b2081b..76171a1bc695 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ Catch
 GSL
 variant
 libtgvoip
+xxHash
diff --git a/PKGBUILD b/PKGBUILD
index 57e59c43bffe..918f74a197b3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 # https://github.com/mymedia2/tdesktop
 
 pkgname=telegram-desktop-systemqt-notoemoji
-pkgver=1.3.15
+pkgver=1.4.0
 pkgrel=1
 pkgdesc='Official Telegram Desktop client (with noto emoji)'
 arch=('x86_64')
@@ -26,6 +26,7 @@ source=(
     "GSL::git+https://github.com/Microsoft/GSL.git"
     "Catch::git+https://github.com/philsquared/Catch"
     "crl::git+https://github.com/telegramdesktop/crl.git"
+    "xxHash::git+https://github.com/Cyan4973/xxHash.git"
     "https://s3.amazonaws.com/aur-telegram-desktop-notoemoji/noto-emoji-${_emojiver}.tar.xz"
     "build-time-optimize.patch.in"
     "tg.protocol"
@@ -40,12 +41,13 @@ sha512sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
+            'SKIP'
             '376a4860e37b0f60892f362e954f976a563c632579167003b4aacbb24b6fea6aabb4e6952baf6d1a546b961936935cc49cf0e0ce9570320245b6bb326cb149e5'
             'fa7042f370ae4e2e14d083395743cdee25bfedc39ab5273b5d1ab12fb074757cf76dab065f2abcb44cad018920e711142fbf24a2b9cd30f517c5a5b46d6a6182'
             'b87414ceaae19185a8a5749cea1f6d9f3fc3c69b8dd729e3db8790cde00b987c3c827cd30baf0eac579d1884e34aa2f37bb90778c3c0bc9ca211d75a82891b9d'
             '95f6fe5e39a8c376280be93c93d92511c2bc5d6172e85059aa2e7e5adce86aa47003c97230f7cfa4076f2189dc0364da2d789d1f02b70824792cc082cfab0175'
-            '251c01424e74a5dce0a70bf4640f1b806017590f5c6db06a07bb7c83b793024a06b7d5e172a01854af44dd34af586096d74129db8c9456f1b766cce65366a9b4'
-            '7a37e0ca582145a56a411585aec0bc94889dc18a80cc038d2efa237e19eebf8b67d56825e068be88f7566b08316ce068d7f20c25729caa33d0e9d6c370325025'
+            'aab565816649f0157ff69636fd92ed434f30bd72554fc86db3151855de04e67b2d9ff8ff9735ed50f05510ea16dee79e134c9b26652e89522b4ffa8dddf09bcf'
+            'c05351aa9f6503daa6ef8b01adb73c7e71fd01377d833f47f826e184d78dd79628ce7c686ae23a40b7468adcd5af0af9ebce4783113957b6126892aca83c7712'
             'd60694dc701aa985b0e82a12c9732b945082470441c687b33167a94f94efcf253baf43bb7280ec160ba338485ee5c62de138e4804cae05f27cc5cf4298166d39')
 
 prepare() {
@@ -56,6 +58,7 @@ prepare() {
     git config submodule.Telegram/ThirdParty/libtgvoip.url "$srcdir/libtgvoip"
     git config submodule.Telegram/ThirdParty/Catch.url "$srcdir/Catch"
     git config submodule.Telegram/ThirdParty/crl.url "$srcdir/crl"
+    git config submodule.Telegram/ThirdParty/xxHash.url "$srcdir/xxHash"
     git submodule update
 
     patch -Np1 -i "$srcdir/tdesktop.patch"
diff --git a/no-gtk2.patch b/no-gtk2.patch
index f2384e322dc0..c510ef8b1c0d 100644
--- a/no-gtk2.patch
+++ b/no-gtk2.patch
@@ -1,7 +1,8 @@
-diff -Naur tdesktop-1.2.6.orig/Telegram/SourceFiles/platform/linux/linux_libs.cpp tdesktop-1.2.6/Telegram/SourceFiles/platform/linux/linux_libs.cpp
---- tdesktop-1.2.6.orig/Telegram/SourceFiles/platform/linux/linux_libs.cpp	2017-12-30 11:13:48.000000000 +0100
-+++ tdesktop-1.2.6/Telegram/SourceFiles/platform/linux/linux_libs.cpp	2018-01-17 11:41:49.593275952 +0100
-@@ -253,24 +253,12 @@
+diff --git a/Telegram/SourceFiles/platform/linux/linux_libs.cpp b/Telegram/SourceFiles/platform/linux/linux_libs.cpp
+index b2d12a838..77c6abf7d 100644
+--- a/Telegram/SourceFiles/platform/linux/linux_libs.cpp
++++ b/Telegram/SourceFiles/platform/linux/linux_libs.cpp
+@@ -240,24 +240,12 @@ void start() {
  			indicatorLoaded = setupAppIndicator(lib_indicator);
  		}
  	}
diff --git a/tdesktop.patch b/tdesktop.patch
index 717d0adf88cf..34d4c6fab59d 100644
--- a/tdesktop.patch
+++ b/tdesktop.patch
@@ -545,10 +545,10 @@ index 80259c687..5f33ff961 100644
        }]
      ],
 diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt
-index dd4f848db..22cf8866c 100644
+index f02296c8a..46bd016dd 100644
 --- a/Telegram/gyp/telegram_sources.txt
 +++ b/Telegram/gyp/telegram_sources.txt
-@@ -765,14 +765,7 @@
+@@ -755,14 +755,7 @@
  <(emoji_suggestions_loc)/emoji_suggestions.cpp
  <(emoji_suggestions_loc)/emoji_suggestions.h