public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/konsole/, kde-apps/konsole/files/
Date: Sat,  1 May 2021 21:24:13 +0000 (UTC)	[thread overview]
Message-ID: <1619904115.2fdb5052e0cf4726eb141fd92a0ca83c2785ca35.asturm@gentoo> (raw)

commit:     2fdb5052e0cf4726eb141fd92a0ca83c2785ca35
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May  1 18:39:38 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May  1 21:21:55 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fdb5052

kde-apps/konsole: Fix build with GCC-11

Closes: https://bugs.gentoo.org/787179
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/konsole/files/konsole-21.04.0-gcc11.patch | 25 ++++++++++++++++++++++
 kde-apps/konsole/konsole-21.04.0.ebuild            |  2 ++
 2 files changed, 27 insertions(+)

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 00000000000..0a9e2a4cbc2
--- /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 701329615e7..387e191ea7f 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


             reply	other threads:[~2021-05-01 21:24 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-01 21:24 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-06-26 20:18 [gentoo-commits] repo/gentoo:master commit in: kde-apps/konsole/, kde-apps/konsole/files/ Sam James
2021-09-22 21:59 Andreas Sturmlechner
2021-08-24 13:39 Andreas Sturmlechner
2021-08-15 19:11 Andreas Sturmlechner
2021-08-13 20:14 Andreas Sturmlechner
2020-05-28 20:20 Andreas Sturmlechner
2020-03-23 23:57 Andreas Sturmlechner
2018-12-23  1:25 Andreas Sturmlechner
2018-02-08  0:10 Andreas Sturmlechner
2017-04-25 12:47 Michael Palimaka

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1619904115.2fdb5052e0cf4726eb141fd92a0ca83c2785ca35.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox