]> git.pld-linux.org Git - packages/chromium-browser.git/blame - system-jsoncpp.patch
projects / packages / chromium-browser.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
build with system srtp if not building with system libjingle
[packages/chromium-browser.git] / system-jsoncpp.patch
CommitLineData
08b25440
ER		 1diff -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': [
32diff -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
44diff -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;
56diff -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;
68diff -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
71@@ -65,7 +65,7 @@
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',
80@@ -106,7 +106,7 @@
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',
86 ],
87 'conditions': [
88 ['OS=="mac"', {
89diff -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
92@@ -349,10 +349,10 @@
93 'source/talk/xmpp/xmpptask.h',
94 ],
95 'dependencies': [
96- '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
97+ '<(DEPTH)/build/linux/system.gyp:jsoncpp',
98 ],
99 'export_dependent_settings': [
100- '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
101+ '<(DEPTH)/build/linux/system.gyp:jsoncpp',
102 ],
103 'conditions': [
104 ['OS=="win"', {
105diff -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
108@@ -32,7 +32,7 @@
109 #include <vector>
110
111 #ifdef JSONCPP_RELATIVE_PATH
112-#include "json/json.h"
113+#include <json/json.h>
114 #else
115 #include "third_party/jsoncpp/json.h"
116 #endif
A WebKit powered web browser
This page took 0.036557 seconds and 4 git commands to generate.