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
8 + 'target_name': 'jsoncpp',
11 + ['_toolset=="target"', {
12 + 'direct_dependent_settings': {
14 + '<!@(pkg-config --cflags jsoncpp)',
19 + '<!@(pkg-config --libs-only-L --libs-only-other jsoncpp)',
22 + '<!@(pkg-config --libs-only-l jsoncpp)',
29 'target_name': 'gnome_keyring',
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
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>
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
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>
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
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>
68 diff -up chromium-20.0.1132.47/ppapi/native_client/src/trusted/plugin/plugin.gyp.system-jsoncpp chromium-20.0.1132.47/ppapi/native_client/src/trusted/plugin/plugin.gyp
69 --- chromium-20.0.1132.47/ppapi/native_client/src/trusted/plugin/plugin.gyp.system-jsoncpp 2012-06-28 09:01:22.000000000 -0400
70 +++ chromium-20.0.1132.47/ppapi/native_client/src/trusted/plugin/plugin.gyp 2012-07-07 21:09:15.092006176 -0400
72 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform',
73 '<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:nonnacl_srpc',
74 '<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:nonnacl_srpc',
75 - '<(DEPTH)/native_client/src/third_party_mod/jsoncpp/jsoncpp.gyp:jsoncpp',
76 + '<(DEPTH)/build/linux/system.gyp:jsoncpp',
77 '<(DEPTH)/native_client/src/trusted/desc/desc.gyp:nrd_xfer',
78 '<(DEPTH)/native_client/src/trusted/nonnacl_util/nonnacl_util.gyp:nonnacl_util',
79 '<(DEPTH)/native_client/src/trusted/platform_qualify/platform_qualify.gyp:platform_qual_lib',
81 '<(DEPTH)/native_client/src/trusted/weak_ref/weak_ref.gyp:weak_ref',
82 '<(DEPTH)/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp:nacl_ppapi_browser',
83 '<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp',
84 - '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
85 + '<(DEPTH)/build/linux/system.gyp:jsoncpp',
89 diff -up chromium-20.0.1132.47/third_party/libjingle/libjingle.gyp.system-jsoncpp chromium-20.0.1132.47/third_party/libjingle/libjingle.gyp
90 --- chromium-20.0.1132.47/third_party/libjingle/libjingle.gyp.system-jsoncpp 2012-07-07 21:09:54.042990761 -0400
91 +++ chromium-20.0.1132.47/third_party/libjingle/libjingle.gyp 2012-07-07 21:10:37.294008997 -0400
93 'source/talk/xmpp/xmpptask.h',
96 - '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
97 + '<(DEPTH)/build/linux/system.gyp:jsoncpp',
99 'export_dependent_settings': [
100 - '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
101 + '<(DEPTH)/build/linux/system.gyp:jsoncpp',
105 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
106 --- chromium-20.0.1132.47/third_party/libjingle/source/talk/base/json.h.system-jsoncpp 2012-07-07 21:11:19.579006082 -0400
107 +++ chromium-20.0.1132.47/third_party/libjingle/source/talk/base/json.h 2012-07-07 21:11:31.392987497 -0400
111 #ifdef JSONCPP_RELATIVE_PATH
112 -#include "json/json.h"
113 +#include <json/json.h>
115 #include "third_party/jsoncpp/json.h"