diff options
Diffstat (limited to 'devel/monotone/patches/patch-src_database.hh')
| -rw-r--r-- | devel/monotone/patches/patch-src_database.hh | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/devel/monotone/patches/patch-src_database.hh b/devel/monotone/patches/patch-src_database.hh new file mode 100644 index 00000000000..1817a253075 --- /dev/null +++ b/devel/monotone/patches/patch-src_database.hh @@ -0,0 +1,25 @@ +$NetBSD: patch-src_database.hh,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/database.hh.orig 2014-05-04 09:15:16.000000000 +0000 ++++ src/database.hh +@@ -11,10 +11,10 @@ + #ifndef __DATABASE_HH__ + #define __DATABASE_HH__ + +-#include "vector.hh" + #include <set> + #include <boost/function.hpp> + #include <boost/shared_ptr.hpp> ++#include "vector.hh" + + #include "rev_types.hh" + #include "cert.hh" |