From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id EB57913888F for ; Thu, 22 Oct 2015 15:51:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 85E7EE0877; Thu, 22 Oct 2015 15:51:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1FF80E0877 for ; Thu, 22 Oct 2015 15:51:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3E38C340806 for ; Thu, 22 Oct 2015 15:51:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 967631270 for ; Thu, 22 Oct 2015 15:50:56 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1445529048.e34323fc29c3ef1afeb54b727766c33b64c1eb6c.kensington@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/files/, mail-client/trojita/ X-VCS-Repository: repo/gentoo X-VCS-Files: mail-client/trojita/files/trojita-0.5-qt5.5-includes.patch mail-client/trojita/trojita-0.5.ebuild X-VCS-Directories: mail-client/trojita/files/ mail-client/trojita/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: e34323fc29c3ef1afeb54b727766c33b64c1eb6c X-VCS-Branch: master Date: Thu, 22 Oct 2015 15:50:56 +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-Archives-Salt: 60748d23-c6a2-43b4-9010-9effdb823847 X-Archives-Hash: c7ef05e3178368b0d6fdf19e1ed63395 commit: e34323fc29c3ef1afeb54b727766c33b64c1eb6c Author: Michael Palimaka gentoo org> AuthorDate: Thu Oct 22 15:49:57 2015 +0000 Commit: Michael Palimaka gentoo 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?= +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 + #include + #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 . + */ + #include "MailboxMetadata.h" ++#include + + 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=(