- fix for "'swap' is not a member of 'std'" in gcc 4

[packages/mongodb.git] / mongodb-system-libs.patch

diff --git a/mongodb-system-libs.patch b/mongodb-system-libs.patch
index 161d4bbb235a85f404f89d89bfc08c9a75cae58e..fb464c57cd8e1fe0e67a75304a863751731351f7 100644 (file)
--- a/mongodb-system-libs.patch
+++ b/mongodb-system-libs.patch
@@ -1,10 +1,35 @@
---- mongodb-src-r2.0.1/util/compress.cpp.orig  2011-10-22 02:52:16.000000000 +0200
-+++ mongodb-src-r2.0.1/util/compress.cpp       2011-11-02 19:02:01.943272460 +0100
-@@ -1,6 +1,6 @@
- // @file compress.cpp
+--- mongodb-src-r2.2.0.orig/src/mongo/util/compress.cpp        2012-08-28 07:28:11.000000000 +0200
++++ mongodb-src-r2.2.0/src/mongo/util/compress.cpp     2012-09-28 14:07:08.000000000 +0200
+@@ -2,7 +2,7 @@
  
--#include "../third_party/snappy/snappy.h"
+ #include "mongo/util/compress.h"
+ 
+-#include "third_party/snappy/snappy.h"
 +#include <snappy.h>
- #include "compress.h"
- #include <string>
- #include <string.h>
+ 
+ namespace mongo {
+ 
+diff -dur mongodb-src-r2.2.0.orig/src/mongo/scripting/engine_spidermonkey.cpp mongodb-src-r2.2.0/src/mongo/scripting/engine_spidermonkey.cpp
+--- mongodb-src-r2.2.0.orig/src/mongo/scripting/engine_spidermonkey.cpp        2012-08-28 07:28:11.000000000 +0200
++++ mongodb-src-r2.2.0/src/mongo/scripting/engine_spidermonkey.cpp     2012-10-08 12:27:07.000000000 +0200
+@@ -25,7 +25,7 @@
+ #include <boost/date_time/posix_time/posix_time.hpp>
+ #endif
+ 
+-#include <third_party/js-1.7/jsdate.h>
++#include <js/jsdate.h>
+ 
+ #include "mongo/util/mongoutils/str.h"
+ 
+diff -dur mongodb-src-r2.2.0.orig/src/mongo/scripting/engine_spidermonkey.h mongodb-src-r2.2.0/src/mongo/scripting/engine_spidermonkey.h
+--- mongodb-src-r2.2.0.orig/src/mongo/scripting/engine_spidermonkey.h  2012-08-28 07:28:11.000000000 +0200
++++ mongodb-src-r2.2.0/src/mongo/scripting/engine_spidermonkey.h       2012-10-08 12:27:55.000000000 +0200
+@@ -29,7 +29,7 @@
+ #define JS_PUBLIC_DATA(t)   t
+ #endif
+ 
+-#include <third_party/js-1.7/jsapi.h>
++#include <js/jsapi.h>
+ 
+ // END inc hacking
+