diff options
| -rw-r--r-- | chromium/chromium/chromium-disable-hotwording.patch | 120 | ||||
| -rw-r--r-- | chromium/chromium/chromium.spec | 30 |
2 files changed, 13 insertions, 137 deletions
diff --git a/chromium/chromium/chromium-disable-hotwording.patch b/chromium/chromium/chromium-disable-hotwording.patch deleted file mode 100644 index 55bb8a3..0000000 --- a/chromium/chromium/chromium-disable-hotwording.patch +++ /dev/null @@ -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)' ], - }], diff --git a/chromium/chromium/chromium.spec b/chromium/chromium/chromium.spec index f5c543e..960ca26 100644 --- a/chromium/chromium/chromium.spec +++ b/chromium/chromium/chromium.spec @@ -6,11 +6,8 @@ # Get the version number of latest stable version # $ curl -s 'https://omahaproxy.appspot.com/all?os=linux&channel=stable' | sed 1d | cut -d , -f 3 -# I don't want to modify patches provided by others -%global _default_patch_fuzz 2 - Name: chromium -Version: 43.0.2357.134 +Version: 44.0.2403.89 Release: 1%{?dist} Summary: An open-source project that aims to build a safer, faster, and more stable browser @@ -24,11 +21,6 @@ Source0: https://commondatastorage.googleapis.com/chromium-browser-official/c Source1: chromium-browser.sh Source2: chromium-browser.desktop -# Add a modified upstream patch from Arch Linux to allow disabling 'Ok Google' -# hotwording feature -# https://code.google.com/p/chromium/issues/detail?id=491435 -Patch0: chromium-disable-hotwording.patch - # I don't have time to test whether it work on other architectures ExclusiveArch: x86_64 @@ -48,7 +40,8 @@ BuildRequires: pkgconfig(gnome-keyring-1) BuildRequires: expat-devel BuildRequires: flac-devel BuildRequires: harfbuzz-devel -BuildRequires: libicu-devel +# Chromium requires icu 55 +# BuildRequires: libicu-devel BuildRequires: jsoncpp-devel BuildRequires: libevent-devel BuildRequires: libjpeg-turbo-devel @@ -80,7 +73,6 @@ Requires: hicolor-icon-theme %prep %setup -q -%patch0 -p1 %build @@ -88,7 +80,7 @@ Requires: hicolor-icon-theme -Duse_system_expat=1 \ -Duse_system_flac=1 \ -Duse_system_harfbuzz=1 \ - -Duse_system_icu=1 \ + -Duse_system_icu=0 \ -Duse_system_jsoncpp=1 \ -Duse_system_libevent=1 \ -Duse_system_libjpeg=1 \ @@ -104,13 +96,13 @@ Requires: hicolor-icon-theme -Duse_system_speex=1 \ -Duse_system_zlib=1 -find third_party/icu -type f '!' -regex '.*\.\(gyp\|gypi\|isolate\)' -delete +# find third_party/icu -type f '!' -regex '.*\.\(gyp\|gypi\|isolate\)' -delete GYP_GENERATORS=ninja ./build/gyp_chromium --depth=. \ -Duse_system_expat=1 \ -Duse_system_flac=1 \ -Duse_system_harfbuzz=1 \ - -Duse_system_icu=1 \ + -Duse_system_icu=0 \ -Duse_system_jsoncpp=1 \ -Duse_system_libevent=1 \ -Duse_system_libjpeg=1 \ @@ -135,7 +127,7 @@ GYP_GENERATORS=ninja ./build/gyp_chromium --depth=. \ -Dlinux_link_libpci=1 \ -Dlinux_link_libspeechd=1 \ -Dlinux_link_pulseaudio=1 \ - -Dicu_use_data_file_flag=0 \ + -Dicu_use_data_file_flag=1 \ -Dlibspeechd_h_prefix=speech-dispatcher/ \ -Dclang=0 \ -Dwerror= \ @@ -165,7 +157,7 @@ install -m 644 out/Release/chrome.1 %{buildroot}%{_mandir}/man1/chromium-browser install -m 755 out/Release/chrome %{buildroot}%{chromiumdir}/chromium-browser install -m 4755 out/Release/chrome_sandbox %{buildroot}%{chromiumdir}/chrome-sandbox install -m 755 out/Release/chromedriver %{buildroot}%{chromiumdir}/ -install -m 755 out/Release/libffmpegsumo.so %{buildroot}%{chromiumdir}/ +install -m 644 out/Release/icudtl.dat %{buildroot}%{chromiumdir}/ install -m 755 out/Release/nacl_helper %{buildroot}%{chromiumdir}/ install -m 755 out/Release/nacl_helper_bootstrap %{buildroot}%{chromiumdir}/ install -m 644 out/Release/nacl_irt_x86_64.nexe %{buildroot}%{chromiumdir}/ @@ -210,7 +202,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{chromiumdir}/chromium-browser %{chromiumdir}/chrome-sandbox %{chromiumdir}/chromedriver -%{chromiumdir}/libffmpegsumo.so +%{chromiumdir}/icudtl.dat %{chromiumdir}/nacl_helper %{chromiumdir}/nacl_helper_bootstrap %{chromiumdir}/nacl_irt_x86_64.nexe @@ -224,6 +216,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Thu Jul 23 2015 - Ting-Wei Lan <lantw44@gmail.com> - 44.0.2403.89-1 +- Update to 44.0.2403.89 +- Temporarily disable the use of system icu because it needs icu 55 + * Wed Jul 15 2015 - Ting-Wei Lan <lantw44@gmail.com> - 43.0.2357.134-1 - Update to 43.0.2357.134 |