From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B326E138350 for ; Tue, 21 Apr 2020 09:22:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 54557E08F2; Tue, 21 Apr 2020 09:22:43 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4070BE08F2 for ; Tue, 21 Apr 2020 09:22:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 02DC134F139 for ; Tue, 21 Apr 2020 09:22:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 22B7A1ED for ; Tue, 21 Apr 2020 09:22:40 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1587460936.73a81e6a36909558b066e17fd275ee9cdef3ba8b.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/konversation/files/, net-irc/konversation/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-irc/konversation/files/konversation-1.7.5-qt-5.15.patch net-irc/konversation/konversation-1.7.5-r2.ebuild X-VCS-Directories: net-irc/konversation/files/ net-irc/konversation/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 73a81e6a36909558b066e17fd275ee9cdef3ba8b X-VCS-Branch: master Date: Tue, 21 Apr 2020 09:22:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4cb245c7-f763-4859-930e-47e75e709385 X-Archives-Hash: 0cb5def1c9b770d69533327b03496d4b commit: 73a81e6a36909558b066e17fd275ee9cdef3ba8b Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Apr 21 08:38:37 2020 +0000 Commit: Andreas Sturmlechner gentoo 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 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 +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 + #include + #include ++#include + #include + #include + #include +-- +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() {