-
-
Notifications
You must be signed in to change notification settings - Fork 12.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #41291 from YorikSar/update-chromium
chromium: 66.0.3359.181 -> 67.0.3396.62
- Loading branch information
Showing
7 changed files
with
113 additions
and
68 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
pkgs/applications/networking/browsers/chromium/patches/fix-freetype.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
--- a/third_party/freetype/BUILD.gn | ||
+++ b/third_party/freetype/BUILD.gn | ||
@@ -63,10 +63,12 @@ source_set("freetype_source") { | ||
"src/src/base/ftbase.c", | ||
"src/src/base/ftbbox.c", | ||
"src/src/base/ftbitmap.c", | ||
+ "src/src/base/ftfntfmt.c", | ||
"src/src/base/ftfstype.c", | ||
"src/src/base/ftgasp.c", | ||
"src/src/base/ftglyph.c", | ||
"src/src/base/ftinit.c", | ||
+ "src/src/base/ftlcdfil.c", | ||
"src/src/base/ftmm.c", | ||
"src/src/base/ftstroke.c", | ||
"src/src/base/fttype1.c", |
10 changes: 10 additions & 0 deletions
10
pkgs/applications/networking/browsers/chromium/patches/fix-openh264.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
--- a/third_party/openh264/BUILD.gn | ||
+++ b/third_party/openh264/BUILD.gn | ||
@@ -24,6 +24,7 @@ config("config") { | ||
if (!is_win || is_clang) { | ||
cflags += [ | ||
"-Wno-format", | ||
+ "-Wno-format-security", | ||
"-Wno-header-hygiene", | ||
"-Wno-unused-function", | ||
"-Wno-unused-value", |
21 changes: 0 additions & 21 deletions
21
pkgs/applications/networking/browsers/chromium/patches/neon_buildfix.patch
This file was deleted.
Oops, something went wrong.
70 changes: 70 additions & 0 deletions
70
pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,70 @@ | ||
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc | ||
index f4e119d..d9775bd 100644 | ||
--- a/chrome/common/chrome_paths.cc | ||
+++ b/chrome/common/chrome_paths.cc | ||
@@ -68,21 +68,14 @@ static base::LazyInstance<base::FilePath> | ||
g_invalid_specified_user_data_dir = LAZY_INSTANCE_INITIALIZER; | ||
|
||
// Gets the path for internal plugins. | ||
-bool GetInternalPluginsDirectory(base::FilePath* result) { | ||
-#if defined(OS_MACOSX) | ||
- // If called from Chrome, get internal plugins from a subdirectory of the | ||
- // framework. | ||
- if (base::mac::AmIBundled()) { | ||
- *result = chrome::GetFrameworkBundlePath(); | ||
- DCHECK(!result->empty()); | ||
- *result = result->Append("Internet Plug-Ins"); | ||
- return true; | ||
- } | ||
- // In tests, just look in the module directory (below). | ||
-#endif | ||
- | ||
- // The rest of the world expects plugins in the module directory. | ||
- return base::PathService::Get(base::DIR_MODULE, result); | ||
+bool GetInternalPluginsDirectory(base::FilePath* result, | ||
+ const std::string& ident) { | ||
+ std::string full_env = std::string("NIX_CHROMIUM_PLUGIN_PATH_") + ident; | ||
+ const char* value = getenv(full_env.c_str()); | ||
+ if (value == NULL) | ||
+ return PathService::Get(base::DIR_MODULE, result); | ||
+ else | ||
+ *result = base::FilePath(value); | ||
} | ||
|
||
// Gets the path for bundled implementations of components. Note that these | ||
@@ -272,7 +265,7 @@ bool PathProvider(int key, base::FilePath* result) { | ||
create_dir = true; | ||
break; | ||
case chrome::DIR_INTERNAL_PLUGINS: | ||
- if (!GetInternalPluginsDirectory(&cur)) | ||
+ if (!GetInternalPluginsDirectory(&cur, "ALL")) | ||
return false; | ||
break; | ||
case chrome::DIR_COMPONENTS: | ||
@@ -280,7 +273,7 @@ bool PathProvider(int key, base::FilePath* result) { | ||
return false; | ||
break; | ||
case chrome::DIR_PEPPER_FLASH_PLUGIN: | ||
- if (!GetInternalPluginsDirectory(&cur)) | ||
+ if (!GetInternalPluginsDirectory(&cur, "PEPPERFLASH")) | ||
return false; | ||
cur = cur.Append(kPepperFlashBaseDirectory); | ||
break; | ||
@@ -323,7 +316,7 @@ bool PathProvider(int key, base::FilePath* result) { | ||
// We currently need a path here to look up whether the plugin is disabled | ||
// and what its permissions are. | ||
case chrome::FILE_NACL_PLUGIN: | ||
- if (!GetInternalPluginsDirectory(&cur)) | ||
+ if (!GetInternalPluginsDirectory(&cur, "NACL")) | ||
return false; | ||
cur = cur.Append(kInternalNaClPluginFileName); | ||
break; | ||
@@ -358,7 +351,7 @@ bool PathProvider(int key, base::FilePath* result) { | ||
cur = cur.DirName(); | ||
} | ||
#else | ||
- if (!GetInternalPluginsDirectory(&cur)) | ||
+ if (!GetInternalPluginsDirectory(&cur, "PNACL")) | ||
return false; | ||
#endif | ||
cur = cur.Append(FILE_PATH_LITERAL("pnacl")); |
22 changes: 0 additions & 22 deletions
22
pkgs/applications/networking/browsers/chromium/patches/skia_buildfix.patch
This file was deleted.
Oops, something went wrong.
18 changes: 9 additions & 9 deletions
18
pkgs/applications/networking/browsers/chromium/upstream-info.nix
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,18 @@ | ||
# This file is autogenerated from update.sh in the same directory. | ||
{ | ||
beta = { | ||
sha256 = "169lxj6rhpqcnrg3n2api82975hkifz6wmks1bh04jkxw0z2vkny"; | ||
sha256bin64 = "1hd4s35yhi2xidy3xncp66p03cv715bzbf3gcv5dl0d1h3nmhhdf"; | ||
version = "67.0.3396.40"; | ||
sha256 = "03bpznpnr22lphixvvc1cr0pn4p7fxjlz0wwysjw9j7i5y9n7vnm"; | ||
sha256bin64 = "06gmn0clhll91pmph07db043006gf2x6nfgxlir4qwqsj2qgdch0"; | ||
version = "67.0.3396.62"; | ||
}; | ||
dev = { | ||
sha256 = "0j4vcfbdj8cvdsmnb6pz0k71w559rm3ka1yyv0yfq7f756hinpvp"; | ||
sha256bin64 = "1qqhyjdd227psvr904w3d3lq47bfwmpk6f7sam2gp4j0wxn23w8w"; | ||
version = "68.0.3423.2"; | ||
sha256 = "0hy36r938k6c89alam4a8yy2wynnlcc0zqhhb0jgy3qlnqrksvrc"; | ||
sha256bin64 = "0liqgz8sip5fz5mxb54zagz3p8s24j96p26i5dql935bic7p3lhw"; | ||
version = "68.0.3440.7"; | ||
}; | ||
stable = { | ||
sha256 = "06g9m7lxm9g63dcci25dqiglyjxjfy7v05vjhdda4rdk84vngrip"; | ||
sha256bin64 = "105ds6r6awzhf5sq3nf43b6zb84lb4qbhjnfk3fnxfqvskq3b6r2"; | ||
version = "66.0.3359.181"; | ||
sha256 = "03bpznpnr22lphixvvc1cr0pn4p7fxjlz0wwysjw9j7i5y9n7vnm"; | ||
sha256bin64 = "16fljvrq2gcpjpyhf1w8s3rv805mknmy2i88n43v2cg7hl35241c"; | ||
version = "67.0.3396.62"; | ||
}; | ||
} |