Djam/chromium-browser-stable
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/chromium-browser-stable.git synced 2025-02-24 23:22:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Delete patche

Browse source
This commit is contained in:
Алзим 2017-03-13 12:55:01 +03:00
parent 13961d3a3c
commit 9577560c0d
2 changed files with 44 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
chromium-browser-stable.spec
View file

@ -23,7 +23,7 @@
Summary: A fast web browser based on the Blink engine Summary: A fast web browser based on the Blink engine
Name: chromium-browser-stable Name: chromium-browser-stable
Version: 57.0.2987.98 Version: 57.0.2987.98
Release: 1 Release: 2
License: BSD, LGPL License: BSD, LGPL
Group: Networking/WWW Group: Networking/WWW
Url: https://www.chromium.org/Home 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) # (cjw) add missing unbundle gn files (1)
Patch28: chromium-53-gn-system-icu-jsoncpp.patch Patch28: chromium-53-gn-system-icu-jsoncpp.patch
### Chromium Tests Patches ### ### 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 # (cjw) build pdfium with system libtiff and libpng
Patch30: chromium-52-pdfium-system-libtiff-libpng.patch Patch30: chromium-52-pdfium-system-libtiff-libpng.patch
# (cjw) fix build with ffmpeg 2.8.x # (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 # fix https://bugs.chromium.org/p/chromium/issues/detail?id=585513
# vaInitialize failed VA error: unknown libva error # vaInitialize failed VA error: unknown libva error
Patch507: issue1688073002_40001.diff Patch507: issue1688073002_40001.diff
# Chromium bug in 57.0.2987.98
#Patch508: issue2730783002_1_10001.patch
Provides: %{crname} = %{EVRD} Provides: %{crname} = %{EVRD}
Conflicts: chromium-browser-unstable Conflicts: chromium-browser-unstable
@ -255,7 +257,7 @@ members of the Chromium and WebDriver teams.
%patch24 -p1 %patch24 -p1
%patch27 -p1 %patch27 -p1
%patch28 -p1 %patch28 -p1
%patch29 -p1 #%%patch29 -p1
%patch30 -p1 %patch30 -p1
%patch31 -p1 %patch31 -p1
%patch32 -p1 %patch32 -p1
@ -281,6 +283,8 @@ members of the Chromium and WebDriver teams.
%patch507 -p1 %patch507 -p1
%endif %endif
#%%patch508 -p1
# files we do not want from upstream source bundles # files we do not want from upstream source bundles
rm -rf breakpad/src/processor/testdata/ rm -rf breakpad/src/processor/testdata/
rm -rf chrome/app/test_data/dlls/ rm -rf chrome/app/test_data/dlls/

37
issue2730783002_1_10001.patch Normal file
View file

@ -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()) {