summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www-client/chromium/ChangeLog18
-rw-r--r--www-client/chromium/Manifest29
-rw-r--r--www-client/chromium/chromium-12.0.742.21.ebuild (renamed from www-client/chromium/chromium-12.0.742.12.ebuild)2
-rw-r--r--www-client/chromium/files/chromium-ffmpeg-build-r1.patch10
-rw-r--r--www-client/chromium/files/chromium-gecko-mediaplayer-r0.patch12
-rw-r--r--www-client/chromium/files/chromium-gecko-mediaplayer-r1.patch12
-rw-r--r--www-client/chromium/files/chromium-gssapi-heimdal-r0.patch10
-rw-r--r--www-client/chromium/files/chromium-launcher.sh25
-rw-r--r--www-client/chromium/files/chromium-net-tests-r0.patch84
-rw-r--r--www-client/chromium/files/chromium-system-flac-r0.patch13
-rw-r--r--www-client/chromium/files/chromium-system-icu-r0.patch22
-rw-r--r--www-client/chromium/files/chromium-system-speex-r0.patch11
-rw-r--r--www-client/chromium/files/chromium-system-vpx-r1.patch64
-rw-r--r--www-client/chromium/files/chromium-system-vpx-r2.patch64
-rw-r--r--www-client/chromium/files/chromium-system-xdg-utils-r0.patch54
-rw-r--r--www-client/chromium/files/chromium-webkit-version.patch40
-rw-r--r--www-client/chromium/files/experimental.gyp8
-rw-r--r--www-client/chromium/files/flac.gyp21
-rw-r--r--www-client/chromium/files/speex.gyp21
-rw-r--r--www-client/chromium/files/v8.gyp88
20 files changed, 24 insertions, 584 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 553c23bfbf38..9eba5a909cbb 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,22 @@
# ChangeLog for www-client/chromium
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.349 2011/05/03 10:21:59 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.350 2011/05/06 08:56:05 phajdan.jr Exp $
+
+*chromium-12.0.742.21 (06 May 2011)
+
+ 06 May 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+ -files/chromium-ffmpeg-build-r1.patch,
+ -files/chromium-gecko-mediaplayer-r0.patch,
+ -files/chromium-gecko-mediaplayer-r1.patch,
+ -files/chromium-gssapi-heimdal-r0.patch, -files/chromium-launcher.sh,
+ -files/chromium-net-tests-r0.patch, -files/chromium-system-flac-r0.patch,
+ -files/chromium-system-icu-r0.patch, -files/chromium-system-speex-r0.patch,
+ -files/chromium-system-vpx-r1.patch, -files/chromium-system-vpx-r2.patch,
+ -files/chromium-system-xdg-utils-r0.patch,
+ -files/chromium-webkit-version.patch, -files/experimental.gyp,
+ -files/flac.gyp, -files/speex.gyp, -files/v8.gyp,
+ -chromium-12.0.742.12.ebuild, +chromium-12.0.742.21.ebuild:
+ Version bump for dev channel release. Remove old ebuilds and files.
*chromium-12.0.742.16 (03 May 2011)
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 715c93038671..15409b176cc4 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -4,41 +4,24 @@ Hash: SHA1
AUX chromium-browser.xml 407 RMD160 457374ff72561648d9777ffb3270ad10d864a6be SHA1 65543bfff7d0350d40ba258e61061b0c5579e1f2 SHA256 bc039012f8677468e9ce5df825f9d8096be6deb5813031c86a087c88105096ff
AUX chromium-cups-r0.patch 1237 RMD160 601fc9a46027580a1817a77abfb47b2b59e212ca SHA1 9826e90746229c7c12d767bb3b6cbdbc5c300041 SHA256 594af80456d977a19949909a7c79cae706964f7ced47634c9c9b19478dc089a2
AUX chromium-ffmpeg-build-r0.patch 774 RMD160 a11ebd15927195fb047a366b1f9ab412a35d1262 SHA1 1972826179eed503f70a1499521072eb99c1fd16 SHA256 205a136035d09fb88549dfe4dbb97508e43a46f35ca791efa79d6c401aea5d84
-AUX chromium-ffmpeg-build-r1.patch 414 RMD160 5b390dc0a031b9ece9853ea8e81ea15b21c531e7 SHA1 9bf55e668fc41dacd87e6619a460ecd11f2f1298 SHA256 a4184ff5e7d079b5f918cd84fd46b958313db55815c9acc26b9bb29658575f99
-AUX chromium-gecko-mediaplayer-r0.patch 590 RMD160 8b01e801ef4a8d3aaa842ab217929e71ebb70a87 SHA1 916ecd1c7a405fc12de579538c07c42cd9e84ecc SHA256 491cfaa353ad965a0cbfe2fc6370e4df5d1cd55398698b838996053f9e46f12c
-AUX chromium-gecko-mediaplayer-r1.patch 591 RMD160 fbfa62e79687fb1d3939d34a21f1b6d4ac4a7d0a SHA1 145d3e50933e14e9213002bebf4a4b2c8d39b177 SHA256 8d822835c1f3b39ce77ad920003bc509e7e1ef85f03b4123a71ac1a00224fce0
-AUX chromium-gssapi-heimdal-r0.patch 447 RMD160 baecbff953216d236efd3c99dfbc218fe6d550a0 SHA1 a222e56b900b48cd094f8385eeec7fd49b97dac3 SHA256 49b178866cd45ad82f2d95ec84c2ae21ebd6c5993175561bc1695b986d8b1c82
AUX chromium-launcher-r1.sh 680 RMD160 17fdc3576819c41d9320fab4b2dde3b8dc3c251b SHA1 5be5d25be14906458eb93cd7275c47f73c55fce4 SHA256 fa9cd53ee929ac77a52abc09eb65bb605b72b384533ba52fb90a905c72c3c208
-AUX chromium-launcher.sh 648 RMD160 d9331083750789d5c514c0fa1843037337ac476a SHA1 015efb2faacfc000c23644323c56795acfb7bc7e SHA256 3ae91f5bee0107adf3511205a062465901c7daaa13e3758ae970a6da4f0fa12c
-AUX chromium-net-tests-r0.patch 4729 RMD160 f5c7df31a786b302064833f52b14270aeb54792e SHA1 f22b84eece6d368720b5d9bd02592e47f8bbcb65 SHA256 dcd1aa5eb10d212c073032d037bea1126a670018597fddb050630d5f0160fc7d
-AUX chromium-system-flac-r0.patch 453 RMD160 5313955501e3d9c985169f5ab45c9c8dae4e1099 SHA1 9c25e31570277b134540a77352ab0910e4a8cfeb SHA256 973e538be539b13b17d99f812ce1bfa6bfdd524d182e5186b89148fbafda175f
-AUX chromium-system-icu-r0.patch 930 RMD160 0b668ac333e4a89cd0bb34e81a0e16d3e9483784 SHA1 029413b1af70a6de7ff451b96bd3c5738dce67e7 SHA256 c777dc24ffdef210a2ed0bd94242f032e9227fbc9c3b78472e47f0d058f09339
-AUX chromium-system-speex-r0.patch 472 RMD160 8a8d573ae2ee08828d2376547a1755cc640875d9 SHA1 815ceb8513bbf20355c6c83dbfae2f7d3bfa4cd8 SHA256 967486edb2f7c0503bb2b373944ce8c5ce050e0f39da65d245f8695b6e8436f6
-AUX chromium-system-vpx-r1.patch 2171 RMD160 7b5e5e624084a0a63c15e7e783676a9365ad211f SHA1 68142ca461ec721f8134af2e9cf45ff18093da10 SHA256 684a88573c33bb5c987f7e08611b4a3a019eac9ea9ec14fe60f79141e75763c5
-AUX chromium-system-vpx-r2.patch 2207 RMD160 7b33f474c4bcd498dfc3e7ce803b9f6c4505b3b0 SHA1 a28a1629937c686aa4ad3b1ea16479d9b11d3789 SHA256 b33e0e66a257837ba3e10d68ad44434e5f0bb75a143ff095379097722c14d211
AUX chromium-system-vpx-r3.patch 1168 RMD160 3f59b6dfff335be21b55de70ccd9a77b008f5cd0 SHA1 09d1d4a6b0b031839d002abc62ec4efef6faef71 SHA256 c46f61559bdbd7e29bb47607f0b152647f73e2cc3e836f53c67bb2925e8957d7
AUX chromium-system-vpx-r4.patch 476 RMD160 ff7feff7dff9de28bdc4c80b43c9574d7769a288 SHA1 b87516b0dac8f65431fdce86f26a3c92cfc313af SHA256 6bf0801a8d4ff208f558fa5740adfbed6178d391314297c80e0c3a058910a10e
-AUX chromium-system-xdg-utils-r0.patch 2313 RMD160 3e68d4860b04c30749d319642002dc435c1b8595 SHA1 f4ca5f19ad4c5d9b2814268d38f02c1f30193fdd SHA256 1241583ada4b3d67727de941da8a81e1762dfac3963f6a45ecb61126e5275ed8
AUX chromium-system-zlib-r0.patch 1318 RMD160 2debfc4f179a57119d5022305134307f4cbbe04d SHA1 036e7573b04046ee0275abcb99a7e7a8b490e47b SHA256 79668fbf6206cd958db328798298a0514d3a95683b41affd3a607a0ac95453e3
-AUX chromium-webkit-version.patch 2085 RMD160 654a4d3bd87de789e80a0364c9167ca8557d072d SHA1 27b29a0fbcb09d044d8dfe037503faaae2d4e96b SHA256 a48fc2c7cd9fe30a6ecc98da1ed6a9d0f77cf89302caec4d5844f1471617cceb
AUX chromium.xml 390 RMD160 6b2f901da76555a7112f71a6f9dae6e2e3307324 SHA1 81148a0b094bc697ff2c9d33efe976b1bffb72a3 SHA256 a81c6257346eaa4f6389fc9ea8834fd2dd3b006cf4e9e999028aca812d76fe9a
-AUX experimental.gyp 92 RMD160 1c86ce8ea3cd4ae83ce416868e493e6263651054 SHA1 1a543f30e8543fbebb7a67ebd8b06f667bfdc0bd SHA256 60ba421744968fcc90359ae55316756d76aaa1a997bb373633e6c7399c9b5e62
-AUX flac.gyp 416 RMD160 5af2709cae77ba139b32b0f22bca347a87170e0b SHA1 cdb2f5404c21ca8375ce9b753577df1df6a9cb78 SHA256 a4f24205b691e21d6208876a7f56859b9c3fc22eb39ec29fb2d0e3d067894932
-AUX speex.gyp 434 RMD160 6111f912450ece1cb016f3800e1a22f135cc68ff SHA1 23c1917b8bc7a4b395a8b5c1b91b6661d73f3df3 SHA256 34b977ccf3092a3af963c6ec1dc79a1f26bf5114571e3dfd2e94c2a6633537b9
-AUX v8.gyp 2602 RMD160 2949c9e2d8e2297182130e5984fb5f114c260a81 SHA1 7d32a04a7a921f30b0c3ed33a5593f1059832c96 SHA256 bc5342501d71754f23bd87914bb11841a7487330ba2f0462611dd1b0f99a2a43
DIST chromium-11.0.696.57.tar.bz2 145246561 RMD160 67a030d615a843e39ca36068333d1fab286a49fd SHA1 5f4a358026eb52570670ad43d38c84d7bf48bf14 SHA256 de29e2fafe5a9fdd1fc8f260fde012230cf7eabde651a2fcd042d3bc3aebee91
-DIST chromium-12.0.742.12.tar.bz2 150360849 RMD160 2e5de6a1c4fd1e9ee2874b14f6cf9525c0671123 SHA1 a29ba3c8176f0819df252beab9fe9c013bd01ae7 SHA256 2b9228d5e5e48f0442bf32f9c079ad593cff48cfdc879dc82201013c82835e69
DIST chromium-12.0.742.16.tar.bz2 150352189 RMD160 aecaf5475e7097f4a54959ea0a71c64981065387 SHA1 305054c6113d1881e85d8a076f155c0d9ac059fd SHA256 93d1d36e2c361a54f004518023111632bd9025e550dd835c9734b5e75e04ac95
+DIST chromium-12.0.742.21.tar.bz2 150264103 RMD160 7df6bd5ebccfe19af8ca0a8f81b6e6e75fb9bd45 SHA1 9f3f64ee132787052fa4789472d77e8790f6ba6b SHA256 09061e607598d16b97947f3f771b044df6a4ef3ec79ef6fc9990f3513578ecd4
EBUILD chromium-11.0.696.57.ebuild 10569 RMD160 1915cfa1a6cc719bc89690882695709df4ef1cd2 SHA1 69d8f9e36ad637115a3fc576225aaba8ff05b7c2 SHA256 0da808f90649507468c4c75dfd8be1aa9ede89142cc932245a902b2a74969fcc
-EBUILD chromium-12.0.742.12.ebuild 11576 RMD160 952c38343894a1a89a81aff083f684aa669bac52 SHA1 6af97fc97482f101ed7021ebe0f697718b7887af SHA256 703ec93ebcbdf41eb9ce1dc1c7ad186bf26dee5b198abe062a0130829e1cd016
EBUILD chromium-12.0.742.16.ebuild 11576 RMD160 6ca1a3079908b74ba87cd3e44d765321c5b95184 SHA1 3ba3df62187ff992185684f663e93f33ab15f76d SHA256 a172775846fb2edaa0abecb065c06846e12390884469ff5dadfcb580358f85a3
+EBUILD chromium-12.0.742.21.ebuild 11576 RMD160 0c0b013da5823fa3207390b636aed2e7faae420f SHA1 6a13901e7380ff63d44f8e90368d33bf44940461 SHA256 4d28a8b26a54307f572a2d077f8f5aa2bdefa15d96d61fb0023f9579b032b42d
EBUILD chromium-9999-r1.ebuild 14267 RMD160 b8dd2d1818b07649dd2680df4e28d8d524c40f2f SHA1 a5cb5019f27b32d7764537831cb81c7bd71fef04 SHA256 c309cff98f72bda298d1ec6b227168928c504b3f17441faa84d9efb95ad32a55
-MISC ChangeLog 77751 RMD160 f8e5c5a9d1e1ee1560a280342f2001b111903fa3 SHA1 9bebd545895ed92701ea4db50b41db8795783d7f SHA256 93dc342b6be0538cc8657032c96b76c22198fd2aa9aa6dd3861397b4bd3a27d2
+MISC ChangeLog 78573 RMD160 bf41af2b667f5f1970cac12f9881069feb58833a SHA1 310fd4c77162e85ca19e6bde0740a7d04e09b380 SHA256 de08ad7cba00a2d668127cf5e3a374ffa52a0ba4bc68c0e9adb0849a0f86aae5
MISC metadata.xml 267 RMD160 3a166415fec415d539c1b7c32ed40b188488b9fb SHA1 5c3d71a9cea27175cbe8c98369b42b79c8643c6c SHA256 4e6afae33f60d6752cacf2785f7f9a396b8711cce605b73d0d752a4af7d01fc8
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk2/11IACgkQuUQtlDBCeQIs+gCffEDpVGfxmkWIInL+qABgcovP
-f6wAn2H8XxLsqGcIbsovh7UQ+w4cvwrq
-=Jg5u
+iEYEARECAAYFAk3Dt7AACgkQuUQtlDBCeQLslgCfeHZM1loGVTNIrjDSJ/QWqhl1
+FY8An3FWKhPYfxXrHFgOV2HghoutqPsB
+=u8Yl
-----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-12.0.742.12.ebuild b/www-client/chromium/chromium-12.0.742.21.ebuild
index 30426a5b8bf9..c8eb4eeae96b 100644
--- a/www-client/chromium/chromium-12.0.742.12.ebuild
+++ b/www-client/chromium/chromium-12.0.742.21.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-12.0.742.12.ebuild,v 1.1 2011/04/29 08:44:55 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-12.0.742.21.ebuild,v 1.1 2011/05/06 08:56:05 phajdan.jr Exp $
EAPI="3"
PYTHON_DEPEND="2:2.6"
diff --git a/www-client/chromium/files/chromium-ffmpeg-build-r1.patch b/www-client/chromium/files/chromium-ffmpeg-build-r1.patch
deleted file mode 100644
index 54e831b45c3c..000000000000
--- a/www-client/chromium/files/chromium-ffmpeg-build-r1.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- trunk/src/media/ffmpeg/ffmpeg_common.h 2011/04/01 19:12:49 80199
-+++ trunk/src/media/ffmpeg/ffmpeg_common.h 2011/04/01 19:30:32 80200
-@@ -19,7 +19,6 @@
- // TODO(scherkus): fix and upstream the compiler warnings.
- MSVC_PUSH_DISABLE_WARNING(4244);
- #include <libavcodec/avcodec.h>
--#include <libavcore/samplefmt.h>
- #include <libavformat/avformat.h>
- #include <libavformat/avio.h>
- #include <libavutil/avutil.h>
diff --git a/www-client/chromium/files/chromium-gecko-mediaplayer-r0.patch b/www-client/chromium/files/chromium-gecko-mediaplayer-r0.patch
deleted file mode 100644
index fb5376b82137..000000000000
--- a/www-client/chromium/files/chromium-gecko-mediaplayer-r0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- webkit/glue/plugins/plugin_list.cc_posix.orig 2010-10-09 11:05:44.000000000 +0200
-+++ webkit/glue/plugins/plugin_list_posix.cc 2010-10-09 11:06:35.000000000 +0200
-@@ -89,7 +89,9 @@
- bool IsBlacklistedPlugin(const FilePath& path) {
- const char* kBlackListedPlugins[] = {
- "nppdf.so", // Adobe PDF
-+#ifndef GENTOO_CHROMIUM_ENABLE_GECKO_MEDIAPLAYER
- "gecko-mediaplayer", // Gecko Media Player
-+#endif // GENTOO_CHROMIUM_ENABLE_GECKO_MEDIAPLAYER
- };
- std::string filename = path.BaseName().value();
- for (size_t i = 0; i < arraysize(kBlackListedPlugins); i++) {
diff --git a/www-client/chromium/files/chromium-gecko-mediaplayer-r1.patch b/www-client/chromium/files/chromium-gecko-mediaplayer-r1.patch
deleted file mode 100644
index 05515f6bd1d8..000000000000
--- a/www-client/chromium/files/chromium-gecko-mediaplayer-r1.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- webkit/glue/plugins/plugin_list.cc_posix.orig 2010-10-09 11:05:44.000000000 +0200
-+++ webkit/plugins/npapi/plugin_list_posix.cc 2010-10-09 11:06:35.000000000 +0200
-@@ -89,7 +89,9 @@
- bool IsBlacklistedPlugin(const FilePath& path) {
- const char* kBlackListedPlugins[] = {
- "nppdf.so", // Adobe PDF
-+#ifndef GENTOO_CHROMIUM_ENABLE_GECKO_MEDIAPLAYER
- "gecko-mediaplayer", // Gecko Media Player
-+#endif // GENTOO_CHROMIUM_ENABLE_GECKO_MEDIAPLAYER
- };
- std::string filename = path.BaseName().value();
- for (size_t i = 0; i < arraysize(kBlackListedPlugins); i++) {
diff --git a/www-client/chromium/files/chromium-gssapi-heimdal-r0.patch b/www-client/chromium/files/chromium-gssapi-heimdal-r0.patch
deleted file mode 100644
index 15ec98a620e4..000000000000
--- a/www-client/chromium/files/chromium-gssapi-heimdal-r0.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- net/http/http_auth_gssapi_posix.cc.orig 2011-04-05 08:25:52.000000000 +0200
-+++ net/http/http_auth_gssapi_posix.cc 2011-04-05 08:26:32.000000000 +0200
-@@ -437,6 +437,7 @@
- #else
- "libgssapi_krb5.so.2", // MIT Kerberos - FC, Suse10, Debian
- "libgssapi.so.4", // Heimdal - Suse10, MDK
-+ "libgssapi.so.2", // Heimdal - Gentoo
- "libgssapi.so.1" // Heimdal - Suse9, CITI - FC, MDK, Suse10
- #endif
- };
diff --git a/www-client/chromium/files/chromium-launcher.sh b/www-client/chromium/files/chromium-launcher.sh
deleted file mode 100644
index 32e563c8c5a8..000000000000
--- a/www-client/chromium/files/chromium-launcher.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2009 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# Let the wrapped binary know that it has been run through the wrapper
-export CHROME_WRAPPER="`readlink -f "$0"`"
-
-PROGDIR="`dirname "$CHROME_WRAPPER"`"
-
-case ":$PATH:" in
- *:$PROGDIR:*)
- # $PATH already contains $PROGDIR
- ;;
- *)
- # Append $PROGDIR to $PATH
- export PATH="$PATH:$PROGDIR"
- ;;
-esac
-
-# Set the .desktop file name
-export CHROME_DESKTOP="chromium-chromium.desktop"
-
-exec "$PROGDIR/chrome" --extra-plugin-dir=/usr/lib/nsbrowser/plugins "$@"
diff --git a/www-client/chromium/files/chromium-net-tests-r0.patch b/www-client/chromium/files/chromium-net-tests-r0.patch
deleted file mode 100644
index 1ee941df07b0..000000000000
--- a/www-client/chromium/files/chromium-net-tests-r0.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-Index: net/data/ssl/certificates/expired_cert.pem
-===================================================================
---- net/data/ssl/certificates/expired_cert.pem (revision 80751)
-+++ net/data/ssl/certificates/expired_cert.pem (working copy)
-@@ -1,3 +1,18 @@
-+-----BEGIN RSA PRIVATE KEY-----
-+MIICWwIBAAKBgQDuUjUPzXBw61Xsh1RGSyJowrqC+TYvpf44P2c5sF/Y/KX0LoJE
-+A72in+2d7N8sf3IsJvy6X1uPnVdX7wKzgtHI6FFjOcbRzs9MiyEJkeFKADI+ZMV0
-+httNOy93ajESsjZMwgoHMKOv5ikNCdwE/nefSfu6ZuapCsadArkHe3d5dwIDAQAB
-+AoGARF1wu0fDqaDY1TE9C60iActalZfH44NKmfgWNIZT+HsBYDq3Q6uPCse18kew
-+/aLRrbjBZvVT3q7UD3WQ4M32P44rEAAhdYGhMndF53xrtX5SQ7LPb381mlPoJ2AE
-+Wv9R+0X45aRtiSC/Y7E9ebN5p4RY9NjRUjcaI67d1NgNAwECQQD6k83u6R73tsJt
-+k2OCTnUxvQi9Oo5GwDfiubHOQx3tG3ZDIjsyg1GCJa/PVRiP6PXkgIoAWmiyGFIR
-++gIO86kPAkEA83qA4L4HxLQLapDvBDNgiz9eHA/FJvsk5yH0jupR+CDLRqM6Dfzj
-+iLeztyJV3n96lMDIc4lEzplysDw/TD6ZGQJABzYFsSBoUbyir8CUFoXnfXzxKXDr
-+80FI2m95nHP2AoLNznTHu1ZoHBS1kIPkZw/PM7o3Pndbl/R3OCk3sfJ1JQJABSB7
-+PkBCIZ4471GF9uyuB8CZ1rVuTVfUexl38Np2R2dJYH9nZYwBrotPuXd7n2fHyQIW
-+NniZflA03gkmvBBFYQJADftQ5+jabFxXkqwZsrsvtG+Ji53BZrLrczFxgPyGVfUF
-+A1pyQE3M6SykYjp+S3Zg6eS+yKE06guecEVhTQtwBA==
-+-----END RSA PRIVATE KEY-----
- -----BEGIN CERTIFICATE-----
- MIIEZDCCAkygAwIBAgIBAzANBgkqhkiG9w0BAQUFADBgMRAwDgYDVQQDEwdUZXN0
- IENBMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN
-@@ -24,18 +39,3 @@
- za7vs4El0Ei7YZYC0vxqpUbiS6l7Ul+TPfk6q/OAkYjaJ76uYlcKVmN060wK83z5
- Vtoy6YuY/8hrMRl3jrMaiVsMSMg+nOsM
- -----END CERTIFICATE-----
-------BEGIN RSA PRIVATE KEY-----
--MIICWwIBAAKBgQDuUjUPzXBw61Xsh1RGSyJowrqC+TYvpf44P2c5sF/Y/KX0LoJE
--A72in+2d7N8sf3IsJvy6X1uPnVdX7wKzgtHI6FFjOcbRzs9MiyEJkeFKADI+ZMV0
--httNOy93ajESsjZMwgoHMKOv5ikNCdwE/nefSfu6ZuapCsadArkHe3d5dwIDAQAB
--AoGARF1wu0fDqaDY1TE9C60iActalZfH44NKmfgWNIZT+HsBYDq3Q6uPCse18kew
--/aLRrbjBZvVT3q7UD3WQ4M32P44rEAAhdYGhMndF53xrtX5SQ7LPb381mlPoJ2AE
--Wv9R+0X45aRtiSC/Y7E9ebN5p4RY9NjRUjcaI67d1NgNAwECQQD6k83u6R73tsJt
--k2OCTnUxvQi9Oo5GwDfiubHOQx3tG3ZDIjsyg1GCJa/PVRiP6PXkgIoAWmiyGFIR
--+gIO86kPAkEA83qA4L4HxLQLapDvBDNgiz9eHA/FJvsk5yH0jupR+CDLRqM6Dfzj
--iLeztyJV3n96lMDIc4lEzplysDw/TD6ZGQJABzYFsSBoUbyir8CUFoXnfXzxKXDr
--80FI2m95nHP2AoLNznTHu1ZoHBS1kIPkZw/PM7o3Pndbl/R3OCk3sfJ1JQJABSB7
--PkBCIZ4471GF9uyuB8CZ1rVuTVfUexl38Np2R2dJYH9nZYwBrotPuXd7n2fHyQIW
--NniZflA03gkmvBBFYQJADftQ5+jabFxXkqwZsrsvtG+Ji53BZrLrczFxgPyGVfUF
--A1pyQE3M6SykYjp+S3Zg6eS+yKE06guecEVhTQtwBA==
-------END RSA PRIVATE KEY-----
-Index: net/data/ssl/certificates/ok_cert.pem
-===================================================================
---- net/data/ssl/certificates/ok_cert.pem (revision 80751)
-+++ net/data/ssl/certificates/ok_cert.pem (working copy)
-@@ -1,3 +1,18 @@
-+-----BEGIN RSA PRIVATE KEY-----
-+MIICXQIBAAKBgQDQj2tPWPUgbuI4H3/3dnttqVbndwU33BdRCd67DFM44GRrsjDS
-+H4bY/EbFyX9D52d/iy6ZaAmDePcCz5k/fgP3DMujykYGqgNiV2ywxTlMj7NlN2C7
-+SRt68fQMZr5iI7rypdxuaZt9lSMD3ENBffYtuLTyZd9a3JPJe1TaIab5GwIDAQAB
-+AoGANHXu8z2YIzlhE+bwhGm8MGBpKL3qhRuKjeriqMA36tWezOw8lY4ymEAU+Ulv
-+BsCdaxqydQoTYou57m4TyUHEcxq9pq3H0zB0qL709DdHi/t4zbV9XIoAzC5v0/hG
-+9+Ca29TwC02FCw+qLkNrtwCpwOcQmc+bPxqvFu1iMiahURECQQD2I/Hi2413CMZz
-+TBjl8fMiVO9GhA2J0sc8Qi+YcgJakaLD9xcbaiLkTzPZDlA389C1b6Ia+poAr4YA
-+Ve0FFbxpAkEA2OobayyHE/QtPEqoy6NLR57jirmVBNmSWWd4lAyL5UIHIYVttJZg
-+8CLvbzaU/iDGwR+wKsM664rKPHEmtlyo4wJBAMeSqYO5ZOCJGu9NWjrHjM3fdAsG
-+8zs2zhiLya+fcU0iHIksBW5TBmt71Jw/wMc9R5J1K0kYvFml98653O5si1ECQBCk
-+RV4/mE1rmlzZzYFyEcB47DQkcM5ictvxGEsje0gnfKyRtAz6zI0f4QbDRUMJ+LWw
-+XK+rMsYHa+SfOb0b9skCQQCLdeonsIpFDv/Uv+flHISy0WA+AFkLXrRkBKh6G/OD
-+dMHaNevkJgUnpceVEnkrdenp5CcEoFTI17pd+nBgDm/B
-+-----END RSA PRIVATE KEY-----
- -----BEGIN CERTIFICATE-----
- MIIEZDCCAkygAwIBAgIBATANBgkqhkiG9w0BAQUFADBgMRAwDgYDVQQDEwdUZXN0
- IENBMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN
-@@ -24,18 +39,3 @@
- AYFvn6I8nj9IldMJiIc3DdhacEAEzRMeRgPdzAa1griKUGknxsyTyRii8ru0WS6w
- DCNrlDOVXdzYGEZooBI76BDVY0W0akjV
- -----END CERTIFICATE-----
-------BEGIN RSA PRIVATE KEY-----
--MIICXQIBAAKBgQDQj2tPWPUgbuI4H3/3dnttqVbndwU33BdRCd67DFM44GRrsjDS
--H4bY/EbFyX9D52d/iy6ZaAmDePcCz5k/fgP3DMujykYGqgNiV2ywxTlMj7NlN2C7
--SRt68fQMZr5iI7rypdxuaZt9lSMD3ENBffYtuLTyZd9a3JPJe1TaIab5GwIDAQAB
--AoGANHXu8z2YIzlhE+bwhGm8MGBpKL3qhRuKjeriqMA36tWezOw8lY4ymEAU+Ulv
--BsCdaxqydQoTYou57m4TyUHEcxq9pq3H0zB0qL709DdHi/t4zbV9XIoAzC5v0/hG
--9+Ca29TwC02FCw+qLkNrtwCpwOcQmc+bPxqvFu1iMiahURECQQD2I/Hi2413CMZz
--TBjl8fMiVO9GhA2J0sc8Qi+YcgJakaLD9xcbaiLkTzPZDlA389C1b6Ia+poAr4YA
--Ve0FFbxpAkEA2OobayyHE/QtPEqoy6NLR57jirmVBNmSWWd4lAyL5UIHIYVttJZg
--8CLvbzaU/iDGwR+wKsM664rKPHEmtlyo4wJBAMeSqYO5ZOCJGu9NWjrHjM3fdAsG
--8zs2zhiLya+fcU0iHIksBW5TBmt71Jw/wMc9R5J1K0kYvFml98653O5si1ECQBCk
--RV4/mE1rmlzZzYFyEcB47DQkcM5ictvxGEsje0gnfKyRtAz6zI0f4QbDRUMJ+LWw
--XK+rMsYHa+SfOb0b9skCQQCLdeonsIpFDv/Uv+flHISy0WA+AFkLXrRkBKh6G/OD
--dMHaNevkJgUnpceVEnkrdenp5CcEoFTI17pd+nBgDm/B
-------END RSA PRIVATE KEY-----
diff --git a/www-client/chromium/files/chromium-system-flac-r0.patch b/www-client/chromium/files/chromium-system-flac-r0.patch
deleted file mode 100644
index a7bc9bbaff5c..000000000000
--- a/www-client/chromium/files/chromium-system-flac-r0.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- third_party/flac/flac.h.orig 2011-01-22 14:23:20.000000000 +0000
-+++ third_party/flac/flac.h 2011-01-22 14:24:34.000000000 +0000
-@@ -9,6 +9,10 @@
- // This is a shim header to include the right flac headers.
- // Use this instead of referencing the flac headers directly.
-
-+#if defined(USE_SYSTEM_FLAC)
-+#include <FLAC/stream_encoder.h>
-+#else
- #include "third_party/flac/include/FLAC/stream_encoder.h"
-+#endif
-
- #endif // THIRD_PARTY_FLAC_FLAC_H_
diff --git a/www-client/chromium/files/chromium-system-icu-r0.patch b/www-client/chromium/files/chromium-system-icu-r0.patch
deleted file mode 100644
index df5b2fb4797c..000000000000
--- a/www-client/chromium/files/chromium-system-icu-r0.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: chrome/browser/autofill/autofill_country.cc
-diff --git a/chrome/browser/autofill/autofill_country.cc b/chrome/browser/autofill/autofill_country.cc
-index a0f1bc8fcfe4a8f90f9845a101dc90959176600a..f39c6511f0e39f55bf972015c35e6919f8cd7266 100644
---- a/chrome/browser/autofill/autofill_country.cc
-+++ b/chrome/browser/autofill/autofill_country.cc
-@@ -13,12 +13,12 @@
- #include "base/utf_string_conversions.h"
- #include "chrome/browser/browser_process.h"
- #include "grit/generated_resources.h"
--#include "third_party/icu/public/common/unicode/locid.h"
--#include "third_party/icu/public/common/unicode/uloc.h"
--#include "third_party/icu/public/i18n/unicode/coll.h"
--#include "third_party/icu/public/i18n/unicode/ucol.h"
- #include "ui/base/l10n/l10n_util_collator.h"
- #include "ui/base/l10n/l10n_util.h"
-+#include "unicode/coll.h"
-+#include "unicode/locid.h"
-+#include "unicode/ucol.h"
-+#include "unicode/uloc.h"
-
- namespace {
-
diff --git a/www-client/chromium/files/chromium-system-speex-r0.patch b/www-client/chromium/files/chromium-system-speex-r0.patch
deleted file mode 100644
index 095082d9b3ed..000000000000
--- a/www-client/chromium/files/chromium-system-speex-r0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/speech/speech_recognizer.cc.orig 2010-12-22 09:58:16.000000000 +0000
-+++ chrome/browser/speech/speech_recognizer.cc 2010-12-22 09:58:45.000000000 +0000
-@@ -10,7 +10,7 @@
- #include "chrome/browser/browser_thread.h"
- #include "chrome/browser/profiles/profile.h"
- #include "chrome/common/net/url_request_context_getter.h"
--#include "third_party/speex/include/speex/speex.h"
-+#include "speex/speex.h"
-
- using media::AudioInputController;
- using std::list;
diff --git a/www-client/chromium/files/chromium-system-vpx-r1.patch b/www-client/chromium/files/chromium-system-vpx-r1.patch
deleted file mode 100644
index a5faa49e292f..000000000000
--- a/www-client/chromium/files/chromium-system-vpx-r1.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- remoting/base/encoder_vp8.cc.orig 2010-11-10 09:52:56.000000000 +0100
-+++ remoting/base/encoder_vp8.cc 2010-11-10 09:53:32.000000000 +0100
-@@ -11,9 +11,9 @@
-
- extern "C" {
- #define VPX_CODEC_DISABLE_COMPAT 1
--#include "third_party/libvpx/include/vpx/vpx_codec.h"
--#include "third_party/libvpx/include/vpx/vpx_encoder.h"
--#include "third_party/libvpx/include/vpx/vp8cx.h"
-+#include "vpx/vpx_codec.h"
-+#include "vpx/vpx_encoder.h"
-+#include "vpx/vp8cx.h"
- }
-
- namespace remoting {
---- remoting/base/decoder_vp8.cc.orig 2010-11-10 09:54:14.000000000 +0100
-+++ remoting/base/decoder_vp8.cc 2010-11-10 09:54:37.000000000 +0100
-@@ -10,9 +10,9 @@
-
- extern "C" {
- #define VPX_CODEC_DISABLE_COMPAT 1
--#include "third_party/libvpx/include/vpx/vpx_codec.h"
--#include "third_party/libvpx/include/vpx/vpx_decoder.h"
--#include "third_party/libvpx/include/vpx/vp8dx.h"
-+#include "vpx/vpx_codec.h"
-+#include "vpx/vpx_decoder.h"
-+#include "vpx/vp8dx.h"
- }
-
- namespace remoting {
---- third_party/ffmpeg/ffmpeg_stub_headers.fragment.orig 2010-11-10 09:55:43.000000000 +0100
-+++ third_party/ffmpeg/ffmpeg_stub_headers.fragment 2010-11-10 09:56:09.000000000 +0100
-@@ -7,9 +7,9 @@
- #include <libavformat/avformat.h>
-
- #define VPX_CODEC_DISABLE_COMPAT 1
--#include "third_party/libvpx/include/vpx/vpx_codec.h"
--#include "third_party/libvpx/include/vpx/vpx_encoder.h"
--#include "third_party/libvpx/include/vpx/vpx_decoder.h"
-+#include "vpx/vpx_codec.h"
-+#include "vpx/vpx_encoder.h"
-+#include "vpx/vpx_decoder.h"
-
- typedef int (*AVLockMgrOperation)(void**, enum AVLockOp);
-
---- third_party/ffmpeg/ffmpeg.gyp.orig 2010-11-19 10:32:50.000000000 +0000
-+++ third_party/ffmpeg/ffmpeg.gyp 2010-11-19 10:36:33.000000000 +0000
-@@ -898,6 +898,16 @@
- },
- }],
-
-+ ['use_system_vpx!=0', {
-+ 'direct_dependent_settings': {
-+ 'link_settings': {
-+ 'libraries': [
-+ '-lvpx',
-+ ],
-+ },
-+ },
-+ }],
-+
- # Add pkg-config result to include path when use_system_ffmpeg!=0
- ['use_system_ffmpeg!=0', {
- 'cflags': [
diff --git a/www-client/chromium/files/chromium-system-vpx-r2.patch b/www-client/chromium/files/chromium-system-vpx-r2.patch
deleted file mode 100644
index 258ff5bcc63e..000000000000
--- a/www-client/chromium/files/chromium-system-vpx-r2.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- remoting/base/encoder_vp8.cc.orig 2010-11-10 09:52:56.000000000 +0100
-+++ remoting/base/encoder_vp8.cc 2010-11-10 09:53:32.000000000 +0100
-@@ -11,9 +11,9 @@
-
- extern "C" {
- #define VPX_CODEC_DISABLE_COMPAT 1
--#include "third_party/libvpx/source/libvpx/vpx/vpx_codec.h"
--#include "third_party/libvpx/source/libvpx/vpx/vpx_encoder.h"
--#include "third_party/libvpx/source/libvpx/vpx/vp8cx.h"
-+#include "vpx/vpx_codec.h"
-+#include "vpx/vpx_encoder.h"
-+#include "vpx/vp8cx.h"
- }
-
- namespace remoting {
---- remoting/base/decoder_vp8.cc.orig 2010-11-10 09:54:14.000000000 +0100
-+++ remoting/base/decoder_vp8.cc 2010-11-10 09:54:37.000000000 +0100
-@@ -10,9 +10,9 @@
-
- extern "C" {
- #define VPX_CODEC_DISABLE_COMPAT 1
--#include "third_party/libvpx/source/libvpx/vpx/vpx_codec.h"
--#include "third_party/libvpx/source/libvpx/vpx/vpx_decoder.h"
--#include "third_party/libvpx/source/libvpx/vpx/vp8dx.h"
-+#include "vpx/vpx_codec.h"
-+#include "vpx/vpx_decoder.h"
-+#include "vpx/vp8dx.h"
- }
-
- namespace remoting {
---- third_party/ffmpeg/ffmpeg_stub_headers.fragment.orig 2010-11-10 09:55:43.000000000 +0100
-+++ third_party/ffmpeg/ffmpeg_stub_headers.fragment 2010-11-10 09:56:09.000000000 +0100
-@@ -7,9 +7,9 @@
- #include <libavformat/avformat.h>
-
- #define VPX_CODEC_DISABLE_COMPAT 1
--#include "third_party/libvpx/include/vpx/vpx_codec.h"
--#include "third_party/libvpx/include/vpx/vpx_encoder.h"
--#include "third_party/libvpx/include/vpx/vpx_decoder.h"
-+#include "vpx/vpx_codec.h"
-+#include "vpx/vpx_encoder.h"
-+#include "vpx/vpx_decoder.h"
-
- typedef int (*AVLockMgrOperation)(void**, enum AVLockOp);
-
---- third_party/ffmpeg/ffmpeg.gyp.orig 2010-11-19 10:32:50.000000000 +0000
-+++ third_party/ffmpeg/ffmpeg.gyp 2010-11-19 10:36:33.000000000 +0000
-@@ -898,6 +898,16 @@
- },
- }],
-
-+ ['use_system_vpx!=0', {
-+ 'direct_dependent_settings': {
-+ 'link_settings': {
-+ 'libraries': [
-+ '-lvpx',
-+ ],
-+ },
-+ },
-+ }],
-+
- # Add pkg-config result to include path when use_system_ffmpeg!=0
- ['use_system_ffmpeg!=0', {
- 'cflags': [
diff --git a/www-client/chromium/files/chromium-system-xdg-utils-r0.patch b/www-client/chromium/files/chromium-system-xdg-utils-r0.patch
deleted file mode 100644
index 143bff4b742a..000000000000
--- a/www-client/chromium/files/chromium-system-xdg-utils-r0.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- chrome/chrome_exe.gypi.orig 2011-01-14 16:57:11.000000000 +0000
-+++ chrome/chrome_exe.gypi 2011-01-14 17:00:50.000000000 +0000
-@@ -141,6 +141,7 @@
- 'msvs_guid': '7B219FAA-E360-43C8-B341-804A94EEFFAC',
- 'variables': {
- 'chrome_exe_target': 1,
-+ 'use_system_xdg_utils%': 0,
- },
- 'conditions': [
- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
-@@ -203,23 +204,27 @@
- 'app/chrome_main.cc',
- 'app/chrome_dll_resource.h',
- ],
-- 'copies': [
-- {
-- 'destination': '<(PRODUCT_DIR)',
-- 'files': ['tools/build/linux/chrome-wrapper',
-- '../third_party/xdg-utils/scripts/xdg-mime',
-- '../third_party/xdg-utils/scripts/xdg-settings',
-- ],
-- # The wrapper script above may need to generate a .desktop file,
-- # which requires an icon. So, copy one next to the script.
-- 'conditions': [
-- ['branding=="Chrome"', {
-- 'files': ['app/theme/google_chrome/product_logo_48.png']
-- }, { # else: 'branding!="Chrome"
-- 'files': ['app/theme/chromium/product_logo_48.png']
-- }],
-+ 'conditions': [
-+ ['use_system_xdg_utils==0', {
-+ 'copies': [
-+ {
-+ 'destination': '<(PRODUCT_DIR)',
-+ 'files': ['tools/build/linux/chrome-wrapper',
-+ '../third_party/xdg-utils/scripts/xdg-mime',
-+ '../third_party/xdg-utils/scripts/xdg-settings',
-+ ],
-+ # The wrapper script above may need to generate a .desktop file,
-+ # which requires an icon. So, copy one next to the script.
-+ 'conditions': [
-+ ['branding=="Chrome"', {
-+ 'files': ['app/theme/google_chrome/product_logo_48.png']
-+ }, { # else: 'branding!="Chrome"
-+ 'files': ['app/theme/chromium/product_logo_48.png']
-+ }],
-+ ],
-+ },
- ],
-- },
-+ }],
- ],
- }],
- ['OS=="mac"', {
diff --git a/www-client/chromium/files/chromium-webkit-version.patch b/www-client/chromium/files/chromium-webkit-version.patch
deleted file mode 100644
index 5bcba7ec2a2b..000000000000
--- a/www-client/chromium/files/chromium-webkit-version.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: webkit/build/webkit_version.py
-diff --git a/webkit/build/webkit_version.py b/webkit/build/webkit_version.py
-index 58110727fee9250058c4318e8f50eb402008f741..f488a2ed8242891542925b6aa21e38748268b253 100755
---- a/webkit/build/webkit_version.py
-+++ b/webkit/build/webkit_version.py
-@@ -45,21 +45,24 @@ def GetWebKitRevision(webkit_dir, version_file):
-
- # "svn info" tells us what we want, but third_party/WebKit does *not*
- # point at the upstream repo. So instead we run svn info on the directory
-- # containing the versioning file (which is some subdirectory of WebKit),
-- # then strip that path back off of the resulting URL.
-+ # containing the versioning file (which is some subdirectory of WebKit).
- version_file_dir = os.path.dirname(version_file)
- version_info = lastchange.FetchVersionInfo(
- default_lastchange=None,
- directory=os.path.join(webkit_dir, version_file_dir))
-
-- # Now compute the real WebKit URL by stripping off the version file
-- # directory from the URL we get out of version_info.
-- # Further, we want to strip off the "http://svn..." from the left.
-- # This is the root URL from the repository.
-- assert version_info.url.startswith(version_info.root)
-- assert version_info.url.endswith(version_file_dir)
-- webkit_url = version_info.url[len(version_info.root):-len(version_file_dir)]
-- webkit_url = webkit_url.strip('/')
-+ if (version_info.url.startswith(version_info.root) and
-+ version_info.url.endswith(version_file_dir)):
-+ # Now compute the real WebKit URL by stripping off the version file
-+ # directory from the URL we get out of version_info.
-+ # Further, we want to strip off the "http://svn..." from the left.
-+ # This is the root URL from the repository.
-+ webkit_url = version_info.url[len(version_info.root):-len(version_file_dir)]
-+ webkit_url = webkit_url.strip('/')
-+ else:
-+ # The data isn't as we expect: perhaps they're using git without svn?
-+ # Just dump the output directly.
-+ webkit_url = version_info.url
-
- return "%s@%s" % (webkit_url, version_info.revision)
-
diff --git a/www-client/chromium/files/experimental.gyp b/www-client/chromium/files/experimental.gyp
deleted file mode 100644
index d3bedc29b7f4..000000000000
--- a/www-client/chromium/files/experimental.gyp
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- 'targets': [
- {
- 'target_name': 'i18n_api',
- 'type': 'none',
- },
- ],
-}
diff --git a/www-client/chromium/files/flac.gyp b/www-client/chromium/files/flac.gyp
deleted file mode 100644
index 3abd34865ada..000000000000
--- a/www-client/chromium/files/flac.gyp
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- 'targets': [
- {
- 'target_name': 'libflac',
- 'type': 'settings',
- 'direct_dependent_settings': {
- 'defines': [
- 'USE_SYSTEM_FLAC',
- ],
- },
- 'link_settings': {
- 'ldflags': [
- '<!@(pkg-config --libs-only-L --libs-only-other flac)',
- ],
- 'libraries': [
- '<!@(pkg-config --libs-only-l flac)',
- ],
- },
- },
- ],
-}
diff --git a/www-client/chromium/files/speex.gyp b/www-client/chromium/files/speex.gyp
deleted file mode 100644
index 43bcc51d55e2..000000000000
--- a/www-client/chromium/files/speex.gyp
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- 'targets': [
- {
- 'target_name': 'libspeex',
- 'type': 'settings',
- 'direct_dependent_settings': {
- 'cflags': [
- '<!@(pkg-config --cflags speex)',
- ],
- },
- 'link_settings': {
- 'ldflags': [
- '<!@(pkg-config --libs-only-L --libs-only-other speex)',
- ],
- 'libraries': [
- '<!@(pkg-config --libs-only-l speex)',
- ],
- },
- },
- ],
-}
diff --git a/www-client/chromium/files/v8.gyp b/www-client/chromium/files/v8.gyp
deleted file mode 100644
index d37920732883..000000000000
--- a/www-client/chromium/files/v8.gyp
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 2009-2010 the V8 project authors. All rights reserved.
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-{
- 'variables': {
- 'msvs_use_common_release': 0,
- 'gcc_version%': 'unknown',
- 'v8_target_arch%': '<(target_arch)',
- 'v8_use_snapshot%': 'true',
- },
- 'targets': [
- {
- 'target_name': 'v8',
- 'type': 'settings',
- 'link_settings': {
- 'libraries': [
- '-lv8',
- ],
- },
- },
- {
- 'target_name': 'v8_snapshot',
- 'type': 'none',
- 'dependencies': [
- 'v8'
- ],
- },
- {
- 'target_name': 'v8_nosnapshot',
- 'type': 'none',
- 'dependencies': [
- 'v8'
- ],
- },
- {
- 'target_name': 'v8_base',
- 'type': 'none',
- 'dependencies': [
- 'v8'
- ],
- },
- {
- 'target_name': 'js2c',
- 'type': 'none',
- 'dependencies': [
- 'v8'
- ],
- },
- {
- 'target_name': 'mksnapshot',
- 'type': 'none',
- 'dependencies': [
- 'v8'
- ],
- },
- {
- 'target_name': 'v8_shell',
- 'type': 'none',
- 'dependencies': [
- 'v8'
- ],
- },
- ],
-}