[arch-commits] Commit in mongodb/trunk (PKGBUILD using-std-string.patch)

[Bartłomiej Piotrowski]

    Date: Sunday, September 17, 2017 @ 20:42:51
  Author: bpiotrowski
Revision: 258648

3.4.3-3: rebuild against boost 1.65.1

Added:
  mongodb/trunk/using-std-string.patch
Modified:
  mongodb/trunk/PKGBUILD

------------------------+
 PKGBUILD               |    9 ++++--
 using-std-string.patch |   70 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-09-17 20:25:50 UTC (rev 258647)
+++ PKGBUILD	2017-09-17 20:42:51 UTC (rev 258648)
@@ -7,7 +7,7 @@
 
 pkgname=mongodb
 pkgver=3.4.3
-pkgrel=2
+pkgrel=3
 pkgdesc='A high-performance, open source, schema-free document-oriented database'
 arch=('x86_64')
 url='http://www.mongodb.org'
@@ -22,13 +22,15 @@
 source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz"
         'mongodb.conf' 'mongodb.service' 'mongodb-3.2.10-boost-1.62.0.patch'
         'asio-openssl-1.1.0.patch'
-        'openssl-1.1.0.patch')
+        'openssl-1.1.0.patch'
+        'using-std-string.patch')
 sha512sums=('e2fb5fc2f02e9dbca6c30d2e2aaf1569180ca15198226cdad46f47f44905293afe77763fe2e5c9add0b5bcbd62b7ce7905fb183068c0738cdeeae8d39f848cef'
             '05dead727d3ea5fe8af1a3c3888693f6b3e2b8cb7f197a5d793352e10d2c524e96c9a5c55ad2e88c1114643a9612ec0b26a2574b48a5260a9b51ec8941461f1c'
             '177251404b2e818ae2b546fe8b13cb76e348c99e85c7bef22a04b0f07b600fd515a309ede50214f4198594388a6d2b31f46e945b9dae84aabb4dfa13b1123bb9'
             'd6f014d2778decde268b9e856d812bc61f7c45986aad751e44fdece39aa8a96505b77e0b917ea38880501497e01d4b051a6f3205c82af653425b5247cd813417'
             'aea8fecb17be07e4517822798810751114f61164dc3ab3e335a7b837876acb918d287caa8b9fe32d7b1d9e7cad2e677d9818a1532ae08b8b013840d2a68b25f5'
-            '62ec95ac4eef42b6fefa1063336812e5e6a78f2d119e5f9a7206e063c5b5a859d160ce77bc57123150a55a51e8695eefea7e301259154bc009bfe027d40de314')
+            '62ec95ac4eef42b6fefa1063336812e5e6a78f2d119e5f9a7206e063c5b5a859d160ce77bc57123150a55a51e8695eefea7e301259154bc009bfe027d40de314'
+            'f2e1e9b9418701738c7a9b6db4f894dc3c35a6fbbf9ded8321080350ba692c6c8b11d6f507043a5bdae83fe8f9806426c0f33acd94895412369e4776c2358052')
 
 _scons_args=(
   --use-system-boost
@@ -49,6 +51,7 @@
   cd mongodb-src-r${pkgver}
   patch -Np1 -i ../mongodb-3.2.10-boost-1.62.0.patch
   patch -Np1 -i ../openssl-1.1.0.patch
+  patch -Np1 -i ../using-std-string.patch
 
   sed -e 's|-std=c++11|-std=gnu++11|g' -i SConstruct  # tests use hex floats, not supported in plain C++
 

Added: using-std-string.patch
===================================================================
--- using-std-string.patch	                        (rev 0)
+++ using-std-string.patch	2017-09-17 20:42:51 UTC (rev 258648)
@@ -0,0 +1,70 @@
+diff --git a/src/mongo/db/dbwebserver.cpp b/src/mongo/db/dbwebserver.cpp
+index b202e05..0255613 100644
+--- a/src/mongo/db/dbwebserver.cpp
++++ b/src/mongo/db/dbwebserver.cpp
+@@ -67,6 +67,7 @@ namespace mongo {
+ using std::map;
+ using std::stringstream;
+ using std::vector;
++using std::string;
+ 
+ using namespace html;
+ 
+diff --git a/src/mongo/db/matcher/expression_leaf.cpp b/src/mongo/db/matcher/expression_leaf.cpp
+index d562bff..b96a36d 100644
+--- a/src/mongo/db/matcher/expression_leaf.cpp
++++ b/src/mongo/db/matcher/expression_leaf.cpp
+@@ -202,7 +202,7 @@ void ComparisonMatchExpression::debugString(StringBuilder& debug, int level) con
+ }
+ 
+ void ComparisonMatchExpression::serialize(BSONObjBuilder* out) const {
+-    string opString = "";
++    std::string opString = "";
+     switch (matchType()) {
+         case LT:
+             opString = "$lt";
+@@ -884,7 +884,7 @@ void BitTestMatchExpression::debugString(StringBuilder& debug, int level) const
+ }
+ 
+ void BitTestMatchExpression::serialize(BSONObjBuilder* out) const {
+-    string opString = "";
++    std::string opString = "";
+ 
+     switch (matchType()) {
+         case BITS_ALL_SET:
+diff --git a/src/mongo/db/repl/master_slave.cpp b/src/mongo/db/repl/master_slave.cpp
+index 05faad1..7fbc062 100644
+--- a/src/mongo/db/repl/master_slave.cpp
++++ b/src/mongo/db/repl/master_slave.cpp
+@@ -81,6 +81,7 @@ using std::set;
+ using std::stringstream;
+ using std::unique_ptr;
+ using std::vector;
++using std::string;
+ 
+ namespace mongo {
+ namespace repl {
+diff --git a/src/mongo/shell/bench.cpp b/src/mongo/shell/bench.cpp
+index 040002f..cb0f6f4 100644
+--- a/src/mongo/shell/bench.cpp
++++ b/src/mongo/shell/bench.cpp
+@@ -78,6 +78,7 @@ namespace mongo {
+ using std::unique_ptr;
+ using std::cout;
+ using std::map;
++using std::string;
+ 
+ const std::map<OpType, std::string> opTypeName{{OpType::NONE, "none"},
+                                                {OpType::NOP, "nop"},
+diff --git a/src/mongo/util/net/miniwebserver.cpp b/src/mongo/util/net/miniwebserver.cpp
+index 5f4165d..7a7d071 100644
+--- a/src/mongo/util/net/miniwebserver.cpp
++++ b/src/mongo/util/net/miniwebserver.cpp
+@@ -47,6 +47,7 @@ namespace mongo {
+ using std::shared_ptr;
+ using std::stringstream;
+ using std::vector;
++using std::string;
+ 
+ MiniWebServer::MiniWebServer(const string& name, const string& ip, int port, ServiceContext* ctx)
+     : Listener(name, ip, port, ctx, false, false) {}