From c4322df982dbe077896a707ed833c236c223fc5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B7=D0=B8=D0=BC?= Date: Thu, 23 Mar 2017 03:49:34 +0300 Subject: [PATCH] Updated to 57.0.2987.110 --- .abf.yml | 2 +- chromium-46.0.2490.86-use_system_opus.patch | 12 ------- chromium-browser-stable.spec | 13 ++------ issue2730783002_1_10001.patch | 37 --------------------- 4 files changed, 3 insertions(+), 61 deletions(-) delete mode 100644 chromium-46.0.2490.86-use_system_opus.patch delete mode 100644 issue2730783002_1_10001.patch diff --git a/.abf.yml b/.abf.yml index c08743e..bbf2141 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,5 +1,5 @@ sources: - chromium-57.0.2987.98.tar.xz: b80fb4219a06f25817a348fa2d707523f9793949 + chromium-57.0.2987.110.tar.xz: 3507370918371431971503099ee0d7dadf3eec2b depot_tools.tar.xz: 082b7f9a4dfa7eb03900755b4866aef2d73543a5 icons.tar.bz2: a835954af164bf38f8ea4ea80608839bed7800a3 new-system-icons.tar.xz: 89339b8b3b05359a8745ed7968fe148902a2fa28 diff --git a/chromium-46.0.2490.86-use_system_opus.patch b/chromium-46.0.2490.86-use_system_opus.patch deleted file mode 100644 index d54938b..0000000 --- a/chromium-46.0.2490.86-use_system_opus.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up chromium-46.0.2490.86/media/cast/receiver/audio_decoder_unittest.cc.use_system_opus chromium-46.0.2490.86/media/cast/receiver/audio_decoder_unittest.cc ---- chromium-46.0.2490.86/media/cast/receiver/audio_decoder_unittest.cc.use_system_opus 2015-10-07 04:42:12.000000000 +0200 -+++ chromium-46.0.2490.86/media/cast/receiver/audio_decoder_unittest.cc 2015-11-11 16:11:13.535250609 +0100 -@@ -13,7 +13,7 @@ - #include "media/cast/test/utility/audio_utility.h" - #include "media/cast/test/utility/standalone_cast_environment.h" - #include "testing/gtest/include/gtest/gtest.h" --#include "third_party/opus/src/include/opus.h" -+#include - - namespace media { - namespace cast { diff --git a/chromium-browser-stable.spec b/chromium-browser-stable.spec index dff3154..4c1080c 100644 --- a/chromium-browser-stable.spec +++ b/chromium-browser-stable.spec @@ -22,8 +22,8 @@ Summary: A fast web browser based on the Blink engine Name: chromium-browser-stable -Version: 57.0.2987.98 -Release: 2 +Version: 57.0.2987.110 +Release: 1 License: BSD, LGPL Group: Networking/WWW Url: https://www.chromium.org/Home @@ -53,8 +53,6 @@ Patch24: chromium-53-ffmpeg-no-deprecation-errors.patch Patch27: chromium-53-link-libgio-libpci-libudev-libbrlapi.patch # (cjw) add missing unbundle gn files (1) Patch28: chromium-53-gn-system-icu-jsoncpp.patch -### Chromium Tests Patches ### -#Patch29: chromium-46.0.2490.86-use_system_opus.patch # (cjw) build pdfium with system libtiff and libpng Patch30: chromium-52-pdfium-system-libtiff-libpng.patch # (cjw) fix build with ffmpeg 2.8.x @@ -86,8 +84,6 @@ Patch504: chromium-system-icu-r0.patch # fix https://bugs.chromium.org/p/chromium/issues/detail?id=585513 # vaInitialize failed VA error: unknown libva error Patch507: issue1688073002_40001.diff -# Chromium bug in 57.0.2987.98 -#Patch508: issue2730783002_1_10001.patch Provides: %{crname} = %{EVRD} Conflicts: chromium-browser-unstable @@ -128,7 +124,6 @@ BuildRequires: pkgconfig(gnome-keyring-1) BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(gtk+-3.0) -#BuildRequires: pkgconfig(harfbuzz) %if 0%{icu} BuildRequires: pkgconfig(icu-i18n) %endif @@ -153,7 +148,6 @@ BuildRequires: pkgconfig(nss) BuildRequires: pkgconfig(opus) BuildRequires: pkgconfig(speex) BuildRequires: pkgconfig(udev) -#BuildRequires: pkgconfig(vpx) >= 1.5.0 BuildRequires: pkgconfig(xscrnsaver) BuildRequires: pkgconfig(xt) BuildRequires: pkgconfig(xtst) @@ -257,7 +251,6 @@ members of the Chromium and WebDriver teams. %patch24 -p1 %patch27 -p1 %patch28 -p1 -#%%patch29 -p1 %patch30 -p1 %patch31 -p1 %patch32 -p1 @@ -283,8 +276,6 @@ members of the Chromium and WebDriver teams. %patch507 -p1 %endif -#%%patch508 -p1 - # files we do not want from upstream source bundles rm -rf breakpad/src/processor/testdata/ rm -rf chrome/app/test_data/dlls/ diff --git a/issue2730783002_1_10001.patch b/issue2730783002_1_10001.patch deleted file mode 100644 index acd3a7b..0000000 --- a/issue2730783002_1_10001.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- chromium-57.0.2987.98/chrome/test/chromedriver/chrome_launcher.cc-orig 2017-03-09 23:04:30.000000000 +0300 -+++ chromium-57.0.2987.98/chrome/test/chromedriver/chrome_launcher.cc 2017-03-12 06:25:40.663618744 +0300 -@@ -775,20 +775,26 @@ - Status status = UnpackAutomationExtension(temp_dir, &automation_extension); - if (status.IsError()) - return status; --#if defined(OS_WIN) || defined(OS_MACOSX) -- // On Chrome for Windows and Mac, a "Disable developer mode extensions" -- // dialog appears for the automation extension. Suppress this by loading -- // it as a component extension. -- UpdateExtensionSwitch(switches, "load-component-extension", -- automation_extension.value()); --#else - if (switches->HasSwitch("disable-extensions")) { -+ UpdateExtensionSwitch(switches, "disable-extensions-except", -+ automation_extension.value()); -+ // TODO(samuong): Stop using --load-component-extension when ChromeDriver -+ // stops supporting Chrome 56. For backwards compatibility, Chrome 57 and -+ // 58 interprets --load-component-extension as --load-extension. - UpdateExtensionSwitch(switches, "load-component-extension", - automation_extension.value()); - } else { -+#if defined(OS_WIN) || defined(OS_MACOSX) -+ // On Chrome 56 for Windows and Mac, a "Disable developer -+ // mode extensions" dialog appears for the automation extension. Suppress -+ // this by loading it as a component extension. -+ UpdateExtensionSwitch(switches, "load-component-extension", -+ automation_extension.value()); -+#else - extension_paths.push_back(automation_extension.value()); -- } -+ - #endif -+ } - } - - if (extension_paths.size()) {