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/kmail/, kde-apps/kmail/files/
Date: Wed, 14 Aug 2019 08:47:27 +0000 (UTC)	[thread overview]
Message-ID: <1565772429.889b7cb2cd6dd320ff513d407b6a67dbef0a1172.asturm@gentoo> (raw)

commit:     889b7cb2cd6dd320ff513d407b6a67dbef0a1172
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 14 08:46:42 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 14 08:47:09 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=889b7cb2

kde-apps/kmail: Fix missing header with Frameworks 5.61

Closes: https://bugs.gentoo.org/692116
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../kmail/files/kmail-19.04.3-missing-header.patch | 24 ++++++++++++++++++++++
 kde-apps/kmail/kmail-19.04.3.ebuild                |  2 ++
 2 files changed, 26 insertions(+)

diff --git a/kde-apps/kmail/files/kmail-19.04.3-missing-header.patch b/kde-apps/kmail/files/kmail-19.04.3-missing-header.patch
new file mode 100644
index 00000000000..6c6cc309213
--- /dev/null
+++ b/kde-apps/kmail/files/kmail-19.04.3-missing-header.patch
@@ -0,0 +1,24 @@
+From 201eac97eba591e16f0108e2605b9977e2db9a03 Mon Sep 17 00:00:00 2001
+From: Allen Winter <winter@kde.org>
+Date: Thu, 18 Jul 2019 15:35:24 -0400
+Subject: summaryview_part.h - fix build by including QMap
+
+---
+ src/kontactplugin/summary/summaryview_part.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/kontactplugin/summary/summaryview_part.h b/src/kontactplugin/summary/summaryview_part.h
+index 542335d..b116e23 100644
+--- a/src/kontactplugin/summary/summaryview_part.h
++++ b/src/kontactplugin/summary/summaryview_part.h
+@@ -25,7 +25,7 @@
+ #define SUMMARYVIEW_PART_H
+ 
+ #include <KParts/ReadOnlyPart>
+-#include <kparts/readonlypart.h>
++#include <QMap>
+ 
+ class DropWidget;
+ 
+-- 
+cgit v1.1

diff --git a/kde-apps/kmail/kmail-19.04.3.ebuild b/kde-apps/kmail/kmail-19.04.3.ebuild
index 0b70de2bd9b..3fb1fb73c9a 100644
--- a/kde-apps/kmail/kmail-19.04.3.ebuild
+++ b/kde-apps/kmail/kmail-19.04.3.ebuild
@@ -83,6 +83,8 @@ RDEPEND="${COMMON_DEPEND}
 	$(add_kdeapps_dep kmail-account-wizard)
 "
 
+PATCHES=( "${FILESDIR}/${P}-missing-header.patch" )
+
 RESTRICT+=" test" # bug 616878
 
 src_prepare() {


             reply	other threads:[~2019-08-14  8:47 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-14  8:47 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-01-28 22:48 [gentoo-commits] repo/gentoo:master commit in: kde-apps/kmail/, kde-apps/kmail/files/ Andreas Sturmlechner
2019-06-06 20:33 Andreas Sturmlechner
2018-10-19 19:20 Andreas Sturmlechner
2018-01-16 11:28 Andreas Sturmlechner
2017-06-15 11:49 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=1565772429.889b7cb2cd6dd320ff513d407b6a67dbef0a1172.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