Package: mrs Version: 6.0.5+dfsg-3 Severity: normal Tags: patch User: [email protected] Usertags: origin-ubuntu bionic ubuntu-patch
Dear maintainers, mrs has been failing to build in Ubuntu bionic, which now has boost 1.65 as default. While Debian has not yet started this transition, the appropriate fix is to replace certain boost headers with their equivalents that are now part of the standard C++ headers from g++7. I have applied the attached patch in Ubuntu to let libzeep build again. Please consider applying it in Debian as well. -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. Ubuntu Developer http://www.debian.org/ [email protected] [email protected]
diff -Nru mrs-6.0.5+dfsg/debian/patches/boost-1.65-compat.patch mrs-6.0.5+dfsg/debian/patches/boost-1.65-compat.patch --- mrs-6.0.5+dfsg/debian/patches/boost-1.65-compat.patch 1969-12-31 16:00:00.000000000 -0800 +++ mrs-6.0.5+dfsg/debian/patches/boost-1.65-compat.patch 2018-03-18 00:23:28.000000000 -0700 @@ -0,0 +1,123 @@ +Description: fix compatibility with boost 1.65 + Boost 1.65 no longer provides tr1/ headers, which are now provided instead + by g++7 directly. Adjust our includes accordingly. +Author: Steve Langasek <[email protected]> +Last-Modified: 2018-03-18 + +Index: mrs-6.0.5+dfsg/src/M6Databank.h +=================================================================== +--- mrs-6.0.5+dfsg.orig/src/M6Databank.h ++++ mrs-6.0.5+dfsg/src/M6Databank.h +@@ -8,7 +8,7 @@ + #include <vector> + #include <map> + #include <set> +-#include <boost/tr1/tuple.hpp> ++#include <tr1/tuple> + + #include "M6File.h" + +Index: mrs-6.0.5+dfsg/src/M6BlastCache.h +=================================================================== +--- mrs-6.0.5+dfsg.orig/src/M6BlastCache.h ++++ mrs-6.0.5+dfsg/src/M6BlastCache.h +@@ -10,7 +10,7 @@ + #include <boost/thread.hpp> + #include <boost/thread/condition.hpp> + #include <boost/filesystem/path.hpp> +-#include <boost/tr1/tuple.hpp> ++#include <tr1/tuple> + + #include "M6Blast.h" + +Index: mrs-6.0.5+dfsg/src/M6Builder.h +=================================================================== +--- mrs-6.0.5+dfsg.orig/src/M6Builder.h ++++ mrs-6.0.5+dfsg/src/M6Builder.h +@@ -10,7 +10,7 @@ + + #include <boost/filesystem/path.hpp> + #include <boost/thread.hpp> +-#include <boost/tr1/tuple.hpp> ++#include <tr1/tuple> + #include <zeep/xml/node.hpp> + + #include "M6Lexicon.h" +Index: mrs-6.0.5+dfsg/src/M6CmdLineDriver.cpp +=================================================================== +--- mrs-6.0.5+dfsg.orig/src/M6CmdLineDriver.cpp ++++ mrs-6.0.5+dfsg/src/M6CmdLineDriver.cpp +@@ -16,7 +16,7 @@ + #include <boost/foreach.hpp> + #define foreach BOOST_FOREACH + //#include <boost/timer/timer.hpp> +-#include <boost/tr1/tuple.hpp> ++#include <tr1/tuple> + #include <boost/algorithm/string.hpp> + + #include "M6Builder.h" +Index: mrs-6.0.5+dfsg/src/M6Iterator.h +=================================================================== +--- mrs-6.0.5+dfsg.orig/src/M6Iterator.h ++++ mrs-6.0.5+dfsg/src/M6Iterator.h +@@ -8,7 +8,7 @@ + #include <vector> + #include <algorithm> + #include <boost/filesystem/path.hpp> +-#include <boost/tr1/tuple.hpp> ++#include <tr1/tuple> + + #include "M6BitStream.h" + #include "M6File.h" +Index: mrs-6.0.5+dfsg/src/M6Server.h +=================================================================== +--- mrs-6.0.5+dfsg.orig/src/M6Server.h ++++ mrs-6.0.5+dfsg/src/M6Server.h +@@ -9,7 +9,7 @@ + #include <map> + #include <set> + +-#include <boost/tr1/tuple.hpp> ++#include <tr1/tuple> + + #include <zeep/http/webapp.hpp> + #include <zeep/http/webapp/el.hpp> +Index: mrs-6.0.5+dfsg/src/M6Server.cpp +=================================================================== +--- mrs-6.0.5+dfsg.orig/src/M6Server.cpp ++++ mrs-6.0.5+dfsg/src/M6Server.cpp +@@ -14,7 +14,7 @@ + #include <numeric> + + #include <boost/bind.hpp> +-#include <boost/tr1/cmath.hpp> ++#include <tr1/cmath> + #include <boost/foreach.hpp> + #define foreach BOOST_FOREACH + #include <boost/filesystem/fstream.hpp> +Index: mrs-6.0.5+dfsg/src/M6Tokenizer.cpp +=================================================================== +--- mrs-6.0.5+dfsg.orig/src/M6Tokenizer.cpp ++++ mrs-6.0.5+dfsg/src/M6Tokenizer.cpp +@@ -11,7 +11,7 @@ + #include <iterator> + #include <algorithm> + +-#include <boost/tr1/tuple.hpp> ++#include <tr1/tuple> + #include <boost/foreach.hpp> + #define foreach BOOST_FOREACH + +Index: mrs-6.0.5+dfsg/src/M6WSSearch.cpp +=================================================================== +--- mrs-6.0.5+dfsg.orig/src/M6WSSearch.cpp ++++ mrs-6.0.5+dfsg/src/M6WSSearch.cpp +@@ -10,7 +10,7 @@ + #include <zeep/dispatcher.hpp> + + #include <boost/bind.hpp> +-#include <boost/tr1/cmath.hpp> ++#include <tr1/cmath> + #include <boost/foreach.hpp> + #define foreach BOOST_FOREACH + #include <boost/filesystem/fstream.hpp> diff -Nru mrs-6.0.5+dfsg/debian/patches/series mrs-6.0.5+dfsg/debian/patches/series --- mrs-6.0.5+dfsg/debian/patches/series 2017-09-04 02:01:22.000000000 -0700 +++ mrs-6.0.5+dfsg/debian/patches/series 2018-03-17 23:49:10.000000000 -0700 @@ -1,3 +1,4 @@ makefile.diff init_d.diff gcc-6.patch +boost-1.65-compat.patch
