[packages/chromium-browser/DEVEL] update system jsoncpp patch from gentoo
glen
glen at pld-linux.org
Sat Mar 16 14:34:24 CET 2013
commit 2d65d09588039cbd09e5d3f99d818e862f2553d1
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sat Mar 16 14:19:12 2013 +0200
update system jsoncpp patch from gentoo
the patch is a lot simplier now that shim_headers are used
chromium-browser.spec | 3 +-
clean-source.sh | 1 -
system-jsoncpp.patch | 118 +++++++-------------------------------------------
3 files changed, 17 insertions(+), 105 deletions(-)
---
diff --git a/chromium-browser.spec b/chromium-browser.spec
index e2216fc..71c53bd 100644
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -290,7 +290,7 @@ cd src
%{!?with_libjpegturbo:%patch11 -p0}
%patch12 -p1
%patch16 -p1
-%patch19 -p1
+%patch19 -p2
%patch27 -p1
%patch28 -p1
cd ..
@@ -408,6 +408,7 @@ test -e Makefile || \
%{gyp_with system_ffmpeg} -Dmedia_use_ffmpeg=1 \
%{gyp_with system_flac} \
%{gyp_with system_harfbuzz} \
+ %{gyp_with system_jsoncpp} \
%{gyp_with system_libexif} \
%{gyp_with system_libmtp} \
%{gyp_with system_libsrtp} \
diff --git a/clean-source.sh b/clean-source.sh
index 069ba6b..291e2bf 100755
--- a/clean-source.sh
+++ b/clean-source.sh
@@ -523,7 +523,6 @@ clean_third_party() {
third_party/iaccessible2 \
third_party/icon_family \
third_party/isimpledom \
- third_party/jsoncpp \
third_party/jsr-305 \
third_party/libexif \
third_party/mach_override \
diff --git a/system-jsoncpp.patch b/system-jsoncpp.patch
index 9f03818..9f7d57e 100644
--- a/system-jsoncpp.patch
+++ b/system-jsoncpp.patch
@@ -1,106 +1,18 @@
-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"', {
+Adjust include path for system jsoncpp
+
+https://src.chromium.org/viewvc/chrome?view=rev&revision=183190
+
+--- a/src/third_party/jsoncpp/jsoncpp.gyp
++++ b/src/third_party/jsoncpp/jsoncpp.gyp
+@@ -66,6 +66,11 @@
+ 'includes': [
+ '../../build/shim_headers.gypi',
+ ],
+ 'direct_dependent_settings': {
-+ 'cflags': [
-+ '<!@(pkg-config --cflags jsoncpp)',
++ 'include_dirs': [
++ '/usr/include/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;
---- chromium-browser-24.0.1312.14/ppapi/native_client/src/trusted/plugin/plugin.gyp~ 2012-11-14 04:35:12.000000000 +0200
-+++ chromium-browser-24.0.1312.14/ppapi/native_client/src/trusted/plugin/plugin.gyp 2012-11-16 00:01:34.889848810 +0200
-@@ -76,7 +76,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
+ 'link_settings': {
+ 'libraries': [
+ '-ljsoncpp',
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/chromium-browser.git/commitdiff/543e99ac8a2b92eb83351095f30278dbf597fab9
More information about the pld-cvs-commit
mailing list