Date: Mon, 15 Aug 2022 01:20:21 GMT From: Hiroki Tagato <tagattie@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: a030a071c3b1 - main - devel/electron18: update to 18.3.8 Message-ID: <202208150120.27F1KL2x043127@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=a030a071c3b1d5d1c3dfbeed1ec9b979904430c6 commit a030a071c3b1d5d1c3dfbeed1ec9b979904430c6 Author: Hiroki Tagato <tagattie@FreeBSD.org> AuthorDate: 2022-08-15 01:18:56 +0000 Commit: Hiroki Tagato <tagattie@FreeBSD.org> CommitDate: 2022-08-15 01:20:09 +0000 devel/electron18: update to 18.3.8 Changelog: https://github.com/electron/electron/releases/tag/v18.3.8 --- devel/electron18/Makefile | 2 +- devel/electron18/Makefile.version | 2 +- devel/electron18/distinfo | 10 +++++----- devel/electron18/files/package.json | 2 +- ...ch-chrome_browser_chrome__content__browser__client.cc | 6 +++--- devel/electron18/files/patch-content_test_BUILD.gn | 4 ++-- devel/electron18/files/patch-electron_filenames.gni | 4 ++-- ...ctron_shell_browser_electron__browser__main__parts.cc | 16 ++++++++-------- ...ectron_shell_browser_electron__browser__main__parts.h | 13 +++++++++++-- editors/vscode/Makefile | 1 + 10 files changed, 35 insertions(+), 25 deletions(-) diff --git a/devel/electron18/Makefile b/devel/electron18/Makefile index 44db7f89d670..f7e3e03e9364 100644 --- a/devel/electron18/Makefile +++ b/devel/electron18/Makefile @@ -152,7 +152,7 @@ REACTIVEOBJC_VER= 74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76 # See ${WRKSRC}/electron/DEPS for MANTLE_VER MANTLE_VER= 78d3966b3c331292ea29ec38661b25df0a245948 -YARN_TIMESTAMP= 1659680636 +YARN_TIMESTAMP= 1660370296 GN_ARGS+= clang_use_chrome_plugins=false \ enable_hangout_services_extension=true \ diff --git a/devel/electron18/Makefile.version b/devel/electron18/Makefile.version index b453915b46a0..ab1041d01d06 100644 --- a/devel/electron18/Makefile.version +++ b/devel/electron18/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 18.3.7 +ELECTRON_VER= 18.3.8 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron18/distinfo b/devel/electron18/distinfo index 0c9f8c572992..91fdcd947dc1 100644 --- a/devel/electron18/distinfo +++ b/devel/electron18/distinfo @@ -1,14 +1,14 @@ -TIMESTAMP = 1659681346 +TIMESTAMP = 1660372113 SHA256 (electron/chromium-100.0.4896.160.tar.xz) = a3f755dff069c6fae3eb7f07b33c0dd3f0762fa82959f41c7bd347da8efbacff SIZE (electron/chromium-100.0.4896.160.tar.xz) = 1228994280 SHA256 (electron/aad6877c8cd3cff0ef1ba628d71acc981c520c29) = 9793d0cfb94bf2ff099682dcd31ef46d1d7f42346c8a2f6355a5f8fda3dcd506 SIZE (electron/aad6877c8cd3cff0ef1ba628d71acc981c520c29) = 12028653 SHA256 (electron/cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb) = ec973eccd669d417fbf2d0a4dac730744a3174268ff062db5451b55c82bc3492 SIZE (electron/cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb) = 26759650 -SHA256 (electron/electron-yarn-cache-18.3.7.tar.xz) = 92136fa751a835aace8ebe68768892ceaf168d7269ef7df0baf62555bcf218b9 -SIZE (electron/electron-yarn-cache-18.3.7.tar.xz) = 38391132 -SHA256 (electron/electron-electron-v18.3.7_GH0.tar.gz) = 8baf3b4860c28b366020522ff5bc57f5fbf5871eb04954dd3f9c1054e18b1bf0 -SIZE (electron/electron-electron-v18.3.7_GH0.tar.gz) = 10564191 +SHA256 (electron/electron-yarn-cache-18.3.8.tar.xz) = 17364f44fddeeecc11a3e685e70116f44db54fe8242583b3935a1131433dacc8 +SIZE (electron/electron-yarn-cache-18.3.8.tar.xz) = 38391168 +SHA256 (electron/electron-electron-v18.3.8_GH0.tar.gz) = 2ad2c482113144b2fbca16f72cd4873e2908084f249f596754d7ef0ab5b7ca8c +SIZE (electron/electron-electron-v18.3.8_GH0.tar.gz) = 10575281 SHA256 (electron/nodejs-node-v16.13.2_GH0.tar.gz) = 93c65be15bfe8151b4a99d529538b23ffc6b5e0202dc7df0e32aa780ab49ad97 SIZE (electron/nodejs-node-v16.13.2_GH0.tar.gz) = 87972240 SHA256 (electron/nodejs-nan-65b32af46e9d7fab2e4ff657751205b3865f4920_GH0.tar.gz) = a649b75bfa9c1a0254c73d022c6e98924b9471f593bcc83832daaf68da4cae8d diff --git a/devel/electron18/files/package.json b/devel/electron18/files/package.json index 096a7d8243dc..2e1f56965ed6 100644 --- a/devel/electron18/files/package.json +++ b/devel/electron18/files/package.json @@ -1,6 +1,6 @@ { "name": "electron", - "version": "18.3.7", + "version": "18.3.8", "repository": "https://github.com/electron/electron", "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS", "devDependencies": { diff --git a/devel/electron18/files/patch-chrome_browser_chrome__content__browser__client.cc b/devel/electron18/files/patch-chrome_browser_chrome__content__browser__client.cc index 59ec2744e98a..c82b1c358f55 100644 --- a/devel/electron18/files/patch-chrome_browser_chrome__content__browser__client.cc +++ b/devel/electron18/files/patch-chrome_browser_chrome__content__browser__client.cc @@ -1,4 +1,4 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2022-05-19 05:17:36 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2022-08-13 06:48:37 UTC +++ chrome/browser/chrome_content_browser_client.cc @@ -374,7 +374,7 @@ #include "services/service_manager/public/mojom/interface_provider_spec.mojom.h" @@ -131,7 +131,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -4292,14 +4294,14 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -4296,14 +4298,14 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati &throttles); } @@ -148,7 +148,7 @@ MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -4332,7 +4334,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -4336,7 +4338,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/devel/electron18/files/patch-content_test_BUILD.gn b/devel/electron18/files/patch-content_test_BUILD.gn index 2faeafaa011d..1b0008e7309c 100644 --- a/devel/electron18/files/patch-content_test_BUILD.gn +++ b/devel/electron18/files/patch-content_test_BUILD.gn @@ -1,4 +1,4 @@ ---- content/test/BUILD.gn.orig 2022-05-19 05:17:42 UTC +--- content/test/BUILD.gn.orig 2022-08-13 06:48:37 UTC +++ content/test/BUILD.gn @@ -1914,7 +1914,7 @@ static_library("run_all_unittests") { ":test_support", @@ -9,7 +9,7 @@ deps += [ "//content/common:set_process_title_linux" ] } } -@@ -2850,7 +2850,7 @@ test("content_unittests") { +@@ -2849,7 +2849,7 @@ test("content_unittests") { deps += [ "//third_party/boringssl" ] } diff --git a/devel/electron18/files/patch-electron_filenames.gni b/devel/electron18/files/patch-electron_filenames.gni index 6411064b64f4..525c949dbe48 100644 --- a/devel/electron18/files/patch-electron_filenames.gni +++ b/devel/electron18/files/patch-electron_filenames.gni @@ -1,6 +1,6 @@ ---- electron/filenames.gni.orig 2022-05-11 15:32:29 UTC +--- electron/filenames.gni.orig 2022-08-10 15:32:20 UTC +++ electron/filenames.gni -@@ -238,8 +238,8 @@ filenames = { +@@ -239,8 +239,8 @@ filenames = { "shell/app/command_line_args.h", "shell/app/electron_content_client.cc", "shell/app/electron_content_client.h", diff --git a/devel/electron18/files/patch-electron_shell_browser_electron__browser__main__parts.cc b/devel/electron18/files/patch-electron_shell_browser_electron__browser__main__parts.cc index d84ee79d77bd..f9c1ebb8b3bc 100644 --- a/devel/electron18/files/patch-electron_shell_browser_electron__browser__main__parts.cc +++ b/devel/electron18/files/patch-electron_shell_browser_electron__browser__main__parts.cc @@ -1,4 +1,4 @@ ---- electron/shell/browser/electron_browser_main_parts.cc.orig 2022-06-22 15:31:20 UTC +--- electron/shell/browser/electron_browser_main_parts.cc.orig 2022-08-10 15:32:20 UTC +++ electron/shell/browser/electron_browser_main_parts.cc @@ -64,7 +64,7 @@ #include "ui/wm/core/wm_state.h" @@ -33,10 +33,10 @@ #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + DetectOzonePlatform(); ui::OzonePlatform::PreEarlyInitialization(); #endif - -@@ -277,7 +277,7 @@ int ElectronBrowserMainParts::PreCreateThreads() { +@@ -278,7 +278,7 @@ int ElectronBrowserMainParts::PreCreateThreads() { #if defined(USE_AURA) screen_ = views::CreateDesktopScreen(); display::Screen::SetScreenInstance(screen_.get()); @@ -45,7 +45,7 @@ views::LinuxUI::instance()->UpdateDeviceScaleFactor(); #endif #endif -@@ -294,7 +294,7 @@ int ElectronBrowserMainParts::PreCreateThreads() { +@@ -295,7 +295,7 @@ int ElectronBrowserMainParts::PreCreateThreads() { // happen before the ResourceBundle is loaded if (locale.empty()) l10n_util::OverrideLocaleWithCocoaLocale(); @@ -54,7 +54,7 @@ // l10n_util::GetApplicationLocaleInternal uses g_get_language_names(), // which keys off of getenv("LC_ALL"). // We must set this env first to make ui::ResourceBundle accept the custom -@@ -317,7 +317,7 @@ int ElectronBrowserMainParts::PreCreateThreads() { +@@ -318,7 +318,7 @@ int ElectronBrowserMainParts::PreCreateThreads() { ElectronBrowserClient::SetApplicationLocale(app_locale); fake_browser_process_->SetApplicationLocale(app_locale); @@ -63,7 +63,7 @@ // Reset to the original LC_ALL since we should not be changing it. if (!locale.empty()) { if (lc_all) -@@ -364,7 +364,7 @@ void ElectronBrowserMainParts::PostDestroyThreads() { +@@ -365,7 +365,7 @@ void ElectronBrowserMainParts::PostDestroyThreads() { } void ElectronBrowserMainParts::ToolkitInitialized() { @@ -72,7 +72,7 @@ auto linux_ui = BuildGtkUi(); linux_ui->Initialize(); DCHECK(ui::LinuxInputMethodContextFactory::instance()); -@@ -481,7 +481,9 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo +@@ -482,7 +482,9 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo ui::OzonePlatform::GetInstance()->PostCreateMainMessageLoop( std::move(shutdown_cb)); bluez::DBusBluezManagerWrapperLinux::Initialize(); @@ -82,7 +82,7 @@ // Set up crypt config. This needs to be done before anything starts the // network service, as the raw encryption key needs to be shared with the // network service for encrypted cookie storage. -@@ -540,7 +542,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun( +@@ -541,7 +543,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun( fake_browser_process_->PostMainMessageLoopRun(); content::DevToolsAgentHost::StopRemoteDebuggingPipeHandler(); diff --git a/devel/electron18/files/patch-electron_shell_browser_electron__browser__main__parts.h b/devel/electron18/files/patch-electron_shell_browser_electron__browser__main__parts.h index f92fd4ce1bb9..43d0ceefb41e 100644 --- a/devel/electron18/files/patch-electron_shell_browser_electron__browser__main__parts.h +++ b/devel/electron18/files/patch-electron_shell_browser_electron__browser__main__parts.h @@ -1,4 +1,4 @@ ---- electron/shell/browser/electron_browser_main_parts.h.orig 2022-05-18 15:31:32 UTC +--- electron/shell/browser/electron_browser_main_parts.h.orig 2022-08-10 15:32:20 UTC +++ electron/shell/browser/electron_browser_main_parts.h @@ -61,7 +61,7 @@ class ViewsDelegate; class ViewsDelegateMac; @@ -9,7 +9,16 @@ class DarkThemeObserver; #endif -@@ -139,7 +139,7 @@ class ElectronBrowserMainParts : public content::Brows +@@ -122,7 +122,7 @@ class ElectronBrowserMainParts : public content::Brows + const scoped_refptr<base::SingleThreadTaskRunner>& task_runner); + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void DetectOzonePlatform(); + #endif + +@@ -143,7 +143,7 @@ class ElectronBrowserMainParts : public content::Brows std::unique_ptr<display::Screen> screen_; #endif diff --git a/editors/vscode/Makefile b/editors/vscode/Makefile index 978b8ae9b5c6..608e7e20be51 100644 --- a/editors/vscode/Makefile +++ b/editors/vscode/Makefile @@ -1,5 +1,6 @@ PORTNAME= vscode DISTVERSION= 1.70.1 +PORTREVISION= 1 CATEGORIES= editors MASTER_SITES= https://registry.npmjs.org/esbuild-freebsd-64/-/:esbuild_binary \ https://nodejs.org/dist/v${NODE_VER}/:node_headers \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202208150120.27F1KL2x043127>