Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/kopete/files/, kde-apps/kopete/
Date: Sat, 07 Jul 2018 10:30:20
Message-Id: 1530959395.f37cb27ce80a7751c76198e9d76e6953191383a8.asturm@gentoo
1 commit: f37cb27ce80a7751c76198e9d76e6953191383a8
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jul 7 09:40:45 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 7 10:29:55 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f37cb27c
7
8 kde-apps/kopete: Fix build with USE=pipes
9
10 Closes: https://bugs.gentoo.org/660552
11 Package-Manager: Portage-2.3.41, Repoman-2.3.9
12
13 kde-apps/kopete/files/kopete-18.04.2-pipes.patch | 33 ++++++++++++++++++++++++
14 kde-apps/kopete/kopete-18.04.2.ebuild | 2 ++
15 2 files changed, 35 insertions(+)
16
17 diff --git a/kde-apps/kopete/files/kopete-18.04.2-pipes.patch b/kde-apps/kopete/files/kopete-18.04.2-pipes.patch
18 new file mode 100644
19 index 00000000000..d52b7194700
20 --- /dev/null
21 +++ b/kde-apps/kopete/files/kopete-18.04.2-pipes.patch
22 @@ -0,0 +1,33 @@
23 +From 8084cfa3a0b3342e73fa128f89c7efd6bac79a36 Mon Sep 17 00:00:00 2001
24 +From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com>
25 +Date: Sat, 7 Jul 2018 11:14:32 +0200
26 +Subject: [PATCH] Fix pipes plugin build (missing moc include)
27 +
28 +---
29 + plugins/pipes/pipesplugin.cpp | 2 ++
30 + plugins/pipes/pipespreferences.cpp | 2 ++
31 + 2 files changed, 4 insertions(+)
32 +
33 +diff --git a/plugins/pipes/pipesplugin.cpp b/plugins/pipes/pipesplugin.cpp
34 +index f86733b5e..27f3e5e68 100644
35 +--- a/plugins/pipes/pipesplugin.cpp
36 ++++ b/plugins/pipes/pipesplugin.cpp
37 +@@ -353,3 +353,5 @@ void PipesPlugin::readXml(PipeOptions pipeOptions, Kopete::Message &msg, const Q
38 + msg.setHtmlBody(body.text());
39 + }
40 + }
41 ++
42 ++#include "pipesplugin.moc"
43 +diff --git a/plugins/pipes/pipespreferences.cpp b/plugins/pipes/pipespreferences.cpp
44 +index f43b42af7..0ee22216b 100644
45 +--- a/plugins/pipes/pipespreferences.cpp
46 ++++ b/plugins/pipes/pipespreferences.cpp
47 +@@ -108,3 +108,5 @@ void PipesPreferences::slotListChanged()
48 + mPrefs->pipesList->resizeColumnToContents(PipesDelegate::ContentsColumn);
49 + changed();
50 + }
51 ++
52 ++#include "pipespreferences.moc"
53 +--
54 +2.18.0
55 +
56
57 diff --git a/kde-apps/kopete/kopete-18.04.2.ebuild b/kde-apps/kopete/kopete-18.04.2.ebuild
58 index 1c613fd9201..93402c1ecf1 100644
59 --- a/kde-apps/kopete/kopete-18.04.2.ebuild
60 +++ b/kde-apps/kopete/kopete-18.04.2.ebuild
61 @@ -136,6 +136,8 @@ DEPEND="${COMMONDEPEND}
62 jingle? ( dev-libs/jsoncpp )
63 "
64
65 +PATCHES=( "${FILESDIR}/${P}-pipes.patch" )
66 +
67 src_configure() {
68 local x x2
69 # Handle common stuff