]>
Commit | Line | Data |
---|---|---|
08b25440 ER |
1 | diff -up chromium-20.0.1132.47/build/linux/system.gyp.system-jsoncpp chromium-20.0.1132.47/build/linux/system.gyp |
2 | --- chromium-20.0.1132.47/build/linux/system.gyp.system-jsoncpp 2012-07-07 21:09:14.954006176 -0400 | |
3 | +++ chromium-20.0.1132.47/build/linux/system.gyp 2012-07-07 21:09:15.088006176 -0400 | |
4 | @@ -468,6 +468,27 @@ | |
5 | ], | |
6 | }, | |
7 | { | |
8 | + 'target_name': 'jsoncpp', | |
9 | + 'type': 'none', | |
10 | + 'conditions': [ | |
11 | + ['_toolset=="target"', { | |
12 | + 'direct_dependent_settings': { | |
13 | + 'cflags': [ | |
14 | + '<!@(pkg-config --cflags jsoncpp)', | |
15 | + ], | |
16 | + }, | |
17 | + 'link_settings': { | |
18 | + 'ldflags': [ | |
19 | + '<!@(pkg-config --libs-only-L --libs-only-other jsoncpp)', | |
20 | + ], | |
21 | + 'libraries': [ | |
22 | + '<!@(pkg-config --libs-only-l jsoncpp)', | |
23 | + ], | |
24 | + }, | |
25 | + }], | |
26 | + ], | |
27 | + }, | |
28 | + { | |
29 | 'target_name': 'gnome_keyring', | |
30 | 'type': 'none', | |
31 | 'conditions': [ | |
32 | diff -up chromium-20.0.1132.47/ppapi/native_client/src/trusted/plugin/json_manifest.cc.system-jsoncpp chromium-20.0.1132.47/ppapi/native_client/src/trusted/plugin/json_manifest.cc | |
33 | --- chromium-20.0.1132.47/ppapi/native_client/src/trusted/plugin/json_manifest.cc.system-jsoncpp 2012-06-28 09:01:22.000000000 -0400 | |
34 | +++ chromium-20.0.1132.47/ppapi/native_client/src/trusted/plugin/json_manifest.cc 2012-07-07 21:09:15.090006176 -0400 | |
35 | @@ -19,7 +19,7 @@ | |
36 | #include "native_client/src/trusted/plugin/utility.h" | |
37 | #include "ppapi/cpp/dev/url_util_dev.h" | |
38 | #include "ppapi/cpp/var.h" | |
39 | -#include "third_party/jsoncpp/source/include/json/reader.h" | |
40 | +#include <json/reader.h> | |
41 | ||
42 | namespace plugin { | |
43 | ||
44 | diff -up chromium-20.0.1132.47/ppapi/native_client/src/trusted/plugin/json_manifest.h.system-jsoncpp chromium-20.0.1132.47/ppapi/native_client/src/trusted/plugin/json_manifest.h | |
45 | --- chromium-20.0.1132.47/ppapi/native_client/src/trusted/plugin/json_manifest.h.system-jsoncpp 2012-06-28 09:01:22.000000000 -0400 | |
46 | +++ chromium-20.0.1132.47/ppapi/native_client/src/trusted/plugin/json_manifest.h 2012-07-07 21:09:15.090006176 -0400 | |
47 | @@ -16,7 +16,7 @@ | |
48 | #include "native_client/src/include/nacl_macros.h" | |
49 | #include "native_client/src/include/nacl_string.h" | |
50 | #include "native_client/src/trusted/plugin/manifest.h" | |
51 | -#include "third_party/jsoncpp/source/include/json/value.h" | |
52 | +#include <json/value.h> | |
53 | ||
54 | namespace pp { | |
55 | class URLUtil_Dev; | |
56 | diff -up chromium-20.0.1132.47/ppapi/native_client/src/trusted/plugin/manifest.h.system-jsoncpp chromium-20.0.1132.47/ppapi/native_client/src/trusted/plugin/manifest.h | |
57 | --- chromium-20.0.1132.47/ppapi/native_client/src/trusted/plugin/manifest.h.system-jsoncpp 2012-06-28 09:01:22.000000000 -0400 | |
58 | +++ chromium-20.0.1132.47/ppapi/native_client/src/trusted/plugin/manifest.h 2012-07-07 21:09:15.091006176 -0400 | |
59 | @@ -15,7 +15,7 @@ | |
60 | ||
61 | #include "native_client/src/include/nacl_macros.h" | |
62 | #include "native_client/src/include/nacl_string.h" | |
63 | -#include "third_party/jsoncpp/source/include/json/value.h" | |
64 | +#include <json/value.h> | |
65 | ||
66 | namespace pp { | |
67 | class URLUtil_Dev; | |
126ea630 ER |
68 | --- chromium-browser-24.0.1312.14/ppapi/native_client/src/trusted/plugin/plugin.gyp~ 2012-11-14 04:35:12.000000000 +0200 |
69 | +++ chromium-browser-24.0.1312.14/ppapi/native_client/src/trusted/plugin/plugin.gyp 2012-11-16 00:01:34.889848810 +0200 | |
70 | @@ -76,7 +76,7 @@ | |
71 | '<(DEPTH)/native_client/src/trusted/weak_ref/weak_ref.gyp:weak_ref', | |
72 | '<(DEPTH)/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp:nacl_ppapi_browser', | |
73 | '<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp', | |
74 | - '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp', | |
75 | + '<(DEPTH)/build/linux/system.gyp:jsoncpp', | |
76 | ], | |
77 | 'conditions': [ | |
78 | ['OS=="mac"', { | |
08b25440 ER |
79 | diff -up chromium-20.0.1132.47/third_party/libjingle/libjingle.gyp.system-jsoncpp chromium-20.0.1132.47/third_party/libjingle/libjingle.gyp |
80 | --- chromium-20.0.1132.47/third_party/libjingle/libjingle.gyp.system-jsoncpp 2012-07-07 21:09:54.042990761 -0400 | |
81 | +++ chromium-20.0.1132.47/third_party/libjingle/libjingle.gyp 2012-07-07 21:10:37.294008997 -0400 | |
82 | @@ -349,10 +349,10 @@ | |
83 | 'source/talk/xmpp/xmpptask.h', | |
84 | ], | |
85 | 'dependencies': [ | |
86 | - '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp', | |
87 | + '<(DEPTH)/build/linux/system.gyp:jsoncpp', | |
88 | ], | |
89 | 'export_dependent_settings': [ | |
90 | - '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp', | |
91 | + '<(DEPTH)/build/linux/system.gyp:jsoncpp', | |
92 | ], | |
93 | 'conditions': [ | |
94 | ['OS=="win"', { | |
95 | diff -up chromium-20.0.1132.47/third_party/libjingle/source/talk/base/json.h.system-jsoncpp chromium-20.0.1132.47/third_party/libjingle/source/talk/base/json.h | |
96 | --- chromium-20.0.1132.47/third_party/libjingle/source/talk/base/json.h.system-jsoncpp 2012-07-07 21:11:19.579006082 -0400 | |
97 | +++ chromium-20.0.1132.47/third_party/libjingle/source/talk/base/json.h 2012-07-07 21:11:31.392987497 -0400 | |
98 | @@ -32,7 +32,7 @@ | |
99 | #include <vector> | |
100 | ||
101 | #ifdef JSONCPP_RELATIVE_PATH | |
102 | -#include "json/json.h" | |
103 | +#include <json/json.h> | |
104 | #else | |
105 | #include "third_party/jsoncpp/json.h" | |
106 | #endif |