diff options
Diffstat (limited to 'devel/monotone/patches/patch-src_update.cc')
| -rw-r--r-- | devel/monotone/patches/patch-src_update.cc | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/devel/monotone/patches/patch-src_update.cc b/devel/monotone/patches/patch-src_update.cc new file mode 100644 index 00000000000..3d0e75e3b4e --- /dev/null +++ b/devel/monotone/patches/patch-src_update.cc @@ -0,0 +1,24 @@ +$NetBSD: patch-src_update.cc,v 1.1 2021/03/06 08:57:54 nia Exp $ + +A function macro named E clashes with internal boost definitions. Rearrange +the order of header inclusion so that affected boost headers are included +before monotone defines the macro. + +Also, stop bundling boost/circular_buffer, which is available in current +versions of boost. + +https://src.fedoraproject.org/fork/jjames/rpms/monotone/raw/84e80f1b992f0b0dba6cfe98eb9d0c55ea39623f/f/monotone-1.1-boost.patch + +--- src/update.cc.orig 2014-05-04 09:15:18.000000000 +0000 ++++ src/update.cc +@@ -9,9 +9,9 @@ + + #include "base.hh" + #include <set> ++#include "lexical_cast.hh" + #include "safe_map.hh" + #include "vector.hh" +-#include "lexical_cast.hh" + + #include "database.hh" + #include "sanity.hh" |