update to 1.4.3-1

Rebase patches and add back a couple of s/uname -p/uname -m/ in
tdesktop.patch, which fixes LTO in builds (dropped when I sync'd with
[community] in the previous commit)

4 files changed, 36 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4f977e3294a1..915f72abb89d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = telegram-desktop-systemqt-notoemoji
 	pkgdesc = Official Telegram Desktop client (with noto emoji)
-	pkgver = 1.4.2
-	pkgrel = 2
+	pkgver = 1.4.3
+	pkgrel = 1
 	url = https://desktop.telegram.org/
 	arch = x86_64
 	license = GPL3
@@ -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.2
+	source = tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#tag=v1.4.3
 	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 = 47c0d1e00401d7899b2ce710c06ceac6caffddbe1a4c85bc407918b43051cba292f6e6131cc0f390a66520e92f0ffa3761f8d973a25986dfe21c54f113062c33
-	sha512sums = 7a37e0ca582145a56a411585aec0bc94889dc18a80cc038d2efa237e19eebf8b67d56825e068be88f7566b08316ce068d7f20c25729caa33d0e9d6c370325025
+	sha512sums = 1bbca36ca1df9e3ef481224b82ccdeb797cf5f8ceb36ea181202c0db342bebcf802d191ee97cf36004ab992f6c23682d56c2c5bf1635ddd0432cd8adce441553
+	sha512sums = c05351aa9f6503daa6ef8b01adb73c7e71fd01377d833f47f826e184d78dd79628ce7c686ae23a40b7468adcd5af0af9ebce4783113957b6126892aca83c7712
 	sha512sums = d60694dc701aa985b0e82a12c9732b945082470441c687b33167a94f94efcf253baf43bb7280ec160ba338485ee5c62de138e4804cae05f27cc5cf4298166d39
 
 pkgname = telegram-desktop-systemqt-notoemoji
diff --git a/PKGBUILD b/PKGBUILD
index cbb7da7c41c3..0d1db4ac03a8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@
 # https://github.com/mymedia2/tdesktop
 
 pkgname=telegram-desktop-systemqt-notoemoji
-pkgver=1.4.2
-pkgrel=2
+pkgver=1.4.3
+pkgrel=1
 pkgdesc='Official Telegram Desktop client (with noto emoji)'
 arch=('x86_64')
 url="https://desktop.telegram.org/"
@@ -46,8 +46,8 @@ sha512sums=('SKIP'
             'fa7042f370ae4e2e14d083395743cdee25bfedc39ab5273b5d1ab12fb074757cf76dab065f2abcb44cad018920e711142fbf24a2b9cd30f517c5a5b46d6a6182'
             'b87414ceaae19185a8a5749cea1f6d9f3fc3c69b8dd729e3db8790cde00b987c3c827cd30baf0eac579d1884e34aa2f37bb90778c3c0bc9ca211d75a82891b9d'
             'b20674f61ff6378749d1f59a6a0da194d33ccc786bd783f6ed62027924a3a8a8d27c9763bf376480432d6536896b0c7eeb8c495c5b8cefff7cf5fe84da50947e'
-            '47c0d1e00401d7899b2ce710c06ceac6caffddbe1a4c85bc407918b43051cba292f6e6131cc0f390a66520e92f0ffa3761f8d973a25986dfe21c54f113062c33'
-            '7a37e0ca582145a56a411585aec0bc94889dc18a80cc038d2efa237e19eebf8b67d56825e068be88f7566b08316ce068d7f20c25729caa33d0e9d6c370325025'
+            '1bbca36ca1df9e3ef481224b82ccdeb797cf5f8ceb36ea181202c0db342bebcf802d191ee97cf36004ab992f6c23682d56c2c5bf1635ddd0432cd8adce441553'
+            'c05351aa9f6503daa6ef8b01adb73c7e71fd01377d833f47f826e184d78dd79628ce7c686ae23a40b7468adcd5af0af9ebce4783113957b6126892aca83c7712'
             'd60694dc701aa985b0e82a12c9732b945082470441c687b33167a94f94efcf253baf43bb7280ec160ba338485ee5c62de138e4804cae05f27cc5cf4298166d39')
 
 prepare() {
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 e3d0d44aea1f..d0700d0b52e7 100644
--- a/tdesktop.patch
+++ b/tdesktop.patch
@@ -242,7 +242,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 1cab5ae29..465e8276a 100644
+index dd7779c7e..c5dd775e4 100644
 --- a/Telegram/gyp/Telegram.gyp
 +++ b/Telegram/gyp/Telegram.gyp
 @@ -75,7 +75,6 @@
@@ -436,7 +436,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..6853b5c3e 100644
+index 17219fa2c..b00fd50ea 100644
 --- a/Telegram/gyp/settings_linux.gypi
 +++ b/Telegram/gyp/settings_linux.gypi
 @@ -11,7 +11,6 @@
@@ -447,6 +447,15 @@ index 17219fa2c..6853b5c3e 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': [
@@ -456,7 +465,7 @@ index 17219fa2c..6853b5c3e 100644
        ],
        'cflags_c': [
 diff --git a/Telegram/gyp/telegram_linux.gypi b/Telegram/gyp/telegram_linux.gypi
-index 80259c687..b5e3c18a2 100644
+index 80259c687..5f33ff961 100644
 --- a/Telegram/gyp/telegram_linux.gypi
 +++ b/Telegram/gyp/telegram_linux.gypi
 @@ -23,10 +23,11 @@
@@ -516,7 +525,14 @@ index 80259c687..b5e3c18a2 100644
  #      '<!(pkg-config 2> /dev/null --libs <@(pkgconfig_libs))',
      ],
      'cflags_cc': [
-@@ -96,10 +89,8 @@
+@@ -90,16 +83,14 @@
+       },
+     },
+     'conditions': [
+-      [ '"<!(uname -p)" != "x86_64"', {
++      [ '"<!(uname -m)" != "x86_64"', {
+         'ldflags': [
+           '-Wl,-wrap,__divmoddi4',
          ],
        }], ['not_need_gtk!="True"', {
          'cflags_cc': [
@@ -530,10 +546,10 @@ index 80259c687..b5e3c18a2 100644
        }]
      ],
 diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt
-index f02296c8a..46bd016dd 100644
+index a21f20b56..ffc1a1ef8 100644
 --- a/Telegram/gyp/telegram_sources.txt
 +++ b/Telegram/gyp/telegram_sources.txt
-@@ -755,14 +755,7 @@
+@@ -761,14 +761,7 @@
  <(emoji_suggestions_loc)/emoji_suggestions.cpp
  <(emoji_suggestions_loc)/emoji_suggestions.h