public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/kdepim-apps-libs/files/, kde-apps/kdepim-apps-libs/
@ 2017-03-25  1:16 Michael Palimaka
  0 siblings, 0 replies; only message in thread
From: Michael Palimaka @ 2017-03-25  1:16 UTC (permalink / raw
  To: gentoo-commits

commit:     2993d3545145a7e4c54cabe7d3bc22f29495e0fd
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 25 01:16:21 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Mar 25 01:16:39 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2993d354

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

 .../files/kdepim-apps-libs-16.12.3-include.patch   | 28 ++++++++++++++++++++++
 .../kdepim-apps-libs-16.12.3.ebuild                |  2 ++
 2 files changed, 30 insertions(+)

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)


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2017-03-25  1:16 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-25  1:16 [gentoo-commits] repo/gentoo:master commit in: kde-apps/kdepim-apps-libs/files/, kde-apps/kdepim-apps-libs/ Michael Palimaka

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox