summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEsteve Varela Colominas <esteve.varela@gmail.com>2021-05-08 16:17:28 +0200
committerGeorgy Yakovlev <gyakovlev@gentoo.org>2021-05-09 01:04:43 -0700
commitbf6fe4f653ded715ab500b5911d394547be42fb3 (patch)
treee3d5986b46539eaa8483ffabef210b13401cb87e
parentmedia-sound/schismtracker: removed obsolete and vulnerable 20180810-r1 (diff)
downloadgentoo-bf6fe4f653ded715ab500b5911d394547be42fb3.tar.gz
gentoo-bf6fe4f653ded715ab500b5911d394547be42fb3.tar.bz2
gentoo-bf6fe4f653ded715ab500b5911d394547be42fb3.zip
net-im/telegram-desktop: Fix build with GCC 11
Closes: https://bugs.gentoo.org/787968 Thanks-to: Agostino Sarubbo <ago@gentoo.org> Signed-off-by: Esteve Varela Colominas <esteve.varela@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/20729 Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
-rw-r--r--net-im/telegram-desktop/files/tdesktop-2.7.4-webview-fix-gcc11.patch25
-rw-r--r--net-im/telegram-desktop/telegram-desktop-2.7.4.ebuild2
2 files changed, 27 insertions, 0 deletions
diff --git a/net-im/telegram-desktop/files/tdesktop-2.7.4-webview-fix-gcc11.patch b/net-im/telegram-desktop/files/tdesktop-2.7.4-webview-fix-gcc11.patch
new file mode 100644
index 000000000000..0188eaf76f8a
--- /dev/null
+++ b/net-im/telegram-desktop/files/tdesktop-2.7.4-webview-fix-gcc11.patch
@@ -0,0 +1,25 @@
+Index: tdesktop-2.7.4-full/Telegram/lib_webview/webview/webview_embed.cpp
+===================================================================
+--- tdesktop-2.7.4-full.orig/Telegram/lib_webview/webview/webview_embed.cpp
++++ tdesktop-2.7.4-full/Telegram/lib_webview/webview/webview_embed.cpp
+@@ -14,7 +14,6 @@
+
+ #include <QtWidgets/QWidget>
+ #include <QtGui/QWindow>
+-#include <QtCore/QJsonDocument>
+
+ namespace Webview {
+ namespace {
+Index: tdesktop-2.7.4-full/Telegram/lib_webview/webview/webview_embed.h
+===================================================================
+--- tdesktop-2.7.4-full.orig/Telegram/lib_webview/webview/webview_embed.h
++++ tdesktop-2.7.4-full/Telegram/lib_webview/webview/webview_embed.h
+@@ -9,6 +9,8 @@
+ #include "base/unique_qptr.h"
+ #include "base/basic_types.h"
+
++#include <QtCore/QJsonDocument>
++
+ class QString;
+ class QWidget;
+ class QWindow;
diff --git a/net-im/telegram-desktop/telegram-desktop-2.7.4.ebuild b/net-im/telegram-desktop/telegram-desktop-2.7.4.ebuild
index 609781f96cb7..8081b9da583e 100644
--- a/net-im/telegram-desktop/telegram-desktop-2.7.4.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-2.7.4.ebuild
@@ -71,6 +71,8 @@ PATCHES=(
"${FILESDIR}/tdesktop-2.7.3-disable-webkit-separately.patch"
# https://github.com/desktop-app/lib_webview/commit/0b4100d7cecc4e748c51f3f51ebfd1392ec3978a
"${FILESDIR}/tdesktop-2.7.3-webview-include-gdkx.patch"
+ # https://github.com/desktop-app/lib_webview/pull/3
+ "${FILESDIR}/tdesktop-2.7.4-webview-fix-gcc11.patch"
)
pkg_pretend() {