Update to 2.8.4

4 files changed, 43 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a42e28e07040..1b17069f17ce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = telegram-desktop9
 	pkgdesc = Official Telegram Desktop client (personal build)
-	pkgver = 2.7.4
+	pkgver = 2.8.4
 	pkgrel = 1
 	url = https://desktop.telegram.org/
 	arch = x86_64
@@ -13,6 +13,7 @@ pkgbase = telegram-desktop9
 	makedepends = tl-expected
 	makedepends = microsoft-gsl
 	makedepends = libtg_owt
+	makedepends = extra-cmake-modules
 	depends = ffmpeg
 	depends = hicolor-icon-theme
 	depends = lz4
@@ -26,12 +27,14 @@ pkgbase = telegram-desktop9
 	depends = gtk3
 	depends = glibmm
 	depends = webkit2gtk
+	depends = rnnoise
+	depends = pipewire
+	depends = libxtst
+	depends = libxrandr
 	provides = telegram-desktop
 	conflicts = telegram-desktop
-	source = https://github.com/telegramdesktop/tdesktop/releases/download/v2.7.4/tdesktop-2.7.4-full.tar.gz
-	source = 71deaa48afab2bcf9df67b9b347b1f44aad3a9ce._patch::https://github.com/telegramdesktop/tdesktop/commit/71deaa48afab2bcf9df67b9b347b1f44aad3a9ce.patch
-	source = a8807bc915f2439acc7c84f06d931d96d6ca602a._patch::https://github.com/telegramdesktop/tdesktop/commit/a8807bc915f2439acc7c84f06d931d96d6ca602a.patch
-	source = fix-webview-includes._patch::https://raw.githubusercontent.com/archlinux/svntogit-community/bf53e23b5321cbc664bfb93e4350b179b26238f6/trunk/fix-webview-includes.patch
+	source = https://github.com/telegramdesktop/tdesktop/releases/download/v2.8.4/tdesktop-2.8.4-full.tar.gz
+	source = fix-gcc11-assert._patch::https://raw.githubusercontent.com/archlinux/svntogit-community/fcf886c3eae607f9827627957016cdfe1b81be33/trunk/fix-gcc11-assert.patch
 	source = always_delete_for_everyone.patch
 	source = always_pin_without_notify.patch
 	source = always_send_as_photo_or_album.patch
@@ -41,18 +44,16 @@ pkgbase = telegram-desktop9
 	source = use_xdg-open.patch
 	source = fix_thread_context_menu.patch
 	source = mediaviewer_nofullscreen.patch
-	sha512sums = 0a796d7a8c5e5982bc60f19c41da53996a609bf794fad224e7beea5fc3816b5cf35f16b0ec2cc7279085c69996063a44085f48e1596dfe746d260a2e8f1b2d14
-	sha512sums = cabdadddc7a6873c7c6fc8128ceddf2712c0c73d3316520482162e5c67937bda2a627ddb2f078558a52e812c2a876351196488a5a75381d84a43815b873bac5b
-	sha512sums = 72ef9bddef1f40e09b9c4334153f1ab8aaddf63d95d9f25dc1b0a0826b7f2ae24f7c5fc4cb5ce90aae2c3144a5d52c4cb870d643f447d654190c4a2c78079354
-	sha512sums = 5492c73f0b984da1e2d1f21c3a36c11c4b9ad511522dccd4d6440681f68d6ebc9e672806a534b1e551f736f080d3ef307c8ddd012e4646bd84d09c5e8fa85a40
+	sha512sums = b0e78aa9bffa1707425f058737b0d0a0db26e8fba14e1413e465eefcbbc95dc0eaee642d1ebc4a82c8239188a3eed677c5c3eb748203348a14ba2ace61afd779
+	sha512sums = d94c21f45a14eea009f4dc099a0be7774aa9c64d6bdb2745eb866a505ad4d95e4e75e53e110bcdc2db553809d8aea485e3fa321feccc7660120c0f418f4d5e3f
 	sha512sums = fdef3a430bdd60d88c9e9011ee878805e7803699204a2a7e22797d0f8729bf7dc0543851083ad700a4ece32bc768b6bfeb6f0135c8c039e035b22afb6df1171d
 	sha512sums = dc5ffda130496c44bfe52792e856dac811b1a8e48b463529dd54396ad1b45915f8b6d9fcb6cb254f9350b3440d7b94a67d1c19660962f0350015061b021af6f1
 	sha512sums = 4da055da633b40b6133d14fd13d1aa9d933b3ba4b19370bc0edbccc02d4e31a9291191f7dc3a2aca9225da8dabca6ed33f90ab757435bebd034b6fed28ac8092
