diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-05-09 08:20:02 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-05-09 08:20:02 +0000 |
| commit | ca8b98ae7b731f37a67c2cc3e8881c31c02acf7f (patch) | |
| tree | 0e80005038077f9a04a8cfb8e33fdc1bfb4010d1 | |
| parent | 2021-05-09 08:05:15 UTC (diff) | |
| parent | net-im/telegram-desktop: Fix build with GCC 11 (diff) | |
| download | gentoo-ca8b98ae7b731f37a67c2cc3e8881c31c02acf7f.tar.gz gentoo-ca8b98ae7b731f37a67c2cc3e8881c31c02acf7f.tar.bz2 gentoo-ca8b98ae7b731f37a67c2cc3e8881c31c02acf7f.zip | |
Merge updates from master
| -rw-r--r-- | net-im/telegram-desktop/files/tdesktop-2.7.4-webview-fix-gcc11.patch | 25 | ||||
| -rw-r--r-- | net-im/telegram-desktop/telegram-desktop-2.7.4.ebuild | 2 |
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() { |