[SCM] KDevelop Platform packaging branch, master, updated. debian/1.7.0-2-6-g397b8a3

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/kdevplatform.git;a=commitdiff;h=4295c4a

The following commit has been merged in the master branch:
commit 4295c4ac4ba00d8d86b9beaff303acef966a0e28
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Aug 31 17:53:44 2015 +0200

    New patch: workaround_boost_ftbfs.
---
 debian/changelog                      |  1 +
 debian/patches/series                 |  1 +
 debian/patches/workaround_boost_ftbfs | 14 ++++++++++++++
 3 files changed, 16 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3f6a18f..64c2736 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ kdevplatform (1.7.1-1~) UNRELEASED; urgency=medium
   * New upstream release (1.7.1).
   * Remove upstream applied patch: fix_shell_script
   * Add libsoprano-dev build dep.
+  * New patch: workaround_boost_ftbfs
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 31 Aug 2015 13:36:03 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index a6a68c8..bc8d36c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 11_disable_examples_tests.diff
+workaround_boost_ftbfs
diff --git a/debian/patches/workaround_boost_ftbfs b/debian/patches/workaround_boost_ftbfs
new file mode 100644
index 0000000..35efdda
--- /dev/null
+++ b/debian/patches/workaround_boost_ftbfs
@@ -0,0 +1,14 @@
+Index: kdevplatform/plugins/classbrowser/documentclassesfolder.h
+===================================================================
+--- kdevplatform.orig/plugins/classbrowser/documentclassesfolder.h	2015-08-31 17:46:10.000000000 +0200
++++ kdevplatform/plugins/classbrowser/documentclassesfolder.h	2015-08-31 17:48:28.034847874 +0200
+@@ -25,7 +25,9 @@
+ #include "classmodelnode.h"
+ #include <boost/multi_index_container.hpp>
+ #include <boost/multi_index/member.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/multi_index/ordered_index.hpp>
++#endif
+ 
+ namespace ClassModelNodes
+ {

-- 
KDevelop Platform packaging