summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2017-03-25 12:16:21 +1100
committerMichael Palimaka <kensington@gentoo.org>2017-03-25 12:16:39 +1100
commit2993d3545145a7e4c54cabe7d3bc22f29495e0fd (patch)
treed7d4bf3cb5369600a8b94db4fe353db5b72075bb /kde-apps/kdepim-apps-libs
parentsci-libs/avogadrolibs: D -> ED (diff)
downloadgentoo-2993d3545145a7e4c54cabe7d3bc22f29495e0fd.tar.gz
gentoo-2993d3545145a7e4c54cabe7d3bc22f29495e0fd.tar.bz2
gentoo-2993d3545145a7e4c54cabe7d3bc22f29495e0fd.zip
kde-apps/kdepim-apps-libs: backport patch from upstream solving build failure
Gentoo-bug: 613394 Package-Manager: Portage-2.3.5, Repoman-2.3.2
Diffstat (limited to 'kde-apps/kdepim-apps-libs')
-rw-r--r--kde-apps/kdepim-apps-libs/files/kdepim-apps-libs-16.12.3-include.patch28
-rw-r--r--kde-apps/kdepim-apps-libs/kdepim-apps-libs-16.12.3.ebuild2
2 files changed, 30 insertions, 0 deletions
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
index 00000000000..2289d348726
--- /dev/null
+++ b/kde-apps/kdepim-apps-libs/files/kdepim-apps-libs-16.12.3-include.patch
@@ -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
+
diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-16.12.3.ebuild b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-16.12.3.ebuild
index cbb67bc0ad3..61468855227 100644
--- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-16.12.3.ebuild
+++ b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-16.12.3.ebuild
@@ -35,6 +35,8 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${P}-include.patch" )
+
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package prison KF5Prison)