[arch-commits] Commit in chromium/trunk (2 files)
Evangelos Foutras
foutrelis at archlinux.org
Wed Jul 22 16:58:28 UTC 2015
Date: Wednesday, July 22, 2015 @ 18:58:28
Author: foutrelis
Revision: 242443
upgpkg: chromium 44.0.2403.89-1
New upstream release.
Modified:
chromium/trunk/PKGBUILD
Deleted:
chromium/trunk/add-build-flag-to-disable-hotwording.patch
--------------------------------------------+
PKGBUILD | 17 ---
add-build-flag-to-disable-hotwording.patch | 120 ---------------------------
2 files changed, 3 insertions(+), 134 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-07-22 16:19:55 UTC (rev 242442)
+++ PKGBUILD 2015-07-22 16:58:28 UTC (rev 242443)
@@ -5,7 +5,7 @@
# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
pkgname=chromium
-pkgver=43.0.2357.134
+pkgver=44.0.2403.89
pkgrel=1
_launcher_ver=2
pkgdesc="The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser"
@@ -29,14 +29,12 @@
chromium.desktop
0001-NSS-reject-DH-groups-smaller-than-1024-bits.patch
0001-Use-the-correct-URL-for-ERR_SSL_WEAK_SERVER_EPHEMERA.patch
- add-build-flag-to-disable-hotwording.patch
chromium-widevine.patch)
-sha256sums=('d3a1bbe3e1445dfcf5ef4aff4b11a8f3770436c8b8954b7cc5fee5416f117659'
+sha256sums=('badd9aa979487b55bbcce4f54ec16926c6fa7eb46ec2536866200a5e68853a98'
'7f91c81721092d707d7b94e6555a48bc7fd0bc0e1174df4649bdcd745930e52f'
'028a748a5c275de9b8f776f97909f999a8583a4b77fd1cd600b4fc5c0c3e91e9'
'46daf921ed7eaab175f5a86b09357c69c33a10ffe1d4e7c24476af510c1b28d0'
'8fb428244be7b50268a2848a34405c5551232e5c77f9e553cfdd3103979748d2'
- '3a1c589aa90c0597776d945d34638d43e2d40d93bc1962148815831a5122ac4e'
'379b746e187de28f80f5a7cd19edcfa31859656826f802a1ede054fcb6dfb221')
# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
@@ -65,12 +63,6 @@
# https://code.google.com/p/chromium/issues/detail?id=490260
patch -Np1 -i ../0001-Use-the-correct-URL-for-ERR_SSL_WEAK_SERVER_EPHEMERA.patch
- # Add build flag to disable 'Ok Google' hotwording feature
- # The issue with this functionality is that it downloads a binary blob
- # and that this behavior cannot be disabled if a user wishes to do so.
- # https://code.google.com/p/chromium/issues/detail?id=491435
- patch -Np1 -i ../add-build-flag-to-disable-hotwording.patch
-
# Enable support for the Widevine CDM plugin
# The actual libraries are not included, but can be copied over from Chrome:
# libwidevinecdmadapter.so
@@ -149,7 +141,6 @@
-Dusb_ids_path=/usr/share/hwdata/usb.ids
-Duse_mojo=0
-Duse_gconf=0
- -Denable_hotwording=0
-Ddisable_fatal_linker_warnings=1
-Ddisable_glibc=1)
@@ -182,13 +173,11 @@
install -D out/Release/chromedriver "$pkgdir/usr/lib/chromium/chromedriver"
- cp out/Release/{*.pak,*.bin,libffmpegsumo.so} \
- "$pkgdir/usr/lib/chromium/"
+ cp out/Release/{*.pak,*.bin} "$pkgdir/usr/lib/chromium/"
# Manually strip binaries so that 'nacl_irt_*.nexe' is left intact
strip $STRIP_BINARIES "$pkgdir/usr/lib/chromium/"{chromium,chrome-sandbox} \
"$pkgdir/usr/lib/chromium/chromedriver"
- strip $STRIP_SHARED "$pkgdir/usr/lib/chromium/libffmpegsumo.so"
if (( $_build_nacl )); then
cp out/Release/nacl_helper{,_bootstrap} out/Release/nacl_irt_*.nexe \
Deleted: add-build-flag-to-disable-hotwording.patch
===================================================================
--- add-build-flag-to-disable-hotwording.patch 2015-07-22 16:19:55 UTC (rev 242442)
+++ add-build-flag-to-disable-hotwording.patch 2015-07-22 16:58:28 UTC (rev 242443)
@@ -1,120 +0,0 @@
-Index: build/common.gypi
-diff --git a/build/common.gypi b/build/common.gypi
-index b26d0e1aaf3baa8c0bea2aa21795051e0767bb39..bac0544541b1ffbd4c9a072e86425476f01fa3d9 100644
---- a/build/common.gypi
-+++ b/build/common.gypi
-@@ -391,6 +391,9 @@
- # Web speech is enabled by default. Set to 0 to disable.
- 'enable_web_speech%': 1,
-
-+ # 'Ok Google' hotwording is enabled by default. Set to 0 to disable.
-+ 'enable_hotwording%': 1,
-+
- # Notifications are compiled in by default. Set to 0 to disable.
- 'notifications%' : 1,
-
-@@ -1136,6 +1139,7 @@
- 'configuration_policy%': '<(configuration_policy)',
- 'safe_browsing%': '<(safe_browsing)',
- 'enable_web_speech%': '<(enable_web_speech)',
-+ 'enable_hotwording%': '<(enable_hotwording)',
- 'notifications%': '<(notifications)',
- 'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)',
- 'mac_want_real_dsym%': '<(mac_want_real_dsym)',
-Index: chrome/browser/BUILD.gn
-diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index 30127a3a2ee6836ffb108fd2859707b765d42cb8..867dc390d0b7f623423ed64bfbbe5f938fbc0659 100644
---- a/chrome/browser/BUILD.gn
-+++ b/chrome/browser/BUILD.gn
-@@ -19,6 +19,11 @@ if (is_desktop_linux) {
- import("//build/config/linux/pkg_config.gni")
- }
-
-+declare_args() {
-+ # 'Ok Google' hotwording is enabled.
-+ enable_hotwording = true
-+}
-+
- about_credits_file = "$target_gen_dir/about_credits.html"
- additional_modules_list_file =
- "$root_gen_dir/chrome/browser/internal/additional_modules_list.txt"
-@@ -452,6 +457,10 @@ source_set("browser") {
- }
- }
-
-+ if (enable_hotwording) {
-+ defines += [ "ENABLE_HOTWORDING" ]
-+ }
-+
- if (is_linux) {
- deps += [
- "//device/media_transfer_protocol",
-Index: chrome/browser/search/hotword_service.cc
-diff --git a/chrome/browser/search/hotword_service.cc b/chrome/browser/search/hotword_service.cc
-index d222b150fbae877fe74598681e956e6e624890fa..5b08027ef4c198480f703a9420a55068e88aa435 100644
---- a/chrome/browser/search/hotword_service.cc
-+++ b/chrome/browser/search/hotword_service.cc
-@@ -639,7 +639,11 @@ bool HotwordService::IsServiceAvailable() {
- if (group == hotword_internal::kHotwordFieldTrialDisabledGroupName)
- return false;
-
-+#if defined(ENABLE_HOTWORDING)
- return DoesHotwordSupportLanguage(profile_);
-+#else
-+ return false;
-+#endif
- }
-
- bool HotwordService::IsOptedIntoAudioLogging() {
-Index: chrome/browser/search/hotword_service_unittest.cc
-diff --git a/chrome/browser/search/hotword_service_unittest.cc b/chrome/browser/search/hotword_service_unittest.cc
-index 588706c1c186e7f410230b12f649a6b8853da2fb..84444468e2f7634ad895d0752355303babf0c7d7 100644
---- a/chrome/browser/search/hotword_service_unittest.cc
-+++ b/chrome/browser/search/hotword_service_unittest.cc
-@@ -157,6 +157,7 @@ INSTANTIATE_TEST_CASE_P(HotwordServiceTests,
- extension_misc::kHotwordSharedModuleId));
-
- TEST_P(HotwordServiceTest, IsHotwordAllowedLocale) {
-+#if defined(ENABLE_HOTWORDING)
- TestingProfile::Builder profile_builder;
- scoped_ptr<TestingProfile> profile = profile_builder.Build();
-
-@@ -187,6 +188,7 @@ TEST_P(HotwordServiceTest, IsHotwordAllowedLocale) {
- Profile* otr_profile = profile->GetOffTheRecordProfile();
- SetApplicationLocale(otr_profile, "en");
- EXPECT_FALSE(HotwordServiceFactory::IsHotwordAllowed(otr_profile));
-+#endif // defined(ENABLE_HOTWORDING)
- }
-
- TEST_P(HotwordServiceTest, ShouldReinstallExtension) {
-@@ -243,6 +245,7 @@ TEST_P(HotwordServiceTest, PreviousLanguageSetOnInstall) {
- }
-
- TEST_P(HotwordServiceTest, UninstallReinstallTriggeredCorrectly) {
-+#if defined(ENABLE_HOTWORDING)
- InitializeEmptyExtensionService();
- service_->Init();
-
-@@ -313,6 +316,7 @@ TEST_P(HotwordServiceTest, UninstallReinstallTriggeredCorrectly) {
- EXPECT_TRUE(HotwordServiceFactory::IsHotwordAllowed(profile()));
- EXPECT_FALSE(hotword_service->MaybeReinstallHotwordExtension());
- EXPECT_EQ(1, hotword_service->uninstall_count()); // no change
-+#endif // defined(ENABLE_HOTWORDING)
- }
-
- TEST_P(HotwordServiceTest, DisableAlwaysOnOnLanguageChange) {
-Index: chrome/chrome_browser.gypi
-diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
-index 4070c8c38867d2394d3a2a60b1cd17361ccea1c3..b589e9a52e0ca183da7bee5a644c0de8f61a0d89 100644
---- a/chrome/chrome_browser.gypi
-+++ b/chrome/chrome_browser.gypi
-@@ -3573,6 +3573,9 @@
- ['enable_session_service==1', {
- 'sources': [ '<@(chrome_browser_session_service_sources)' ],
- }],
-+ ['enable_hotwording==1', {
-+ 'defines': [ 'ENABLE_HOTWORDING' ],
-+ }],
- ['OS!="android" and OS!="ios" and chromeos==0', {
- 'sources': [ '<@(chrome_browser_desktop_sources)' ],
- }],
More information about the arch-commits
mailing list