Update to 1.9.22

4 files changed, 20 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e07a66589e6e..13bdab90e7f1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = telegram-desktop9
 	pkgdesc = Official Telegram Desktop client (personal build)
-	pkgver = 1.9.14
+	pkgver = 1.9.22
 	pkgrel = 1
 	url = https://desktop.telegram.org/
 	arch = x86_64
@@ -19,26 +19,23 @@ pkgbase = telegram-desktop9
 	depends = openal
 	depends = qt5-imageformats
 	depends = xxhash
-	depends = libappindicator-gtk3
 	depends = libdbusmenu-qt5
 	optdepends = ttf-opensans: default Open Sans font family
 	provides = telegram-desktop
 	conflicts = telegram-desktop
-	source = https://github.com/telegramdesktop/tdesktop/releases/download/v1.9.14/tdesktop-1.9.14-full.tar.gz
-	source = telegram-desktop.sh
+	source = https://github.com/telegramdesktop/tdesktop/releases/download/v1.9.22/tdesktop-1.9.22-full.tar.gz
 	source = always_delete_for_everyone.patch
 	source = always_pin_without_notify.patch
 	source = always_send_as_photo_or_album.patch
 	source = clicky_sticker_panel.patch
 	source = dont_pulse_mentions.patch
 	source = no_circles.patch
-	sha512sums = 56efa64048d23b280782b51319c0071c6cef833cb7e2584e52c6e45488577755beb85185ec9187029c425cc8d4c9c1887142687c744697e7731a15abe2846056
-	sha512sums = 3c21c871e28bac365400f7bc439a16ad1a9a8d87590ad764ce262f1db968c10387caed372d4e064cb50f43da726cebaa9b24bcbcc7c6d5489515620f44dbf56b
+	sha512sums = 1fd9b04da02e648bf4e54cb3344b2490f5d7dc08d94e2dc0aa18f0402b96a8a923adaf9a1664393629bc8054ef91ef8ea20e8dd59222da52560a04eb5c541d0d
 	sha512sums = fdef3a430bdd60d88c9e9011ee878805e7803699204a2a7e22797d0f8729bf7dc0543851083ad700a4ece32bc768b6bfeb6f0135c8c039e035b22afb6df1171d
 	sha512sums = 91a0edab6408a223db77b75df5a913ffd36efa79340e8d78fa01ac2c3b6e09d5a5fc7fa214ccd40473093809f86b7aef199cebf56a1d5821c20083c4a3e5780b
 	sha512sums = 247ba6576166dead08289b145ca126b6498c0731f9e4a5763b80d4a4cc3f057dffc6d8b697ed4fa2129a5b86c568ec5130fda25df30661a4f4c147d358f3ae5b
 	sha512sums = 4f5b61073b4bd28d2cf92cb6bddb91a50518c4ce801d178366b3760ee2cf1692164546e439049c9ba821e23bff2e3080a42bfabf6fa46d613fd56905b405f340
-	sha512sums = 128c139e2e7cd3b12a4a31af1cac1c326b5ed95763499c95a2484efe12cf5f448e3c8e83d73e90169651478e091abfbe505a9001bbb49e8f9fa139cca3aa5012
+	sha512sums = 673e2a28781d0d604549c621592b1017ad306ddaf6d1beedfe73f3f1357fbb6afd994a324dfa15029789bdf8a4d6e85ad12a3877519618f6585bbc1927c06900
 	sha512sums = 048c6784fb0bb9182d07916fdfab9f9952cdcb1998b0f780ce74bf03b61ae62774611819db7de5fec5019b9158b42c3912ca28797aeca41a881493e5822afcd8
 
 pkgname = telegram-desktop9
diff --git a/PKGBUILD b/PKGBUILD
index f83fb63f15ce..344fd7bb608a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,22 +6,19 @@
 # https://github.com/mymedia2/tdesktop
 
 pkgname=telegram-desktop9