-	sha512sums = 19a13dbe8d8af5400bb64c2004fbf31b162da7ecc46636b5e5d93dc860ab0a6b9d81331789d11171451ade679459e0338134b64a21cc69b01ab201d64ec7560e
+	sha512sums = 91e6b5af2db63f4c24a43f8e6799be44e27775ef3f0615f760552b1d691b6e734812a87cba9b9753272dc1d3dc5d33ad2890d2dc0be4b9e87680a6dc8a26997c
 	sha512sums = 673e2a28781d0d604549c621592b1017ad306ddaf6d1beedfe73f3f1357fbb6afd994a324dfa15029789bdf8a4d6e85ad12a3877519618f6585bbc1927c06900
 	sha512sums = 8ec6b1739a1391b75a2653fff704a7d22e830c526acffe138936bbd20047bd24831e42558fa22069d7e914e762bbcfa2e1b14a8fd3911fd8bbbd0662d8baac14
 	sha512sums = fd8d0bf64e1e682711f161b1f22ada8ab7551e6bbd794aa3bc53cdfecc0d60c688c1b82525d87ae26c6eb7f9b958c836a0ed57851ef95d32d031921a973e0675
 	sha512sums = e6a10c1304e01676373c77d27629d93c085fa4e34e80ce1e4bd10af9cfb0a24c1fe2077cc0fdda83162e865cfab6811c9bc27aa13661c6d300c54749ffaef796
-	sha512sums = e74c9c4cef3c6ac17c1cac19ecc4fc788b20a06776344a32f5ebdeeab9064c61a5ee302eca1f3d25af63f1e4c11b5ee615f3afdfefa30c1b1626fb093bf26866
+	sha512sums = f38793e89a735ce0bc86158d567c156bad83ab5a924898aec6429c61317e64261c533cbe463630815f061c18bf24a378ea0256ed6c28fe968af74f222bdbc546
 
 pkgname = telegram-desktop9
diff --git a/PKGBUILD b/PKGBUILD
index f455387a88e5..6e8ed8a0b634 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,22 @@
 # Maintainer: novenary <streetwalkermc@gmail.com>
+# Contributor: Sven-Hendrik Haase <svenstaro@gmail.com>
 # Contributor: hexchain <i@hexchain.org>
 pkgname=telegram-desktop9
-pkgver=2.7.4
+pkgver=2.8.4
 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' 'ttf-opensans'
