[med-svn] [camp] 01/01: Fix parse error at 'BOOST_JOIN'
Corentin Desfarges
corentin-guest at moszumanska.debian.org
Mon Dec 21 15:05:51 UTC 2015
This is an automated email from the git hooks/post-receive script.
corentin-guest pushed a commit to branch master
in repository camp.
commit fec853c02eb1b815c9e54daa345b85d35419253b
Author: Corentin Desfarges <corentin.desfarges.dev at gmail.com>
Date: Mon Dec 21 14:38:56 2015 +0100
Fix parse error at 'BOOST_JOIN'
---
debian/changelog | 6 +
debian/control | 2 +-
debian/patches/hide_boost_from_qt4moc.patch | 624 ++++++++++++++++++++++++++++
debian/patches/series | 1 +
4 files changed, 632 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 19f84b1..4d6c36c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+camp (0.7.1.1-2) unstable; urgency=medium
+
+ * Apply patch to prevent parse error at "BOOST_JOIN". Closes: #795497.
+
+ -- Corentin Desfarges <corentin.desfarges.dev at gmail.com> Mon, 21 Dec 2015 12:59:59 +0200
+
camp (0.7.1.1-1) unstable; urgency=low
* Initial release (Closes: #759244)
diff --git a/debian/control b/debian/control
index afb332b..93554d2 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: cmake,
libboost-dev,
libboost-test-dev,
libqt4-dev
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/camp.git
Vcs-Git: git://anonscm.debian.org/debian-med/camp.git
Homepage: https://github.com/tegesoft/camp
diff --git a/debian/patches/hide_boost_from_qt4moc.patch b/debian/patches/hide_boost_from_qt4moc.patch
new file mode 100644
index 0000000..81fba6d
--- /dev/null
+++ b/debian/patches/hide_boost_from_qt4moc.patch
@@ -0,0 +1,624 @@
+Description: Hide boost includes from qt4 moc.
+ This prevents FTBFS with 'Parse error at "BOOST_JOIN"'
+Author: Robert Bruce Park <robert.park at canonical.com>
+
+--- camp.orig/include/camp/arraymapper.hpp
++++ camp/include/camp/arraymapper.hpp
+@@ -27,7 +27,9 @@
+
+ #include <camp/config.hpp>
+ #include <camp/detail/yesnotype.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/array.hpp>
++#endif
+ #include <list>
+ #include <vector>
+
+--- camp.orig/include/camp/detail/functionimpl.hpp
++++ camp/include/camp/detail/functionimpl.hpp
+@@ -29,9 +29,11 @@
+ #include <camp/value.hpp>
+ #include <camp/errors.hpp>
+ #include <camp/detail/callhelper.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/bind.hpp>
+ #include <boost/function.hpp>
+ #include <boost/assign/list_of.hpp>
++#endif
+ #include <string>
+
+
+--- camp.orig/include/camp/detail/functiontraits.hpp
++++ camp/include/camp/detail/functiontraits.hpp
+@@ -26,9 +26,11 @@
+
+
+ #include <camp/detail/yesnotype.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/utility/enable_if.hpp>
+ #include <boost/function_types/is_callable_builtin.hpp>
+ #include <boost/function_types/result_type.hpp>
++#endif
+
+
+ namespace camp
+--- camp.orig/include/camp/detail/getter.hpp
++++ camp/include/camp/detail/getter.hpp
+@@ -26,8 +26,10 @@
+
+
+ #include <camp/userobject.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/function.hpp>
+ #include <boost/shared_ptr.hpp>
++#endif
+
+
+ namespace camp
+--- camp.orig/include/camp/detail/issmartpointer.hpp
++++ camp/include/camp/detail/issmartpointer.hpp
+@@ -26,7 +26,9 @@
+
+
+ #include <camp/detail/yesnotype.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/utility/enable_if.hpp>
++#endif
+
+
+ namespace camp
+--- camp.orig/include/camp/detail/objecttraits.hpp
++++ camp/include/camp/detail/objecttraits.hpp
+@@ -27,9 +27,11 @@
+
+ #include <camp/detail/rawtype.hpp>
+ #include <camp/detail/issmartpointer.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/type_traits/is_const.hpp>
+ #include <boost/type_traits/is_pointer.hpp>
+ #include <boost/utility/enable_if.hpp>
++#endif
+
+
+ namespace camp
+--- camp.orig/include/camp/detail/propertyfactory.hpp
++++ camp/include/camp/detail/propertyfactory.hpp
+@@ -31,10 +31,12 @@
+ #include <camp/detail/enumpropertyimpl.hpp>
+ #include <camp/detail/userpropertyimpl.hpp>
+ #include <camp/detail/functiontraits.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/function.hpp>
+ #include <boost/utility/enable_if.hpp>
+ #include <boost/type_traits/remove_reference.hpp>
+ #include <boost/type_traits/is_void.hpp>
++#endif
+
+
+ namespace camp
+--- camp.orig/include/camp/detail/typeid.hpp
++++ camp/include/camp/detail/typeid.hpp
+@@ -27,7 +27,9 @@
+
+ #include <camp/detail/objecttraits.hpp>
+ #include <camp/detail/yesnotype.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/utility/enable_if.hpp>
++#endif
+
+
+ namespace camp
+--- camp.orig/include/camp/detail/valueimpl.hpp
++++ camp/include/camp/detail/valueimpl.hpp
+@@ -27,7 +27,9 @@
+ #include <camp/type.hpp>
+ #include <camp/valuemapper.hpp>
+ #include <camp/errors.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/variant/static_visitor.hpp>
++#endif
+
+
+ namespace camp
+--- camp.orig/include/camp/enumbuilder.hpp
++++ camp/include/camp/enumbuilder.hpp
+@@ -26,7 +26,9 @@
+
+
+ #include <camp/config.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/noncopyable.hpp>
++#endif
+ #include <string>
+
+
+--- camp.orig/include/camp/enumobject.hpp
++++ camp/include/camp/enumobject.hpp
+@@ -27,9 +27,11 @@
+
+ #include <camp/config.hpp>
+ #include <camp/enumget.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/type_traits.hpp>
+ #include <boost/operators.hpp>
+ #include <boost/utility/enable_if.hpp>
++#endif
+ #include <string>
+
+
+--- camp.orig/include/camp/error.hpp
++++ camp/include/camp/error.hpp
+@@ -26,8 +26,10 @@
+
+
+ #include <camp/config.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/current_function.hpp>
+ #include <boost/lexical_cast.hpp>
++#endif
+ #include <exception>
+ #include <string>
+
+--- camp.orig/include/camp/tagholder.hpp
++++ camp/include/camp/tagholder.hpp
+@@ -28,7 +28,9 @@
+ #include <camp/config.hpp>
+ #include <camp/detail/getter.hpp>
+ #include <camp/value.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+ #include <map>
+
+
+--- camp.orig/include/camp/userobject.hpp
++++ camp/include/camp/userobject.hpp
+@@ -30,10 +30,12 @@
+ #include <camp/errors.hpp>
+ #include <camp/detail/objecttraits.hpp>
+ #include <camp/detail/objectholder.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/operators.hpp>
+ #include <boost/shared_ptr.hpp>
+ #include <boost/scoped_ptr.hpp>
+ #include <boost/utility/enable_if.hpp>
++#endif
+ #include <string>
+
+
+--- camp.orig/include/camp/value.hpp
++++ camp/include/camp/value.hpp
+@@ -31,7 +31,9 @@
+ #include <camp/userobject.hpp>
+ #include <camp/valuemapper.hpp>
+ #include <camp/detail/valueimpl.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/operators.hpp>
++#endif
+ #include <iosfwd>
+ #include <string>
+
+--- camp.orig/include/camp/valuemapper.hpp
++++ camp/include/camp/valuemapper.hpp
+@@ -30,9 +30,11 @@
+ #include <camp/userobject.hpp>
+ #include <camp/arraymapper.hpp>
+ #include <camp/errors.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/lexical_cast.hpp>
+ #include <boost/type_traits.hpp>
+ #include <boost/utility/enable_if.hpp>
++#endif
+
+
+ namespace camp_ext
+--- camp.orig/include/camp/valuevisitor.hpp
++++ camp/include/camp/valuevisitor.hpp
+@@ -25,7 +25,9 @@
+ #define CAMP_VALUEVISITOR_HPP
+
+
++#ifndef Q_MOC_RUN
+ #include <boost/variant/static_visitor.hpp>
++#endif
+
+
+ namespace camp
+--- camp.orig/test/arrayproperty.cpp
++++ camp/test/arrayproperty.cpp
+@@ -24,7 +24,9 @@
+ #include <camp/classget.hpp>
+ #include <camp/errors.hpp>
+ #include <camp/arrayproperty.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/test/unit_test.hpp>
++#endif
+
+ using namespace ArrayPropertyTest;
+
+--- camp.orig/test/arrayproperty.hpp
++++ camp/test/arrayproperty.hpp
+@@ -25,7 +25,9 @@
+
+ #include <camp/camptype.hpp>
+ #include <camp/class.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/array.hpp>
++#endif
+ #include <list>
+ #include <vector>
+
+--- camp.orig/test/class.cpp
++++ camp/test/class.cpp
+@@ -23,7 +23,9 @@
+ #include "class.hpp"
+ #include <camp/classget.hpp>
+ #include <camp/errors.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/test/unit_test.hpp>
++#endif
+
+ using namespace ClassTest;
+
+--- camp.orig/test/classvisitor.cpp
++++ camp/test/classvisitor.cpp
+@@ -22,7 +22,9 @@
+
+ #include "classvisitor.hpp"
+ #include <camp/classget.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/test/unit_test.hpp>
++#endif
+
+ using namespace ClassVisitorTest;
+
+--- camp.orig/test/constructor.cpp
++++ camp/test/constructor.cpp
+@@ -23,7 +23,9 @@
+ #include "constructor.hpp"
+ #include <camp/classget.hpp>
+ #include <camp/errors.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/test/unit_test.hpp>
++#endif
+
+ using namespace ConstructorTest;
+
+--- camp.orig/test/enum.cpp
++++ camp/test/enum.cpp
+@@ -23,7 +23,9 @@
+ #include "enum.hpp"
+ #include <camp/enumget.hpp>
+ #include <camp/errors.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/test/unit_test.hpp>
++#endif
+
+ using namespace EnumTest;
+
+--- camp.orig/test/enumobject.cpp
++++ camp/test/enumobject.cpp
+@@ -24,7 +24,9 @@
+ #include <camp/enumget.hpp>
+ #include <camp/enumobject.hpp>
+ #include <camp/errors.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/test/unit_test.hpp>
++#endif
+
+ using namespace EnumObjectTest;
+
+--- camp.orig/test/enumproperty.cpp
++++ camp/test/enumproperty.cpp
+@@ -25,7 +25,9 @@
+ #include <camp/enumget.hpp>
+ #include <camp/errors.hpp>
+ #include <camp/enumproperty.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/test/unit_test.hpp>
++#endif
+
+ using namespace EnumPropertyTest;
+
+--- camp.orig/test/enumproperty.hpp
++++ camp/test/enumproperty.hpp
+@@ -26,7 +26,9 @@
+ #include <camp/camptype.hpp>
+ #include <camp/enum.hpp>
+ #include <camp/class.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/array.hpp>
++#endif
+ #include <list>
+ #include <vector>
+
+--- camp.orig/test/function.cpp
++++ camp/test/function.cpp
+@@ -25,7 +25,9 @@
+ #include <camp/enumget.hpp>
+ #include <camp/function.hpp>
+ #include <camp/errors.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/test/unit_test.hpp>
++#endif
+
+ using namespace FunctionTest;
+
+--- camp.orig/test/functionaccess.cpp
++++ camp/test/functionaccess.cpp
+@@ -24,7 +24,9 @@
+ #include <camp/classget.hpp>
+ #include <camp/function.hpp>
+ #include <camp/errors.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/test/unit_test.hpp>
++#endif
+
+ using namespace FunctionAccessTest;
+
+--- camp.orig/test/inheritance.cpp
++++ camp/test/inheritance.cpp
+@@ -24,7 +24,9 @@
+ #include <camp/class.hpp>
+ #include <camp/classget.hpp>
+ #include <camp/errors.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/test/unit_test.hpp>
++#endif
+
+ using namespace InheritanceTest;
+
+--- camp.orig/test/main.cpp
++++ camp/test/main.cpp
+@@ -27,4 +27,6 @@
+ // so that we don't need to link to it as an external library.
+ // Note: to disable that and link to boost.test as a library,
+ // simply remove "/included" from the header path below.
++#ifndef Q_MOC_RUN
+ #include <boost/test/included/unit_test.hpp>
++#endif
+--- camp.orig/test/mapper.cpp
++++ camp/test/mapper.cpp
+@@ -22,7 +22,9 @@
+
+ #include "mapper.hpp"
+ #include <camp/classget.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/test/unit_test.hpp>
++#endif
+
+ using namespace MapperTest;
+
+--- camp.orig/test/property.cpp
++++ camp/test/property.cpp
+@@ -25,7 +25,9 @@
+ #include <camp/enumget.hpp>
+ #include <camp/property.hpp>
+ #include <camp/errors.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/test/unit_test.hpp>
++#endif
+
+ using namespace PropertyTest;
+
+--- camp.orig/test/property.hpp
++++ camp/test/property.hpp
+@@ -26,7 +26,9 @@
+ #include <camp/camptype.hpp>
+ #include <camp/class.hpp>
+ #include <camp/enum.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
++#endif
+ #include <string>
+
+ namespace PropertyTest
+--- camp.orig/test/propertyaccess.cpp
++++ camp/test/propertyaccess.cpp
+@@ -24,7 +24,9 @@
+ #include <camp/classget.hpp>
+ #include <camp/property.hpp>
+ #include <camp/errors.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/test/unit_test.hpp>
++#endif
+
+ using namespace PropertyAccessTest;
+
+--- camp.orig/test/qt/functionmapping.cpp
++++ camp/test/qt/functionmapping.cpp
+@@ -23,7 +23,9 @@
+ #include "functionmapping.hpp"
+ #include <camp/class.hpp>
+ #include <camp/classget.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/test/unit_test.hpp>
++#endif
+
+ using namespace FunctionMappingTest;
+
+--- camp.orig/test/qt/main.cpp
++++ camp/test/qt/main.cpp
+@@ -27,4 +27,6 @@
+ // so that we don't need to link to it as an external library.
+ // Note: to disable that and link to boost.test as a library,
+ // simply remove "/included" from the header path below.
++#ifndef Q_MOC_RUN
+ #include <boost/test/included/unit_test.hpp>
++#endif
+--- camp.orig/test/qt/propertymapping.cpp
++++ camp/test/qt/propertymapping.cpp
+@@ -23,7 +23,9 @@
+ #include "propertymapping.hpp"
+ #include <camp/class.hpp>
+ #include <camp/classget.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/test/unit_test.hpp>
++#endif
+
+ using namespace PropertyMappingTest;
+
+--- camp.orig/test/qt/qstringmapping.cpp
++++ camp/test/qt/qstringmapping.cpp
+@@ -22,7 +22,9 @@
+
+ #include <camp/value.hpp>
+ #include <camp/qt/qt.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/test/unit_test.hpp>
++#endif
+ #include <QString>
+
+ // To make the boost.test logger happy
+--- camp.orig/test/tagholder.cpp
++++ camp/test/tagholder.cpp
+@@ -23,7 +23,9 @@
+ #include "tagholder.hpp"
+ #include <camp/classget.hpp>
+ #include <camp/errors.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/test/unit_test.hpp>
++#endif
+
+ using namespace TagHolderTest;
+
+--- camp.orig/test/userobject.cpp
++++ camp/test/userobject.cpp
+@@ -24,7 +24,9 @@
+ #include <camp/classget.hpp>
+ #include <camp/errors.hpp>
+ #include <camp/userobject.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/test/unit_test.hpp>
++#endif
+
+ using namespace UserObjectTest;
+
+--- camp.orig/test/userobject.hpp
++++ camp/test/userobject.hpp
+@@ -25,7 +25,9 @@
+
+ #include <camp/camptype.hpp>
+ #include <camp/class.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/noncopyable.hpp>
++#endif
+ #include <ostream>
+
+ namespace UserObjectTest
+--- camp.orig/test/userproperty.cpp
++++ camp/test/userproperty.cpp
+@@ -23,7 +23,9 @@
+ #include "userproperty.hpp"
+ #include <camp/classget.hpp>
+ #include <camp/userproperty.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/test/unit_test.hpp>
++#endif
+
+ using namespace UserPropertyTest;
+
+--- camp.orig/test/value.cpp
++++ camp/test/value.cpp
+@@ -23,7 +23,9 @@
+ #include "value.hpp"
+ #include <camp/value.hpp>
+ #include <camp/errors.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/test/unit_test.hpp>
++#endif
+
+ using namespace ValueTest;
+
+--- camp.orig/include/camp/class.hpp
++++ camp/include/camp/class.hpp
+@@ -36,12 +36,14 @@
+ #include <camp/userobject.hpp>
+ #include <camp/detail/classmanager.hpp>
+ #include <camp/detail/typeid.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/noncopyable.hpp>
+ #include <boost/shared_ptr.hpp>
+ #include <boost/multi_index_container.hpp>
+ #include <boost/multi_index/mem_fun.hpp>
+ #include <boost/multi_index/ordered_index.hpp>
+ #include <boost/multi_index/random_access_index.hpp>
++#endif
+ #include <string>
+
+
+--- camp.orig/include/camp/classbuilder.hpp
++++ camp/include/camp/classbuilder.hpp
+@@ -31,9 +31,11 @@
+ #include <camp/detail/functiontraits.hpp>
+ #include <camp/detail/constructorimpl.hpp>
+ #include <camp/detail/propertyfactory.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/noncopyable.hpp>
+ #include <boost/mpl/if.hpp>
+ #include <boost/function_types/function_type.hpp>
++#endif
+ #include <cassert>
+ #include <string>
+
+--- camp.orig/include/camp/detail/arraypropertyimpl.hpp
++++ camp/include/camp/detail/arraypropertyimpl.hpp
+@@ -28,7 +28,9 @@
+ #include <camp/arrayproperty.hpp>
+ #include <camp/arraymapper.hpp>
+ #include <camp/detail/valueprovider.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/type_traits/remove_reference.hpp>
++#endif
+
+
+ namespace camp
+--- camp.orig/include/camp/enum.hpp
++++ camp/include/camp/enum.hpp
+@@ -30,11 +30,13 @@
+ #include <camp/enumget.hpp>
+ #include <camp/detail/enummanager.hpp>
+ #include <camp/detail/typeid.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/noncopyable.hpp>
+ #include <boost/multi_index_container.hpp>
+ #include <boost/multi_index/member.hpp>
+ #include <boost/multi_index/ordered_index.hpp>
+ #include <boost/multi_index/random_access_index.hpp>
++#endif
+ #include <string>
+
+
+--- camp.orig/include/camp/detail/enummanager.hpp
++++ camp/include/camp/detail/enummanager.hpp
+@@ -27,11 +27,13 @@
+
+ #include <camp/config.hpp>
+ #include <camp/detail/observernotifier.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/noncopyable.hpp>
+ #include <boost/shared_ptr.hpp>
+ #include <boost/multi_index_container.hpp>
+ #include <boost/multi_index/member.hpp>
+ #include <boost/multi_index/ordered_index.hpp>
++#endif
+ #include <string>
+
+
+--- camp.orig/include/camp/detail/classmanager.hpp
++++ camp/include/camp/detail/classmanager.hpp
+@@ -27,12 +27,14 @@
+
+ #include <camp/config.hpp>
+ #include <camp/detail/observernotifier.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/noncopyable.hpp>
+ #include <boost/shared_ptr.hpp>
+ #include <boost/shared_ptr.hpp>
+ #include <boost/multi_index_container.hpp>
+ #include <boost/multi_index/member.hpp>
+ #include <boost/multi_index/ordered_index.hpp>
++#endif
+ #include <string>
+
+
diff --git a/debian/patches/series b/debian/patches/series
index ad87146..acf7eb8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ add_soname.patch
rm_boost_version.patch
remove_licences_files.patch
fix_unit_tests_execution.patch
+hide_boost_from_qt4moc.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/camp.git
More information about the debian-med-commit
mailing list