From cb441e87ef15613eb864801605bf975c6db2759e Mon Sep 17 00:00:00 2001 From: nia Date: Sat, 6 Mar 2021 08:57:54 +0000 Subject: monotone: Fix building with recent boost and Lua 5.4 Patches from Fedora. --- devel/monotone/distinfo | 37 ++++++++++++++++- devel/monotone/patches/patch-Makefile.in | 47 ++++++++++++++++++++++ devel/monotone/patches/patch-src_ancestry.cc | 23 +++++++++++ devel/monotone/patches/patch-src_asciik.hh | 23 +++++++++++ devel/monotone/patches/patch-src_automate.cc | 27 +++++++++++++ devel/monotone/patches/patch-src_basic__io.hh | 26 ++++++++++++ devel/monotone/patches/patch-src_charset.cc | 30 ++++++++++++++ devel/monotone/patches/patch-src_cmd__list.cc | 29 +++++++++++++ devel/monotone/patches/patch-src_commands.hh | 23 +++++++++++ devel/monotone/patches/patch-src_database.cc | 28 +++++++++++++ devel/monotone/patches/patch-src_database.hh | 25 ++++++++++++ devel/monotone/patches/patch-src_enumerator.cc | 24 +++++++++++ devel/monotone/patches/patch-src_file__io.cc | 24 +++++++++++ devel/monotone/patches/patch-src_globish.cc | 24 +++++++++++ devel/monotone/patches/patch-src_hmac.cc | 24 +++++++++++ devel/monotone/patches/patch-src_key__store.hh | 23 +++++++++++ devel/monotone/patches/patch-src_lua__hooks.cc | 18 +++++++++ devel/monotone/patches/patch-src_migrate__work.cc | 23 +++++++++++ devel/monotone/patches/patch-src_netcmd.cc | 26 ++++++++++++ devel/monotone/patches/patch-src_netcmd.hh | 29 +++++++++++++ .../patches/patch-src_network_listener__base.hh | 26 ++++++++++++ devel/monotone/patches/patch-src_option.hh | 25 ++++++++++++ devel/monotone/patches/patch-src_project.cc | 24 +++++++++++ devel/monotone/patches/patch-src_rcs__file.cc | 29 +++++++++++++ devel/monotone/patches/patch-src_rcs__file.hh | 24 +++++++++++ devel/monotone/patches/patch-src_rcs__import.cc | 28 +++++++++++++ devel/monotone/patches/patch-src_restrictions.cc | 24 +++++++++++ devel/monotone/patches/patch-src_revision.hh | 23 +++++++++++ devel/monotone/patches/patch-src_roster.cc | 25 ++++++++++++ devel/monotone/patches/patch-src_sanity.cc | 29 +++++++++++++ devel/monotone/patches/patch-src_sanity.hh | 22 ++++++++++ devel/monotone/patches/patch-src_sha1.cc | 26 ++++++++++++ devel/monotone/patches/patch-src_transforms.cc | 29 +++++++++++++ devel/monotone/patches/patch-src_update.cc | 24 +++++++++++ devel/monotone/patches/patch-src_vocab.cc | 23 +++++++++++ devel/monotone/patches/patch-src_xdelta.cc | 29 +++++++++++++ 36 files changed, 942 insertions(+), 1 deletion(-) create mode 100644 devel/monotone/patches/patch-Makefile.in create mode 100644 devel/monotone/patches/patch-src_ancestry.cc create mode 100644 devel/monotone/patches/patch-src_asciik.hh create mode 100644 devel/monotone/patches/patch-src_automate.cc create mode 100644 devel/monotone/patches/patch-src_basic__io.hh create mode 100644 devel/monotone/patches/patch-src_charset.cc create mode 100644 devel/monotone/patches/patch-src_cmd__list.cc create mode 100644 devel/monotone/patches/patch-src_commands.hh create mode 100644 devel/monotone/patches/patch-src_database.cc create mode 100644 devel/monotone/patches/patch-src_database.hh create mode 100644 devel/monotone/patches/patch-src_enumerator.cc create mode 100644 devel/monotone/patches/patch-src_file__io.cc create mode 100644 devel/monotone/patches/patch-src_globish.cc create mode 100644 devel/monotone/patches/patch-src_hmac.cc create mode 100644 devel/monotone/patches/patch-src_key__store.hh create mode 100644 devel/monotone/patches/patch-src_lua__hooks.cc create mode 100644 devel/monotone/patches/patch-src_migrate__work.cc create mode 100644 devel/monotone/patches/patch-src_netcmd.cc create mode 100644 devel/monotone/patches/patch-src_netcmd.hh create mode 100644 devel/monotone/patches/patch-src_network_listener__base.hh create mode 100644 devel/monotone/patches/patch-src_option.hh create mode 100644 devel/monotone/patches/patch-src_project.cc create mode 100644 devel/monotone/patches/patch-src_rcs__file.cc create mode 100644 devel/monotone/patches/patch-src_rcs__file.hh create mode 100644 devel/monotone/patches/patch-src_rcs__import.cc create mode 100644 devel/monotone/patches/patch-src_restrictions.cc create mode 100644 devel/monotone/patches/patch-src_revision.hh create mode 100644 devel/monotone/patches/patch-src_roster.cc create mode 100644 devel/monotone/patches/patch-src_sanity.cc create mode 100644 devel/monotone/patches/patch-src_sanity.hh create mode 100644 devel/monotone/patches/patch-src_sha1.cc create mode 100644 devel/monotone/patches/patch-src_transforms.cc create mode 100644 devel/monotone/patches/patch-src_update.cc create mode 100644 devel/monotone/patches/patch-src_vocab.cc create mode 100644 devel/monotone/patches/patch-src_xdelta.cc diff --git a/devel/monotone/distinfo b/devel/monotone/distinfo index 4519e75664e..f7fdba62101 100644 --- a/devel/monotone/distinfo +++ b/devel/monotone/distinfo @@ -1,9 +1,44 @@ -$NetBSD: distinfo,v 1.53 2018/09/13 21:14:45 gavan Exp $ +$NetBSD: distinfo,v 1.54 2021/03/06 08:57:54 nia Exp $ SHA1 (monotone-1.1.tar.bz2) = 2b97559b252decaee3a374b81bf714cf33441ba3 RMD160 (monotone-1.1.tar.bz2) = c5e0f45028b806eb166b4aaecababa8e8e81b686 SHA512 (monotone-1.1.tar.bz2) = 0599e7fc004552f6a15095b62627eb60d80bfd32904608b6fef15f6c6f83db8059375833cb8ddc54fed569223a95f8ea0ba3c7008ad2969a5776faa27e5e5f3b Size (monotone-1.1.tar.bz2) = 3428699 bytes +SHA1 (patch-Makefile.in) = 7a7c9219f963e7ff352c1778e7d5465ba8fbc608 +SHA1 (patch-src_ancestry.cc) = 62d58a71a44e5454d69a35963774a2f31094e302 +SHA1 (patch-src_asciik.hh) = 2f83d92323bdcbb167868809efca7d4ab8eb8207 +SHA1 (patch-src_automate.cc) = 04306a7889e40ccaeea868eb655969944709578f +SHA1 (patch-src_basic__io.hh) = a716d1f50949756ab6eea0cec66b1183119cf757 +SHA1 (patch-src_charset.cc) = 9ffe2e88c62cf897c72298a8626d55eb85709006 +SHA1 (patch-src_cmd__list.cc) = 74a11d4d15db798064accc9e1c92242ac8cdf48e +SHA1 (patch-src_commands.hh) = 8112f948164e7c80ece2d66e0bf9d2bcdccc3e40 +SHA1 (patch-src_database.cc) = 806c19434a149fb96fe38aec281236b72d204955 +SHA1 (patch-src_database.hh) = 257f845e8c11727c10bf375ff1e2e1922c091745 +SHA1 (patch-src_enumerator.cc) = 5c86d27cfa45e3ccb3d9a88959d71a6c72692717 +SHA1 (patch-src_file__io.cc) = 851fe7d772063e74d73bb67aae973655a8e3c246 +SHA1 (patch-src_globish.cc) = e462c2407ce54f15c5107f12186335de17cda337 SHA1 (patch-src_hash__map.hh) = 3f8e83b651452aa87eb5409d6e852a49e3747db4 +SHA1 (patch-src_hmac.cc) = ae17ce604eabf14c33e56fbed01700dd31829764 +SHA1 (patch-src_key__store.hh) = a83d85e4810a84e01559494d332399f65e882ecd +SHA1 (patch-src_lua__hooks.cc) = 7593608df6c997368a7d57a2f8183514b7b0169e +SHA1 (patch-src_migrate__work.cc) = 1917092a134c28dc4301107610c335eb92cccab7 +SHA1 (patch-src_netcmd.cc) = 7ebcbd1887158cc10dae5ba21e69975d82241820 +SHA1 (patch-src_netcmd.hh) = ce687b6fa80ccb0a8c07b1d20dcc26a4e56624a0 +SHA1 (patch-src_network_listener__base.hh) = 554e8b458e126f07ee0cf22b8b6b2158749dc98a +SHA1 (patch-src_option.hh) = e36dfcd20b1e0d7015f8cb398c9bf6b157f1916d SHA1 (patch-src_pcrewrap.cc) = c40693610033a899b3d14867e3228d86d2a732d4 SHA1 (patch-src_pcrewrap.hh) = 60fae878445e2eedece85660741062b80090b043 +SHA1 (patch-src_project.cc) = ade101994af3f2c64ee23bbaef0e2a0333fe0498 +SHA1 (patch-src_rcs__file.cc) = 531378ceb7cc0d4d88eb65b7c6f3cc72acf69c67 +SHA1 (patch-src_rcs__file.hh) = 730c8b7ab63cd1d33316efb3647af84327578f65 +SHA1 (patch-src_rcs__import.cc) = 723332ca1172707858bb1a7394ca9d039b9d88f1 +SHA1 (patch-src_restrictions.cc) = ebce64b7b09a35fb3f324e0dad20138db7ea8146 +SHA1 (patch-src_revision.hh) = 1b36f466b32d70ce46d827f68e11f95b6bb9d1ab +SHA1 (patch-src_roster.cc) = 21f6a7afe1ba992fc7ebb4d4d1e81c84b7f21200 +SHA1 (patch-src_sanity.cc) = d091b89238110cae21e0c9881ef36a970b296bfb +SHA1 (patch-src_sanity.hh) = 278b024cc601aec941980319f61823160e962625 +SHA1 (patch-src_sha1.cc) = 360fd1959d460fee792694af71795114b4422932 +SHA1 (patch-src_transforms.cc) = 108f778ace54093724704649a6450bd623a41c63 +SHA1 (patch-src_update.cc) = 28761a113536e6a00bef2d70a1c3855b56dadd82 +SHA1 (patch-src_vocab.cc) = c774b962065c6e7840dc1cc3138df6c0c37f2bf9 +SHA1 (patch-src_xdelta.cc) = 827820556c4a5ad19465d66efc55517a079053dd diff --git a/devel/monotone/patches/patch-Makefile.in b/devel/monotone/patches/patch-Makefile.in new file mode 100644 index 00000000000..aefca580695 --- /dev/null +++ b/devel/monotone/patches/patch-Makefile.in @@ -0,0 +1,47 @@ +$NetBSD: patch-Makefile.in,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 + +--- Makefile.in.orig 2014-05-04 09:18:01.000000000 +0000 ++++ Makefile.in +@@ -156,10 +156,7 @@ am__v_AR_1 = + src_lib3rdparty_a_AR = $(AR) $(ARFLAGS) + src_lib3rdparty_a_LIBADD = + am__src_lib3rdparty_a_SOURCES_DIST = \ +- src/boost/circular_buffer_adaptor.hpp \ +- src/boost/circular_buffer_base.hpp \ +- src/boost/circular_buffer_fwd.hpp \ +- src/boost/circular_buffer.hpp src/netxx/accept.cxx \ ++ src/netxx/accept.cxx \ + src/netxx/accept.h src/netxx/address.cxx src/netxx/common.h \ + src/netxx/compat.h src/netxx/datagram.cxx \ + src/netxx/datagramserver.cxx src/netxx/osutil.cxx \ +@@ -933,12 +930,6 @@ NETXX_SOURCES = \ + src/netxx/stream.h src/netxx/streambase.h \ + src/netxx/streamserver.h src/netxx/timeout.h src/netxx/types.h + +-BOOST_SANDBOX_SOURCES = \ +- src/boost/circular_buffer_adaptor.hpp \ +- src/boost/circular_buffer_base.hpp \ +- src/boost/circular_buffer_fwd.hpp \ +- src/boost/circular_buffer.hpp +- + UNIX_PLATFORM_SOURCES = \ + src/unix/read_password.cc src/unix/get_system_flavour.cc \ + src/unix/process.cc src/unix/terminal.cc src/unix/inodeprint.cc \ +@@ -1026,7 +1017,7 @@ nodist_test_bin_tester_SOURCES = test/sr + noinst_LIBRARIES = src/libplatform.a src/lib3rdparty.a + src_libplatform_a_SOURCES = src/platform.hh $(am__append_1) \ + $(am__append_6) +-src_lib3rdparty_a_SOURCES = $(BOOST_SANDBOX_SOURCES) $(NETXX_SOURCES) \ ++src_lib3rdparty_a_SOURCES = $(NETXX_SOURCES) \ + $(am__append_9) $(am__append_11) $(am__append_13) \ + $(am__append_14) + bashcompdir = $(sysconfdir)/bash_completion.d diff --git a/devel/monotone/patches/patch-src_ancestry.cc b/devel/monotone/patches/patch-src_ancestry.cc new file mode 100644 index 00000000000..afa1ca7f1f6 --- /dev/null +++ b/devel/monotone/patches/patch-src_ancestry.cc @@ -0,0 +1,23 @@ +$NetBSD: patch-src_ancestry.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/ancestry.cc.orig 2014-05-04 09:15:15.000000000 +0000 ++++ src/ancestry.cc +@@ -8,8 +8,8 @@ + // PURPOSE. + + #include "base.hh" +-#include "sanity.hh" + #include "revision.hh" ++#include "sanity.hh" + #include "rev_height.hh" + #include "roster.hh" + diff --git a/devel/monotone/patches/patch-src_asciik.hh b/devel/monotone/patches/patch-src_asciik.hh new file mode 100644 index 00000000000..dfef2326da1 --- /dev/null +++ b/devel/monotone/patches/patch-src_asciik.hh @@ -0,0 +1,23 @@ +$NetBSD: patch-src_asciik.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/asciik.hh.orig 2014-05-04 09:15:15.000000000 +0000 ++++ src/asciik.hh +@@ -11,8 +11,8 @@ + #define __ASCIIK_HH__ + + #include +-#include "vector.hh" + #include "vocab.hh" ++#include "vector.hh" + + class asciik + { diff --git a/devel/monotone/patches/patch-src_automate.cc b/devel/monotone/patches/patch-src_automate.cc new file mode 100644 index 00000000000..63c9c852903 --- /dev/null +++ b/devel/monotone/patches/patch-src_automate.cc @@ -0,0 +1,27 @@ +$NetBSD: patch-src_automate.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/automate.cc.orig 2014-05-04 09:15:16.000000000 +0000 ++++ src/automate.cc +@@ -13,12 +13,12 @@ + #include + #include + #include +-#include "vector.hh" + + #include + #include + #include "lexical_cast.hh" + #include ++#include "vector.hh" + + #include "app_state.hh" + #include "automate_stdio_helpers.hh" diff --git a/devel/monotone/patches/patch-src_basic__io.hh b/devel/monotone/patches/patch-src_basic__io.hh new file mode 100644 index 00000000000..d43d7228a7d --- /dev/null +++ b/devel/monotone/patches/patch-src_basic__io.hh @@ -0,0 +1,26 @@ +$NetBSD: patch-src_basic__io.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/basic_io.hh.orig 2014-05-04 09:15:16.000000000 +0000 ++++ src/basic_io.hh +@@ -11,11 +11,11 @@ + #ifndef __BASIC_IO_HH__ + #define __BASIC_IO_HH__ + +-#include "vector.hh" + #include + + #include "paths.hh" + #include "sanity.hh" ++#include "vector.hh" + #include "vocab.hh" + #include "numeric_vocab.hh" + #include "char_classifiers.hh" diff --git a/devel/monotone/patches/patch-src_charset.cc b/devel/monotone/patches/patch-src_charset.cc new file mode 100644 index 00000000000..e2f1f7085c7 --- /dev/null +++ b/devel/monotone/patches/patch-src_charset.cc @@ -0,0 +1,30 @@ +$NetBSD: patch-src_charset.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/charset.cc.orig 2014-05-04 09:15:16.000000000 +0000 ++++ src/charset.cc +@@ -7,13 +7,13 @@ + // implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + // PURPOSE. + +-#include "base.hh" +-#include "vector.hh" +- + #include + #include + #include + ++#include "base.hh" ++#include "vector.hh" ++ + #include "charset.hh" + #include "numeric_vocab.hh" + #include "sanity.hh" diff --git a/devel/monotone/patches/patch-src_cmd__list.cc b/devel/monotone/patches/patch-src_cmd__list.cc new file mode 100644 index 00000000000..0993b370716 --- /dev/null +++ b/devel/monotone/patches/patch-src_cmd__list.cc @@ -0,0 +1,29 @@ +$NetBSD: patch-src_cmd__list.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/cmd_list.cc.orig 2014-05-04 09:15:16.000000000 +0000 ++++ src/cmd_list.cc +@@ -10,7 +10,6 @@ + + #include "base.hh" + #include +-#include "safe_map.hh" + #include + #include + #include +@@ -18,6 +17,7 @@ + #include + + #include "basic_io.hh" ++#include "safe_map.hh" + #include "cert.hh" + #include "charset.hh" + #include "cmd.hh" diff --git a/devel/monotone/patches/patch-src_commands.hh b/devel/monotone/patches/patch-src_commands.hh new file mode 100644 index 00000000000..cb8ffd0d7eb --- /dev/null +++ b/devel/monotone/patches/patch-src_commands.hh @@ -0,0 +1,23 @@ +$NetBSD: patch-src_commands.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/commands.hh.orig 2014-05-04 09:15:16.000000000 +0000 ++++ src/commands.hh +@@ -10,8 +10,8 @@ + #ifndef __COMMANDS_HH__ + #define __COMMANDS_HH__ + +-#include "vector.hh" + #include "options.hh" ++#include "vector.hh" + class app_state; + class utf8; + diff --git a/devel/monotone/patches/patch-src_database.cc b/devel/monotone/patches/patch-src_database.cc new file mode 100644 index 00000000000..a80ed9cf328 --- /dev/null +++ b/devel/monotone/patches/patch-src_database.cc @@ -0,0 +1,28 @@ +$NetBSD: patch-src_database.cc,v 1.3 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.cc.orig 2014-05-04 09:15:16.000000000 +0000 ++++ src/database.cc +@@ -17,13 +17,13 @@ + #include + #include + #include +-#include "vector.hh" + + #include + #include + #include + #include + #include ++#include "vector.hh" + + #include + #include 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 + #include + #include ++#include "vector.hh" + + #include "rev_types.hh" + #include "cert.hh" diff --git a/devel/monotone/patches/patch-src_enumerator.cc b/devel/monotone/patches/patch-src_enumerator.cc new file mode 100644 index 00000000000..2ae86b77efa --- /dev/null +++ b/devel/monotone/patches/patch-src_enumerator.cc @@ -0,0 +1,24 @@ +$NetBSD: patch-src_enumerator.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/enumerator.cc.orig 2014-05-04 09:15:16.000000000 +0000 ++++ src/enumerator.cc +@@ -11,9 +11,9 @@ + #include + #include + #include +-#include "vector.hh" + + #include "cset.hh" ++#include "vector.hh" + #include "enumerator.hh" + #include "revision.hh" + #include "vocab.hh" diff --git a/devel/monotone/patches/patch-src_file__io.cc b/devel/monotone/patches/patch-src_file__io.cc new file mode 100644 index 00000000000..636dd5c6b85 --- /dev/null +++ b/devel/monotone/patches/patch-src_file__io.cc @@ -0,0 +1,24 @@ +$NetBSD: patch-src_file__io.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/file_io.cc.orig 2014-05-04 09:15:16.000000000 +0000 ++++ src/file_io.cc +@@ -12,9 +12,9 @@ + #include + + #include +-#include "botan_pipe_cache.hh" + + #include "file_io.hh" ++#include "botan_pipe_cache.hh" + #include "sanity.hh" + #include "simplestring_xform.hh" + #include "charset.hh" diff --git a/devel/monotone/patches/patch-src_globish.cc b/devel/monotone/patches/patch-src_globish.cc new file mode 100644 index 00000000000..c61c9fac78f --- /dev/null +++ b/devel/monotone/patches/patch-src_globish.cc @@ -0,0 +1,24 @@ +$NetBSD: patch-src_globish.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/globish.cc.orig 2014-05-04 09:15:16.000000000 +0000 ++++ src/globish.cc +@@ -9,9 +9,9 @@ + // PURPOSE. + + #include "base.hh" ++#include "option.hh" // for arg_type + #include "sanity.hh" + #include "globish.hh" +-#include "option.hh" // for arg_type + #include "numeric_vocab.hh" + + #include diff --git a/devel/monotone/patches/patch-src_hmac.cc b/devel/monotone/patches/patch-src_hmac.cc new file mode 100644 index 00000000000..470fe912967 --- /dev/null +++ b/devel/monotone/patches/patch-src_hmac.cc @@ -0,0 +1,24 @@ +$NetBSD: patch-src_hmac.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/hmac.cc.orig 2014-05-04 09:15:17.000000000 +0000 ++++ src/hmac.cc +@@ -10,9 +10,9 @@ + #include "base.hh" + #include + +-#include "sanity.hh" + #include "hmac.hh" + #include "vocab.hh" ++#include "sanity.hh" + #include "constants.hh" + + using std::string; diff --git a/devel/monotone/patches/patch-src_key__store.hh b/devel/monotone/patches/patch-src_key__store.hh new file mode 100644 index 00000000000..48eb02cc421 --- /dev/null +++ b/devel/monotone/patches/patch-src_key__store.hh @@ -0,0 +1,23 @@ +$NetBSD: patch-src_key__store.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/key_store.hh.orig 2014-05-04 09:15:17.000000000 +0000 ++++ src/key_store.hh +@@ -19,8 +19,8 @@ + #include + #endif + +-#include "vector.hh" + #include "vocab.hh" ++#include "vector.hh" + #include "paths.hh" + + class app_state; diff --git a/devel/monotone/patches/patch-src_lua__hooks.cc b/devel/monotone/patches/patch-src_lua__hooks.cc new file mode 100644 index 00000000000..901c2d0cdac --- /dev/null +++ b/devel/monotone/patches/patch-src_lua__hooks.cc @@ -0,0 +1,18 @@ +$NetBSD: patch-src_lua__hooks.cc,v 1.1 2021/03/06 08:57:54 nia Exp $ + +The LUA_QL macro was removed in lua 5.4.0. Make the same transformation +as was made in the lua code itself. + +https://src.fedoraproject.org/fork/jjames/rpms/monotone/raw/743f0c8ae3af8551c1047c049e9ad2d54abc7af9/f/monotone-1.1-lua-ql.patch + +--- src/lua_hooks.cc.orig 2014-05-04 09:15:17.000000000 +0000 ++++ src/lua_hooks.cc +@@ -90,7 +90,7 @@ extern "C" + s = lua_tostring(LS, -1); + if (s == NULL) + return luaL_error( +- LS, LUA_QL("tostring") " must return a string to ", LUA_QL("print") ++ LS, "'tostring' must return a string to 'print'" + ); + + if (i > 1) diff --git a/devel/monotone/patches/patch-src_migrate__work.cc b/devel/monotone/patches/patch-src_migrate__work.cc new file mode 100644 index 00000000000..8c45d91608b --- /dev/null +++ b/devel/monotone/patches/patch-src_migrate__work.cc @@ -0,0 +1,23 @@ +$NetBSD: patch-src_migrate__work.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/migrate_work.cc.orig 2014-05-04 09:15:17.000000000 +0000 ++++ src/migrate_work.cc +@@ -8,8 +8,8 @@ + // PURPOSE. + + #include "base.hh" +-#include "sanity.hh" + #include "cset.hh" ++#include "sanity.hh" + #include "simplestring_xform.hh" + #include "revision.hh" + #include "file_io.hh" diff --git a/devel/monotone/patches/patch-src_netcmd.cc b/devel/monotone/patches/patch-src_netcmd.cc new file mode 100644 index 00000000000..a7ad4d8678c --- /dev/null +++ b/devel/monotone/patches/patch-src_netcmd.cc @@ -0,0 +1,26 @@ +$NetBSD: patch-src_netcmd.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/netcmd.cc.orig 2014-05-04 09:15:17.000000000 +0000 ++++ src/netcmd.cc +@@ -8,11 +8,11 @@ + // PURPOSE. + + #include "base.hh" +-#include "vector.hh" + #include + + #include "constants.hh" + #include "netcmd.hh" ++#include "vector.hh" + #include "netio.hh" + #include "numeric_vocab.hh" + #include "sanity.hh" diff --git a/devel/monotone/patches/patch-src_netcmd.hh b/devel/monotone/patches/patch-src_netcmd.hh new file mode 100644 index 00000000000..8e3ac11a0f0 --- /dev/null +++ b/devel/monotone/patches/patch-src_netcmd.hh @@ -0,0 +1,29 @@ +$NetBSD: patch-src_netcmd.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/netcmd.hh.orig 2014-05-04 09:15:17.000000000 +0000 ++++ src/netcmd.hh +@@ -10,13 +10,13 @@ + #ifndef __NETCMD_HH__ + #define __NETCMD_HH__ + +-#include "vector.hh" + #include + #include + #include + +-#include "globish.hh" + #include "merkle_tree.hh" ++#include "vector.hh" ++#include "globish.hh" + #include "numeric_vocab.hh" + #include "uri.hh" + #include "vocab.hh" diff --git a/devel/monotone/patches/patch-src_network_listener__base.hh b/devel/monotone/patches/patch-src_network_listener__base.hh new file mode 100644 index 00000000000..2c8806d7112 --- /dev/null +++ b/devel/monotone/patches/patch-src_network_listener__base.hh @@ -0,0 +1,26 @@ +$NetBSD: patch-src_network_listener__base.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/network/listener_base.hh.orig 2014-05-04 09:15:17.000000000 +0000 ++++ src/network/listener_base.hh +@@ -11,10 +11,10 @@ + #ifndef __LISTENER_BASE_HH__ + #define __LISTENER_BASE_HH__ + +-#include "reactable.hh" +- + #include + ++#include "reactable.hh" ++ + // This is not currently needed because there's only one kind of listener. + // But it's already here and not hurting anything, and might be useful if + // we want to add another kind of listener later (something that accepts diff --git a/devel/monotone/patches/patch-src_option.hh b/devel/monotone/patches/patch-src_option.hh new file mode 100644 index 00000000000..4709775e849 --- /dev/null +++ b/devel/monotone/patches/patch-src_option.hh @@ -0,0 +1,25 @@ +$NetBSD: patch-src_option.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/option.hh.orig 2014-05-04 09:15:17.000000000 +0000 ++++ src/option.hh +@@ -22,9 +22,9 @@ + #include + #include + #include +-#include "vector.hh" +- + #include ++ ++#include "vector.hh" + #include "lexical_cast.hh" + + #include "sanity.hh" diff --git a/devel/monotone/patches/patch-src_project.cc b/devel/monotone/patches/patch-src_project.cc new file mode 100644 index 00000000000..6a4eca20fbc --- /dev/null +++ b/devel/monotone/patches/patch-src_project.cc @@ -0,0 +1,24 @@ +$NetBSD: patch-src_project.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/project.cc.orig 2014-05-04 09:15:17.000000000 +0000 ++++ src/project.cc +@@ -8,9 +8,9 @@ + // PURPOSE. + + #include "base.hh" +-#include "vector.hh" + + #include "cert.hh" ++#include "vector.hh" + #include "database.hh" + #include "date_format.hh" + #include "project.hh" diff --git a/devel/monotone/patches/patch-src_rcs__file.cc b/devel/monotone/patches/patch-src_rcs__file.cc new file mode 100644 index 00000000000..3ea41de1865 --- /dev/null +++ b/devel/monotone/patches/patch-src_rcs__file.cc @@ -0,0 +1,29 @@ +$NetBSD: patch-src_rcs__file.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/rcs_file.cc.orig 2014-05-04 09:15:17.000000000 +0000 ++++ src/rcs_file.cc +@@ -10,7 +10,6 @@ + + #include "base.hh" + #include +-#include "vector.hh" + + #ifdef WIN32 + #include +@@ -32,6 +31,7 @@ + #endif + + #include "rcs_file.hh" ++#include "vector.hh" + #include "sanity.hh" + #include "char_classifiers.hh" + diff --git a/devel/monotone/patches/patch-src_rcs__file.hh b/devel/monotone/patches/patch-src_rcs__file.hh new file mode 100644 index 00000000000..ddb2a2af8c9 --- /dev/null +++ b/devel/monotone/patches/patch-src_rcs__file.hh @@ -0,0 +1,24 @@ +$NetBSD: patch-src_rcs__file.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/rcs_file.hh.orig 2014-05-04 09:15:17.000000000 +0000 ++++ src/rcs_file.hh +@@ -10,9 +10,9 @@ + #ifndef __RCS_FILE_HH__ + #define __RCS_FILE_HH__ + +-#include "vector.hh" + #include + #include ++#include "vector.hh" + + struct rcs_admin + { diff --git a/devel/monotone/patches/patch-src_rcs__import.cc b/devel/monotone/patches/patch-src_rcs__import.cc new file mode 100644 index 00000000000..f42ab715e4f --- /dev/null +++ b/devel/monotone/patches/patch-src_rcs__import.cc @@ -0,0 +1,28 @@ +$NetBSD: patch-src_rcs__import.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/rcs_import.cc.orig 2014-05-04 09:15:17.000000000 +0000 ++++ src/rcs_import.cc +@@ -16,13 +16,13 @@ + #include + #include + #include +-#include "vector.hh" + #include // memset + + #include + #include + #include "lexical_cast.hh" + #include ++#include "vector.hh" + + #include "cert.hh" + #include "constants.hh" diff --git a/devel/monotone/patches/patch-src_restrictions.cc b/devel/monotone/patches/patch-src_restrictions.cc new file mode 100644 index 00000000000..223314dc2ef --- /dev/null +++ b/devel/monotone/patches/patch-src_restrictions.cc @@ -0,0 +1,24 @@ +$NetBSD: patch-src_restrictions.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/restrictions.cc.orig 2014-05-04 09:15:17.000000000 +0000 ++++ src/restrictions.cc +@@ -8,9 +8,9 @@ + // PURPOSE. + + #include "base.hh" ++#include "restrictions.hh" + #include "safe_map.hh" + #include "vector.hh" +-#include "restrictions.hh" + #include "file_io.hh" + #include "roster.hh" + #include "database.hh" // for parent_roster diff --git a/devel/monotone/patches/patch-src_revision.hh b/devel/monotone/patches/patch-src_revision.hh new file mode 100644 index 00000000000..60016a609bf --- /dev/null +++ b/devel/monotone/patches/patch-src_revision.hh @@ -0,0 +1,23 @@ +$NetBSD: patch-src_revision.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/revision.hh.orig 2014-05-04 09:15:18.000000000 +0000 ++++ src/revision.hh +@@ -11,8 +11,8 @@ + #define __REVISION_HH__ + + #include +-#include "vector.hh" + #include "rev_types.hh" ++#include "vector.hh" + + class key_store; + class node_restriction; diff --git a/devel/monotone/patches/patch-src_roster.cc b/devel/monotone/patches/patch-src_roster.cc new file mode 100644 index 00000000000..afed8eb2533 --- /dev/null +++ b/devel/monotone/patches/patch-src_roster.cc @@ -0,0 +1,25 @@ +$NetBSD: patch-src_roster.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/roster.cc.orig 2014-05-04 09:15:18.000000000 +0000 ++++ src/roster.cc +@@ -11,10 +11,10 @@ + #include "base.hh" + #include + #include +-#include "vector.hh" + #include + + #include "basic_io.hh" ++#include "vector.hh" + #include "cset.hh" + #include "database.hh" + #include "platform-wrapped.hh" diff --git a/devel/monotone/patches/patch-src_sanity.cc b/devel/monotone/patches/patch-src_sanity.cc new file mode 100644 index 00000000000..eded65c2b8b --- /dev/null +++ b/devel/monotone/patches/patch-src_sanity.cc @@ -0,0 +1,29 @@ +$NetBSD: patch-src_sanity.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/sanity.cc.orig 2014-05-04 09:15:18.000000000 +0000 ++++ src/sanity.cc +@@ -12,12 +12,11 @@ + #include + #include + #include +-#include "vector.hh" +- + #include + +-// circular_buffer is not in Boost 1.34; it's in monotone/boost. +-#include "boost/circular_buffer.hpp" ++#include "vector.hh" ++ ++#include + + #include "lexical_cast.hh" + #include "constants.hh" diff --git a/devel/monotone/patches/patch-src_sanity.hh b/devel/monotone/patches/patch-src_sanity.hh new file mode 100644 index 00000000000..f58195c15eb --- /dev/null +++ b/devel/monotone/patches/patch-src_sanity.hh @@ -0,0 +1,22 @@ +$NetBSD: patch-src_sanity.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/sanity.hh.orig 2014-05-04 09:15:18.000000000 +0000 ++++ src/sanity.hh +@@ -14,7 +14,7 @@ + #include + #include + +-#include "boost/current_function.hpp" ++#include + + #include "numeric_vocab.hh" + #include "origin_type.hh" diff --git a/devel/monotone/patches/patch-src_sha1.cc b/devel/monotone/patches/patch-src_sha1.cc new file mode 100644 index 00000000000..21dec45bce8 --- /dev/null +++ b/devel/monotone/patches/patch-src_sha1.cc @@ -0,0 +1,26 @@ +$NetBSD: patch-src_sha1.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/sha1.cc.orig 2014-05-04 09:15:18.000000000 +0000 ++++ src/sha1.cc +@@ -22,10 +22,10 @@ + #include + #endif + +-#include "sanity.hh" +-#include "ui.hh" + #include "platform.hh" + #include "cmd.hh" ++#include "sanity.hh" ++#include "ui.hh" + #include "transforms.hh" + + using std::string; 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 + #include + +-#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; 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 ++#include "lexical_cast.hh" + #include "safe_map.hh" + #include "vector.hh" +-#include "lexical_cast.hh" + + #include "database.hh" + #include "sanity.hh" diff --git a/devel/monotone/patches/patch-src_vocab.cc b/devel/monotone/patches/patch-src_vocab.cc new file mode 100644 index 00000000000..96901f0258d --- /dev/null +++ b/devel/monotone/patches/patch-src_vocab.cc @@ -0,0 +1,23 @@ +$NetBSD: patch-src_vocab.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/vocab.cc.orig 2014-05-04 09:15:18.000000000 +0000 ++++ src/vocab.cc +@@ -11,8 +11,8 @@ + #include "base.hh" + #include "constants.hh" + #include "hash_map.hh" +-#include "sanity.hh" + #include "vocab.hh" ++#include "sanity.hh" + #include "char_classifiers.hh" + #include "transforms.hh" + diff --git a/devel/monotone/patches/patch-src_xdelta.cc b/devel/monotone/patches/patch-src_xdelta.cc new file mode 100644 index 00000000000..35a72bda101 --- /dev/null +++ b/devel/monotone/patches/patch-src_xdelta.cc @@ -0,0 +1,29 @@ +$NetBSD: patch-src_xdelta.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/xdelta.cc.orig 2014-05-04 09:15:19.000000000 +0000 ++++ src/xdelta.cc +@@ -26,7 +26,6 @@ + + #include "base.hh" + #include +-#include "vector.hh" + #include + #include + #include // memcmp +@@ -34,6 +33,7 @@ + #include + #include + ++#include "vector.hh" + #include "adler32.hh" + #include "hash_map.hh" + #include "numeric_vocab.hh" -- cgit v1.2.3