-         'qt5-imageformats' 'xxhash' 'libdbusmenu-qt5' 'kwayland' 'gtk3' 'glibmm' 'webkit2gtk')
-makedepends=('cmake' 'git' 'ninja' 'python' 'range-v3' 'tl-expected' 'microsoft-gsl' 'libtg_owt')
+         'qt5-imageformats' 'xxhash' 'libdbusmenu-qt5' 'kwayland' 'gtk3' 'glibmm'
+         'webkit2gtk' 'rnnoise' 'pipewire' 'libxtst' 'libxrandr' )
+makedepends=('cmake' 'git' 'ninja' 'python' 'range-v3' 'tl-expected' 'microsoft-gsl'
+             'libtg_owt' 'extra-cmake-modules')
 provides=('telegram-desktop')
 conflicts=('telegram-desktop')
 source=("https://github.com/telegramdesktop/tdesktop/releases/download/v${pkgver}/tdesktop-${pkgver}-full.tar.gz"
-        "71deaa48afab2bcf9df67b9b347b1f44aad3a9ce._patch::https://github.com/telegramdesktop/tdesktop/commit/71deaa48afab2bcf9df67b9b347b1f44aad3a9ce.patch"
-        "a8807bc915f2439acc7c84f06d931d96d6ca602a._patch::https://github.com/telegramdesktop/tdesktop/commit/a8807bc915f2439acc7c84f06d931d96d6ca602a.patch"
-        "fix-webview-includes._patch::https://raw.githubusercontent.com/archlinux/svntogit-community/bf53e23b5321cbc664bfb93e4350b179b26238f6/trunk/fix-webview-includes.patch"
+        "fix-gcc11-assert._patch::https://raw.githubusercontent.com/archlinux/svntogit-community/fcf886c3eae607f9827627957016cdfe1b81be33/trunk/fix-gcc11-assert.patch"
 
         "always_delete_for_everyone.patch"
         "always_pin_without_notify.patch"
@@ -26,22 +27,20 @@ source=("https://github.com/telegramdesktop/tdesktop/releases/download/v${pkgver
         "use_xdg-open.patch"
         "fix_thread_context_menu.patch"
         "mediaviewer_nofullscreen.patch")
-sha512sums=('0a796d7a8c5e5982bc60f19c41da53996a609bf794fad224e7beea5fc3816b5cf35f16b0ec2cc7279085c69996063a44085f48e1596dfe746d260a2e8f1b2d14'
-            'cabdadddc7a6873c7c6fc8128ceddf2712c0c73d3316520482162e5c67937bda2a627ddb2f078558a52e812c2a876351196488a5a75381d84a43815b873bac5b'
-            '72ef9bddef1f40e09b9c4334153f1ab8aaddf63d95d9f25dc1b0a0826b7f2ae24f7c5fc4cb5ce90aae2c3144a5d52c4cb870d643f447d654190c4a2c78079354'
-            '5492c73f0b984da1e2d1f21c3a36c11c4b9ad511522dccd4d6440681f68d6ebc9e672806a534b1e551f736f080d3ef307c8ddd012e4646bd84d09c5e8fa85a40'
+sha512sums=('b0e78aa9bffa1707425f058737b0d0a0db26e8fba14e1413e465eefcbbc95dc0eaee642d1ebc4a82c8239188a3eed677c5c3eb748203348a14ba2ace61afd779'
+            'd94c21f45a14eea009f4dc099a0be7774aa9c64d6bdb2745eb866a505ad4d95e4e75e53e110bcdc2db553809d8aea485e3fa321feccc7660120c0f418f4d5e3f'
             'fdef3a430bdd60d88c9e9011ee878805e7803699204a2a7e22797d0f8729bf7dc0543851083ad700a4ece32bc768b6bfeb6f0135c8c039e035b22afb6df1171d'
             'dc5ffda130496c44bfe52792e856dac811b1a8e48b463529dd54396ad1b45915f8b6d9fcb6cb254f9350b3440d7b94a67d1c19660962f0350015061b021af6f1'
             '4da055da633b40b6133d14fd13d1aa9d933b3ba4b19370bc0edbccc02d4e31a9291191f7dc3a2aca9225da8dabca6ed33f90ab757435bebd034b6fed28ac8092'
-            '19a13dbe8d8af5400bb64c2004fbf31b162da7ecc46636b5e5d93dc860ab0a6b9d81331789d11171451ade679459e0338134b64a21cc69b01ab201d64ec7560e'
+            '91e6b5af2db63f4c24a43f8e6799be44e27775ef3f0615f760552b1d691b6e734812a87cba9b9753272dc1d3dc5d33ad2890d2dc0be4b9e87680a6dc8a26997c'
             '673e2a28781d0d604549c621592b1017ad306ddaf6d1beedfe73f3f1357fbb6afd994a324dfa15029789bdf8a4d6e85ad12a3877519618f6585bbc1927c06900'
             '8ec6b1739a1391b75a2653fff704a7d22e830c526acffe138936bbd20047bd24831e42558fa22069d7e914e762bbcfa2e1b14a8fd3911fd8bbbd0662d8baac14'
             'fd8d0bf64e1e682711f161b1f22ada8ab7551e6bbd794aa3bc53cdfecc0d60c688c1b82525d87ae26c6eb7f9b958c836a0ed57851ef95d32d031921a973e0675'
             'e6a10c1304e01676373c77d27629d93c085fa4e34e80ce1e4bd10af9cfb0a24c1fe2077cc0fdda83162e865cfab6811c9bc27aa13661c6d300c54749ffaef796'
-            'e74c9c4cef3c6ac17c1cac19ecc4fc788b20a06776344a32f5ebdeeab9064c61a5ee302eca1f3d25af63f1e4c11b5ee615f3afdfefa30c1b1626fb093bf26866')
+            'f38793e89a735ce0bc86158d567c156bad83ab5a924898aec6429c61317e64261c533cbe463630815f061c18bf24a378ea0256ed6c28fe968af74f222bdbc546')
 
 prepare() {
-    cd "$srcdir/tdesktop-$pkgver-full"
+    cd tdesktop-$pkgver-full
 
     local src
     for src in "${source[@]}"; do
@@ -53,14 +52,13 @@ prepare() {
     done
 
     cd cmake
-    # force webrtc link to libjpeg
+    # force webrtc link to libjpeg and X11 libs
     echo "target_link_libraries(external_webrtc INTERFACE jpeg)" | tee -a external/webrtc/CMakeLists.txt
-    cd ../Telegram/lib_webview
-    patch -Np1 -i "$srcdir"/fix-webview-includes._patch
+    echo "find_package(X11 REQUIRED COMPONENTS Xcomposite Xdamage Xext Xfixes Xrender Xrandr Xtst)" | tee -a external/webrtc/CMakeLists.txt
+    echo "target_link_libraries(external_webrtc INTERFACE Xcomposite Xdamage Xext Xfixes Xrandr Xrender Xtst)" | tee -a external/webrtc/CMakeLists.txt
 
     cd ..
-    patch -Np2 -i "$srcdir"/71deaa48afab2bcf9df67b9b347b1f44aad3a9ce._patch
-    patch -Np2 -i "$srcdir"/a8807bc915f2439acc7c84f06d931d96d6ca602a._patch
+    patch -b -d Telegram/lib_webview/ -Np1 -i ${srcdir}/fix-gcc11-assert._patch
 }
 
 build() {
diff --git a/clicky_sticker_panel.patch b/clicky_sticker_panel.patch
index 119fba17aa7c..52258a95454c 100644
--- a/clicky_sticker_panel.patch
+++ b/clicky_sticker_panel.patch
@@ -2,7 +2,7 @@ Description: open the sticker panel by clicking rather than hovering, disable pe
 Credits: JuanPotato, novie
 
 diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp
-index 8fba46c57..c7e9450fd 100644
+index 189c8ec18..d7c7f982a 100644
 --- a/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp
 +++ b/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp
 @@ -232,10 +232,12 @@ void TabbedPanel::leaveEventHook(QEvent *e) {
@@ -19,10 +19,10 @@ index 8fba46c57..c7e9450fd 100644
  		return;
  	}
 diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
-index a36a76b37..7321ecf9b 100644
+index 91833a8f4..9ce28008a 100644
 --- a/Telegram/SourceFiles/history/history_widget.cpp
 +++ b/Telegram/SourceFiles/history/history_widget.cpp
-@@ -3924,6 +3924,7 @@ void HistoryWidget::onModerateKeyActivate(int index, bool *outHandled) {
+@@ -4029,6 +4029,7 @@ void HistoryWidget::showMembersDropdown() {
  bool HistoryWidget::pushTabbedSelectorToThirdSection(
  		not_null<PeerData*> peer,
  		const Window::SectionShow &params) {
@@ -30,12 +30,13 @@ index a36a76b37..7321ecf9b 100644
  	if (!_tabbedPanel) {
  		return true;
  	} else if (!peer->canWrite()) {
-@@ -3969,19 +3970,7 @@ void HistoryWidget::toggleTabbedSelectorMode() {
+@@ -4082,20 +4083,7 @@ void HistoryWidget::toggleTabbedSelectorMode() {
  	if (!_peer) {
  		return;
  	}
 -	if (_tabbedPanel) {
--		if (controller()->canShowThirdSection() && !Adaptive::OneColumn()) {
+-		if (controller()->canShowThirdSection()
+-			&& !controller()->adaptive().isOneColumn()) {
 -			Core::App().settings().setTabbedSelectorSectionEnabled(true);
 -			Core::App().saveSettingsDelayed();
 -			pushTabbedSelectorToThirdSection(
@@ -52,10 +53,10 @@ index a36a76b37..7321ecf9b 100644
  
  void HistoryWidget::recountChatWidth() {
 diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
-index 7edb1a78e..f93b4deb6 100644
+index 01809184b..b7581bb8e 100644
 --- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
 +++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
-@@ -784,6 +784,7 @@ void ComposeControls::escape() {
+@@ -1869,6 +1869,7 @@ void ComposeControls::escape() {
  bool ComposeControls::pushTabbedSelectorToThirdSection(
  		not_null<PeerData*> peer,
  		const Window::SectionShow &params) {
@@ -63,12 +64,13 @@ index 7edb1a78e..f93b4deb6 100644
  	if (!_tabbedPanel) {
  		return true;
  	//} else if (!_canSendMessages) {
-@@ -834,19 +835,7 @@ void ComposeControls::toggleTabbedSelectorMode() {
+@@ -1919,20 +1920,7 @@ void ComposeControls::toggleTabbedSelectorMode() {
  	if (!_history) {
  		return;
  	}
 -	if (_tabbedPanel) {
--		if (_window->canShowThirdSection() && !Adaptive::OneColumn()) {
+-		if (_window->canShowThirdSection()
+-				&& !_window->adaptive().isOneColumn()) {
 -			Core::App().settings().setTabbedSelectorSectionEnabled(true);
 -			Core::App().saveSettingsDelayed();
 -			pushTabbedSelectorToThirdSection(
diff --git a/mediaviewer_nofullscreen.patch b/mediaviewer_nofullscreen.patch
index a2517e86f4f2..5c559b13f0c5 100644
--- a/mediaviewer_nofullscreen.patch
+++ b/mediaviewer_nofullscreen.patch
@@ -3,16 +3,16 @@ See 3251b8bf6e740e55777e85d63065a61e43df54fe
 Credits: novie
 
 diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
-index 604449dd3..799e1de14 100644
+index ab523514a..2b6ae1b2c 100644
 --- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
 +++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
-@@ -463,9 +463,6 @@ void OverlayWidget::moveToScreen() {
+@@ -501,9 +501,6 @@ void OverlayWidget::moveToScreen() {
  }
  
  void OverlayWidget::updateGeometry() {
 -	if (Platform::IsWayland()) {
 -		return;
 -	}
- 	const auto screen = windowHandle() && windowHandle()->screen()
- 		? windowHandle()->screen()
+ 	const auto screen = window()->screen()
+ 		? window()->screen()
  		: QApplication::primaryScreen();