pyrox.dev
1Remove check for QT_NO_STYLE_GTK to avoid building with QCleanlooksStyle which results in error due to missing QCleanlooksStyle
2Ensure environment is preserved for scons build -- scons clears the env but we want to keep the nix build environment
3Fix typo in cmakelists
4Add stdint.h include to mongo driver src
5diff -rupN robomongo-0.8.3/CMakeLists.txt robomongo-0.8.3-patched/CMakeLists.txt
6--- robomongo-0.8.3/CMakeLists.txt 2013-10-01 10:55:00.000000000 -0400
7+++ robomongo-0.8.3-patched/CMakeLists.txt 2013-12-06 12:22:06.070659856 -0500
8@@ -133,7 +133,7 @@ ELSE()
9 ENDIF()
10
11 ##################################DEFAULT VALUES##########################################
12-IF(NOT CMAKE_INSTALL_PREFIX})
13+IF(NOT CMAKE_INSTALL_PREFIX)
14 SET(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install")
15 ENDIF()
16
17diff -rupN robomongo-0.8.3/src/robomongo/gui/AppStyle.h robomongo-0.8.3-patched/src/robomongo/gui/AppStyle.h
18--- robomongo-0.8.3/src/robomongo/gui/AppStyle.h 2013-10-01 10:55:00.000000000 -0400
19+++ robomongo-0.8.3-patched/src/robomongo/gui/AppStyle.h 2013-12-06 12:20:57.417297186 -0500
20@@ -8,13 +8,8 @@
21 #include <QProxyStyle>
22 typedef QProxyStyle OsStyle;
23 #elif defined OS_LINUX
24- #if !defined(QT_NO_STYLE_GTK)
25- #include <QProxyStyle>
26- typedef QProxyStyle OsStyle;
27- #else
28- #include <QCleanlooksStyle>
29- typedef QCleanlooksStyle OsStyle;
30- #endif
31+ #include <QProxyStyle>
32+ typedef QProxyStyle OsStyle;
33 #endif
34
35 namespace Robomongo
36
37diff -rupN robomongo-0.8.3/src/third-party/mongodb/SConstruct robomongo-0.8.3-patched/src/third-party/mongodb/SConstruct
38--- robomongo-0.8.3/src/third-party/mongodb/SConstruct 2013-10-01 10:55:00.000000000 -0400
39+++ robomongo-0.8.3-patched/src/third-party/mongodb/SConstruct 2013-12-06 12:21:45.705255731 -0500
40@@ -283,7 +283,8 @@ usePCH = has_option( "usePCH" )
41
42 justClientLib = (COMMAND_LINE_TARGETS == ['mongoclient'])
43
44-env = Environment( BUILD_DIR=variantDir,
45+env = Environment( ENV=os.environ,
46+ BUILD_DIR=variantDir,
47 CLIENT_ARCHIVE='${CLIENT_DIST_BASENAME}${DIST_ARCHIVE_SUFFIX}',
48 CLIENT_DIST_BASENAME=get_option('client-dist-basename'),
49 CLIENT_LICENSE='#distsrc/client/LICENSE.txt',
50
51diff -rupN robomongo-0.8.4/src/third-party/mongodb/src/mongo/pch.h robomongo-0.8.4-patched/src/third-party/mongodb/src/mongo/pch.h
52--- robomongo-0.8.4/src/third-party/mongodb/src/mongo/pch.h 2013-12-13 12:56:35.000000000 -0500
53+++ robomongo-0.8.4-patched/src/third-party/mongodb/src/mongo/pch.h 2014-08-20 18:16:31.788396489 -0400
54@@ -39,6 +39,7 @@
55 #include <stdio.h>
56 #include <stdlib.h>
57 #include <signal.h>
58+#include <stdint.h>
59
60 #include "time.h"
61 #include "string.h"