SecBSD's official ports repository

devel/monotone/patches/patch-src_database_cc

@@ -0,0 +1,25 @@
+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. From Fedora.
+
+Index: src/database.cc
+--- src/database.cc.orig
++++ src/database.cc
+@@ -17,13 +17,13 @@
+ #include <numeric>
+ #include <set>
+ #include <sstream>
+-#include "vector.hh"
+ 
+ #include <string.h>
+ #include <boost/bind.hpp>
+ #include <boost/shared_ptr.hpp>
+ #include <boost/tuple/tuple.hpp>
+ #include <boost/tuple/tuple_comparison.hpp>
++#include "vector.hh"
+ 
+ #include <botan/botan.h>
+ #include <botan/rsa.h>