Newer boost doesn't use the placeholders namespace implicitly.

7 files changed, 81 insertions, 1 deletions

diff --git a/editors/Sigil/distinfo b/editors/Sigil/distinfo
index bb9f7779b2f..bb3bdb8d25d 100644
--- a/editors/Sigil/distinfo
+++ b/editors/Sigil/distinfo
@@ -1,7 +1,13 @@
-$NetBSD: distinfo,v 1.32 2015/11/03 03:32:14 agc Exp $
+$NetBSD: distinfo,v 1.33 2016/01/13 23:55:42 joerg Exp $
 
 SHA1 (Sigil-0.8.7.tar.gz) = bc0b2f7fc741d2392823120ddf652b820ce682a0
 RMD160 (Sigil-0.8.7.tar.gz) = 48494b5ea61194ddb76a7eae53ea308546d441e7
 SHA512 (Sigil-0.8.7.tar.gz) = 24b74c835ae1f8fb887c9d2c59b3ccc6720ce1fe8d19a6b0056754ab5ea6e63c34c4b229f4e4b3a880e722876d288e58385f5a0ad15b295f147b77b1acf28652
 Size (Sigil-0.8.7.tar.gz) = 19394061 bytes
+SHA1 (patch-src_Sigil_BookManipulation_Headings.cpp) = 1c932c0cbcf01c87bbcfc53413eb9c7060ec903c
+SHA1 (patch-src_Sigil_Importers_ImportHTML.cpp) = 5c9340eddfd26b045734f09768029f163d40c537
+SHA1 (patch-src_Sigil_SourceUpdates_AnchorUpdates.cpp) = 33f57b457cbec464b0428f3c4a62232abfccf2c4
+SHA1 (patch-src_Sigil_SourceUpdates_LinkUpdates.cpp) = 3d628d458909017f974a39a885acba4e5aca0cdf
+SHA1 (patch-src_Sigil_SourceUpdates_UniversalUpdates.cpp) = f99956c9e3b4a281f459e45cc5a8a955de80b357
+SHA1 (patch-src_Sigil_SourceUpdates_WordUpdates.cpp) = db78170e0e094988dec3be55cc41ceed1e4ba745
 SHA1 (patch-src_minizip_ioapi.c) = 0a227daf214ceeb1fe8483aeed700fce05b21ccd
