commit: bf6fe4f653ded715ab500b5911d394547be42fb3 Author: Esteve Varela Colominas <esteve.varela <AT> gmail <DOT> com> AuthorDate: Sat May 8 14:17:28 2021 +0000 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> CommitDate: Sun May 9 08:04:43 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf6fe4f6
net-im/telegram-desktop: Fix build with GCC 11 Closes: https://bugs.gentoo.org/787968 Thanks-to: Agostino Sarubbo <ago <AT> gentoo.org> Signed-off-by: Esteve Varela Colominas <esteve.varela <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/20729 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> .../files/tdesktop-2.7.4-webview-fix-gcc11.patch | 25 ++++++++++++++++++++++ .../telegram-desktop/telegram-desktop-2.7.4.ebuild | 2 ++ 2 files changed, 27 insertions(+) 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 00000000000..0188eaf76f8 --- /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 609781f96cb..8081b9da583 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() {
