From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/kopete/files/, kde-apps/kopete/
Date: Sat, 7 Jul 2018 10:30:07 +0000 (UTC) [thread overview]
Message-ID: <1530959395.f37cb27ce80a7751c76198e9d76e6953191383a8.asturm@gentoo> (raw)
commit: f37cb27ce80a7751c76198e9d76e6953191383a8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 7 09:40:45 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 7 10:29:55 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f37cb27c
kde-apps/kopete: Fix build with USE=pipes
Closes: https://bugs.gentoo.org/660552
Package-Manager: Portage-2.3.41, Repoman-2.3.9
kde-apps/kopete/files/kopete-18.04.2-pipes.patch | 33 ++++++++++++++++++++++++
kde-apps/kopete/kopete-18.04.2.ebuild | 2 ++
2 files changed, 35 insertions(+)
diff --git a/kde-apps/kopete/files/kopete-18.04.2-pipes.patch b/kde-apps/kopete/files/kopete-18.04.2-pipes.patch
new file mode 100644
index 00000000000..d52b7194700
--- /dev/null
+++ b/kde-apps/kopete/files/kopete-18.04.2-pipes.patch
@@ -0,0 +1,33 @@
+From 8084cfa3a0b3342e73fa128f89c7efd6bac79a36 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sat, 7 Jul 2018 11:14:32 +0200
+Subject: [PATCH] Fix pipes plugin build (missing moc include)
+
+---
+ plugins/pipes/pipesplugin.cpp | 2 ++
+ plugins/pipes/pipespreferences.cpp | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/plugins/pipes/pipesplugin.cpp b/plugins/pipes/pipesplugin.cpp
+index f86733b5e..27f3e5e68 100644
+--- a/plugins/pipes/pipesplugin.cpp
++++ b/plugins/pipes/pipesplugin.cpp
+@@ -353,3 +353,5 @@ void PipesPlugin::readXml(PipeOptions pipeOptions, Kopete::Message &msg, const Q
+ msg.setHtmlBody(body.text());
+ }
+ }
++
++#include "pipesplugin.moc"
+diff --git a/plugins/pipes/pipespreferences.cpp b/plugins/pipes/pipespreferences.cpp
+index f43b42af7..0ee22216b 100644
+--- a/plugins/pipes/pipespreferences.cpp
++++ b/plugins/pipes/pipespreferences.cpp
+@@ -108,3 +108,5 @@ void PipesPreferences::slotListChanged()
+ mPrefs->pipesList->resizeColumnToContents(PipesDelegate::ContentsColumn);
+ changed();
+ }
++
++#include "pipespreferences.moc"
+--
+2.18.0
+
diff --git a/kde-apps/kopete/kopete-18.04.2.ebuild b/kde-apps/kopete/kopete-18.04.2.ebuild
index 1c613fd9201..93402c1ecf1 100644
--- a/kde-apps/kopete/kopete-18.04.2.ebuild
+++ b/kde-apps/kopete/kopete-18.04.2.ebuild
@@ -136,6 +136,8 @@ DEPEND="${COMMONDEPEND}
jingle? ( dev-libs/jsoncpp )
"
+PATCHES=( "${FILESDIR}/${P}-pipes.patch" )
+
src_configure() {
local x x2
# Handle common stuff
next reply other threads:[~2018-07-07 10:30 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-07 10:30 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-11-16 19:07 [gentoo-commits] repo/gentoo:master commit in: kde-apps/kopete/files/, kde-apps/kopete/ Andreas Sturmlechner
2018-04-24 9:56 Andreas Sturmlechner
2017-04-23 16:11 Andreas Sturmlechner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1530959395.f37cb27ce80a7751c76198e9d76e6953191383a8.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox