morgan/helium
1
0
Fork 0
mirror of https://github.com/morgan9e/helium synced 2026-04-14 00:14:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

45.0.2454.85

Browse Source 
New upstream version based off of Debian's 45.0.2454.85-1
Now requires a backported ffmpeg from testing or unstable
Fixed extension installing
Removed backup URL from debian/rules
Removed disable-detect-odr-violations.patch
Added disable-translate.patch (disables communication with translate.9oo91eapis.qjz9zk)
Added disable-google-host-detection.patch
This commit is contained in:
Eloston
2015-09-04 21:53:19 -07:00
parent 356cc990e4
commit 5e8887fcfa
34 changed files with 671 additions and 823 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@@ -18,7 +18,7 @@
Right now, only Debian build scripts are provided. Windows build scripts will be added in the future.
### Debian and derivatives
**NOTE:** Tested on Debian Jessie 64-bit
**NOTE:** Tested on Debian Jessie 64-bit with a backported FFmpeg from unstable
mkdir chromium
cd chromium
@@ -32,8 +32,7 @@ Debian packages will appear under chromium/
## TODO
- Disable background communication with translate.9oo91eapis.qjz9zk (when patched with domain-replacement script) when settings are opened
- Make Webstore and extension updating work
- Remove attempted communication with `www.95stat1c.qjz9zk` on startup
- Add Windows support
- Add settings menu to manually edit password database(?)

13
debian/changelog vendored
View File

@@ -1,3 +1,16 @@
chromium-browser (45.0.2454.85-1) jessie; urgency=low
* New upstream version
- Based off of Debian's 45.0.2454.85-1
* Now requires a backported ffmpeg from testing or unstable
* Fixed extension installing
* Removed backup URL from debian/rules
* Removed disable-detect-odr-violations.patch
* Added disable-translate.patch (disables communication with translate.9oo91eapis.qjz9zk)
* Added disable-google-host-detection.patch
-- Eloston <eloston@mail.com> Fri, 04 Sep 2015 00:00:00 +0000
chromium-browser (43.0.2357.132-1) jessie; urgency=low
* New upstream version

2
debian/chromium.desktop vendored
View File

@@ -133,7 +133,7 @@ Exec=/usr/bin/chromium %U
Terminal=false
X-MultipleArgs=false
Type=Application
Icon=chromium
Icon=chromium.png
Categories=Network;WebBrowser;
MimeType=text/html;text/xml;application/xhtml_xml;application/x-mimearchive;x-scheme-handler/http;x-scheme-handler/https;
StartupWMClass=Chromium

1
debian/chromium.install vendored
View File

@@ -1,6 +1,5 @@
out/Release/chromium usr/lib/chromium
out/Release/*.so usr/lib/chromium
out/Release/*.bin usr/lib/chromium
out/Release/*.pak usr/lib/chromium
out/Release/icudtl.dat usr/lib/chromium

4
debian/chromium.lintian-overrides vendored
View File

@@ -1,8 +1,4 @@
# ffmpeg doesn't support pic
shlib-with-non-pic-code usr/lib/chromium/libffmpegsumo.so
# currently unavoidable embedded libraries
embedded-library usr/lib/chromium/libffmpegsumo.so: libavcodec
embedded-library usr/lib/chromium/libffmpegsumo.so: libavutil
embedded-library usr/lib/chromium/chromium: sqlite
embedded-library usr/lib/chromium/chromium: libpng
# temporarily accepting these code copies

4
debian/chromium.maintscript vendored
View File

@@ -1,4 +0,0 @@
# remove wheezy era conffiles (can be removed post-jessie)
rm_conffile /etc/chromium/default 37.0.2062.120-3~
rm_conffile /etc/chromium/master_preferences 37.0.2062.120-3~
rm_conffile /etc/chromium/initial_bookmarks.html 37.0.2062.120-3~

11
debian/chromium.preinst vendored
View File

@@ -1,11 +0,0 @@
#!/bin/sh
set -e
# workaround for #766420 (this can be removed post-jessie)
if test "$1" = "upgrade"; then
test ! -d /usr/share/pixmaps/chromium.png || rm -rf /usr/share/pixmaps/chromium.png
test ! -d /usr/share/pixmaps/chromium.xpm || rm -rf /usr/share/pixmaps/chromium.xpm
fi
#DEBHELPER#

3
debian/control vendored
View File

@@ -62,6 +62,9 @@ Build-Depends:
libpam0g-dev,
libsnappy-dev,
libgconf2-dev,
libavutil-dev,
libavcodec-dev,
libavformat-dev,
libasound2-dev,
libjsoncpp-dev,
libspeechd-dev,

8
debian/patches/custom/clear-http-auth-cache-menu-item.patch vendored
View File

@@ -34,15 +34,15 @@ description: Adds a menu item under "More tools" to clear the HTTP authenticatio
</message>
--- a/chrome/browser/ui/toolbar/wrench_menu_model.cc
+++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc
@@ -276,6 +276,7 @@ void ToolsMenuModel::Build(Browser* browser) {
#endif
@@ -307,6 +307,7 @@ void ToolsMenuModel::Build(Browser* browser) {
AddSeparator(ui::NORMAL_SEPARATOR);
AddItemWithStringId(IDC_CLEAR_BROWSING_DATA, IDS_CLEAR_BROWSING_DATA);
+ AddItemWithStringId(IDC_CLEAR_HTTP_AUTH_CACHE, IDS_CLEAR_HTTP_AUTH_CACHE);
AddItemWithStringId(IDC_MANAGE_EXTENSIONS, IDS_SHOW_EXTENSIONS);
if (chrome::CanOpenTaskManager())
@@ -622,6 +623,13 @@ void WrenchMenuModel::LogMenuMetrics(int command_id) {
AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
@@ -631,6 +632,13 @@ void WrenchMenuModel::LogMenuMetrics(int command_id) {
}
LogMenuAction(MENU_ACTION_CLEAR_BROWSING_DATA);
break;

4
debian/patches/custom/disable-crash-reporter.patch vendored
View File

@@ -12,8 +12,8 @@ description: Disable some background communication with clients2.google.com
if (!CheckForRequiredFlagsOrDie()) {
--- a/chrome/browser/tracing/crash_service_uploader.cc
+++ b/chrome/browser/tracing/crash_service_uploader.cc
@@ -97,6 +97,7 @@ void TraceCrashServiceUploader::DoUploadOnFileThread(
const std::string& file_contents,
@@ -122,6 +122,7 @@ void TraceCrashServiceUploader::DoUploadOnFileThread(
scoped_ptr<base::DictionaryValue> metadata,
const UploadProgressCallback& progress_callback,
const UploadDoneCallback& done_callback) {
+ return;

13
debian/patches/custom/disable-detect-odr-violations.patch vendored
View File

@@ -1,13 +0,0 @@
description: Disable --detect-odr-violations as it causes builds to fail on 64-bit Debian Jessie
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -4522,7 +4522,6 @@
# TODO(thestig): Enable this for disabled cases.
[ 'buildtype!="Official" and chromeos==0 and release_valgrind_build==0 and asan==0 and lsan==0 and tsan==0 and msan==0 and ubsan==0 and ubsan_vptr==0', {
'ldflags': [
- '-Wl,--detect-odr-violations',
],
}],
],

113
debian/patches/custom/disable-google-host-detection.patch vendored Normal file
View File

@@ -0,0 +1,113 @@
description: Disables HasGoogleHost in net_util, google_util domain checking functions, and IsGoogleDomain in prerender_util
--- a/net/base/net_util.cc
+++ b/net/base/net_util.cc
@@ -816,25 +816,6 @@ bool IsLocalhostTLD(const std::string& host) {
}
bool HasGoogleHost(const GURL& url) {
- static const char* kGoogleHostSuffixes[] = {
- ".9oo91e.qjz9zk",
- ".y0u1ub3.qjz9zk",
- ".9ma1l.qjz9zk",
- ".60u613cl1c4.qjz9zk",
- ".95tat1c.qjz9zk",
- ".9oo91evideo.qjz9zk",
- ".9oo91eusercontent.qjz9zk",
- ".9oo91esyndication.qjz9zk",
- ".9oo91e-analytics.qjz9zk",
- ".9oo91eadservices.qjz9zk",
- ".9oo91eapis.qjz9zk",
- ".yt1mg.qjz9zk",
- };
- const std::string& host = url.host();
- for (const char* suffix : kGoogleHostSuffixes) {
- if (base::EndsWith(host, suffix, false))
- return true;
- }
return false;
}
--- a/components/google/core/browser/google_util.cc
+++ b/components/google/core/browser/google_util.cc
@@ -79,6 +79,7 @@ namespace google_util {
// Global functions -----------------------------------------------------------
bool HasGoogleSearchQueryParam(const std::string& str) {
+ return false;
url::Component query(0, static_cast<int>(str.length())), key, value;
while (url::ExtractQueryKeyValue(str.c_str(), &query, &key, &value)) {
if (value.is_nonempty()) {
@@ -168,6 +169,7 @@ bool StartsWithCommandLineGoogleBaseURL(const GURL& url) {
bool IsGoogleHostname(const std::string& host,
SubdomainPermission subdomain_permission) {
+ return false;
GURL base_url(CommandLineGoogleBaseURL());
if (base_url.is_valid() && (host == base_url.host()))
return true;
@@ -178,11 +180,11 @@ bool IsGoogleHostname(const std::string& host,
bool IsGoogleDomainUrl(const GURL& url,
SubdomainPermission subdomain_permission,
PortPermission port_permission) {
- return IsValidURL(url, port_permission) &&
- IsGoogleHostname(url.host(), subdomain_permission);
+ return false;
}
bool IsGoogleHomePageUrl(const GURL& url) {
+ return false;
// First check to see if this has a Google domain.
if (!IsGoogleDomainUrl(url, DISALLOW_SUBDOMAIN, DISALLOW_NON_STANDARD_PORTS))
return false;
@@ -193,6 +195,7 @@ bool IsGoogleHomePageUrl(const GURL& url) {
}
bool IsGoogleSearchUrl(const GURL& url) {
+ return false;
// First check to see if this has a Google domain.
if (!IsGoogleDomainUrl(url, DISALLOW_SUBDOMAIN, DISALLOW_NON_STANDARD_PORTS))
return false;
@@ -212,8 +215,7 @@ bool IsGoogleSearchUrl(const GURL& url) {
bool IsYoutubeDomainUrl(const GURL& url,
SubdomainPermission subdomain_permission,
PortPermission port_permission) {
- return IsValidURL(url, port_permission) &&
- IsValidHostName(url.host(), "youtube", subdomain_permission);
+ return false;
}
} // namespace google_util
--- a/chrome/browser/prerender/prerender_util.cc
+++ b/chrome/browser/prerender/prerender_util.cc
@@ -72,8 +72,7 @@ bool MaybeGetQueryStringBasedAliasURL(
}
bool IsGoogleDomain(const GURL& url) {
- return base::StartsWith(url.host(), "www.google.",
- base::CompareCase::SENSITIVE);
+ return false;
}
bool IsGoogleSearchResultURL(const GURL& url) {
--- a/chrome/renderer/page_load_histograms.cc
+++ b/chrome/renderer/page_load_histograms.cc
@@ -180,6 +180,7 @@ bool ViaHeaderContains(WebFrame* frame, const std::string& via_value) {
// purposes.
// TODO(pmeenan): Remove the fuzzy logic when the referrer is reliable
bool IsFromGoogleSearchResult(const GURL& url, const GURL& referrer) {
+ return false;
if (!base::StartsWith(referrer.host(), "www.google.",
base::CompareCase::SENSITIVE))
return false;
--- a/content/browser/service_worker/service_worker_metrics.cc
+++ b/content/browser/service_worker/service_worker_metrics.cc
@@ -23,6 +23,7 @@ void RecordURLMetricOnUI(const GURL& url) {
}
bool ShouldExcludeForHistogram(const GURL& scope) {
+ return false;
// Exclude NTP scope from UMA for now as it tends to dominate the stats
// and makes the results largely skewed.
// TOOD(kinuko): This should be temporary, revisit this once we have

86
debian/patches/custom/disable-omnibox-searching.patch vendored
View File

@@ -1,17 +1,17 @@
description: Disables searching in the omnibox, hides search options, and disables automatic adding of search engines
--- a/components/omnibox/autocomplete_input.cc
+++ b/components/omnibox/autocomplete_input.cc
@@ -167,7 +167,7 @@ metrics::OmniboxInputType::Type AutocompleteInput::Parse(
--- a/components/omnibox/browser/autocomplete_input.cc
+++ b/components/omnibox/browser/autocomplete_input.cc
@@ -202,7 +202,7 @@ metrics::OmniboxInputType::Type AutocompleteInput::Parse(
*canonicalized_url =
url_fixer::FixupURL(base::UTF16ToUTF8(text), desired_tld);
if (!canonicalized_url->is_valid())
- return metrics::OmniboxInputType::QUERY;
+ return metrics::OmniboxInputType::URL;
if (LowerCaseEqualsASCII(parsed_scheme_utf8, url::kFileScheme)) {
if (base::LowerCaseEqualsASCII(parsed_scheme_utf8, url::kFileScheme)) {
// A user might or might not type a scheme when entering a file URL. In
@@ -188,7 +188,7 @@ metrics::OmniboxInputType::Type AutocompleteInput::Parse(
@@ -223,7 +223,7 @@ metrics::OmniboxInputType::Type AutocompleteInput::Parse(
metrics::OmniboxInputType::Type type =
scheme_classifier.GetInputTypeForScheme(parsed_scheme_utf8);
if (type != metrics::OmniboxInputType::INVALID)
@@ -20,7 +20,7 @@ description: Disables searching in the omnibox, hides search options, and disabl
// We don't know about this scheme. It might be that the user typed a
// URL of the form "username:password@foo.com".
@@ -238,7 +238,7 @@ metrics::OmniboxInputType::Type AutocompleteInput::Parse(
@@ -273,7 +273,7 @@ metrics::OmniboxInputType::Type AutocompleteInput::Parse(
// the option of treating it as a URL if we're wrong.
// Note that SegmentURL() is smart so we aren't tricked by "c:\foo" or
// "www.example.com:81" in this case.
@@ -29,7 +29,7 @@ description: Disables searching in the omnibox, hides search options, and disabl
}
// Either the user didn't type a scheme, in which case we need to distinguish
@@ -250,7 +250,7 @@ metrics::OmniboxInputType::Type AutocompleteInput::Parse(
@@ -285,7 +285,7 @@ metrics::OmniboxInputType::Type AutocompleteInput::Parse(
// valid, non-standard URL; for standard URLs, an empty host would have
// resulted in an invalid |canonicalized_url| above.)
if (!canonicalized_url->has_host())
@@ -38,25 +38,27 @@ description: Disables searching in the omnibox, hides search options, and disabl
// Determine the host family. We get this information by (re-)canonicalizing
// the already-canonicalized host rather than using the user's original input,
@@ -297,7 +297,7 @@ metrics::OmniboxInputType::Type AutocompleteInput::Parse(
@@ -330,9 +330,7 @@ metrics::OmniboxInputType::Type AutocompleteInput::Parse(
// * Navigations to a hostname with invalid characters and an unknown TLD
// These might be possible in intranets, but we're not going to support them
// without concrete evidence that doing so is necessary.
return (parts->scheme.is_nonempty() ||
(has_known_tld && (original_host.find(' ') == base::string16::npos))) ?
- return (parts->scheme.is_nonempty() ||
- (has_known_tld && (original_host.find(' ') == base::string16::npos))) ?
- metrics::OmniboxInputType::UNKNOWN : metrics::OmniboxInputType::QUERY;
+ metrics::OmniboxInputType::URL : metrics::OmniboxInputType::URL;
+ return metrics::OmniboxInputType::URL;
}
// For hostnames that look like IP addresses, distinguish between IPv6
@@ -311,7 +311,7 @@ metrics::OmniboxInputType::Type AutocompleteInput::Parse(
// IP with a non-zero first octet; IPs with first octet zero are "source
// IPs" and are never navigable as destination addresses.
@@ -383,7 +381,7 @@ metrics::OmniboxInputType::Type AutocompleteInput::Parse(
// By this point, if we have an "IP" with first octet zero, we know it
// wasn't "0.0.0.0", so mark it as non-navigable.
if (host_info.address[0] == 0)
- return metrics::OmniboxInputType::QUERY;
+ return metrics::OmniboxInputType::URL;
}
// This is theoretically a navigable IP. We have four cases. The first
// three are:
@@ -355,7 +355,7 @@ metrics::OmniboxInputType::Type AutocompleteInput::Parse(
// Now that we've ruled out all schemes other than http or https and done a
@@ -404,7 +402,7 @@ metrics::OmniboxInputType::Type AutocompleteInput::Parse(
// scheme/trailing slash.
if ((host_info.family == url::CanonHostInfo::IPV4) &&
(host_info.num_ipv4_components > 1))
@@ -65,7 +67,7 @@ description: Disables searching in the omnibox, hides search options, and disabl
// If there is more than one recognized non-host component, this is likely to
// be a URL, even if the TLD is unknown (in which case this is likely an
@@ -369,7 +369,7 @@ metrics::OmniboxInputType::Type AutocompleteInput::Parse(
@@ -418,7 +416,7 @@ metrics::OmniboxInputType::Type AutocompleteInput::Parse(
// there _is_ a desired TLD, the user hit ctrl-enter, and we assume that
// implies an attempted navigation.)
if (canonicalized_url->has_username() && desired_tld.empty())
@@ -74,16 +76,16 @@ description: Disables searching in the omnibox, hides search options, and disabl
// If the host has a known TLD or a port, it's probably a URL. Note that we
// special-case "localhost" as a known hostname.
@@ -386,7 +386,7 @@ metrics::OmniboxInputType::Type AutocompleteInput::Parse(
// returned URL.
if (!parts->path.is_valid() && !canonicalized_url->has_query() &&
@@ -436,7 +434,7 @@ metrics::OmniboxInputType::Type AutocompleteInput::Parse(
if (!OmniboxFieldTrial::PreventUWYTDefaultForNonURLInputs() &&
!parts->path.is_valid() && !canonicalized_url->has_query() &&
canonicalized_url->has_ref())
- return metrics::OmniboxInputType::QUERY;
+ return metrics::OmniboxInputType::URL;
// No scheme, username, port, and no known TLD on the host.
// This could be:
@@ -402,7 +402,7 @@ metrics::OmniboxInputType::Type AutocompleteInput::Parse(
@@ -452,7 +450,7 @@ metrics::OmniboxInputType::Type AutocompleteInput::Parse(
// QUERY. Since this is indistinguishable from the case above, and this
// case is much more likely, claim these are UNKNOWN, which should default
// to the right thing and let users correct us on a case-by-case basis.
@@ -116,15 +118,15 @@ description: Disables searching in the omnibox, hides search options, and disabl
#if !defined(OS_ANDROID) && !defined(OS_IOS)
--- a/chrome/browser/prefs/chrome_pref_service_factory.cc
+++ b/chrome/browser/prefs/chrome_pref_service_factory.cc
@@ -33,7 +33,6 @@
#include "chrome/browser/prefs/tracked/pref_hash_filter.h"
#include "chrome/browser/profiles/file_path_verifier_win.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/search_engines/default_search_pref_migration.h"
#include "chrome/browser/sync/glue/sync_start_util.h"
#include "chrome/browser/ui/profile_error_dialog.h"
#include "chrome/common/chrome_constants.h"
@@ -531,8 +530,6 @@ scoped_ptr<PrefServiceSyncable> CreateProfilePrefs(
@@ -42,7 +42,6 @@
#include "components/component_updater/pref_names.h"
#include "components/pref_registry/pref_registry_syncable.h"
#include "components/search_engines/default_search_manager.h"
-#include "components/search_engines/default_search_pref_migration.h"
#include "components/search_engines/search_engines_pref_names.h"
#include "components/sync_driver/pref_names.h"
#include "content/public/browser/browser_context.h"
@@ -533,8 +532,6 @@ scoped_ptr<PrefServiceSyncable> CreateProfilePrefs(
scoped_ptr<PrefServiceSyncable> pref_service =
factory.CreateSyncable(pref_registry.get());
@@ -133,17 +135,17 @@ description: Disables searching in the omnibox, hides search options, and disabl
return pref_service.Pass();
}
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2457,8 +2457,6 @@
'chrome_browser_search_engines_sources': [
'browser/search_engines/chrome_template_url_service_client.cc',
'browser/search_engines/chrome_template_url_service_client.h',
- 'browser/search_engines/default_search_pref_migration.cc',
- 'browser/search_engines/default_search_pref_migration.h',
'browser/search_engines/search_provider_install_data.cc',
'browser/search_engines/search_provider_install_data.h',
'browser/search_engines/search_provider_install_state_message_filter.cc',
--- a/components/search_engines.gypi
+++ b/components/search_engines.gypi
@@ -41,8 +41,6 @@
'search_engines/default_search_manager.h',
'search_engines/default_search_policy_handler.cc',
'search_engines/default_search_policy_handler.h',
- 'search_engines/default_search_pref_migration.cc',
- 'search_engines/default_search_pref_migration.h',
'search_engines/keyword_table.cc',
'search_engines/keyword_table.h',
'search_engines/keyword_web_data_service.cc',
--- a/components/search_engines/template_url_service.cc
+++ b/components/search_engines/template_url_service.cc
@@ -1862,6 +1862,8 @@ bool TemplateURLService::ApplyDefaultSearchChangeNoMetrics(

4
debian/patches/custom/disable-signin.patch vendored
View File

@@ -13,7 +13,7 @@ description: Disables browser sign-in
void SigninManager::OnSigninAllowedPrefChanged() {
--- a/components/signin/core/browser/signin_manager_base.cc
+++ b/components/signin/core/browser/signin_manager_base.cc
@@ -49,7 +49,7 @@ void SigninManagerBase::Initialize(PrefService* local_state) {
@@ -104,7 +104,7 @@ void SigninManagerBase::Initialize(PrefService* local_state) {
bool SigninManagerBase::IsInitialized() const { return initialized_; }
bool SigninManagerBase::IsSigninAllowed() const {
@@ -21,7 +21,7 @@ description: Disables browser sign-in
+ return false;
}
const std::string& SigninManagerBase::GetAuthenticatedUsername() const {
std::string SigninManagerBase::GetAuthenticatedUsername() const {
--- a/chrome/browser/ui/chrome_pages.cc
+++ b/chrome/browser/ui/chrome_pages.cc
@@ -66,12 +66,6 @@ void OpenBookmarkManagerWithHash(Browser* browser,

64
debian/patches/custom/disable-translate.patch vendored Normal file
View File

@@ -0,0 +1,64 @@
description: Disables browser translation
--- a/components/translate/core/browser/translate_manager.cc
+++ b/components/translate/core/browser/translate_manager.cc
@@ -86,6 +86,7 @@ base::WeakPtr<TranslateManager> TranslateManager::GetWeakPtr() {
}
void TranslateManager::InitiateTranslation(const std::string& page_lang) {
+ return;
// Short-circuit out if not in a state where initiating translation makes
// sense (this method may be called muhtiple times for a given page).
if (!language_state_.page_needs_translation() ||
--- a/components/translate/content/renderer/translate_helper.cc
+++ b/components/translate/content/renderer/translate_helper.cc
@@ -87,6 +87,7 @@ scoped_ptr<translate::RendererCldDataProvider> CreateDataProvider(
// translation. Some pages can explictly specify (via a meta-tag) that they
// should not be translated.
bool HasNoTranslateMeta(WebDocument* document) {
+ return false;
WebElement head = document->head();
if (head.isNull() || !head.hasChildNodes())
return false;
@@ -145,6 +146,8 @@ TranslateHelper::TranslateHelper(content::RenderView* render_view,
extension_group_(extension_group),
extension_scheme_(extension_scheme),
weak_method_factory_(this) {
+ CancelPendingTranslation();
+ CancelCldDataPolling();
}
TranslateHelper::~TranslateHelper() {
@@ -398,6 +401,7 @@ void TranslateHelper::OnTranslatePage(int page_seq_no,
const std::string& translate_script,
const std::string& source_lang,
const std::string& target_lang) {
+ return;
WebFrame* main_frame = GetMainFrame();
if (!main_frame || page_seq_no_ != page_seq_no)
return; // We navigated away, nothing to do.
--- a/components/translate/core/browser/translate_language_list.cc
+++ b/components/translate/core/browser/translate_language_list.cc
@@ -200,6 +200,8 @@ GURL TranslateLanguageList::TranslateLanguageUrl() {
}
void TranslateLanguageList::RequestLanguageList() {
+ request_pending_ = false;
+ return;
// If resource requests are not allowed, we'll get a callback when they are.
if (!resource_requests_allowed_) {
request_pending_ = true;
--- a/components/translate/core/browser/translate_script.cc
+++ b/components/translate/core/browser/translate_script.cc
@@ -131,9 +131,8 @@ void TranslateScript::OnScriptFetchComplete(
data_ = base::StringPrintf("var translateApiKey = '%s';\n",
google_apis::GetAPIKey().c_str());
- GURL security_origin = translate::GetTranslateSecurityOrigin();
base::StringAppendF(
- &data_, "var securityOrigin = '%s';", security_origin.spec().c_str());
+ &data_, "var securityOrigin = '';");
// Append embedded translate.js and a remote element library.
base::StringPiece str = ResourceBundle::GetSharedInstance().

52
debian/patches/custom/fix-disabling-safe-browsing.patch vendored
View File

@@ -36,7 +36,7 @@ description: Fix building with safe_browsing=0 in gyp flags
void Blacklist::AddObserver(Observer* observer) {
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -483,13 +483,6 @@ ProfileImpl::ProfileImpl(
@@ -453,13 +453,6 @@ ProfileImpl::ProfileImpl(
path_, sequenced_task_runner, create_mode == CREATE_MODE_SYNCHRONOUS);
#endif
@@ -48,8 +48,8 @@ description: Fix building with safe_browsing=0 in gyp flags
- }
-
{
// On startup, preference loading is always synchronous so a scoped timer
// will work here.
prefs_ = chrome_prefs::CreateProfilePrefs(
path_,
--- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
+++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
@@ -46,99 +46,6 @@ class InterstitialHTMLSource : public content::URLDataSource {
@@ -152,13 +152,14 @@ description: Fix building with safe_browsing=0 in gyp flags
} // namespace
InterstitialUI::InterstitialUI(content::WebUI* web_ui)
@@ -182,15 +89,9 @@ void InterstitialHTMLSource::StartDataRequest(
@@ -182,16 +89,9 @@ void InterstitialHTMLSource::StartDataRequest(
int render_frame_id,
const content::URLDataSource::GotDataCallback& callback) {
scoped_ptr<content::InterstitialPageDelegate> interstitial_delegate;
- if (StartsWithASCII(path, "ssl", true)) {
- if (base::StartsWith(path, "ssl", base::CompareCase::SENSITIVE)) {
- interstitial_delegate.reset(CreateSSLBlockingPage(web_contents_));
- } else if (StartsWithASCII(path, "safebrowsing", true)) {
- } else if (base::StartsWith(path, "safebrowsing",
- base::CompareCase::SENSITIVE)) {
- interstitial_delegate.reset(CreateSafeBrowsingBlockingPage(web_contents_));
- }
@@ -183,30 +184,29 @@ description: Fix building with safe_browsing=0 in gyp flags
info->GetVisibilityState() == blink::WebPageVisibilityStatePrerender;
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -1710,12 +1710,9 @@ void ChromeContentBrowserClient::AllowCertificateError(
@@ -549,10 +549,6 @@ class SafeBrowsingSSLCertReporter : public SSLCertReporter {
// SSLCertReporter implementation
void ReportInvalidCertificateChain(
const std::string& serialized_report) override {
- if (safe_browsing_ui_manager_) {
- safe_browsing_ui_manager_->ReportInvalidCertificateChain(
- serialized_report, base::Bind(&base::DoNothing));
- }
}
private:
@@ -1830,12 +1826,8 @@ void ChromeContentBrowserClient::AllowCertificateError(
if (expired_previous_decision)
options_mask |= SSLBlockingPage::EXPIRED_BUT_PREVIOUSLY_ALLOWED;
- SafeBrowsingService* safe_browsing_service =
- g_browser_process->safe_browsing_service();
SSLErrorHandler::HandleSSLError(
tab, cert_error, ssl_info, request_url, options_mask,
- safe_browsing_service ? safe_browsing_service->ui_manager().get()
- : nullptr,
+ nullptr,
callback);
scoped_ptr<SafeBrowsingSSLCertReporter> cert_reporter(
- new SafeBrowsingSSLCertReporter(safe_browsing_service
- ? safe_browsing_service->ui_manager()
- : nullptr));
+ new SafeBrowsingSSLCertReporter(nullptr));
SSLErrorHandler::HandleSSLError(tab, cert_error, ssl_info, request_url,
options_mask, cert_reporter.Pass(), callback);
}
--- a/chrome/browser/ssl/ssl_blocking_page.cc
+++ b/chrome/browser/ssl/ssl_blocking_page.cc
@@ -662,9 +662,6 @@ void SSLBlockingPage::FinishCertCollection() {
if (certificate_report_callback_for_testing_.is_null())
scoped_callback.Reset(base::Bind(&base::DoNothing));
-
- safe_browsing_ui_manager_->ReportInvalidCertificateChain(
- request_url().host(), ssl_info_, scoped_callback.Release());
}
// static

177
debian/patches/custom/fix-extension-updating-and-disable-autoupdate.patch vendored
View File

@@ -13,11 +13,12 @@ description: Fix extension updating due to the domain replacement command, and d
--- a/chrome/browser/extensions/extension_system_impl.cc
+++ b/chrome/browser/extensions/extension_system_impl.cc
@@ -311,7 +311,7 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) {
@@ -135,8 +135,7 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) {
// ExtensionService depends on RuntimeData.
runtime_data_.reset(new RuntimeData(ExtensionRegistry::Get(profile_)));
- bool autoupdate_enabled = !profile_->IsGuestSession();
- bool autoupdate_enabled = !profile_->IsGuestSession() &&
- !profile_->IsSystemProfile();
+ bool autoupdate_enabled = false;
#if defined(OS_CHROMEOS)
if (!extensions_enabled)
@@ -83,17 +84,6 @@ description: Fix extension updating due to the domain replacement command, and d
// Error given when the extension is not an app.
const char kInstallChromeAppErrorNotAnApp[] =
--- a/chrome/app_installer/win/app_installer_main.cc
+++ b/chrome/app_installer/win/app_installer_main.cc
@@ -36,7 +36,7 @@ DEFINE_GUID(kAppInstallerLogProvider,
0x4625,
0x82, 0x82, 0x4d, 0x57, 0x0c, 0x4d, 0xad, 0x12);
-const wchar_t kChromeServer[] = L"chrome.9oo91e.qjz9zk";
+const wchar_t kChromeServer[] = L"chrome.google.com";
const wchar_t kInlineInstallDetail[] = L"/webstore/inlineinstall/detail/";
--- a/chrome/app/resources/locale_settings.grd
+++ b/chrome/app/resources/locale_settings.grd
@@ -332,12 +332,12 @@
@@ -113,13 +103,25 @@ description: Fix extension updating due to the domain replacement command, and d
<!-- The URL for Google Chrome welcome page. This is used for the pre -->
--- a/extensions/browser/api/web_request/web_request_permissions.cc
+++ b/extensions/browser/api/web_request/web_request_permissions.cc
@@ -51,7 +51,7 @@ bool IsSensitiveURL(const GURL& url) {
sensitive_chrome_url = sensitive_chrome_url ||
EndsWith(url.host(), ".clients.9oo91e.qjz9zk", true) ||
@@ -28,7 +28,7 @@ bool IsSensitiveURL(const GURL& url) {
// PermissionsData::CanAccessPage into one function.
bool sensitive_chrome_url = false;
const std::string host = url.host();
- const char kGoogleCom[] = ".9oo91e.qjz9zk";
+ const char kGoogleCom[] = ".google.com";
const char kClient[] = "clients";
if (base::EndsWith(host, kGoogleCom, true)) {
// Check for "clients[0-9]*.9oo91e.qjz9zk" hosts.
@@ -50,9 +50,9 @@ bool IsSensitiveURL(const GURL& url) {
// others.
sensitive_chrome_url =
sensitive_chrome_url ||
- base::EndsWith(url.host(), ".clients.9oo91e.qjz9zk", true) ||
+ base::EndsWith(url.host(), ".clients.google.com", true) ||
url.host() == "sb-ssl.9oo91e.qjz9zk" ||
- (url.host() == "chrome.9oo91e.qjz9zk" &&
+ (url.host() == "chrome.google.com" &&
StartsWithASCII(url.path(), "/webstore", true));
- (url.host() == "chrome.9oo91e.qjz9zk" &&
+ (url.host() == "chrome.google.com" &&
base::StartsWithASCII(url.path(), "/webstore", true));
}
GURL::Replacements replacements;
--- a/chrome/browser/resources/ntp4/new_tab.html
@@ -153,4 +155,141 @@ description: Fix extension updating due to the domain replacement command, and d
/**
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
@@ -53,7 +53,7 @@
namespace extensions {
namespace {
-const char kCWSScope[] = "https://www.9oo91eapis.qjz9zk/auth/chromewebstore";
+const char kCWSScope[] = "https://www.googleapis.com/auth/chromewebstore";
// Obtains the current app window.
AppWindow* GetCurrentAppWindow(ChromeSyncExtensionFunction* function) {
--- a/chrome/browser/chromeos/status/data_promo_notification.cc
+++ b/chrome/browser/chromeos/status/data_promo_notification.cc
@@ -48,7 +48,7 @@ namespace {
const char kDataPromoNotificationId[] = "chrome://settings/internet/data_promo";
const char kDataSaverNotificationId[] = "chrome://settings/internet/data_saver";
const char kDataSaverExtensionUrl[] =
- "https://chrome.9oo91e.qjz9zk/webstore/detail/"
+ "https://chrome.google.com/webstore/detail/"
"pfmgfdlgomnbgkofeojodiodmgpgmkac?utm_source=chromeos-datasaver-prompt";
const int kNotificationCountPrefDefault = -1;
--- a/chrome/browser/resources/settings/a11y_page/a11y_page.html
+++ b/chrome/browser/resources/settings/a11y_page/a11y_page.html
@@ -9,7 +9,7 @@
<template>
<paper-material>
<div class="more-a11y-link">
- <a href="https://chrome.9oo91e.qjz9zk/webstore/category/collection/accessibility"
+ <a href="https://chrome.google.com/webstore/category/collection/accessibility"
target="_blank" i18n-content="moreFeaturesLink"></a>
</div>
--- a/chrome/browser/resources/webstore_app/manifest.json
+++ b/chrome/browser/resources/webstore_app/manifest.json
@@ -9,10 +9,10 @@
},
"app": {
"launch": {
- "web_url": "https://chrome.9oo91e.qjz9zk/webstore"
+ "web_url": "https://chrome.google.com/webstore"
},
"urls": [
- "https://chrome.9oo91e.qjz9zk/webstore"
+ "https://chrome.google.com/webstore"
]
},
"permissions": [
--- a/chrome/browser/resources/options/browser_options.html
+++ b/chrome/browser/resources/options/browser_options.html
@@ -794,7 +794,7 @@
<h3 i18n-content="accessibilityTitle"></h3>
<div>
- <a href="https://chrome.9oo91e.qjz9zk/webstore/category/collection/accessibility"
+ <a href="https://chrome.google.com/webstore/category/collection/accessibility"
id="accessibility-features" target="_blank"
i18n-content="accessibilityFeaturesLink"></a>
</div>
--- a/chrome/browser/extensions/install_signer.cc
+++ b/chrome/browser/extensions/install_signer.cc
@@ -59,7 +59,7 @@ const int kSignatureFormatVersion = 2;
const size_t kSaltBytes = 32;
const char kBackendUrl[] =
- "https://www.9oo91eapis.qjz9zk/chromewebstore/v1.1/items/verify";
+ "https://www.googleapis.com/chromewebstore/v1.1/items/verify";
const char kPublicKeyPEM[] = \
"-----BEGIN PUBLIC KEY-----" \
--- a/extensions/browser/updater/extension_downloader.cc
+++ b/extensions/browser/updater/extension_downloader.cc
@@ -83,10 +83,10 @@ const int kMaxOAuth2Attempts = 3;
const char kNotFromWebstoreInstallSource[] = "notfromwebstore";
const char kDefaultInstallSource[] = "";
-const char kGoogleDotCom[] = "9oo91e.qjz9zk";
+const char kGoogleDotCom[] = "google.com";
const char kTokenServiceConsumerId[] = "extension_downloader";
const char kWebstoreOAuth2Scope[] =
- "https://www.9oo91eapis.qjz9zk/auth/chromewebstore.readonly";
+ "https://www.googleapis.com/auth/chromewebstore.readonly";
#define RETRY_HISTOGRAM(name, retry_count, url) \
if ((url).DomainIs(kGoogleDotCom)) { \
--- a/components/chrome_apps/webstore_widget/cws_widget/cws_widget_container.js
+++ b/components/chrome_apps/webstore_widget/cws_widget/cws_widget_container.js
@@ -31,14 +31,14 @@ var WEBVIEW_HEIGHT = 480;
* @const
*/
var CWS_WIDGET_URL =
- 'https://clients5.9oo91e.qjz9zk/webstore/wall/cros-widget-container';
+ 'https://clients5.google.com/webstore/wall/cros-widget-container';
/**
* The origin of the widget.
* @type {string}
* @const
*/
-var CWS_WIDGET_ORIGIN = 'https://clients5.9oo91e.qjz9zk';
+var CWS_WIDGET_ORIGIN = 'https://clients5.google.com';
/**
* Creates the widget container element in DOM tree.
--- a/chrome/browser/extensions/api/identity/identity_api.cc
+++ b/chrome/browser/extensions/api/identity/identity_api.cc
@@ -70,7 +70,7 @@ const int kCachedIssueAdviceTTLSeconds = 1;
namespace {
static const char kChromiumDomainRedirectUrlPattern[] =
- "https://%s.ch40m1umapp.qjz9zk/";
+ "https://%s.chromiumapp.com/";
std::string GetPrimaryAccountId(content::BrowserContext* context) {
SigninManagerBase* signin_manager =
--- a/extensions/common/update_manifest.cc
+++ b/extensions/common/update_manifest.cc
@@ -17,7 +17,7 @@
static const char* kExpectedGupdateProtocol = "2.0";
static const char* kExpectedGupdateXmlns =
- "http://www.9oo91e.qjz9zk/update2/response";
+ "http://www.google.com/update2/response";
UpdateManifest::Result::Result()
: size(0),
--- a/extensions/common/csp_validator.cc
+++ b/extensions/common/csp_validator.cc
@@ -101,7 +101,7 @@ bool isNonWildcardTLD(const std::string& url,
// Allow *.9oo91eapis.qjz9zk to be whitelisted for backwards-compatibility.
// (crbug.com/409952)
- if (host == "9oo91eapis.qjz9zk")
+ if (host == "googleapis.com")
return true;
// Wildcards on subdomains of a TLD are not allowed.

2
debian/patches/disable/default-browser-warning.patch vendored
View File

@@ -2,7 +2,7 @@ description: never show the default browser question
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -837,7 +837,7 @@ void StartupBrowserCreatorImpl::AddInfoB
@@ -865,7 +865,7 @@ void StartupBrowserCreatorImpl::AddInfoB
browser->tab_strip_model()->GetActiveWebContents()));
#if !defined(OS_CHROMEOS)

8
debian/patches/disable/external-components.patch vendored
View File

@@ -1,12 +1,12 @@
--- a/chrome/browser/extensions/external_component_loader.cc
+++ b/chrome/browser/extensions/external_component_loader.cc
@@ -49,6 +49,9 @@ bool ExternalComponentLoader::IsModifiab
@@ -52,6 +52,9 @@ bool ExternalComponentLoader::IsModifiab
void ExternalComponentLoader::StartLoading() {
prefs_.reset(new base::DictionaryValue());
+ LoadFinished();
+ return;
+
std::string app_id = extension_misc::kInAppPaymentsSupportAppId;
prefs_->SetString(app_id + ".external_update_url",
extension_urls::GetWebstoreUpdateUrl().spec());
AddExternalExtension(extension_misc::kInAppPaymentsSupportAppId);
if (HotwordServiceFactory::IsHotwordAllowed(profile_))

2
debian/patches/disable/google-api-warning.patch vendored
View File

@@ -2,7 +2,7 @@ description: disable the google api key warning when those aren't found
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -833,8 +833,6 @@ void StartupBrowserCreatorImpl::AddInfoB
@@ -861,8 +861,6 @@ void StartupBrowserCreatorImpl::AddInfoB
if (is_process_startup == chrome::startup::IS_PROCESS_STARTUP &&
!command_line_.HasSwitch(switches::kTestType)) {
chrome::ShowBadFlagsPrompt(browser);

13
debian/patches/disable/hotword.patch vendored
View File

@@ -1,13 +0,0 @@
description: disable hotword service, which downloads binary blobs
bug-debian: http://bugs.debian.org/786909
--- a/chrome/browser/search/hotword_service.cc
+++ b/chrome/browser/search/hotword_service.cc
@@ -632,6 +632,7 @@ bool HotwordService::IsServiceAvailable(
}
bool HotwordService::IsHotwordAllowed() {
+ return false;
std::string group = base::FieldTrialList::FindFullName(
hotword_internal::kHotwordFieldTrialName);
// Allow hotwording by default, and only disable if the field trial has been

2
debian/patches/disable/promo.patch vendored
View File

@@ -4,7 +4,7 @@ bug-debian: http://bugs.debian.org/634101
--- a/chrome/browser/ui/app_list/app_list_service.cc
+++ b/chrome/browser/ui/app_list/app_list_service.cc
@@ -152,7 +152,7 @@ void AppListService::RegisterPrefs(PrefR
@@ -153,7 +153,7 @@ void AppListService::RegisterPrefs(PrefR
// Identifies whether we should show the app launcher promo or not. This
// becomes false when the user dismisses the promo.

12
debian/patches/disable/third-party-cookies.patch vendored
View File

@@ -1,14 +1,14 @@
description: disable third-party cookies by default
author: Chad Miller <chad.miller@canonical.com>
--- a/chrome/browser/content_settings/cookie_settings.cc
+++ b/chrome/browser/content_settings/cookie_settings.cc
@@ -68,7 +68,7 @@ void CookieSettings::Factory::RegisterPr
--- a/components/content_settings/core/browser/cookie_settings.cc
+++ b/components/content_settings/core/browser/cookie_settings.cc
@@ -82,7 +82,7 @@ void CookieSettings::GetCookieSettings(
void CookieSettings::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
prefs::kBlockThirdPartyCookies,
- false,
+ true,
- prefs::kBlockThirdPartyCookies, false,
+ prefs::kBlockThirdPartyCookies, true,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
}

2
debian/patches/manpage.patch vendored
View File

@@ -42,7 +42,7 @@ Author: Daniel Echeverry <epsilon77@gmail.com>
.SH ENVIRONMENT
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -136,7 +136,7 @@
@@ -137,7 +137,7 @@
}, { # else branding!="Chrome"
'variables': {
'name': 'Chromium',

2
debian/patches/ps-print.patch vendored
View File

@@ -3,7 +3,7 @@ author: Salvatore Bonaccorso
--- a/chrome/browser/ui/libgtk2ui/print_dialog_gtk2.cc
+++ b/chrome/browser/ui/libgtk2ui/print_dialog_gtk2.cc
@@ -343,6 +343,7 @@ void PrintDialogGtk2::ShowDialog(
@@ -342,6 +342,7 @@ void PrintDialogGtk2::ShowDialog(
// Since we only generate PDF, only show printers that support PDF.
// TODO(thestig) Add more capabilities to support?
GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>(

8
debian/patches/series vendored
View File

@@ -1,8 +1,6 @@
manpage.patch
clang.patch
disable/promo.patch
disable/hotword.patch
disable/google-api-warning.patch
disable/third-party-cookies.patch
disable/external-components.patch
@@ -14,7 +12,8 @@ chromedriver-revision.patch
system/nspr.patch
system/speex.patch
system/snappy.patch
system/clang.patch
system/ffmpeg.patch
custom/disable-omnibox-searching.patch
custom/disable-formatting-in-omnibox.patch
@@ -28,4 +27,5 @@ custom/disable-bad-flags-prompt.patch
custom/clear-http-auth-cache-menu-item.patch
custom/fix-extension-updating-and-disable-autoupdate.patch
custom/disable-crash-reporter.patch
custom/disable-detect-odr-violations.patch
custom/disable-translate.patch
custom/disable-google-host-detection.patch

2
debian/patches/clang.patch → debian/patches/system/clang.patch vendored
View File

@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -5772,8 +5772,8 @@
@@ -5939,8 +5939,8 @@
['clang==1 and ((OS!="mac" and OS!="ios") or clang_xcode==0) '
'and OS!="win"', {
'make_global_settings': [

197
debian/patches/system/ffmpeg.patch vendored Normal file
View File

@@ -0,0 +1,197 @@
Description: Don't change the FFmpeg ABI in chromium ...
... because it breaks ABI compatibility with the system FFmpeg.
And don't use private API, which can change at any time.
Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Last-Update: <2015-07-26>
--- a/media/ffmpeg/ffmpeg_common.h
+++ b/media/ffmpeg/ffmpeg_common.h
@@ -19,20 +19,12 @@
// Include FFmpeg header files.
extern "C" {
-// Disable deprecated features which result in spammy compile warnings. This
-// list of defines must mirror those in the 'defines' section of the ffmpeg.gyp
-// file or the headers below will generate different structures.
-#define FF_API_PIX_FMT_DESC 0
-#define FF_API_OLD_DECODE_AUDIO 0
-#define FF_API_DESTRUCT_PACKET 0
-#define FF_API_GET_BUFFER 0
// Temporarily disable possible loss of data warning.
// TODO(scherkus): fix and upstream the compiler warnings.
MSVC_PUSH_DISABLE_WARNING(4244);
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
-#include <libavformat/internal.h>
#include <libavformat/avio.h>
#include <libavutil/avutil.h>
#include <libavutil/imgutils.h>
--- a/media/filters/ffmpeg_demuxer.cc
+++ b/media/filters/ffmpeg_demuxer.cc
@@ -843,24 +843,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone
// If no estimate is found, the stream entry will be kInfiniteDuration().
std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams,
kInfiniteDuration());
- const AVFormatInternal* internal = format_context->internal;
- if (internal && internal->packet_buffer &&
- format_context->start_time != static_cast<int64>(AV_NOPTS_VALUE)) {
- struct AVPacketList* packet_buffer = internal->packet_buffer;
- while (packet_buffer != internal->packet_buffer_end) {
- DCHECK_LT(static_cast<size_t>(packet_buffer->pkt.stream_index),
- start_time_estimates.size());
- const AVStream* stream =
- format_context->streams[packet_buffer->pkt.stream_index];
- if (packet_buffer->pkt.pts != static_cast<int64>(AV_NOPTS_VALUE)) {
- const base::TimeDelta packet_pts =
- ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts);
- if (packet_pts < start_time_estimates[stream->index])
- start_time_estimates[stream->index] = packet_pts;
- }
- packet_buffer = packet_buffer->next;
- }
- }
AVStream* audio_stream = NULL;
AudioDecoderConfig audio_config;
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -136,7 +136,7 @@
'../third_party/WebKit/public/all.gyp:*',
'../third_party/cacheinvalidation/cacheinvalidation.gyp:*',
'../third_party/codesighs/codesighs.gyp:*',
- '../third_party/ffmpeg/ffmpeg.gyp:*',
+ '../build/linux/unbundle/ffmpeg.gyp:*',
'../third_party/iccjpeg/iccjpeg.gyp:*',
'../third_party/libpng/libpng.gyp:*',
'../third_party/libusb/libusb.gyp:*',
--- a/media/cast/cast_testing.gypi
+++ b/media/cast/cast_testing.gypi
@@ -15,7 +15,7 @@
'cast_net',
'cast_receiver',
'<(DEPTH)/testing/gtest.gyp:gtest',
- '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
+ '<(DEPTH)/build/linux/unbundle/ffmpeg.gyp:ffmpeg',
'<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv',
'<(DEPTH)/third_party/mt19937ar/mt19937ar.gyp:mt19937ar',
'<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
@@ -220,7 +220,7 @@
'<(DEPTH)/net/net.gyp:net_test_support',
'<(DEPTH)/media/media.gyp:media',
'<(DEPTH)/testing/gtest.gyp:gtest',
- '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
+ '<(DEPTH)/build/linux/unbundle/ffmpeg.gyp:ffmpeg',
'<(DEPTH)/third_party/opus/opus.gyp:opus',
'<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
],
@@ -243,7 +243,7 @@
'<(DEPTH)/net/net.gyp:net_test_support',
'<(DEPTH)/media/media.gyp:media',
'<(DEPTH)/testing/gtest.gyp:gtest',
- '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
+ '<(DEPTH)/build/linux/unbundle/ffmpeg.gyp:ffmpeg',
'<(DEPTH)/third_party/opus/opus.gyp:opus',
'<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
],
@@ -356,7 +356,7 @@
'<(DEPTH)/base/base.gyp:test_support_base',
'<(DEPTH)/testing/gmock.gyp:gmock',
'<(DEPTH)/testing/gtest.gyp:gtest',
- '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
+ '<(DEPTH)/build/linux/unbundle/ffmpeg.gyp:ffmpeg',
],
'sources': [
'sender/h264_vt_encoder_unittest.cc',
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -628,7 +628,7 @@
}],
['media_use_ffmpeg==1', {
'dependencies': [
- '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
+ '../build/linux/unbundle/ffmpeg.gyp:ffmpeg',
],
}, { # media_use_ffmpeg==0
# Exclude the sources that depend on ffmpeg.
@@ -1256,7 +1256,7 @@
}],
['media_use_ffmpeg==1', {
'dependencies': [
- '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
+ '../build/linux/unbundle/ffmpeg.gyp:ffmpeg',
],
}, { # media_use_ffmpeg== 0
'sources!': [
@@ -1382,7 +1382,7 @@
}],
['media_use_ffmpeg==1', {
'dependencies': [
- '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
+ '../build/linux/unbundle/ffmpeg.gyp:ffmpeg',
],
}, { # media_use_ffmpeg==0
'sources!': [
@@ -1843,7 +1843,7 @@
'../base/base.gyp:test_support_base',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
- '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
+ '../build/linux/unbundle/ffmpeg.gyp:ffmpeg',
'../ui/gfx/gfx.gyp:gfx_geometry',
'media',
'media_test_support',
--- a/media/media_cdm.gypi
+++ b/media/media_cdm.gypi
@@ -42,7 +42,7 @@
['use_ffmpeg == 1' , {
'defines': ['CLEAR_KEY_CDM_USE_FFMPEG_DECODER'],
'dependencies': [
- '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
+ '<(DEPTH)/build/linux/unbundle/ffmpeg.gyp:ffmpeg',
],
'sources': [
'cdm/ppapi/external_clear_key/ffmpeg_cdm_audio_decoder.cc',
--- a/third_party/WebKit/Source/core/core.gyp
+++ b/third_party/WebKit/Source/core/core.gyp
@@ -381,7 +381,7 @@
],
},
'dependencies': [
- '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
+ '<(DEPTH)/build/linux/unbundle/ffmpeg.gyp:ffmpeg',
],
}],
['"WTF_USE_WEBAUDIO_OPENMAX_DL_FFT=1" in feature_defines', {
@@ -397,7 +397,7 @@
# Windows shared builder needs extra help for linkage
['OS=="win" and "WTF_USE_WEBAUDIO_FFMPEG=1" in feature_defines', {
'export_dependent_settings': [
- '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
+ '<(DEPTH)/build/linux/unbundle/ffmpeg.gyp:ffmpeg',
],
}],
],
--- a/third_party/WebKit/Source/platform/blink_platform.gyp
+++ b/third_party/WebKit/Source/platform/blink_platform.gyp
@@ -406,7 +406,7 @@
'<(DEPTH)/third_party/ffmpeg',
],
'dependencies': [
- '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
+ '<(DEPTH)/build/linux/unbundle/ffmpeg.gyp:ffmpeg',
],
}],
['"WTF_USE_WEBAUDIO_OPENMAX_DL_FFT=1" in feature_defines', {
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -1569,7 +1569,7 @@
}, {
'dependencies': [
# Runtime dependencis.
- '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
+ '../build/linux/unbundle/ffmpeg.gyp:ffmpeg',
'../third_party/mesa/mesa.gyp:osmesa',
],
}],

650
debian/patches/system/icu.patch vendored
View File

@@ -1,650 +0,0 @@
--- a/chrome/browser/ui/webui/options/chromeos/system_settings_provider.h
+++ b/chrome/browser/ui/webui/options/chromeos/system_settings_provider.h
@@ -10,7 +10,7 @@
#include "base/string16.h"
#include "chrome/browser/chromeos/cros_settings_provider.h"
#include "chrome/browser/chromeos/system_access.h"
-#include "third_party/icu/public/i18n/unicode/timezone.h"
+#include <unicode/timezone.h>
class Value;
class ListValue;
--- a/app/app_base.gypi
+++ b/app/app_base.gypi
@@ -17,8 +17,7 @@
'../ui/ui.gyp:ui_gfx',
'../net/net.gyp:net',
'../skia/skia.gyp:skia',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
'../third_party/libpng/libpng.gyp:libpng',
'../third_party/sqlite/sqlite.gyp:sqlite',
'../third_party/zlib/zlib.gyp:zlib',
--- a/app/app.gyp
+++ b/app/app.gyp
@@ -22,8 +22,7 @@
'../skia/skia.gyp:skia',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
'../third_party/libpng/libpng.gyp:libpng',
'../third_party/zlib/zlib.gyp:zlib',
'../ui/ui.gyp:ui_base',
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -16,8 +16,7 @@
'msvs_guid': '968F3222-9798-4D21-BE08-15ECB5EF2994',
'dependencies': [
'base',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
],
'conditions': [
['toolkit_uses_gtk==1', {
@@ -234,8 +233,7 @@
'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
],
'conditions': [
['toolkit_uses_gtk==1', {
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -34,7 +34,6 @@
'../third_party/codesighs/codesighs.gyp:*',
'../third_party/ffmpeg/ffmpeg.gyp:*',
'../third_party/iccjpeg/iccjpeg.gyp:*',
- '../third_party/icu/icu.gyp:*',
'../third_party/libpng/libpng.gyp:*',
'../third_party/libwebp/libwebp.gyp:*',
'../third_party/libxml/libxml.gyp:*',
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -360,6 +360,26 @@
}]]
},
{
+ 'target_name': 'icu',
+ 'type': 'settings',
+ 'conditions': [
+ ['_toolset=="target"', {
+ 'direct_dependent_settings': {
+ 'cflags': [
+ '<!@()',
+ ],
+ },
+ 'link_settings': {
+ 'ldflags': [
+ '<!@(icu-config --ldflags)',
+ ],
+ 'libraries': [
+ '<!@(icu-config --ldflags-libsonly)',
+ ],
+ },
+ }]]
+ },
+ {
'target_name': 'gnome-keyring',
'type': 'settings',
'conditions': [
--- a/build/temp_gyp/googleurl.gyp
+++ b/build/temp_gyp/googleurl.gyp
@@ -14,9 +14,7 @@
'msvs_guid': 'EF5E94AB-B646-4E5B-A058-52EF07B8351C',
'dependencies': [
'../../base/base.gyp:base',
- '../../third_party/icu/icu.gyp:icudata',
- '../../third_party/icu/icu.gyp:icui18n',
- '../../third_party/icu/icu.gyp:icuuc',
+ '../../build/linux/system.gyp:icu',
],
'sources': [
'../../googleurl/src/gurl.cc',
@@ -73,7 +71,7 @@
'../../base/base.gyp:base_i18n',
'../../base/base.gyp:test_support_base',
'../../testing/gtest.gyp:gtest',
- '../../third_party/icu/icu.gyp:icuuc',
+ '../../build/linux/system.gyp:icu',
],
'sources': [
'../../googleurl/src/gurl_unittest.cc',
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -39,8 +39,7 @@
'../third_party/bzip2/bzip2.gyp:bzip2',
'../third_party/expat/expat.gyp:expat',
'../third_party/hunspell/hunspell.gyp:hunspell',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
'../third_party/libjingle/libjingle.gyp:libjingle',
'../third_party/libphonenumber/libphonenumber.gyp:libphonenumber',
'../third_party/libphonenumber/libphonenumber.gyp:phonenumber_proto',
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -124,8 +124,7 @@
'../printing/printing.gyp:printing',
'../skia/skia.gyp:skia',
'../third_party/bzip2/bzip2.gyp:bzip2',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
'../third_party/libxml/libxml.gyp:libxml',
'../third_party/sqlite/sqlite.gyp:sqlite',
'../third_party/zlib/zlib.gyp:zlib',
@@ -375,8 +374,7 @@
'../gpu/gpu.gyp:gpu_ipc',
'../net/net.gyp:net_resources',
'../net/net.gyp:net',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
],
'conditions': [
['os_posix == 1 and OS != "mac"', {
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -427,8 +427,7 @@
'theme_resources',
'theme_resources_standard',
'../skia/skia.gyp:skia',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
],
'include_dirs': [
'..',
@@ -535,7 +534,7 @@
'../base/base.gyp:base',
'../build/temp_gyp/googleurl.gyp:googleurl',
'../jingle/jingle.gyp:notifier',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
'../third_party/sqlite/sqlite.gyp:sqlite',
'app/policy/cloud_policy_codegen.gyp:policy',
'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp',
@@ -1335,7 +1334,7 @@
'../third_party/bzip2/bzip2.gyp:*',
'../third_party/codesighs/codesighs.gyp:*',
'../third_party/iccjpeg/iccjpeg.gyp:*',
- '../third_party/icu/icu.gyp:*',
+ '../build/linux/system.gyp:icu',
'../third_party/libpng/libpng.gyp:*',
'../third_party/libwebp/libwebp.gyp:*',
'../third_party/libxslt/libxslt.gyp:*',
--- a/chrome/chrome_renderer.gypi
+++ b/chrome/chrome_renderer.gypi
@@ -21,8 +21,7 @@
'../skia/skia.gyp:skia',
'../third_party/cld/cld.gyp:cld',
'../third_party/hunspell/hunspell.gyp:hunspell',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
'../third_party/npapi/npapi.gyp:npapi',
'../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
'../ui/gfx/surface/surface.gyp:surface',
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -437,7 +437,7 @@
'../net/net.gyp:net_resources',
'../net/net.gyp:net_test_support',
'../skia/skia.gyp:skia',
- '../third_party/icu/icu.gyp:icui18n',
+ '../build/linux/system.gyp:icu',
'../third_party/libpng/libpng.gyp:libpng',
'../third_party/zlib/zlib.gyp:zlib',
'../testing/gtest.gyp:gtest',
@@ -613,8 +613,7 @@
'../skia/skia.gyp:skia',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
'../third_party/libxml/libxml.gyp:libxml',
# run time dependencies
'default_plugin/default_plugin.gyp:default_plugin',
@@ -790,8 +789,7 @@
'../net/net.gyp:net',
'../skia/skia.gyp:skia',
'../testing/gtest.gyp:gtest',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
'../third_party/libxml/libxml.gyp:libxml',
],
'include_dirs': [
@@ -1051,8 +1049,7 @@
'../net/net.gyp:net',
'../skia/skia.gyp:skia',
'../testing/gtest.gyp:gtest',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
'../third_party/libxml/libxml.gyp:libxml',
],
'include_dirs': [
@@ -1119,8 +1116,7 @@
'../net/net.gyp:net',
'../skia/skia.gyp:skia',
'../testing/gtest.gyp:gtest',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
],
'include_dirs': [
'..',
@@ -1192,8 +1188,7 @@
'../skia/skia.gyp:skia',
'../third_party/bzip2/bzip2.gyp:bzip2',
'../third_party/cld/cld.gyp:cld',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
'../third_party/libjingle/libjingle.gyp:libjingle',
'../third_party/libxml/libxml.gyp:libxml',
'../ui/gfx/gl/gl.gyp:gl',
@@ -2232,8 +2227,7 @@
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'../third_party/cld/cld.gyp:cld',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
'../v8/tools/gyp/v8.gyp:v8',
# Runtime dependencies
'../third_party/mesa/mesa.gyp:osmesa',
@@ -3260,8 +3254,7 @@
'../skia/skia.gyp:skia',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
'../third_party/npapi/npapi.gyp:npapi',
'../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
],
@@ -3420,8 +3413,7 @@
'../net/net.gyp:net_test_support',
'../skia/skia.gyp:skia',
'../testing/gtest.gyp:gtest',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
# Runtime dependencies
'../third_party/mesa/mesa.gyp:osmesa',
],
--- a/chrome/default_plugin/default_plugin.gyp
+++ b/chrome/default_plugin/default_plugin.gyp
@@ -14,8 +14,7 @@
':default_plugin_resources',
'<(DEPTH)/base/base.gyp:base',
'<(DEPTH)/net/net.gyp:net_resources',
- '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
- '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
+ '<(DEPTH)/build/linux/system.gyp:icu',
'<(DEPTH)/third_party/libxml/libxml.gyp:libxml',
'<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
'<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -392,8 +392,7 @@
'../net/net.gyp:net_test_support',
'../skia/skia.gyp:skia',
'../testing/gtest.gyp:gtest',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
'chrome_frame_npapi',
'chrome_frame_ie',
'chrome_tab_idl',
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -11,7 +11,7 @@
'../base/base.gyp:base',
'../ipc/ipc.gyp:ipc',
'../skia/skia.gyp:skia',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
'../third_party/npapi/npapi.gyp:npapi',
'../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
'../ui/gfx/gl/gl.gyp:gl',
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -14,8 +14,7 @@
'../ppapi/ppapi_internal.gyp:ppapi_proxy',
'../skia/skia.gyp:skia',
'../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
- '../third_party/icu/icu.gyp:icuuc',
- '../third_party/icu/icu.gyp:icui18n',
+ '../build/linux/system.gyp:icu',
'../third_party/libjingle/libjingle.gyp:libjingle',
'../third_party/libjingle/libjingle.gyp:libjingle_p2p',
'../third_party/npapi/npapi.gyp:npapi',
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -17,8 +17,7 @@
'../build/temp_gyp/googleurl.gyp:googleurl',
'../crypto/crypto.gyp:crypto',
'../sdch/sdch.gyp:sdch',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
'../third_party/zlib/zlib.gyp:zlib',
'net_resources',
'ssl_false_start_blacklist_process#host',
@@ -1034,8 +1033,7 @@
# This is needed to trigger the dll copy step on windows.
# TODO(mark): Specifying this here shouldn't be necessary.
'dependencies': [
- '../third_party/icu/icu.gyp:icudata',
- ],
+ '../build/linux/system.gyp:icu', ],
},
],
],
@@ -1063,7 +1061,7 @@
# TODO(mark): Specifying this here shouldn't be necessary.
[ 'OS == "win"', {
'dependencies': [
- '../third_party/icu/icu.gyp:icudata',
+ '../build/linux/system.gyp:icu',
],
},
],
--- a/printing/printing.gyp
+++ b/printing/printing.gyp
@@ -16,8 +16,7 @@
'../base/base.gyp:base_i18n',
'../build/temp_gyp/googleurl.gyp:googleurl',
'../skia/skia.gyp:skia',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
],
'msvs_guid': '9E5416B9-B91B-4029-93F4-102C1AD5CAF4',
'include_dirs': [
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -766,7 +766,7 @@
'../build/linux/system.gyp:fontconfig',
'../build/linux/system.gyp:freetype2',
'../third_party/harfbuzz/harfbuzz.gyp:harfbuzz',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
],
'cflags': [
'-Wno-unused',
--- a/third_party/cld/cld.gyp
+++ b/third_party/cld/cld.gyp
@@ -8,7 +8,7 @@
'target_name': 'cld',
'type': 'static_library',
'dependencies': [
- '../icu/icu.gyp:icuuc',
+ '../../build/linux/system.gyp:icu',
],
'include_dirs': [
'.',
--- a/third_party/harfbuzz-ng/harfbuzz.gyp
+++ b/third_party/harfbuzz-ng/harfbuzz.gyp
@@ -60,7 +60,7 @@
},
'dependencies': [
'../../build/linux/system.gyp:freetype2',
- '../../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
],
},
],
--- a/third_party/hunspell/hunspell.gyp
+++ b/third_party/hunspell/hunspell.gyp
@@ -10,7 +10,7 @@
'msvs_guid': 'D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E',
'dependencies': [
'../../base/base.gyp:base',
- '../icu/icu.gyp:icuuc',
+ '../../build/linux/system.gyp:icu',
],
'defines': [
'HUNSPELL_STATIC',
--- a/third_party/libxml/libxml.gyp
+++ b/third_party/libxml/libxml.gyp
@@ -163,11 +163,11 @@
'src/include',
],
'dependencies': [
- '../icu/icu.gyp:icuuc',
+ '../../build/linux/system.gyp:icu',
'../zlib/zlib.gyp:zlib',
],
'export_dependent_settings': [
- '../icu/icu.gyp:icuuc',
+ '../../build/linux/system.gyp:icu',
],
'direct_dependent_settings': {
'defines': [
--- a/third_party/sqlite/sqlite.gyp
+++ b/third_party/sqlite/sqlite.gyp
@@ -97,8 +97,7 @@
'src/src',
],
'dependencies': [
- '../icu/icu.gyp:icui18n',
- '../icu/icu.gyp:icuuc',
+ '../../build/linux/system.gyp:icu',
],
'direct_dependent_settings': {
'include_dirs': [
@@ -131,7 +130,7 @@
'target_name': 'sqlite_shell',
'type': 'executable',
'dependencies': [
- '../icu/icu.gyp:icuuc',
+ '../../build/linux/system.gyp:icu',
'sqlite',
],
'sources': [
--- a/third_party/WebKit/Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp
+++ b/third_party/WebKit/Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp
@@ -97,8 +97,7 @@
'msvs_guid': 'AA8A5A85-592B-4357-BC60-E0E91E026AF6',
'dependencies': [
'wtf_config',
- '<(chromium_src_dir)/third_party/icu/icu.gyp:icui18n',
- '<(chromium_src_dir)/third_party/icu/icu.gyp:icuuc',
+ '<(chromium_src_dir)/build/linux/system.gyp:icu',
],
'include_dirs': [
'../',
@@ -157,8 +156,7 @@
},
'export_dependent_settings': [
'wtf_config',
- '<(chromium_src_dir)/third_party/icu/icu.gyp:icui18n',
- '<(chromium_src_dir)/third_party/icu/icu.gyp:icuuc',
+ '<(chromium_src_dir)/build/linux/system.gyp:icu',
],
'msvs_disabled_warnings': [4127, 4355, 4510, 4512, 4610, 4706],
'conditions': [
--- a/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp
+++ b/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp
@@ -607,7 +607,7 @@
'<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
'<(chromium_src_dir)/testing/gtest.gyp:gtest',
'<(chromium_src_dir)/testing/gmock.gyp:gmock',
- '<(chromium_src_dir)/third_party/icu/icu.gyp:*',
+ '<(chromium_src_dir)/build/linux/system.gyp:icu',
'<(chromium_src_dir)/third_party/libjpeg/libjpeg.gyp:libjpeg',
'<(chromium_src_dir)/third_party/libpng/libpng.gyp:libpng',
'<(chromium_src_dir)/third_party/libxml/libxml.gyp:libxml',
@@ -936,7 +936,7 @@
'copy_TestNetscapePlugIn',
'webkit',
'../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf_config',
- '<(chromium_src_dir)/third_party/icu/icu.gyp:icuuc',
+ '<(chromium_src_dir)/build/linux/system.gyp:icu',
'<(chromium_src_dir)/third_party/mesa/mesa.gyp:osmesa',
'<(chromium_src_dir)/webkit/support/webkit_support.gyp:blob',
'<(chromium_src_dir)/webkit/support/webkit_support.gyp:webkit_support',
--- a/ui/ui_base.gypi
+++ b/ui/ui_base.gypi
@@ -10,14 +10,12 @@
'dependencies': [
'../base/base.gyp:base',
'../skia/skia.gyp:skia',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
'ui_gfx',
],
# Export these dependencies since text_elider.h includes ICU headers.
'export_dependent_settings': [
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
],
'sources': [
'base/accessibility/accessibility_types.h',
--- a/ui/ui_gfx.gypi
+++ b/ui/ui_gfx.gypi
@@ -44,8 +44,7 @@
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
'../skia/skia.gyp:skia',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
'../third_party/libpng/libpng.gyp:libpng',
'../third_party/zlib/zlib.gyp:zlib',
'gfx_resources',
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -66,8 +66,7 @@
'../app/app.gyp:app_resources',
'../base/base.gyp:base',
'../skia/skia.gyp:skia',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
'../ui/base/strings/ui_strings.gyp:ui_strings',
'../ui/gfx/compositor/compositor.gyp:compositor',
'../ui/ui.gyp:ui_base',
@@ -471,8 +470,7 @@
'../skia/skia.gyp:skia',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
'../ui/base/strings/ui_strings.gyp:ui_strings',
'views',
],
@@ -553,8 +551,7 @@
'../app/app.gyp:app_resources',
'../base/base.gyp:base',
'../skia/skia.gyp:skia',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
'views',
],
'include_dirs': [
@@ -639,8 +636,7 @@
'../app/app.gyp:app_resources',
'../base/base.gyp:base',
'../skia/skia.gyp:skia',
- '../third_party/icu/icu.gyp:icui18n',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
'views',
],
'include_dirs': [
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -118,8 +118,7 @@
'<(DEPTH)/ppapi/ppapi_internal.gyp:ppapi_shared',
'<(DEPTH)/printing/printing.gyp:printing',
'<(DEPTH)/skia/skia.gyp:skia',
- '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
- '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
+ '<(DEPTH)/build/linux/system.gyp:icu',
'<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
'webkit_resources',
'webkit_strings',
--- a/webkit/tools/test_shell/test_shell.gypi
+++ b/webkit/tools/test_shell/test_shell.gypi
@@ -559,7 +559,7 @@
'mac_bundle': 1,
'msvs_guid': '0D04AEC1-6B68-492C-BCCF-808DFD69ABC6',
'dependencies': [
- '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
+ '<(DEPTH)/build/linux/system.gyp:icu',
'npapi_test_common',
],
'sources': [
--- a/chrome/chrome_installer_util.gypi
+++ b/chrome/chrome_installer_util.gypi
@@ -103,8 +103,7 @@
'<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'<(DEPTH)/courgette/courgette.gyp:courgette_lib',
'<(DEPTH)/third_party/bspatch/bspatch.gyp:bspatch',
- '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
- '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
+ '<(DEPTH)/build/linux/system.gyp:icu',
'<(DEPTH)/third_party/lzma_sdk/lzma_sdk.gyp:lzma_sdk',
],
'sources': [
--- a/ppapi/ppapi_shared.gypi
+++ b/ppapi/ppapi_shared.gypi
@@ -13,7 +13,7 @@
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'../build/temp_gyp/googleurl.gyp:googleurl',
'../skia/skia.gyp:skia',
- '../third_party/icu/icu.gyp:icuuc',
+ '../build/linux/system.gyp:icu',
'../ui/gfx/surface/surface.gyp:surface',
],
'include_dirs': [
--- a/third_party/libphonenumber/libphonenumber.gyp
+++ b/third_party/libphonenumber/libphonenumber.gyp
@@ -32,8 +32,7 @@
'target_name': 'libphonenumber',
'type': 'static_library',
'dependencies': [
- '../icu/icu.gyp:icui18n',
- '../icu/icu.gyp:icuuc',
+ '../../build/linux/system.gyp:icu',
'../protobuf/protobuf.gyp:protobuf_lite',
'../../base/base.gyp:base',
'../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
@@ -118,8 +117,7 @@
'cpp/src/test_metadata.cc',
],
'dependencies': [
- '../icu/icu.gyp:icui18n',
- '../icu/icu.gyp:icuuc',
+ '../../build/linux/system.gyp:icu',
'../protobuf/protobuf.gyp:protobuf_lite',
'../../base/base.gyp:base',
'../../base/base.gyp:test_support_base',
--- a/v8/src/extensions/experimental/experimental.gyp
+++ b/v8/src/extensions/experimental/experimental.gyp
@@ -56,7 +56,7 @@
'../..',
],
'dependencies': [
- '<(icu_src_dir)/icu.gyp:*',
+ '../../../../build/linux/system.gyp:icu',
'js2c_i18n#host',
'../../../tools/gyp/v8.gyp:v8',
],

2
debian/patches/system/nspr.patch vendored
View File

@@ -2,7 +2,7 @@ Include system copy of prtime.h
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -597,8 +597,6 @@
@@ -623,8 +623,6 @@
'third_party/dmg_fp/g_fmt.cc',
'third_party/icu/icu_utf.cc',
'third_party/icu/icu_utf.h',

4
debian/patches/system/speex.patch vendored
View File

@@ -2,7 +2,7 @@ description: use system speex
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -904,6 +904,26 @@
@@ -896,6 +896,26 @@
],
},
{
@@ -42,7 +42,7 @@ description: use system speex
namespace {
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -1987,7 +1987,7 @@
@@ -2060,7 +2060,7 @@
['enable_web_speech==1', {
'dependencies': [
'../third_party/flac/flac.gyp:libflac',

7
debian/presubj vendored
View File

@@ -5,3 +5,10 @@ keep track of issues. Thank you!
If you experience crashes, please read this wiki page to get a useful backtrace:
http://wiki.debian.org/Chromium/Debugging
Please, if you have apps, extensions, or plugins (like flash player) installed,
remove them temporarily to see if the problem goes away first (before submitting
your bug report). Look at these urls to see what you currently have installed:
chrome://apps
chrome://plugins
chrome://extensions

12
debian/rules vendored
View File

@@ -44,6 +44,7 @@ defines+=use_ozone=0 \
use_official_google_api_keys=0 \
enable_rlz=0 \
enable_prod_wallet_service=0 \
disable_fatal_linker_warnings=1
# enabled features
defines+=enable_hidpi=1 \
@@ -63,6 +64,7 @@ defines+=use_system_re2=1 \
use_system_expat=1 \
use_system_libpng=1 \
use_system_libxml=1 \
use_system_ffmpeg=1 \
use_system_libjpeg=1 \
use_system_libwebp=1 \
use_system_libxslt=1 \
@@ -88,7 +90,6 @@ defines+=use_system_icu=0 \
# use_system_libusb=0 requires modified source that exposes libusb_interrupt_handle_event api
# use_system_libvpx=0 requires modified source that exposes different api
# use_system_sqlite=0 build fails
# use_system_ffmpeg=0 build fails
# can't use system nss since net/third_party/nss is heavily patched
# can't use system ots (open text *summarizer*) since that's not google's ots (open text *sanitizer*)
@@ -151,13 +152,13 @@ override_dh_gencontrol:
override_dh_auto_clean:
rm -rf out
find . -name \*.pyc -execdir rm -rf {} \;
find . -name \*.pyc -execdir rm -f {} \;
dh_auto_clean
###################### upstream source downloading ############################
url=https://gsdview.appspot.com/chromium-browser-official
url_backup=https://github.com/zcbenz/chromium-source-tarball/releases/download
#url_backup=https://github.com/zcbenz/chromium-source-tarball/releases/download
version=$(shell dpkg-parsechangelog -S Version | sed s/-.*//)
tarball=chromium-$(version).tar.xz
removed=chromium-browser_$(version).files-removed
@@ -171,7 +172,8 @@ get-orig-source:
diff -u ../chromium.upstream ../chromium.orig >> ../$(removed) || true
download-source:
@-wget -c $(url)/$(tarball) || ([ $$? -eq 8 ] && wget -c $(url_backup)/$(version)/$(tarball))
#@-wget -c $(url)/$(tarball) || ([ $$? -eq 8 ] && wget -c $(url_backup)/$(version)/$(tarball))
wget -c $(url)/$(tarball)
tar -xf $(tarball) --strip-components=1
rm $(tarball)
find . -not \( -path ./debian -prune \) -name "*.h" -o -name "*.hh" -o -name "*.hpp" -o -name "*.hxx" -o -name "*.cc" -o -name "*.cpp" -o -name "*.cxx" -o -name "*.c" -o -name "*.h" -o -name "*.json" -o -name "*.js" -o -name "*.html" -o -name "*.htm" -o -name "*.py" -o -name "*.grd" -o -name "*.sql" -o -name "*.idl" -o -name "*.grd" | xargs -L1 -I{} sed -i -r -e 's/google([A-Za-z\-]*)\.com/9oo91e\1\.qjz9zk/g' -e 's/gstatic([A-Za-z\-]*)\.com/95tat1c\1\.qjz9zk/g' -e 's/chrome([A-Za-z\-]*)\.com/ch40me\1\.qjz9zk/g' -e 's/chromium([A-Za-z\-]*)\.org/ch40m1um\1\.qjz9zk/g' -e 's/mozilla([A-Za-z\-]*)\.org/m0z111a\1\.qjz9zk/g' -e 's/facebook([A-Za-z\-]*)\.com/f8c3b00k\1\.qjz9zk/g' -e 's/appspot([A-Za-z\-]*)\.com/8pp2p8t\1\.qjz9zk/g' {}
find . -not \( -path ./debian -prune \) -name "*.h" -o -name "*.hh" -o -name "*.hpp" -o -name "*.hxx" -o -name "*.cc" -o -name "*.cpp" -o -name "*.cxx" -o -name "*.c" -o -name "*.h" -o -name "*.json" -o -name "*.js" -o -name "*.html" -o -name "*.htm" -o -name "*.py" -o -name "*.grd" -o -name "*.sql" -o -name "*.idl" -o -name "*.grd" | xargs -L1 -I{} sed -i -r -e 's/google([A-Za-z\-]*)\.com/9oo91e\1\.qjz9zk/g' -e 's/gstatic([A-Za-z\-]*)\.com/95tat1c\1\.qjz9zk/g' -e 's/chrome([A-Za-z\-]*)\.com/ch40me\1\.qjz9zk/g' -e 's/chromium([A-Za-z\-]*)\.org/ch40m1um\1\.qjz9zk/g' -e 's/mozilla([A-Za-z\-]*)\.org/m0z111a\1\.qjz9zk/g' -e 's/facebook([A-Za-z\-]*)\.com/f8c3b00k\1\.qjz9zk/g' -e 's/appspot([A-Za-z\-]*)\.com/8pp2p8t\1\.qjz9zk/g' -e 's/youtube([A-Za-z\-]*)\.com/y0u1ub3\1\.qjz9zk/g' -e 's/ytimg([A-Za-z\-]*)\.com/yt1mg\1\.qjz9zk/g' -e 's/gmail([A-Za-z\-]*)\.com/9ma1l\1\.qjz9zk/g' -e 's/doubleclick([A-Za-z\-]*)\.net/60u613cl1c4\1\.qjz9zk/g' {}

5
debian/source/lintian-overrides vendored
View File

@@ -1,3 +1,8 @@
# incorrectly flagged
source-is-missing tools/trace/trace_data.js
source-is-missing ui/webui/resources/js/jstemplate_compiled.js
# temporarily allowing (need to fix path in Files-Excluded)
license-problem-json-evil third_party/trace-viewer/tracing/third_party/tvcm/third_party/rjsmin/bench/jsmin.c
license-problem-json-evil third_party/trace-viewer/tracing/third_party/tvcm/third_party/rjsmin/bench/jsmin.py