kde-apps/kdepim-runtime: backport patch from upstream solving build failure

Gentoo-bug: 613394
Package-Manager: Portage-2.3.5, Repoman-2.3.2

diff --git a/kde-apps/kdepim-runtime/files/kdepim-runtime-16.12.3-include.patch b/kde-apps/kdepim-runtime/files/kdepim-runtime-16.12.3-include.patch
new file mode 100644 (file)
index 0000000..abde97f
--- /dev/null
+++ b/kde-apps/kdepim-runtime/files/kdepim-runtime-16.12.3-include.patch
@@ -0,0 +1,24 @@
+From bccc569b2c049e6eb1c43b45ba0e25bb39868913 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sandro=20Knau=C3=9F?= <sknauss@kde.org>
+Date: Wed, 25 Jan 2017 23:35:22 +0100
+Subject: [PATCH] import QImage directly instead of usage via KContacts
+
+---
+ resources/openxchange/oxa/contactutils.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/resources/openxchange/oxa/contactutils.cpp b/resources/openxchange/oxa/contactutils.cpp
+index dea8188..06bb34b 100644
+--- a/resources/openxchange/oxa/contactutils.cpp
++++ b/resources/openxchange/oxa/contactutils.cpp
+@@ -28,6 +28,7 @@
+ #include <Akonadi/Contact/ContactGroupExpandJob>
+ 
+ #include <QtCore/QBuffer>
++#include <QtGui/QImage>
+ #include <QtXml/QDomElement>
+ 
+ using namespace OXA;
+-- 
+2.10.2
+

diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-16.12.3-r1.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-16.12.3-r1.ebuild
index ea9c898e7f349c82b30792f1dbbc183c1a5ef01f..38c169b9c9bae61e0af592f171497e08556d06bb 100644 (file)
--- a/kde-apps/kdepim-runtime/kdepim-runtime-16.12.3-r1.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-16.12.3-r1.ebuild
@@ -72,6 +72,8 @@ RDEPEND="${CDEPEND}
 
 RESTRICT+=" test"
 
+PATCHES=( "${FILESDIR}/${P}-include.patch" )
+
 src_configure() {
        local mycmakeargs=(
                $(cmake-utils_use_find_package google KF5GAPI)