From 9577560c0d03d1fddae7b9a4614ed4f7ebfb359d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B7=D0=B8=D0=BC?= Date: Mon, 13 Mar 2017 12:55:01 +0300 Subject: [PATCH] Delete patche --- chromium-browser-stable.spec | 10 +++++++--- issue2730783002_1_10001.patch | 37 +++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 issue2730783002_1_10001.patch diff --git a/chromium-browser-stable.spec b/chromium-browser-stable.spec index 8a44752..dff3154 100644 --- a/chromium-browser-stable.spec +++ b/chromium-browser-stable.spec @@ -23,7 +23,7 @@ Summary: A fast web browser based on the Blink engine Name: chromium-browser-stable Version: 57.0.2987.98 -Release: 1 +Release: 2 License: BSD, LGPL Group: Networking/WWW Url: https://www.chromium.org/Home @@ -54,7 +54,7 @@ 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 +#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,6 +86,8 @@ 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 @@ -255,7 +257,7 @@ members of the Chromium and WebDriver teams. %patch24 -p1 %patch27 -p1 %patch28 -p1 -%patch29 -p1 +#%%patch29 -p1 %patch30 -p1 %patch31 -p1 %patch32 -p1 @@ -281,6 +283,8 @@ 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 new file mode 100644 index 0000000..acd3a7b --- /dev/null +++ b/issue2730783002_1_10001.patch @@ -0,0 +1,37 @@ +--- 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()) {