commit: e34323fc29c3ef1afeb54b727766c33b64c1eb6c Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> AuthorDate: Thu Oct 22 15:49:57 2015 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Thu Oct 22 15:50:48 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e34323fc
mail-client/trojita: backport patch from upstream to solve build failure with Qt 5.5 Gentoo-bug: 563556 Package-Manager: portage-2.2.20.1 .../trojita/files/trojita-0.5-qt5.5-includes.patch | 40 ++++++++++++++++++++++ mail-client/trojita/trojita-0.5.ebuild | 1 + 2 files changed, 41 insertions(+) diff --git a/mail-client/trojita/files/trojita-0.5-qt5.5-includes.patch b/mail-client/trojita/files/trojita-0.5-qt5.5-includes.patch new file mode 100644 index 0000000..31bc62d --- /dev/null +++ b/mail-client/trojita/files/trojita-0.5-qt5.5-includes.patch @@ -0,0 +1,40 @@ +From 8a2496c273f2b0034f0edcc525e4987938a86c50 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <j...@kde.org> +Date: Tue, 10 Mar 2015 14:41:20 +0100 +Subject: [PATCH] Fix build with (unreleased) Qt 5.5 + +It is our fault for not including the headers we need, of course. + +Change-Id: Ibaa1df4a8b763bf6ae611c85cbdeeac5d2e3f9fd +--- + src/AbookAddressbook/AbookAddressbook.h | 1 + + src/Imap/Model/MailboxMetadata.cpp | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/AbookAddressbook/AbookAddressbook.h b/src/AbookAddressbook/AbookAddressbook.h +index 787661b..6f0634d 100644 +--- a/src/AbookAddressbook/AbookAddressbook.h ++++ b/src/AbookAddressbook/AbookAddressbook.h +@@ -25,6 +25,7 @@ + #ifndef ABOOK_ADDRESSBOOK + #define ABOOK_ADDRESSBOOK + ++#include <QObject> + #include <QPair> + #include "Gui/AbstractAddressbook.h" + +diff --git a/src/Imap/Model/MailboxMetadata.cpp b/src/Imap/Model/MailboxMetadata.cpp +index d5d2323..0dba1cd 100644 +--- a/src/Imap/Model/MailboxMetadata.cpp ++++ b/src/Imap/Model/MailboxMetadata.cpp +@@ -20,6 +20,7 @@ + along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #include "MailboxMetadata.h" ++#include <QDataStream> + + namespace Imap + { +-- +1.8.3.2 + diff --git a/mail-client/trojita/trojita-0.5.ebuild b/mail-client/trojita/trojita-0.5.ebuild index b0bfd16..171063d 100644 --- a/mail-client/trojita/trojita-0.5.ebuild +++ b/mail-client/trojita/trojita-0.5.ebuild @@ -60,6 +60,7 @@ DEPEND="${RDEPEND} " DOCS="README LICENSE" +PATCHES=( "${FILESDIR}/${P}-qt5.5-includes.patch" ) src_configure() { local mycmakeargs=(
