1 files changed, 29 insertions, 0 deletions
diff --git a/devel/monotone/patches/patch-src_transforms.cc b/devel/monotone/patches/patch-src_transforms.cc
new file mode 100644
index 00000000000..67daeba1764
--- /dev/null
+++ b/devel/monotone/patches/patch-src_transforms.cc
@@ -0,0 +1,29 @@
+$NetBSD: patch-src_transforms.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/transforms.cc.orig	2014-05-04 09:15:18.000000000 +0000
++++ src/transforms.cc
+@@ -12,12 +12,12 @@
+ #include <botan/botan.h>
+ #include <botan/sha160.h>
+ 
+-#include "botan_pipe_cache.hh"
+-#include "gzip.hh"
+-
+ #include "transforms.hh"
+ #include "char_classifiers.hh"
+ 
++#include "botan_pipe_cache.hh"
++#include "gzip.hh"
++
+ using std::string;
+ using Botan::Pipe;
+ using Botan::Base64_Encoder;