Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libkgapi/files/, net-libs/libkgapi/
Date: Sun, 12 Feb 2017 10:50:39
Message-Id: 1486896617.0f77c73d06eef8a7df141cee61d86cb3681f6ea3.asturm@gentoo
1 commit: 0f77c73d06eef8a7df141cee61d86cb3681f6ea3
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 12 10:48:57 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 12 10:50:17 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f77c73d
7
8 net-libs/libkgapi: Fix build with Qt-5.8.0
9
10 Package-Manager: portage-2.3.3
11
12 .../libkgapi/files/libkgapi-5.3.1-qt-5.8.patch | 52 ++++++++++++++++++++++
13 net-libs/libkgapi/libkgapi-5.3.1-r1.ebuild | 33 ++++++++++++++
14 2 files changed, 85 insertions(+)
15
16 diff --git a/net-libs/libkgapi/files/libkgapi-5.3.1-qt-5.8.patch b/net-libs/libkgapi/files/libkgapi-5.3.1-qt-5.8.patch
17 new file mode 100644
18 index 0000000000..a7f69a86ca
19 --- /dev/null
20 +++ b/net-libs/libkgapi/files/libkgapi-5.3.1-qt-5.8.patch
21 @@ -0,0 +1,52 @@
22 +From 03a019820e9da9cf293a3ac66e55da745894c504 Mon Sep 17 00:00:00 2001
23 +From: Milian Wolff <mail@×××××××.de>
24 +Date: Tue, 31 Jan 2017 17:18:57 +0100
25 +Subject: Fix compile with Qt 5.8: add missing QImage includes
26 +
27 +---
28 + src/contacts/contactcreatejob.cpp | 2 +-
29 + src/contacts/contactfetchphotojob.cpp | 1 +
30 + src/contacts/contactmodifyjob.cpp | 2 +-
31 + 3 files changed, 3 insertions(+), 2 deletions(-)
32 +
33 +diff --git a/src/contacts/contactcreatejob.cpp b/src/contacts/contactcreatejob.cpp
34 +index 5f41c1a..a7eb5f7 100644
35 +--- a/src/contacts/contactcreatejob.cpp
36 ++++ b/src/contacts/contactcreatejob.cpp
37 +@@ -31,7 +31,7 @@
38 + #include <QtNetwork/QNetworkRequest>
39 + #include <QtNetwork/QNetworkReply>
40 + #include <QtCore/QBuffer>
41 +-
42 ++#include <QtGui/QImage>
43 +
44 + using namespace KGAPI2;
45 +
46 +diff --git a/src/contacts/contactfetchphotojob.cpp b/src/contacts/contactfetchphotojob.cpp
47 +index 54606cb..a3ebe48 100644
48 +--- a/src/contacts/contactfetchphotojob.cpp
49 ++++ b/src/contacts/contactfetchphotojob.cpp
50 +@@ -28,6 +28,7 @@
51 +
52 + #include <QtNetwork/QNetworkRequest>
53 + #include <QtNetwork/QNetworkReply>
54 ++#include <QtGui/QImage>
55 +
56 + Q_DECLARE_METATYPE(KGAPI2::ContactPtr)
57 +
58 +diff --git a/src/contacts/contactmodifyjob.cpp b/src/contacts/contactmodifyjob.cpp
59 +index ead5787..03a0e73 100644
60 +--- a/src/contacts/contactmodifyjob.cpp
61 ++++ b/src/contacts/contactmodifyjob.cpp
62 +@@ -31,7 +31,7 @@
63 + #include <QtNetwork/QNetworkRequest>
64 + #include <QtNetwork/QNetworkReply>
65 + #include <QtCore/QBuffer>
66 +-
67 ++#include <QtGui/QImage>
68 +
69 + using namespace KGAPI2;
70 +
71 +--
72 +cgit v0.11.2
73 +
74
75 diff --git a/net-libs/libkgapi/libkgapi-5.3.1-r1.ebuild b/net-libs/libkgapi/libkgapi-5.3.1-r1.ebuild
76 new file mode 100644
77 index 0000000000..9f749f1969
78 --- /dev/null
79 +++ b/net-libs/libkgapi/libkgapi-5.3.1-r1.ebuild
80 @@ -0,0 +1,33 @@
81 +# Copyright 1999-2017 Gentoo Foundation
82 +# Distributed under the terms of the GNU General Public License v2
83 +# $Id$
84 +
85 +EAPI=6
86 +
87 +KDE_TEST="true"
88 +VIRTUALX_REQUIRED="test"
89 +inherit kde5
90 +
91 +DESCRIPTION="Library for accessing Google calendar and contact resources"
92 +HOMEPAGE="https://projects.kde.org/projects/extragear/libs/libkgapi"
93 +[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
94 +
95 +LICENSE="GPL-2+ LGPL-2.1+"
96 +KEYWORDS="~amd64 ~x86"
97 +IUSE=""
98 +
99 +DEPEND="
100 + $(add_frameworks_dep kcoreaddons)
101 + $(add_frameworks_dep kio)
102 + $(add_frameworks_dep kwindowsystem)
103 + $(add_kdeapps_dep kcalcore)
104 + $(add_kdeapps_dep kcontacts)
105 + $(add_qt_dep qtgui)
106 + $(add_qt_dep qtnetwork)
107 + $(add_qt_dep qtwebkit)
108 + $(add_qt_dep qtwidgets)
109 + $(add_qt_dep qtxml)
110 +"
111 +RDEPEND="${DEPEND}"
112 +
113 +PATCHES=( "${FILESDIR}"/${P}-qt-5.8.patch )