From e377f9f5a2674469247a0fd568da8a966309ed7c Mon Sep 17 00:00:00 2001 From: Lorem Date: Sat, 17 Jul 2021 19:17:05 +0530 Subject: [PATCH] telegram-desktop: update to 2.8.10. --- .../patches/0003-gdk-include.patch | 10 ------- .../0003-remove-redundant-extern-c.patch | 28 +++++++++++++++++++ srcpkgs/telegram-desktop/template | 6 ++-- 3 files changed, 31 insertions(+), 13 deletions(-) delete mode 100644 srcpkgs/telegram-desktop/patches/0003-gdk-include.patch create mode 100644 srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch diff --git a/srcpkgs/telegram-desktop/patches/0003-gdk-include.patch b/srcpkgs/telegram-desktop/patches/0003-gdk-include.patch deleted file mode 100644 index 87c82f074d10..000000000000 --- a/srcpkgs/telegram-desktop/patches/0003-gdk-include.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h 2021-04-26 18:33:58.641158572 +0200 -+++ b/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h 2021-04-26 18:33:58.641158572 +0200 -@@ -12,6 +12,7 @@ - #undef signals - #include - #include -+#include - #include - #include - #define signals public diff --git a/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch b/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch new file mode 100644 index 000000000000..0bb89b65c7ff --- /dev/null +++ b/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch @@ -0,0 +1,28 @@ +https://github.com/desktop-app/lib_webview/pull/9 + +From 75e924934eee8624020befbef1f3cb5b865d3b86 Mon Sep 17 00:00:00 2001 +From: Vitaly Lipatov +Date: Fri, 9 Jul 2021 16:56:50 +0300 +Subject: [PATCH] webview_linux_webkit_gtk.h: there are already exists extern C + in the included headers + +--- + webview/platform/linux/webview_linux_webkit_gtk.h | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/webview/platform/linux/webview_linux_webkit_gtk.h b/webview/platform/linux/webview_linux_webkit_gtk.h +index 8d180c1..e894c75 100644 +--- a/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h ++++ b/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h +@@ -6,11 +6,9 @@ + // + #pragma once + +-extern "C" { + #include + #include + #include +-} // extern "C" + + namespace Webview::WebkitGtk { + diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template index 8c0981763b83..ca30e932a5ad 100644 --- a/srcpkgs/telegram-desktop/template +++ b/srcpkgs/telegram-desktop/template @@ -1,6 +1,6 @@ # Template file for 'telegram-desktop' pkgname=telegram-desktop -version=2.8.4 +version=2.8.10 revision=1 wrksrc="tdesktop-${version}-full" build_style=cmake @@ -19,7 +19,7 @@ makedepends="alsa-lib-devel ffmpeg-devel libdbusmenu-glib-devel libopenal-devel libva-devel rapidjson liblz4-devel liblzma-devel gtk+3-devel MesaLib-devel libdbusmenu-qt5-devel qt5-wayland-devel libatomic-devel xcb-util-keysyms-devel $(vopt_if spellcheck hunspell-devel) - kwayland-devel glibmm-devel tg_owt webkit2gtk-devel rnnoise-devel" + kwayland-devel glibmm-devel tg_owt webkit2gtk-devel rnnoise-devel jemalloc-devel" depends="qt5-imageformats qt5-core>=5.15.2<5.16.0" short_desc="Telegram Desktop messaging app" maintainer="John " @@ -27,7 +27,7 @@ license="GPL-3.0-or-later, OpenSSL" homepage="https://desktop.telegram.org/" changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt" distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz" -checksum=0a2a68590cdbccb40ff835516e9c575c761c91f83712891f69a5310fcb23a6a0 +checksum=60a81f447ee9a46982d66a85672041bba496d728c042865a65e4950e1b631013 build_options="spellcheck" build_options_default="spellcheck"