diff --git a/editors/Sigil/patches/patch-src_Sigil_BookManipulation_Headings.cpp b/editors/Sigil/patches/patch-src_Sigil_BookManipulation_Headings.cpp
new file mode 100644
index 00000000000..fba9622b75d
--- /dev/null
+++ b/editors/Sigil/patches/patch-src_Sigil_BookManipulation_Headings.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_Sigil_BookManipulation_Headings.cpp,v 1.1 2016/01/13 23:55:42 joerg Exp $
+
+--- src/Sigil/BookManipulation/Headings.cpp.orig	2016-01-12 20:35:47.000000000 +0000
++++ src/Sigil/BookManipulation/Headings.cpp
+@@ -35,7 +35,7 @@
+ #include "sigil_constants.h"
+ 
+ using boost::make_tuple;
+-
++using namespace boost::placeholders;
+ 
+ // The maximum allowed distance (in lines) that a heading
+ // can be located from a body tag and still
diff --git a/editors/Sigil/patches/patch-src_Sigil_Importers_ImportHTML.cpp b/editors/Sigil/patches/patch-src_Sigil_Importers_ImportHTML.cpp
new file mode 100644
index 00000000000..51b21414fc6
--- /dev/null
+++ b/editors/Sigil/patches/patch-src_Sigil_Importers_ImportHTML.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_Sigil_Importers_ImportHTML.cpp,v 1.1 2016/01/13 23:55:42 joerg Exp $
+
+--- src/Sigil/Importers/ImportHTML.cpp.orig	2016-01-12 20:49:21.000000000 +0000
++++ src/Sigil/Importers/ImportHTML.cpp
+@@ -46,6 +46,7 @@
+ #include "sigil_constants.h"
+ #include "sigil_exception.h"
+ 
++using namespace boost::placeholders;
+ using boost::tie;
+ 
+ // Constructor;
diff --git a/editors/Sigil/patches/patch-src_Sigil_SourceUpdates_AnchorUpdates.cpp b/editors/Sigil/patches/patch-src_Sigil_SourceUpdates_AnchorUpdates.cpp
new file mode 100644
index 00000000000..67734f6fbfb
--- /dev/null
+++ b/editors/Sigil/patches/patch-src_Sigil_SourceUpdates_AnchorUpdates.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_Sigil_SourceUpdates_AnchorUpdates.cpp,v 1.1 2016/01/13 23:55:42 joerg Exp $
+
+--- src/Sigil/SourceUpdates/AnchorUpdates.cpp.orig	2016-01-12 20:10:20.000000000 +0000
++++ src/Sigil/SourceUpdates/AnchorUpdates.cpp
+@@ -40,6 +40,7 @@ using boost::make_tuple;
+ using boost::shared_ptr;
+ using boost::tie;
+ using boost::tuple;
++using namespace boost::placeholders;
+ 
+ void AnchorUpdates::UpdateAllAnchorsWithIDs(const QList<HTMLResource *> &html_resources)
+ {
diff --git a/editors/Sigil/patches/patch-src_Sigil_SourceUpdates_LinkUpdates.cpp b/editors/Sigil/patches/patch-src_Sigil_SourceUpdates_LinkUpdates.cpp
new file mode 100644
index 00000000000..dba43efa855
--- /dev/null
+++ b/editors/Sigil/patches/patch-src_Sigil_SourceUpdates_LinkUpdates.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_Sigil_SourceUpdates_LinkUpdates.cpp,v 1.1 2016/01/13 23:55:42 joerg Exp $
+
+--- src/Sigil/SourceUpdates/LinkUpdates.cpp.orig	2016-01-12 20:31:45.000000000 +0000
++++ src/Sigil/SourceUpdates/LinkUpdates.cpp
+@@ -34,6 +34,7 @@
+ #include "SourceUpdates/LinkUpdates.h"
+ 
+ using boost::shared_ptr;
++using namespace boost::placeholders;
+ 
+ static QString HTML_XML_NAMESPACE = "http://www.w3.org/1999/xhtml";
+ 
diff --git a/editors/Sigil/patches/patch-src_Sigil_SourceUpdates_UniversalUpdates.cpp b/editors/Sigil/patches/patch-src_Sigil_SourceUpdates_UniversalUpdates.cpp
new file mode 100644
index 00000000000..d5cdb29e7d4
--- /dev/null
+++ b/editors/Sigil/patches/patch-src_Sigil_SourceUpdates_UniversalUpdates.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_Sigil_SourceUpdates_UniversalUpdates.cpp,v 1.1 2016/01/13 23:55:42 joerg Exp $
+
+--- src/Sigil/SourceUpdates/UniversalUpdates.cpp.orig	2016-01-12 20:32:59.000000000 +0000
++++ src/Sigil/SourceUpdates/UniversalUpdates.cpp
+@@ -47,6 +47,7 @@
+ #include "SourceUpdates/UniversalUpdates.h"
+ 
+ using boost::make_tuple;
++using namespace boost::placeholders;
+ using boost::shared_ptr;
+ using boost::tie;
+ using boost::tuple;
diff --git a/editors/Sigil/patches/patch-src_Sigil_SourceUpdates_WordUpdates.cpp b/editors/Sigil/patches/patch-src_Sigil_SourceUpdates_WordUpdates.cpp
new file mode 100644
index 00000000000..f48f9d5ca71
--- /dev/null
+++ b/editors/Sigil/patches/patch-src_Sigil_SourceUpdates_WordUpdates.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_Sigil_SourceUpdates_WordUpdates.cpp,v 1.1 2016/01/13 23:55:42 joerg Exp $
+
+--- src/Sigil/SourceUpdates/WordUpdates.cpp.orig	2016-01-12 20:32:16.000000000 +0000
++++ src/Sigil/SourceUpdates/WordUpdates.cpp
+@@ -29,6 +29,8 @@
+ #include "ResourceObjects/HTMLResource.h"
+ #include "SourceUpdates/WordUpdates.h"
+ 
++using namespace boost::placeholders;
++
+ void WordUpdates::UpdateWordInAllFiles(const QList<HTMLResource *> &html_resources, const QString old_word, QString new_word)
+ {
+     QtConcurrent::blockingMap(html_resources, boost::bind(UpdateWordsInOneFile, _1, old_word, new_word));