tags 674373 + patch thanks Please find attached a patch to fix the FTBFS.
Kind regards -- Sebastian Ramacher
diff -Nru plastimatch-1.5.10+dfsg0/debian/changelog plastimatch-1.5.10+dfsg0/debian/changelog --- plastimatch-1.5.10+dfsg0/debian/changelog 2012-04-24 04:48:36.000000000 +0200 +++ plastimatch-1.5.10+dfsg0/debian/changelog 2012-06-15 22:52:39.000000000 +0200 @@ -1,3 +1,10 @@ +plastimatch (1.5.10+dfsg0-1.1) UNRELEASED; urgency=low + + * Non-maintainer upload. + * debian/patches/674374.patch: Fix FTBFS with gcc 4.7. (Closes: #674373) + + -- Sebastian Ramacher <s.ramac...@gmx.at> Fri, 15 Jun 2012 22:44:04 +0200 + plastimatch (1.5.10+dfsg0-1) unstable; urgency=low * build with libpng-dev instead of libpng12-dev (Closes: #662467) diff -Nru plastimatch-1.5.10+dfsg0/debian/patches/674373.patch plastimatch-1.5.10+dfsg0/debian/patches/674373.patch --- plastimatch-1.5.10+dfsg0/debian/patches/674373.patch 1970-01-01 01:00:00.000000000 +0100 +++ plastimatch-1.5.10+dfsg0/debian/patches/674373.patch 2012-06-15 22:52:28.000000000 +0200 @@ -0,0 +1,108 @@ +Description: Fix build failures with gcc 4.7 +Author: Sebastian Ramacher <s.ramac...@gmx.at> +Last-Update: 2012-06-15 + +Index: plastimatch-1.5.10+dfsg0/libs/dlib-17.34/dlib/string/string.h [36/3823] +=================================================================== +--- plastimatch-1.5.10+dfsg0.orig/libs/dlib-17.34/dlib/string/string.h 2012-06-15 20:12:23.000000000 +0000 ++++ plastimatch-1.5.10+dfsg0/libs/dlib-17.34/dlib/string/string.h 2012-06-15 20:12:23.000000000 +0000 +@@ -222,6 +222,43 @@ + + // ---------------------------------------------------------------------------------------- + ++ template < ++ typename charT, ++ typename traits, ++ typename alloc ++ > ++ inline const typename disable_if<is_same_type<charT,char>,std::string>::type narrow ( ++ const std::basic_string<charT,traits,alloc>& str ++ ) ++ { ++ std::string temp; ++ temp.reserve(str.size()); ++ std::string::size_type i; ++ for (i = 0; i < str.size(); ++i) ++ { ++ if (zero_extend_cast<unsigned long>(str[i]) > 255) ++ temp += ' '; ++ else ++ temp += zero_extend_cast<char>(str[i]); ++ } ++ return temp; ++ } ++ ++ template < ++ typename charT, ++ typename traits, ++ typename alloc ++ > ++ inline const typename enable_if<is_same_type<charT,char>,std::string>::type narrow ( ++ const std::basic_string<charT,traits,alloc>& str ++ ) ++ { ++ return str; ++ } ++ ++ ++// ---------------------------------------------------------------------------------------- ++ + class string_cast_error : public error + { + public: +@@ -438,42 +475,6 @@ + + // ---------------------------------------------------------------------------------------- + +- template < +- typename charT, +- typename traits, +- typename alloc +- > +- inline const typename disable_if<is_same_type<charT,char>,std::string>::type narrow ( +- const std::basic_string<charT,traits,alloc>& str +- ) +- { +- std::string temp; +- temp.reserve(str.size()); +- std::string::size_type i; +- for (i = 0; i < str.size(); ++i) +- { +- if (zero_extend_cast<unsigned long>(str[i]) > 255) +- temp += ' '; +- else +- temp += zero_extend_cast<char>(str[i]); +- } +- return temp; +- } +- +- template < +- typename charT, +- typename traits, +- typename alloc +- > +- inline const typename enable_if<is_same_type<charT,char>,std::string>::type narrow ( +- const std::basic_string<charT,traits,alloc>& str +- ) +- { +- return str; +- } +- +-// ---------------------------------------------------------------------------------------- +- + template < + typename charT, + typename traits, +Index: plastimatch-1.5.10+dfsg0/libs/dlib-17.34/dlib/cmd_line_parser/cmd_line_parser_check_1.h +=================================================================== +--- plastimatch-1.5.10+dfsg0.orig/libs/dlib-17.34/dlib/cmd_line_parser/cmd_line_parser_check_1.h 2012-06-15 20:24:20.357943831 +0000 ++++ plastimatch-1.5.10+dfsg0/libs/dlib-17.34/dlib/cmd_line_parser/cmd_line_parser_check_1.h 2012-06-15 20:25:39.104440882 +0000 +@@ -533,7 +533,7 @@ + size_t i = 0; + for (; i < length; ++i) + { +- if (option(option_set[i]).count() > 1) ++ if (this->option(option_set[i]).count() > 1) + break; + } + if (i != length) diff -Nru plastimatch-1.5.10+dfsg0/debian/patches/series plastimatch-1.5.10+dfsg0/debian/patches/series --- plastimatch-1.5.10+dfsg0/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ plastimatch-1.5.10+dfsg0/debian/patches/series 2012-06-15 22:45:29.000000000 +0200 @@ -0,0 +1 @@ +674373.patch
signature.asc
Description: OpenPGP digital signature