[packages/chromium-browser] build with system jsoncpp
glen
glen at pld-linux.org
Mon Nov 12 22:06:56 CET 2012
commit 08b254403a42ad9c38365124d22ffc142da9d90b
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Mon Nov 12 02:05:13 2012 +0200
build with system jsoncpp
patch from fedora
chromium-browser.spec | 4 ++
clean-source.sh | 2 +
system-jsoncpp.patch | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 122 insertions(+)
---
diff --git a/chromium-browser.spec b/chromium-browser.spec
index 925fd21..c623664 100644
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -15,6 +15,7 @@
%bcond_with tcmalloc # use tcmalloc
%bcond_with system_sqlite # with system sqlite
%bcond_without system_flac # with system flac
+%bcond_without system_jsoncpp # with system jsoncpp
%bcond_without system_libwebp # with system libwebp
%bcond_without system_speex # with system speex
%bcond_with system_v8 # with system v8
@@ -92,6 +93,7 @@ Patch15: nacl-build-irt.patch
Patch16: nacl-linkingfix.patch
Patch17: system-icu.patch
Patch18: nacl-no-untar.patch
+Patch19: system-jsoncpp.patch
URL: http://www.chromium.org/Home
%{?with_gconf:BuildRequires: GConf2-devel}
BuildRequires: OpenGL-GLU-devel
@@ -141,6 +143,7 @@ BuildRequires: python-modules
BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpmbuild(macros) >= 1.453
%{?with_system_speex:BuildRequires: speex-devel >= 1:1.2-rc1}
+%{?with_system_jsoncpp:BuildRequires: jsoncpp-devel}
BuildRequires: sqlite3-devel >= 3.6.1
BuildRequires: subversion
BuildRequires: tar >= 1:1.22
@@ -239,6 +242,7 @@ cd src
%{!?with_libjpegturbo:%patch11 -p0}
%patch16 -p1
%patch17 -p0
+%patch19 -p1
cd ..
%patch18 -p1
diff --git a/clean-source.sh b/clean-source.sh
index fdf51ea..4d94660 100755
--- a/clean-source.sh
+++ b/clean-source.sh
@@ -461,6 +461,8 @@ strip_system_dirs \
_third_party/zlib \
third_party/libwebp \
_third_party/libvpx \
+ native_client/src/third_party_mod/jsoncpp \
+ third_party/jsoncpp \
v8 \
| tee -a REMOVED-stripped.txt
diff --git a/system-jsoncpp.patch b/system-jsoncpp.patch
new file mode 100644
index 0000000..7478bc5
--- /dev/null
+++ b/system-jsoncpp.patch
@@ -0,0 +1,116 @@
+diff -up chromium-20.0.1132.47/build/linux/system.gyp.system-jsoncpp chromium-20.0.1132.47/build/linux/system.gyp
+--- chromium-20.0.1132.47/build/linux/system.gyp.system-jsoncpp 2012-07-07 21:09:14.954006176 -0400
++++ chromium-20.0.1132.47/build/linux/system.gyp 2012-07-07 21:09:15.088006176 -0400
+@@ -468,6 +468,27 @@
+ ],
+ },
+ {
++ 'target_name': 'jsoncpp',
++ 'type': 'none',
++ 'conditions': [
++ ['_toolset=="target"', {
++ 'direct_dependent_settings': {
++ 'cflags': [
++ '<!@(pkg-config --cflags jsoncpp)',
++ ],
++ },
++ 'link_settings': {
++ 'ldflags': [
++ '<!@(pkg-config --libs-only-L --libs-only-other jsoncpp)',
++ ],
++ 'libraries': [
++ '<!@(pkg-config --libs-only-l jsoncpp)',
++ ],
++ },
++ }],
++ ],
++ },
++ {
+ 'target_name': 'gnome_keyring',
+ 'type': 'none',
+ 'conditions': [
+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
+--- chromium-20.0.1132.47/ppapi/native_client/src/trusted/plugin/json_manifest.cc.system-jsoncpp 2012-06-28 09:01:22.000000000 -0400
++++ chromium-20.0.1132.47/ppapi/native_client/src/trusted/plugin/json_manifest.cc 2012-07-07 21:09:15.090006176 -0400
+@@ -19,7 +19,7 @@
+ #include "native_client/src/trusted/plugin/utility.h"
+ #include "ppapi/cpp/dev/url_util_dev.h"
+ #include "ppapi/cpp/var.h"
+-#include "third_party/jsoncpp/source/include/json/reader.h"
++#include <json/reader.h>
+
+ namespace plugin {
+
+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
+--- chromium-20.0.1132.47/ppapi/native_client/src/trusted/plugin/json_manifest.h.system-jsoncpp 2012-06-28 09:01:22.000000000 -0400
++++ chromium-20.0.1132.47/ppapi/native_client/src/trusted/plugin/json_manifest.h 2012-07-07 21:09:15.090006176 -0400
+@@ -16,7 +16,7 @@
+ #include "native_client/src/include/nacl_macros.h"
+ #include "native_client/src/include/nacl_string.h"
+ #include "native_client/src/trusted/plugin/manifest.h"
+-#include "third_party/jsoncpp/source/include/json/value.h"
++#include <json/value.h>
+
+ namespace pp {
+ class URLUtil_Dev;
+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
+--- chromium-20.0.1132.47/ppapi/native_client/src/trusted/plugin/manifest.h.system-jsoncpp 2012-06-28 09:01:22.000000000 -0400
++++ chromium-20.0.1132.47/ppapi/native_client/src/trusted/plugin/manifest.h 2012-07-07 21:09:15.091006176 -0400
+@@ -15,7 +15,7 @@
+
+ #include "native_client/src/include/nacl_macros.h"
+ #include "native_client/src/include/nacl_string.h"
+-#include "third_party/jsoncpp/source/include/json/value.h"
++#include <json/value.h>
+
+ namespace pp {
+ class URLUtil_Dev;
+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
+--- chromium-20.0.1132.47/ppapi/native_client/src/trusted/plugin/plugin.gyp.system-jsoncpp 2012-06-28 09:01:22.000000000 -0400
++++ chromium-20.0.1132.47/ppapi/native_client/src/trusted/plugin/plugin.gyp 2012-07-07 21:09:15.092006176 -0400
+@@ -65,7 +65,7 @@
+ '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform',
+ '<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:nonnacl_srpc',
+ '<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:nonnacl_srpc',
+- '<(DEPTH)/native_client/src/third_party_mod/jsoncpp/jsoncpp.gyp:jsoncpp',
++ '<(DEPTH)/build/linux/system.gyp:jsoncpp',
+ '<(DEPTH)/native_client/src/trusted/desc/desc.gyp:nrd_xfer',
+ '<(DEPTH)/native_client/src/trusted/nonnacl_util/nonnacl_util.gyp:nonnacl_util',
+ '<(DEPTH)/native_client/src/trusted/platform_qualify/platform_qualify.gyp:platform_qual_lib',
+@@ -106,7 +106,7 @@
+ '<(DEPTH)/native_client/src/trusted/weak_ref/weak_ref.gyp:weak_ref',
+ '<(DEPTH)/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp:nacl_ppapi_browser',
+ '<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp',
+- '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
++ '<(DEPTH)/build/linux/system.gyp:jsoncpp',
+ ],
+ 'conditions': [
+ ['OS=="mac"', {
+diff -up chromium-20.0.1132.47/third_party/libjingle/libjingle.gyp.system-jsoncpp chromium-20.0.1132.47/third_party/libjingle/libjingle.gyp
+--- chromium-20.0.1132.47/third_party/libjingle/libjingle.gyp.system-jsoncpp 2012-07-07 21:09:54.042990761 -0400
++++ chromium-20.0.1132.47/third_party/libjingle/libjingle.gyp 2012-07-07 21:10:37.294008997 -0400
+@@ -349,10 +349,10 @@
+ 'source/talk/xmpp/xmpptask.h',
+ ],
+ 'dependencies': [
+- '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
++ '<(DEPTH)/build/linux/system.gyp:jsoncpp',
+ ],
+ 'export_dependent_settings': [
+- '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
++ '<(DEPTH)/build/linux/system.gyp:jsoncpp',
+ ],
+ 'conditions': [
+ ['OS=="win"', {
+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
+--- chromium-20.0.1132.47/third_party/libjingle/source/talk/base/json.h.system-jsoncpp 2012-07-07 21:11:19.579006082 -0400
++++ chromium-20.0.1132.47/third_party/libjingle/source/talk/base/json.h 2012-07-07 21:11:31.392987497 -0400
+@@ -32,7 +32,7 @@
+ #include <vector>
+
+ #ifdef JSONCPP_RELATIVE_PATH
+-#include "json/json.h"
++#include <json/json.h>
+ #else
+ #include "third_party/jsoncpp/json.h"
+ #endif
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/chromium-browser.git/commitdiff/08b254403a42ad9c38365124d22ffc142da9d90b
More information about the pld-cvs-commit
mailing list