Date: Sunday, July 18, 2021 @ 09:51:36 Author: farseerfc Revision: 978465
upgpkg: telegram-desktop 2.8.11-1 Modified: telegram-desktop/trunk/PKGBUILD Deleted: telegram-desktop/trunk/fix-gcc11-assert.patch ------------------------+ PKGBUILD | 26 ++++++++++++-------------- fix-gcc11-assert.patch | 26 -------------------------- 2 files changed, 12 insertions(+), 40 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-07-18 09:40:16 UTC (rev 978464) +++ PKGBUILD 2021-07-18 09:51:36 UTC (rev 978465) @@ -1,8 +1,8 @@ # Maintainer: Sven-Hendrik Haase <[email protected]> # Contributor: hexchain <[email protected]> pkgname=telegram-desktop -pkgver=2.8.4 -pkgrel=3 +pkgver=2.8.11 +pkgrel=1 pkgdesc='Official Telegram Desktop client' arch=('x86_64') url="https://desktop.telegram.org/"; @@ -9,17 +9,13 @@ license=('GPL3') depends=('hunspell' 'ffmpeg' 'hicolor-icon-theme' 'lz4' 'minizip' 'openal' 'ttf-opensans' 'qt5-imageformats' 'xxhash' 'libdbusmenu-qt5' 'kwayland' 'gtk3' 'glibmm' - 'webkit2gtk' 'rnnoise' 'pipewire' 'libxtst' 'libxrandr' ) + 'webkit2gtk' 'rnnoise' 'pipewire' 'libxtst' 'libxrandr' 'jemalloc') 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"; - "fix-gcc11-assert.patch" - "fix-freeze-after-file-dialog.patch::https://github.com/telegramdesktop/tdesktop/commit/1261c775d4ca6fb78277ec213794da7c15e304e2.patch"; - "revert-qmenubar-fix-global-menu.patch::https://github.com/telegramdesktop/tdesktop/commit/6f031a715e5f9db1f75ec230cf06538d77d5b4ec.patch";) -sha512sums=('b0e78aa9bffa1707425f058737b0d0a0db26e8fba14e1413e465eefcbbc95dc0eaee642d1ebc4a82c8239188a3eed677c5c3eb748203348a14ba2ace61afd779' - 'd94c21f45a14eea009f4dc099a0be7774aa9c64d6bdb2745eb866a505ad4d95e4e75e53e110bcdc2db553809d8aea485e3fa321feccc7660120c0f418f4d5e3f' - '2a5c8f5ca5a3a34872567ac98032717c40689baab2926d9fa8960404c6630925732f028dc7fdcf28bef11dd247a78779c3f5ca631f8b75abf23e23dab8d0f24c' - '9a49f7e074f8e5c2ecad0092146af2647f7afd5e7b7904d3634013fcba7fb81eaff7ccca35c955ee55010431172b2c1bcdbe7f01d3d5a391d950b278b491fb54') + "fix-webview-extern-C-linkage.patch::https://patch-diff.githubusercontent.com/raw/desktop-app/lib_webview/pull/9.patch";) +sha512sums=('a553313b04fbb562745be2381a84117657172952e46e280980a73c9fcfe2a7cf29c0e012e4b1259816d1e6652418e7a1ddfc4e394544fcc3aeb33704cbe80860' + '6f405d48457f8839c9759ec1024db20251f0d42a3ec0026d1334d56511877f830213ac4b3c2396319dc8811e330324a4d62a0973221e280063aa69c18fd09a0e') prepare() { cd tdesktop-$pkgver-full/cmake @@ -28,11 +24,13 @@ 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 + # cp libjemalloc from jemalloc package + mkdir -p external/jemalloc/jemalloc-prefix/src/jemalloc/lib/ + cp /usr/lib/libjemalloc_pic.a external/jemalloc/jemalloc-prefix/src/jemalloc/lib/libjemalloc.a + # fix webview extern "C" linkage error cd .. - patch -b -d Telegram/lib_webview/ -Np1 -i ${srcdir}/fix-gcc11-assert.patch - # backport file dialog patch - patch -Np1 -i ${srcdir}/fix-freeze-after-file-dialog.patch - patch -Np1 -i ${srcdir}/revert-qmenubar-fix-global-menu.patch + patch -b -d Telegram/lib_webview/ -Np1 -i ${srcdir}/fix-webview-extern-C-linkage.patch + } build() { Deleted: fix-gcc11-assert.patch =================================================================== --- fix-gcc11-assert.patch 2021-07-18 09:40:16 UTC (rev 978464) +++ fix-gcc11-assert.patch 2021-07-18 09:51:36 UTC (rev 978465) @@ -1,26 +0,0 @@ -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);
