gentoo resync : 04.05.2021

4 files changed, 29 insertions, 1 deletions

diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 0ca2f630f856..0cc2cf143e95 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest
index ee03c41242ef..8461c3674e27 100644
--- a/kde-apps/konsole/Manifest
+++ b/kde-apps/konsole/Manifest
@@ -1,5 +1,6 @@
+AUX konsole-21.04.0-gcc11.patch 791 BLAKE2B 6d01b7302d6c43ec68c1cda18087de3be403427c6fa7ffc186f5161011013e31c988e1afc83a71de040318295bc1f905783fa5ce79ee9bba3dd53854fa7bbe16 SHA512 f35aead7fefb994df61880dae3de634e94664289a81639c2fc5f2c107b87c20e9ad6d9a027f063bba69f5884bcceec5ccb463d82b3aade7c32eeb20c898b5996
 DIST konsole-20.12.3.tar.xz 1250536 BLAKE2B 83d4af770e42feb9fe96dcebc2cddc6889d98a7d6ce637fde6f8665ce845430e2118b3fcb34ca6448025a397826f14804442a590f1ff4ca62383768af7007a30 SHA512 a48eaa0080b26369f5f163f3ae345bca7f35aa06d581ecc0bbeca54fee2e9b900a4b648f940a67f506ecb00dba971220f1c1c7a699efcbb6e27ee0932c27e37a
 DIST konsole-21.04.0.tar.xz 1276124 BLAKE2B 40617f81d8204e5c8a89a21bf47338c4cf9c14c6a7bc68b696d8d9ad6613fc54c0f19684aaf2d99ff54774cddd97e9393517877aa565383d1df051e9471e535f SHA512 35cb9822c442bc3dcec0539451f2bd1672c27ea522a2dc412e7cffbd805497c58711a9035e2af3ba5cb804dc42da5563bb3a6017774d22000870bc9e7450402e
 EBUILD konsole-20.12.3.ebuild 1768 BLAKE2B 2ce4ebeaf5696ee86053793f877c8a48a912de4adddafbe69dfb61b561b1c253421784a7d70a3129653cf297f09571aa5fb1c85df1accc53690279274eda75d8 SHA512 30af05b642a7f7c4afd2a92d20cec2085f0f4c7a07526e7edb996f850718fa951b9354d5f6467cd4209d3c69468db3a1767827a14a546847d13a61ce75f3f8db
-EBUILD konsole-21.04.0.ebuild 1801 BLAKE2B 8b030795ca90844c899e976c7885171267998999b160b4a5b674831f176cc34d68463d639bc6117850f33caec121553299b54527dbc9b832dcd4b6f3e2e7bbe3 SHA512 965f20dbf5ea0d534e41dab070bf1e23544df94d98a4af715f2fcab3309d6481f6596a6a38308749ec3cb2ad237f8429a2a535a526947f27d21469d0289d7d7c
+EBUILD konsole-21.04.0.ebuild 1858 BLAKE2B 951628cd843bcc9cba844deac57272f8a48cdcc38bc4c458b13f16ff8cb5f8574b27fe967d1aac70e941e611e2339820c0ae4c3dc710aeb4fc20bbb81bb04638 SHA512 7312c36495a0f41efdeff3f5ca08a3464c75ce57134282f1b44be7f51a39057e6bbea92e0e30079a664ffecdf645adb6c5430f299fa8c243f857940c72877526
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konsole/files/konsole-21.04.0-gcc11.patch b/kde-apps/konsole/files/konsole-21.04.0-gcc11.patch
new file mode 100644
index 000000000000..0a9e2a4cbc28
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-21.04.0-gcc11.patch
@@ -0,0 +1,25 @@
+From 242213afd9eb9886e04eb9e6e69a4caa9c606363 Mon Sep 17 00:00:00 2001
+From: Kurt Hindenburg <kurt.hindenburg@gmail.com>
+Date: Fri, 30 Apr 2021 17:07:13 -0400
+Subject: [PATCH] Add missing include to fix build on gcc-11
+
+---
+ src/terminalDisplay/TerminalPainter.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/terminalDisplay/TerminalPainter.cpp b/src/terminalDisplay/TerminalPainter.cpp
+index fce10d09..7623602e 100644
+--- a/src/terminalDisplay/TerminalPainter.cpp
++++ b/src/terminalDisplay/TerminalPainter.cpp
+@@ -30,6 +30,8 @@
+ #include <QDebug>
+ #include <QtMath>
+ 
++#include <optional>
++
+ // we use this to force QPainter to display text in LTR mode
+ // more information can be found in: https://unicode.org/reports/tr9/
+ const QChar LTR_OVERRIDE_CHAR(0x202D);
+-- 
+GitLab
+
diff --git a/kde-apps/konsole/konsole-21.04.0.ebuild b/kde-apps/konsole/konsole-21.04.0.ebuild
index 701329615e79..387e191ea7f3 100644
--- a/kde-apps/konsole/konsole-21.04.0.ebuild
+++ b/kde-apps/konsole/konsole-21.04.0.ebuild
@@ -51,6 +51,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}"/${P}-gcc11.patch ) # bug 787179
+
 src_prepare() {
 	ecm_src_prepare
 	ecm_punt_bogus_dep KF5 Completion