[Pkg-mongodb-maintainers] [pkg-mongodb] 07/19: Fix build with boost 1.62; patch by NetBSD

Apollon Oikonomopoulos apoikos at moszumanska.debian.org
Thu Dec 15 10:44:14 UTC 2016


This is an automated email from the git hooks/post-receive script.

apoikos pushed a commit to branch master
in repository pkg-mongodb.

commit 4b6ed8d5464a55c3e47c27ec2149555eb2e3f0cf
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Wed Dec 14 23:07:28 2016 +0200

    Fix build with boost 1.62; patch by NetBSD
---
 debian/patches/fix-boost-1.62-build.patch | 17 +++++++++++++++++
 debian/patches/series                     |  1 +
 2 files changed, 18 insertions(+)

diff --git a/debian/patches/fix-boost-1.62-build.patch b/debian/patches/fix-boost-1.62-build.patch
new file mode 100644
index 0000000..3123c81
--- /dev/null
+++ b/debian/patches/fix-boost-1.62-build.patch
@@ -0,0 +1,17 @@
+Origin: http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/databases/mongodb/patches/patch-src_mongo_db_fts_unicode_string.cpp?rev=1.1&content-type=text/x-cvsweb-markup
+Description: Fix FTBFS with boost 1.62
+Last-Update: 2016-12-14
+Forwarded: no
+Index: mongodb-3.2.11/src/mongo/db/fts/unicode/string.cpp
+===================================================================
+--- mongodb-3.2.11.orig/src/mongo/db/fts/unicode/string.cpp
++++ mongodb-3.2.11/src/mongo/db/fts/unicode/string.cpp
+@@ -274,7 +274,7 @@ bool String::substrMatch(const std::stri
+ 
+     // Case sensitive and diacritic sensitive.
+     return boost::algorithm::boyer_moore_search(
+-               haystack.begin(), haystack.end(), needle.begin(), needle.end()) != haystack.end();
++               haystack.begin(), haystack.end(), needle.begin(), needle.end()) != std::make_pair(haystack.end(), haystack.end());
+ }
+ 
+ }  // namespace unicode
diff --git a/debian/patches/series b/debian/patches/series
index 9e9475f..83b3ee6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 hardened-build.patch
 fix-gcc-6-ftbfs.patch
 fix-boost-1.60-build.patch
+fix-boost-1.62-build.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mongodb/pkg-mongodb.git



More information about the Pkg-mongodb-maintainers mailing list