From: Michael Palimaka <kensington@gentoo.org>
Date: Mon, 14 Sep 2015 14:01:16 +0000 (+1000)
Subject: dev-util/kdevplatform: backport patch from upstream solving build failure with dev... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ad6352d9f0c3e97b7c8c72d1267ded6dbde06a03;p=gentoo.git

dev-util/kdevplatform: backport patch from upstream solving build failure with dev-libs/boost-1.57.0.

Gentoo-bug: 534140

Package-Manager: portage-2.2.20.1
---

diff --git a/dev-util/kdevplatform/files/kdevplatform-1.7.1-boost-1.57.patch b/dev-util/kdevplatform/files/kdevplatform-1.7.1-boost-1.57.patch
new file mode 100644
index 000000000000..5abf3c593bc1
--- /dev/null
+++ b/dev-util/kdevplatform/files/kdevplatform-1.7.1-boost-1.57.patch
@@ -0,0 +1,45 @@
+From a430a60a274d369d98105b9d51285d5a9a6bc86f Mon Sep 17 00:00:00 2001
+From: Kevin Funk <kfunk@kde.org>
+Date: Fri, 4 Sep 2015 17:52:15 +0200
+Subject: [PATCH] Make compile (cf. BOOST_JOIN)
+
+Also see https://bugreports.qt.io/browse/QTBUG-22829
+---
+ plugins/classbrowser/documentclassesfolder.cpp | 2 ++
+ plugins/classbrowser/documentclassesfolder.h   | 3 +++
+ 2 files changed, 5 insertions(+)
+
+diff --git a/plugins/classbrowser/documentclassesfolder.cpp b/plugins/classbrowser/documentclassesfolder.cpp
+index c578305..55cb637 100644
+--- a/plugins/classbrowser/documentclassesfolder.cpp
++++ b/plugins/classbrowser/documentclassesfolder.cpp
+@@ -29,7 +29,9 @@
+ #include <QTimer>
+ #include <KIcon>
+ 
++#ifndef Q_MOC_RUN
+ #include <boost/foreach.hpp>
++#endif
+ 
+ using namespace KDevelop;
+ using namespace ClassModelNodes;
+diff --git a/plugins/classbrowser/documentclassesfolder.h b/plugins/classbrowser/documentclassesfolder.h
+index 91edfe8..80f6fb6 100644
+--- a/plugins/classbrowser/documentclassesfolder.h
++++ b/plugins/classbrowser/documentclassesfolder.h
+@@ -23,9 +23,12 @@
+ #define KDEVPLATFORM_PLUGIN_DOCUMENTCLASSESFOLDER_H
+ 
+ #include "classmodelnode.h"
++
++#ifndef Q_MOC_RUN
+ #include <boost/multi_index_container.hpp>
+ #include <boost/multi_index/member.hpp>
+ #include <boost/multi_index/ordered_index.hpp>
++#endif
+ 
+ namespace ClassModelNodes
+ {
+-- 
+2.4.6
+
diff --git a/dev-util/kdevplatform/kdevplatform-1.7.1.ebuild b/dev-util/kdevplatform/kdevplatform-1.7.1.ebuild
index f15ed0fbffe0..b6e1a272b493 100644
--- a/dev-util/kdevplatform/kdevplatform-1.7.1.ebuild
+++ b/dev-util/kdevplatform/kdevplatform-1.7.1.ebuild
@@ -44,6 +44,8 @@ RDEPEND="${COMMON_DEPEND}
 	!<dev-util/kdevelop-${KDEVELOP_VERSION}:4
 "
 
+PATCHES=( "${FILESDIR}/${P}-boost-1.57.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_build classbrowser)