1 |
commit: 2fdb5052e0cf4726eb141fd92a0ca83c2785ca35 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat May 1 18:39:38 2021 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat May 1 21:21:55 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fdb5052 |
7 |
|
8 |
kde-apps/konsole: Fix build with GCC-11 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/787179 |
11 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
13 |
|
14 |
kde-apps/konsole/files/konsole-21.04.0-gcc11.patch | 25 ++++++++++++++++++++++ |
15 |
kde-apps/konsole/konsole-21.04.0.ebuild | 2 ++ |
16 |
2 files changed, 27 insertions(+) |
17 |
|
18 |
diff --git a/kde-apps/konsole/files/konsole-21.04.0-gcc11.patch b/kde-apps/konsole/files/konsole-21.04.0-gcc11.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..0a9e2a4cbc2 |
21 |
--- /dev/null |
22 |
+++ b/kde-apps/konsole/files/konsole-21.04.0-gcc11.patch |
23 |
@@ -0,0 +1,25 @@ |
24 |
+From 242213afd9eb9886e04eb9e6e69a4caa9c606363 Mon Sep 17 00:00:00 2001 |
25 |
+From: Kurt Hindenburg <kurt.hindenburg@×××××.com> |
26 |
+Date: Fri, 30 Apr 2021 17:07:13 -0400 |
27 |
+Subject: [PATCH] Add missing include to fix build on gcc-11 |
28 |
+ |
29 |
+--- |
30 |
+ src/terminalDisplay/TerminalPainter.cpp | 2 ++ |
31 |
+ 1 file changed, 2 insertions(+) |
32 |
+ |
33 |
+diff --git a/src/terminalDisplay/TerminalPainter.cpp b/src/terminalDisplay/TerminalPainter.cpp |
34 |
+index fce10d09..7623602e 100644 |
35 |
+--- a/src/terminalDisplay/TerminalPainter.cpp |
36 |
++++ b/src/terminalDisplay/TerminalPainter.cpp |
37 |
+@@ -30,6 +30,8 @@ |
38 |
+ #include <QDebug> |
39 |
+ #include <QtMath> |
40 |
+ |
41 |
++#include <optional> |
42 |
++ |
43 |
+ // we use this to force QPainter to display text in LTR mode |
44 |
+ // more information can be found in: https://unicode.org/reports/tr9/ |
45 |
+ const QChar LTR_OVERRIDE_CHAR(0x202D); |
46 |
+-- |
47 |
+GitLab |
48 |
+ |
49 |
|
50 |
diff --git a/kde-apps/konsole/konsole-21.04.0.ebuild b/kde-apps/konsole/konsole-21.04.0.ebuild |
51 |
index 701329615e7..387e191ea7f 100644 |
52 |
--- a/kde-apps/konsole/konsole-21.04.0.ebuild |
53 |
+++ b/kde-apps/konsole/konsole-21.04.0.ebuild |
54 |
@@ -51,6 +51,8 @@ DEPEND=" |
55 |
" |
56 |
RDEPEND="${DEPEND}" |
57 |
|
58 |
+PATCHES=( "${FILESDIR}"/${P}-gcc11.patch ) # bug 787179 |
59 |
+ |
60 |
src_prepare() { |
61 |
ecm_src_prepare |
62 |
ecm_punt_bogus_dep KF5 Completion |