Package: camp Version: 0.7.1.1-1 Severity: important Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu wily ubuntu-patch
Dear Maintainer, The attached patch fixes FTBFS due to qt4 moc & boost issues. Thanks for considering the patch. -- System Information: Debian Release: jessie/sid APT prefers vivid-updates APT policy: (500, 'vivid-updates'), (500, 'vivid-security'), (500, 'vivid'), (100, 'vivid-backports') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.19.0-25-generic (SMP w/8 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system)
diff -Nru camp-0.7.1.1/debian/changelog camp-0.7.1.1/debian/changelog diff -Nru camp-0.7.1.1/debian/control camp-0.7.1.1/debian/control --- camp-0.7.1.1/debian/control 2015-08-03 00:51:14.000000000 -0700 +++ camp-0.7.1.1/debian/control 2015-08-14 11:07:19.000000000 -0700 @@ -1,6 +1,5 @@ Source: camp -Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com> -XSBC-Original-Maintainer: Corentin Desfarges <corentin.desfarges....@gmail.com> +Maintainer: Corentin Desfarges <corentin.desfarges....@gmail.com> Section: science Priority: optional Build-Depends: cmake, diff -Nru camp-0.7.1.1/debian/patches/hide_boost_from_qt4moc.patch camp-0.7.1.1/debian/patches/hide_boost_from_qt4moc.patch --- camp-0.7.1.1/debian/patches/hide_boost_from_qt4moc.patch 1969-12-31 16:00:00.000000000 -0800 +++ camp-0.7.1.1/debian/patches/hide_boost_from_qt4moc.patch 2015-08-14 10:48:56.000000000 -0700 @@ -0,0 +1,636 @@ +Description: Hide boost includes from qt4 moc. + This prevents FTBFS with 'Parse error at "BOOST_JOIN"' +Author: Robert Bruce Park <robert.p...@canonical.com> + +--- a/include/camp/arraymapper.hpp ++++ b/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> + +--- a/include/camp/class.hpp ++++ b/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> + + +--- a/include/camp/classbuilder.hpp ++++ b/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> + +--- a/include/camp/detail/arraypropertyimpl.hpp ++++ b/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 +--- a/include/camp/detail/classmanager.hpp ++++ b/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> + + +--- a/include/camp/detail/enummanager.hpp ++++ b/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> + + +--- a/include/camp/detail/functionimpl.hpp ++++ b/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> + + +--- a/include/camp/detail/functiontraits.hpp ++++ b/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 +--- a/include/camp/detail/getter.hpp ++++ b/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 +--- a/include/camp/detail/issmartpointer.hpp ++++ b/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 +--- a/include/camp/detail/objecttraits.hpp ++++ b/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 +--- a/include/camp/detail/propertyfactory.hpp ++++ b/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 +--- a/include/camp/detail/typeid.hpp ++++ b/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 +--- a/include/camp/detail/valueimpl.hpp ++++ b/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 +--- a/include/camp/enum.hpp ++++ b/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> + + +--- a/include/camp/enumbuilder.hpp ++++ b/include/camp/enumbuilder.hpp +@@ -26,7 +26,9 @@ + + + #include <camp/config.hpp> ++#ifndef Q_MOC_RUN + #include <boost/noncopyable.hpp> ++#endif + #include <string> + + +--- a/include/camp/enumobject.hpp ++++ b/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> + + +--- a/include/camp/error.hpp ++++ b/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> + +--- a/include/camp/tagholder.hpp ++++ b/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> + + +--- a/include/camp/userobject.hpp ++++ b/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> + + +--- a/include/camp/value.hpp ++++ b/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> + +--- a/include/camp/valuemapper.hpp ++++ b/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 +--- a/include/camp/valuevisitor.hpp ++++ b/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 +--- a/test/arrayproperty.cpp ++++ b/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; + +--- a/test/arrayproperty.hpp ++++ b/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> + +--- a/test/class.cpp ++++ b/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; + +--- a/test/classvisitor.cpp ++++ b/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; + +--- a/test/constructor.cpp ++++ b/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; + +--- a/test/enum.cpp ++++ b/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; + +--- a/test/enumobject.cpp ++++ b/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; + +--- a/test/enumproperty.cpp ++++ b/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; + +--- a/test/enumproperty.hpp ++++ b/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> + +--- a/test/function.cpp ++++ b/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; + +--- a/test/function.hpp ++++ b/test/function.hpp +@@ -27,7 +27,9 @@ + #include <camp/enum.hpp> + #include <camp/class.hpp> + #include <camp/value.hpp> ++#ifndef Q_MOC_RUN + #include <boost/shared_ptr.hpp> ++#endif + #include <string> + + namespace FunctionTest +--- a/test/functionaccess.cpp ++++ b/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; + +--- a/test/inheritance.cpp ++++ b/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; + +--- a/test/main.cpp ++++ b/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 +--- a/test/mapper.cpp ++++ b/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; + +--- a/test/property.cpp ++++ b/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; + +--- a/test/property.hpp ++++ b/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 +--- a/test/propertyaccess.cpp ++++ b/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; + +--- a/test/qt/functionmapping.cpp ++++ b/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; + +--- a/test/qt/main.cpp ++++ b/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 +--- a/test/qt/propertymapping.cpp ++++ b/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; + +--- a/test/qt/qstringmapping.cpp ++++ b/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 +--- a/test/tagholder.cpp ++++ b/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; + +--- a/test/userobject.cpp ++++ b/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; + +--- a/test/userobject.hpp ++++ b/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 +--- a/test/userproperty.cpp ++++ b/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; + +--- a/test/value.cpp ++++ b/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; + diff -Nru camp-0.7.1.1/debian/patches/series camp-0.7.1.1/debian/patches/series --- camp-0.7.1.1/debian/patches/series 2014-09-11 04:08:09.000000000 -0700 +++ camp-0.7.1.1/debian/patches/series 2015-08-14 10:06:53.000000000 -0700 @@ -2,3 +2,4 @@ rm_boost_version.patch remove_licences_files.patch fix_unit_tests_execution.patch +hide_boost_from_qt4moc.patch