-pkgver=1.9.14
+pkgver=1.9.22
 pkgrel=1
 pkgdesc='Official Telegram Desktop client (personal build)'
 arch=('x86_64')
 url="https://desktop.telegram.org/"
 license=('GPL3')
 depends=('ffmpeg' 'hicolor-icon-theme' 'lz4' 'minizip' 'openal'
-         'qt5-imageformats' 'xxhash' 'libappindicator-gtk3' 'libdbusmenu-qt5')
-# for libappindicator-gtk3 see https://bugs.archlinux.org/task/65080
-
+         'qt5-imageformats' 'xxhash' 'libdbusmenu-qt5')
 makedepends=('cmake' 'git' 'ninja' 'python' 'range-v3' 'tl-expected' 'microsoft-gsl')
 optdepends=('ttf-opensans: default Open Sans font family')
 provides=('telegram-desktop')
 conflicts=('telegram-desktop')
 source=("https://github.com/telegramdesktop/tdesktop/releases/download/v${pkgver}/tdesktop-${pkgver}-full.tar.gz"
-        telegram-desktop.sh
 
         "always_delete_for_everyone.patch"
         "always_pin_without_notify.patch"
@@ -29,13 +26,12 @@ source=("https://github.com/telegramdesktop/tdesktop/releases/download/v${pkgver
         "clicky_sticker_panel.patch"
         "dont_pulse_mentions.patch"
         "no_circles.patch")
-sha512sums=('56efa64048d23b280782b51319c0071c6cef833cb7e2584e52c6e45488577755beb85185ec9187029c425cc8d4c9c1887142687c744697e7731a15abe2846056'
-            '3c21c871e28bac365400f7bc439a16ad1a9a8d87590ad764ce262f1db968c10387caed372d4e064cb50f43da726cebaa9b24bcbcc7c6d5489515620f44dbf56b'
+sha512sums=('1fd9b04da02e648bf4e54cb3344b2490f5d7dc08d94e2dc0aa18f0402b96a8a923adaf9a1664393629bc8054ef91ef8ea20e8dd59222da52560a04eb5c541d0d'
             'fdef3a430bdd60d88c9e9011ee878805e7803699204a2a7e22797d0f8729bf7dc0543851083ad700a4ece32bc768b6bfeb6f0135c8c039e035b22afb6df1171d'
             '91a0edab6408a223db77b75df5a913ffd36efa79340e8d78fa01ac2c3b6e09d5a5fc7fa214ccd40473093809f86b7aef199cebf56a1d5821c20083c4a3e5780b'
             '247ba6576166dead08289b145ca126b6498c0731f9e4a5763b80d4a4cc3f057dffc6d8b697ed4fa2129a5b86c568ec5130fda25df30661a4f4c147d358f3ae5b'
             '4f5b61073b4bd28d2cf92cb6bddb91a50518c4ce801d178366b3760ee2cf1692164546e439049c9ba821e23bff2e3080a42bfabf6fa46d613fd56905b405f340'
-            '128c139e2e7cd3b12a4a31af1cac1c326b5ed95763499c95a2484efe12cf5f448e3c8e83d73e90169651478e091abfbe505a9001bbb49e8f9fa139cca3aa5012'
+            '673e2a28781d0d604549c621592b1017ad306ddaf6d1beedfe73f3f1357fbb6afd994a324dfa15029789bdf8a4d6e85ad12a3877519618f6585bbc1927c06900'
             '048c6784fb0bb9182d07916fdfab9f9952cdcb1998b0f780ce74bf03b61ae62774611819db7de5fec5019b9158b42c3912ca28797aeca41a881493e5822afcd8')
 
 prepare() {
@@ -54,35 +50,23 @@ prepare() {
 build() {
     cd tdesktop-$pkgver-full
 
-    export CXXFLAGS="$CXXFLAGS -ffile-prefix-map=$srcdir/tdesktop-$pkgver-full="
-    # For some reason, this is needed when building without spellchecking
-    export LDFLAGS="$LDFLAGS,--copy-dt-needed-entries"
+    # export CXXFLAGS="$CXXFLAGS -ffile-prefix-map=$srcdir/tdesktop-$pkgver-full="
     cmake -B build -G Ninja . \
-        -Ddisable_autoupdate=1 \
-        -DCMAKE_INSTALL_PREFIX="$pkgdir/usr" \
+        -DCMAKE_INSTALL_PREFIX="/usr" \
         -DCMAKE_BUILD_TYPE=Release \
         -DTDESKTOP_API_ID=2040 \
         -DTDESKTOP_API_HASH=b18441a1ff607e10a989891a5462e627 \
-        -DDESKTOP_APP_USE_GLIBC_WRAPS=OFF \
-        -DDESKTOP_APP_USE_PACKAGED=ON \
         -DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF \
         -DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF \
-        -DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON \
         -DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME=ON \
-        -DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION=ON \
         -DTDESKTOP_USE_PACKAGED_TGVOIP=OFF \
         -DDESKTOP_APP_SPECIAL_TARGET="" \
         -DTDESKTOP_LAUNCHER_BASENAME="telegramdesktop" \
-        -DDESKTOP_APP_DISABLE_SPELLCHECK=ON \
-        -DTDESKTOP_FORCE_GTK_FILE_DIALOG=ON
+        -DDESKTOP_APP_DISABLE_SPELLCHECK=ON
     ninja -C build
 }
 
 package() {
     cd tdesktop-$pkgver-full
-    ninja -C build install
-
-    mv "$pkgdir/usr/bin/telegram-desktop"{,-bin}
-    install -dm755 "$pkgdir/usr/bin"
-    install -m755 "$srcdir/telegram-desktop.sh" "$pkgdir/usr/bin/telegram-desktop"
+    DESTDIR=$pkgdir ninja -C build install
 }
diff --git a/dont_pulse_mentions.patch b/dont_pulse_mentions.patch
index ec978229ff05..fe317d7daad4 100644
--- a/dont_pulse_mentions.patch
+++ b/dont_pulse_mentions.patch
@@ -2,10 +2,10 @@ Description: disables visual distractions from incoming mentions
 Credits: novie
 
 diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
-index 305f9c71d..c0add9da2 100644
+index 67ae34198..341ce398a 100644
 --- a/Telegram/SourceFiles/history/history_inner_widget.cpp
 +++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
-@@ -626,7 +626,6 @@ void HistoryInner::paintEvent(QPaintEvent *e) {
+@@ -630,7 +630,6 @@ void HistoryInner::paintEvent(QPaintEvent *e) {
  				}
  				if (item->isUnreadMention() && !item->isUnreadMedia()) {
  					readMentions.insert(item);
@@ -13,11 +13,11 @@ index 305f9c71d..c0add9da2 100644
  				}
  
  				int32 h = view->height();
-@@ -672,7 +671,6 @@ void HistoryInner::paintEvent(QPaintEvent *e) {
- 					}
- 					if (item->isUnreadMention() && !item->isUnreadMedia()) {
- 						readMentions.insert(item);
--						_widget->enqueueMessageHighlight(view);
+@@ -686,7 +685,6 @@ void HistoryInner::paintEvent(QPaintEvent *e) {
+ 						}
+ 						if (item->isUnreadMention() && !item->isUnreadMedia()) {
+ 							readMentions.insert(item);
+-							_widget->enqueueMessageHighlight(view);
+ 						}
  					}
  				}
- 				p.translate(0, h);
diff --git a/telegram-desktop.sh b/telegram-desktop.sh
deleted file mode 100644
index 6611ff848fc2..000000000000
--- a/telegram-desktop.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/sh
-unset QT_QPA_PLATFORMTHEME
-exec /usr/bin/telegram-desktop-bin "$@"