kde-apps/kdepim-apps-libs: backport patch from upstream solving build failure
authorMichael Palimaka <kensington@gentoo.org>
Sat, 25 Mar 2017 01:16:21 +0000 (12:16 +1100)
committerMichael Palimaka <kensington@gentoo.org>
Sat, 25 Mar 2017 01:16:39 +0000 (12:16 +1100)
Gentoo-bug: 613394
Package-Manager: Portage-2.3.5, Repoman-2.3.2

kde-apps/kdepim-apps-libs/files/kdepim-apps-libs-16.12.3-include.patch [new file with mode: 0644]
kde-apps/kdepim-apps-libs/kdepim-apps-libs-16.12.3.ebuild

diff --git a/kde-apps/kdepim-apps-libs/files/kdepim-apps-libs-16.12.3-include.patch b/kde-apps/kdepim-apps-libs/files/kdepim-apps-libs-16.12.3-include.patch
new file mode 100644 (file)
index 0000000..2289d34
--- /dev/null
@@ -0,0 +1,28 @@
+From 1238688143cc435ec626f3aac7f718ce323b6433 Mon Sep 17 00:00:00 2001
+From: Milian Wolff <mail@milianw.de>
+Date: Tue, 31 Jan 2017 17:16:29 +0100
+Subject: [PATCH] Fix compile: add missing QImage include
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+/home/milian/projects/kf5/src/kde/pim/kdepim-apps-libs/kaddressbookgrantlee/src/printing/contactgrantleeprintobject.cpp:257:74: error: invalid use of incomplete type ‘class QImage’
+---
+ kaddressbookgrantlee/src/printing/contactgrantleeprintobject.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/kaddressbookgrantlee/src/printing/contactgrantleeprintobject.cpp b/kaddressbookgrantlee/src/printing/contactgrantleeprintobject.cpp
+index 9e6f757..baf4294 100644
+--- a/kaddressbookgrantlee/src/printing/contactgrantleeprintobject.cpp
++++ b/kaddressbookgrantlee/src/printing/contactgrantleeprintobject.cpp
+@@ -32,6 +32,7 @@
+ #include <QVariant>
+ #include <grantlee/metatype.h>
+ #include <QLocale>
++#include <QImage>
+ using namespace KAddressBookGrantlee;
+-- 
+2.10.2
+
index cbb67bc0ad31493c7a04a2654e632eb3292502ad..61468855227a983c484c7f7b7fdabf02051fe280 100644 (file)
@@ -35,6 +35,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-include.patch" )
+
 src_configure() {
        local mycmakeargs=(
                $(cmake-utils_use_find_package prison KF5Prison)