From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/konversation/files/, net-irc/konversation/
Date: Tue, 21 Apr 2020 09:22:40 +0000 (UTC) [thread overview]
Message-ID: <1587460936.73a81e6a36909558b066e17fd275ee9cdef3ba8b.asturm@gentoo> (raw)
commit: 73a81e6a36909558b066e17fd275ee9cdef3ba8b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 21 08:38:37 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Apr 21 09:22:16 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73a81e6a
net-irc/konversation: Fix build with Qt 5.15
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/konversation-1.7.5-qt-5.15.patch | 31 ++++++++++++++++++++++
net-irc/konversation/konversation-1.7.5-r2.ebuild | 1 +
2 files changed, 32 insertions(+)
diff --git a/net-irc/konversation/files/konversation-1.7.5-qt-5.15.patch b/net-irc/konversation/files/konversation-1.7.5-qt-5.15.patch
new file mode 100644
index 00000000000..a17c0a43231
--- /dev/null
+++ b/net-irc/konversation/files/konversation-1.7.5-qt-5.15.patch
@@ -0,0 +1,31 @@
+From f88c73cf278da9907496eab0777903f942c50cb9 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 21 Apr 2020 10:34:49 +0200
+Subject: [PATCH] Fix build with Qt 5.15 (missing header)
+
+Test Plan: Build succeeds with Qt 5.15.0_beta4
+
+Reviewers: #konversation, psn
+
+Reviewed By: #konversation, psn
+
+Differential Revision: https://phabricator.kde.org/D29038
+---
+ src/viewer/viewtree.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/viewer/viewtree.cpp b/src/viewer/viewtree.cpp
+index eeee8fb4..04ec4e54 100644
+--- a/src/viewer/viewtree.cpp
++++ b/src/viewer/viewtree.cpp
+@@ -21,6 +21,7 @@
+ #include <QFontDatabase>
+ #include <QGuiApplication>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QItemSelectionModel>
+ #include <QStyleHints>
+ #include <QToolTip>
+--
+2.26.1
+
diff --git a/net-irc/konversation/konversation-1.7.5-r2.ebuild b/net-irc/konversation/konversation-1.7.5-r2.ebuild
index 8c3b601c6cc..22ed78f5a2d 100644
--- a/net-irc/konversation/konversation-1.7.5-r2.ebuild
+++ b/net-irc/konversation/konversation-1.7.5-r2.ebuild
@@ -65,6 +65,7 @@ PATCHES=(
# git master
"${FILESDIR}"/${P}-kf5bookmarks-5.69.patch
"${FILESDIR}"/${P}-unused-kemoticons.patch
+ "${FILESDIR}"/${P}-qt-5.15.patch
)
src_configure() {
next reply other threads:[~2020-04-21 9:22 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-21 9:22 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-12-19 16:41 [gentoo-commits] repo/gentoo:master commit in: net-irc/konversation/files/, net-irc/konversation/ Andreas Sturmlechner
2021-06-26 17:40 Ulrich Müller
2021-04-06 8:23 Andreas Sturmlechner
2020-04-17 20:59 Andreas Sturmlechner
2020-04-17 20:59 Andreas Sturmlechner
2018-07-06 6:33 Andreas Sturmlechner
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=1587460936.73a81e6a36909558b066e17fd275ee9cdef3ba8b.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