diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2013-03-09 18:00:25 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2013-03-09 18:00:25 +0000 |
| commit | d6bf3842d8ac8e4b5deda151c1215c17fc1feb9f (patch) | |
| tree | fad73938a8ad2af7ea7787b93b4e22b711376589 /www-client | |
| parent | Fix epunt_cxx not to subshell. (diff) | |
| download | gentoo-2-d6bf3842d8ac8e4b5deda151c1215c17fc1feb9f.tar.gz gentoo-2-d6bf3842d8ac8e4b5deda151c1215c17fc1feb9f.tar.bz2 gentoo-2-d6bf3842d8ac8e4b5deda151c1215c17fc1feb9f.zip | |
Backport phajdan's jsoncpp include path patch to M26, bug 452234.
(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'www-client')
| -rw-r--r-- | www-client/chromium/ChangeLog | 6 | ||||
| -rw-r--r-- | www-client/chromium/chromium-26.0.1410.19.ebuild | 6 | ||||
| -rw-r--r-- | www-client/chromium/files/chromium-jsoncpp-path-r0.patch | 18 |
3 files changed, 27 insertions, 3 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index 412743a259dc..d1c992e7707d 100644 --- a/www-client/chromium/ChangeLog +++ b/www-client/chromium/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-client/chromium # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.839 2013/03/09 05:25:39 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.840 2013/03/09 18:00:25 floppym Exp $ + + 09 Mar 2013; Mike Gilbert <floppym@gentoo.org> + +files/chromium-jsoncpp-path-r0.patch, chromium-26.0.1410.19.ebuild: + Backport phajdan's jsoncpp include path patch to M26, bug 452234. 09 Mar 2013; Pawel Hajdan jr <phajdan.jr@gentoo.org> chromium-25.0.1364.160.ebuild, chromium-26.0.1410.19.ebuild, diff --git a/www-client/chromium/chromium-26.0.1410.19.ebuild b/www-client/chromium/chromium-26.0.1410.19.ebuild index 31bf28053741..642bcf719eee 100644 --- a/www-client/chromium/chromium-26.0.1410.19.ebuild +++ b/www-client/chromium/chromium-26.0.1410.19.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-26.0.1410.19.ebuild,v 1.6 2013/03/09 05:25:39 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-26.0.1410.19.ebuild,v 1.7 2013/03/09 18:00:25 floppym Exp $ EAPI="5" PYTHON_COMPAT=( python{2_6,2_7} ) @@ -34,7 +34,7 @@ RDEPEND="app-accessibility/speech-dispatcher >=dev-libs/elfutils-0.149 dev-libs/expat >=dev-libs/icu-49.1.1-r1:= - =dev-libs/jsoncpp-0.5.0 + dev-libs/jsoncpp >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt @@ -135,6 +135,8 @@ src_prepare() { epatch "${FILESDIR}/${PN}-system-v8-r0.patch" epatch "${FILESDIR}/${PN}-system-ffmpeg-r2.patch" + epatch "${FILESDIR}/${PN}-jsoncpp-path-r0.patch" + epatch_user # Remove most bundled libraries. Some are still needed. diff --git a/www-client/chromium/files/chromium-jsoncpp-path-r0.patch b/www-client/chromium/files/chromium-jsoncpp-path-r0.patch new file mode 100644 index 000000000000..9f7d57ef209f --- /dev/null +++ b/www-client/chromium/files/chromium-jsoncpp-path-r0.patch @@ -0,0 +1,18 @@ +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': { ++ 'include_dirs': [ ++ '/usr/include/jsoncpp', ++ ], ++ }, + 'link_settings': { + 'libraries': [ + '-ljsoncpp', |