From a9652052c4a1a4f422b4d342dfd93a09802cdc2d Mon Sep 17 00:00:00 2001 From: "Brian R. Bondy" Date: Wed, 4 May 2016 13:46:37 -0400 Subject: [PATCH] Update Brightray and libchromiumcontent v50 ref (Electron maintainer use your refs) --- .gitmodules | 2 +- atom/common/chrome_version.h | 2 +- script/lib/config.py | 2 +- vendor/brightray | 2 +- vendor/crashpad | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 13679d3dc..a38a8d044 100644 --- a/.gitmodules +++ b/.gitmodules @@ -15,7 +15,7 @@ url = https://github.com/zcbenz/native-mate.git [submodule "vendor/crashpad"] path = vendor/crashpad - url = https://github.com/brave/crashpad.git + url = https://github.com/crashpad/crashpad.git [submodule "vendor/requests"] path = vendor/requests url = https://github.com/kennethreitz/requests diff --git a/atom/common/chrome_version.h b/atom/common/chrome_version.h index 8b9b7ef0c..18abcdeca 100644 --- a/atom/common/chrome_version.h +++ b/atom/common/chrome_version.h @@ -8,7 +8,7 @@ #ifndef ATOM_COMMON_CHROME_VERSION_H_ #define ATOM_COMMON_CHROME_VERSION_H_ -#define CHROME_VERSION_STRING "49.0.2623.75" +#define CHROME_VERSION_STRING "50.0.2661.94" #define CHROME_VERSION "v" CHROME_VERSION_STRING #endif // ATOM_COMMON_CHROME_VERSION_H_ diff --git a/script/lib/config.py b/script/lib/config.py index 4b3f4ba6f..a79fbed73 100644 --- a/script/lib/config.py +++ b/script/lib/config.py @@ -8,7 +8,7 @@ import sys BASE_URL = os.getenv('LIBCHROMIUMCONTENT_MIRROR') or \ 'https://s3.amazonaws.com/github-janky-artifacts/libchromiumcontent' -LIBCHROMIUMCONTENT_COMMIT = '1a4c5e51a670633ff3ecd4448ad01ba21b440542' +LIBCHROMIUMCONTENT_COMMIT = '5a15db93479dfaf6506d8d263d409d3f022c81b5' PLATFORM = { 'cygwin': 'win32', diff --git a/vendor/brightray b/vendor/brightray index a98267c71..75bda7d21 160000 --- a/vendor/brightray +++ b/vendor/brightray @@ -1 +1 @@ -Subproject commit a98267c714b2c3435c1b86e50fd40523ef428a23 +Subproject commit 75bda7d2118c953b35d8a7d1962067a68dea34fb diff --git a/vendor/crashpad b/vendor/crashpad index 8b065d74c..db713da75 160000 --- a/vendor/crashpad +++ b/vendor/crashpad @@ -1 +1 @@ -Subproject commit 8b065d74c59a2dfacccae664a31131be976a634b +Subproject commit db713da7554f565e43c6dcf9a51b59ccc4f06066 -- 2.34.1