Date: Monday, June 28, 2021 @ 01:17:41
Author: farseerfc
Revision: 967636
upgpkg: telegram-desktop 2.8.1-1: telegram-desktop 2.8.1
Added:
telegram-desktop/trunk/fix-gcc11-assert.patch
Modified:
telegram-desktop/trunk/PKGBUILD
Deleted:
telegram-desktop/trunk/fix-tgcalls-gcc10.patch
telegram-desktop/trunk/fix-webview-includes.patch
----------------------------+
PKGBUILD | 29 +++++++++++++----------------
fix-gcc11-assert.patch | 26 ++++++++++++++++++++++++++
fix-tgcalls-gcc10.patch | 34 ----------------------------------
fix-webview-includes.patch | 12 ------------
4 files changed, 39 insertions(+), 62 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-06-28 01:16:03 UTC (rev 967635)
+++ PKGBUILD 2021-06-28 01:17:41 UTC (rev 967636)
@@ -1,34 +1,31 @@
# Maintainer: Sven-Hendrik Haase <svenst...@gmail.com>
# Contributor: hexchain <i...@hexchain.org>
pkgname=telegram-desktop
-pkgver=2.7.4
-pkgrel=2
+pkgver=2.8.1
+pkgrel=1
pkgdesc='Official Telegram Desktop client'
arch=('x86_64')
url="https://desktop.telegram.org/";
license=('GPL3')
depends=('hunspell' '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')
source=("https://github.com/telegramdesktop/tdesktop/releases/download/v${pkgver}/tdesktop-${pkgver}-full.tar.gz";
-
https://github.com/telegramdesktop/tdesktop/commit/71deaa48afab2bcf9df67b9b347b1f44aad3a9ce.patch
-
https://github.com/telegramdesktop/tdesktop/commit/a8807bc915f2439acc7c84f06d931d96d6ca602a.patch
- "fix-webview-includes.patch")
-sha512sums=('0a796d7a8c5e5982bc60f19c41da53996a609bf794fad224e7beea5fc3816b5cf35f16b0ec2cc7279085c69996063a44085f48e1596dfe746d260a2e8f1b2d14'
-
'cabdadddc7a6873c7c6fc8128ceddf2712c0c73d3316520482162e5c67937bda2a627ddb2f078558a52e812c2a876351196488a5a75381d84a43815b873bac5b'
-
'72ef9bddef1f40e09b9c4334153f1ab8aaddf63d95d9f25dc1b0a0826b7f2ae24f7c5fc4cb5ce90aae2c3144a5d52c4cb870d643f447d654190c4a2c78079354'
-
'5492c73f0b984da1e2d1f21c3a36c11c4b9ad511522dccd4d6440681f68d6ebc9e672806a534b1e551f736f080d3ef307c8ddd012e4646bd84d09c5e8fa85a40')
+ "fix-gcc11-assert.patch")
+sha512sums=('df35cc00dc47a8c65b32b62c139cc3a49333f573aa88fb70cc65197524f9b9b4756c58752866c843704ea4df5d6224eb4cba5b32953dd9a4d721b0ee0e1efc69'
+
'd94c21f45a14eea009f4dc099a0be7774aa9c64d6bdb2745eb866a505ad4d95e4e75e53e110bcdc2db553809d8aea485e3fa321feccc7660120c0f418f4d5e3f')
prepare() {
cd tdesktop-$pkgver-full/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() {
Added: fix-gcc11-assert.patch
===================================================================
--- fix-gcc11-assert.patch (rev 0)
+++ fix-gcc11-assert.patch 2021-06-28 01:17:41 UTC (rev 967636)
@@ -0,0 +1,26 @@
+diff --git a/webview/webview_embed.cpp b/webview/webview_embed.cpp
+index 7d4050a..bc55f7e 100644
+--- a/webview/webview_embed.cpp
++++ b/webview/webview_embed.cpp
+@@ -125,7 +125,7 @@ void Window::setMessageHandler(Fn<void(std::string)>
handler) {
+ _messageHandler = std::move(handler);
+ }
+
+-void Window::setMessageHandler(Fn<void(QJsonDocument)> handler) {
++void Window::setMessageHandler(Fn<void(const QJsonDocument&)> handler) {
+ if (!handler) {
+ setMessageHandler(Fn<void(std::string)>());
+ return;
+diff --git a/webview/webview_embed.h b/webview/webview_embed.h
+index 930cb8e..1281a71 100644
+--- a/webview/webview_embed.h
++++ b/webview/webview_embed.h
+@@ -36,7 +36,7 @@ class Window final {
+
+ void navigate(const QString &url);
+ void setMessageHandler(Fn<void(std::string)> handler);
+- void setMessageHandler(Fn<void(QJsonDocument)> handler);
++ void setMessageHandler(Fn<void(const QJsonDocument&)> handler);
+ void setNavigationStartHandler(Fn<bool(QString)> handler);
+ void setNavigationDoneHandler(Fn<void(bool)> handler);
+ void init(const QByteArray &js);
Deleted: fix-tgcalls-gcc10.patch
===================================================================
--- fix-tgcalls-gcc10.patch 2021-06-28 01:16:03 UTC (rev 967635)
+++ fix-tgcalls-gcc10.patch 2021-06-28 01:17:41 UTC (rev 967636)
@@ -1,34 +0,0 @@
-From eded7cc540123eaf26361958b9a61c65cb2f7cfc Mon Sep 17 00:00:00 2001
-From: John Preston <johnprestonm...@gmail.com>
-Date: Mon, 22 Mar 2021 19:24:10 +0400
-Subject: [PATCH] Fix build on GCC 10, second attempt.
-
----
- tgcalls/group/StreamingPart.cpp | 1 -
- tgcalls/group/StreamingPart.h | 1 +
- 2 files changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tgcalls/group/StreamingPart.cpp b/tgcalls/group/StreamingPart.cpp
-index a7f2e00..6b0206f 100644
---- a/tgcalls/group/StreamingPart.cpp
-+++ b/tgcalls/group/StreamingPart.cpp
-@@ -12,7 +12,6 @@ extern "C" {
- #include <string>
- #include <set>
- #include <map>
--#include <stdint.h>
-
- namespace tgcalls {
-
-diff --git a/tgcalls/group/StreamingPart.h b/tgcalls/group/StreamingPart.h
-index 08859d6..6e0812c 100644
---- a/tgcalls/group/StreamingPart.h
-+++ b/tgcalls/group/StreamingPart.h
-@@ -3,6 +3,7 @@
-
- #include "absl/types/optional.h"
- #include <vector>
-+#include <stdint.h>
-
- namespace tgcalls {
-
Deleted: fix-webview-includes.patch
===================================================================
--- fix-webview-includes.patch 2021-06-28 01:16:03 UTC (rev 967635)
+++ fix-webview-includes.patch 2021-06-28 01:17:41 UTC (rev 967636)
@@ -1,12 +0,0 @@
-diff --git a/webview/platform/linux/webview_linux_webkit_gtk.h
b/webview/platform/linux/webview_linux_webkit_gtk.h
-index a7f0f97..c2b21c7 100644
---- a/webview/platform/linux/webview_linux_webkit_gtk.h
-+++ b/webview/platform/linux/webview_linux_webkit_gtk.h
-@@ -14,6 +14,7 @@ extern "C" {
- #include <gtk/gtk.h>
- #include <webkit2/webkit2.h>
- #include <X11/Xlib.h>
-+#include <gdk/gdkx.h>
- #define signals public
- } // extern "C"
-
