From fe8747b098518859e51bfce5d29447805ae03c88 Mon Sep 17 00:00:00 2001 From: Hiroki Tagato Date: Mon, 6 Mar 2023 14:58:13 +0900 Subject: [PATCH] devel/electron23: update to 23.1.2 Changelog: https://github.com/electron/electron/releases/tag/v23.1.2 --- devel/electron23/Makefile | 5 ++--- devel/electron23/Makefile.version | 2 +- devel/electron23/distinfo | 14 +++++++------- ...-chrome_browser_ui_views_frame_browser__view.cc | 4 ++-- devel/electron23/files/patch-chrome_test_BUILD.gn | 4 ++-- ...ell_browser_api_electron__api__web__contents.cc | 8 ++++---- ...hell_browser_api_electron__api__web__contents.h | 4 ++-- .../patch-media_gpu_vaapi_vaapi__video__decoder.cc | 4 ++-- 8 files changed, 22 insertions(+), 23 deletions(-) diff --git a/devel/electron23/Makefile b/devel/electron23/Makefile index 441bf4e43..10bfa34d8 100644 --- a/devel/electron23/Makefile +++ b/devel/electron23/Makefile @@ -1,7 +1,6 @@ PORTNAME= electron DISTVERSIONPREFIX= v DISTVERSION= ${ELECTRON_VER:S/-beta./.b/} -PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/:chromium \ https://commondatastorage.googleapis.com/chromium-fonts/:chromium_testfonts @@ -205,7 +204,7 @@ SNDIO_VARS= GN_ARGS+=use_sndio=true SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false # See ${WRKSRC}/electron/DEPS for CHROMIUM_VER -CHROMIUM_VER= 110.0.5481.100 +CHROMIUM_VER= 110.0.5481.177 # See ${WRKSRC}/third_party/test_fonts/test_fonts.tar.gz.sha1 for CHROMIUM_TEST_FONTS_HASH CHROMIUM_TEST_FONTS_HASH= 336e775eec536b2d785cc80eff6ac39051931286 # See ${WRKSRC}/electron/DEPS for NODE_VER @@ -219,7 +218,7 @@ REACTIVEOBJC_VER= 74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76 # See ${WRKSRC}/electron/DEPS for MANTLE_VER MANTLE_VER= 78d3966b3c331292ea29ec38661b25df0a245948 -YARN_TIMESTAMP= 1677480801 +YARN_TIMESTAMP= 1678067448 .include "Makefile.version" .include diff --git a/devel/electron23/Makefile.version b/devel/electron23/Makefile.version index 7f4e3e871..a76648cfa 100644 --- a/devel/electron23/Makefile.version +++ b/devel/electron23/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 23.1.1 +ELECTRON_VER= 23.1.2 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron23/distinfo b/devel/electron23/distinfo index ad1d1ce9d..7491a12de 100644 --- a/devel/electron23/distinfo +++ b/devel/electron23/distinfo @@ -1,12 +1,12 @@ -TIMESTAMP = 1677482291 -SHA256 (electron/chromium-110.0.5481.100.tar.xz) = 6d870d690c1f2c41a288011b0149752681077f1459ebe7a4f9215dbfde21f633 -SIZE (electron/chromium-110.0.5481.100.tar.xz) = 1703445256 +TIMESTAMP = 1678068095 +SHA256 (electron/chromium-110.0.5481.177.tar.xz) = 7b2f454d1195270a39f94a9ff6d8d68126be315e0da4e31c20f4ba9183a1c9b7 +SIZE (electron/chromium-110.0.5481.177.tar.xz) = 1703390456 SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8 SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734 -SHA256 (electron/electron-yarn-cache-23.1.1.tar.xz) = 7449bb062cb2b57a6b8e18a176ae9dd4f39fcbf1910749a8ba6d6d0347130c06 -SIZE (electron/electron-yarn-cache-23.1.1.tar.xz) = 38871220 -SHA256 (electron/electron-electron-v23.1.1_GH0.tar.gz) = 5213dc292399710e5e5653204b87b6210d26fb0f7b441203d6d7c714de3f7ff9 -SIZE (electron/electron-electron-v23.1.1_GH0.tar.gz) = 10489107 +SHA256 (electron/electron-yarn-cache-23.1.2.tar.xz) = a9f422a632784dca925378cf77db503aacfa4abe9cc854c112fb9027ba4dbe32 +SIZE (electron/electron-yarn-cache-23.1.2.tar.xz) = 38871216 +SHA256 (electron/electron-electron-v23.1.2_GH0.tar.gz) = 5ec405a00e0d43a12fe8ee99a3ac3f9e1b569ea0d3ed992716548afe1abaf0c2 +SIZE (electron/electron-electron-v23.1.2_GH0.tar.gz) = 10493693 SHA256 (electron/nodejs-node-v18.12.1_GH0.tar.gz) = 7e7962209d25ed6c28b722b78a0b0ca304307d7bf536aca142be330901b11d50 SIZE (electron/nodejs-node-v18.12.1_GH0.tar.gz) = 108947341 SHA256 (electron/nodejs-nan-16fa32231e2ccd89d2804b3f765319128b20c4ac_GH0.tar.gz) = 3807ae6a1e451a29f068540472f100f9718d457c60ac62f2f8469d1d57475d39 diff --git a/devel/electron23/files/patch-chrome_browser_ui_views_frame_browser__view.cc b/devel/electron23/files/patch-chrome_browser_ui_views_frame_browser__view.cc index 7c890763c..5c0317217 100644 --- a/devel/electron23/files/patch-chrome_browser_ui_views_frame_browser__view.cc +++ b/devel/electron23/files/patch-chrome_browser_ui_views_frame_browser__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/browser_view.cc.orig 2023-02-01 18:43:13 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2023-02-22 18:41:43 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -2115,7 +2115,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra +@@ -2117,7 +2117,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra // CrOS cleanup is done. // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/devel/electron23/files/patch-chrome_test_BUILD.gn b/devel/electron23/files/patch-chrome_test_BUILD.gn index a0598b2bd..625ca5542 100644 --- a/devel/electron23/files/patch-chrome_test_BUILD.gn +++ b/devel/electron23/files/patch-chrome_test_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/test/BUILD.gn.orig 2023-02-15 13:08:45 UTC +--- chrome/test/BUILD.gn.orig 2023-03-06 02:35:51 UTC +++ chrome/test/BUILD.gn -@@ -10226,7 +10226,7 @@ test("chrome_app_unittests") { +@@ -10225,7 +10225,7 @@ test("chrome_app_unittests") { "//components/heap_profiling/in_process", "//components/safe_browsing:buildflags", ] diff --git a/devel/electron23/files/patch-electron_shell_browser_api_electron__api__web__contents.cc b/devel/electron23/files/patch-electron_shell_browser_api_electron__api__web__contents.cc index 993bc5faf..a11446567 100644 --- a/devel/electron23/files/patch-electron_shell_browser_api_electron__api__web__contents.cc +++ b/devel/electron23/files/patch-electron_shell_browser_api_electron__api__web__contents.cc @@ -1,4 +1,4 @@ ---- electron/shell/browser/api/electron_api_web_contents.cc.orig 2023-02-21 16:55:58 UTC +--- electron/shell/browser/api/electron_api_web_contents.cc.orig 2023-03-03 08:46:05 UTC +++ electron/shell/browser/api/electron_api_web_contents.cc @@ -154,11 +154,11 @@ #include "ui/base/cocoa/defaults_utils.h" @@ -32,7 +32,7 @@ // Update font settings. static const gfx::FontRenderParams params( gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), nullptr)); -@@ -2397,7 +2397,7 @@ void WebContents::ForcefullyCrashRenderer() { +@@ -2395,7 +2395,7 @@ void WebContents::ForcefullyCrashRenderer() { content::RenderProcessHost* rph = rwh->GetProcess(); if (rph) { @@ -41,7 +41,7 @@ // A generic |CrashDumpHungChildProcess()| is not implemented for Linux. // Instead we send an explicit IPC to crash on the renderer's IO thread. rph->ForceCrash(); -@@ -3040,7 +3040,7 @@ void WebContents::CopyImageAt(int x, int y) { +@@ -3038,7 +3038,7 @@ void WebContents::CopyImageAt(int x, int y) { void WebContents::Focus() { // Focusing on WebContents does not automatically focus the window on macOS // and Linux, do it manually to match the behavior on Windows. @@ -50,7 +50,7 @@ if (owner_window()) owner_window()->Focus(true); #endif -@@ -3834,7 +3834,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { +@@ -3840,7 +3840,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { } #endif diff --git a/devel/electron23/files/patch-electron_shell_browser_api_electron__api__web__contents.h b/devel/electron23/files/patch-electron_shell_browser_api_electron__api__web__contents.h index 3dfcf12bb..419d1164e 100644 --- a/devel/electron23/files/patch-electron_shell_browser_api_electron__api__web__contents.h +++ b/devel/electron23/files/patch-electron_shell_browser_api_electron__api__web__contents.h @@ -1,6 +1,6 @@ ---- electron/shell/browser/api/electron_api_web_contents.h.orig 2023-02-06 19:29:11 UTC +--- electron/shell/browser/api/electron_api_web_contents.h.orig 2023-03-03 08:46:05 UTC +++ electron/shell/browser/api/electron_api_web_contents.h -@@ -712,7 +712,7 @@ class WebContents : public ExclusiveAccessContext, +@@ -718,7 +718,7 @@ class WebContents : public ExclusiveAccessContext, #if defined(TOOLKIT_VIEWS) && !BUILDFLAG(IS_MAC) ui::ImageModel GetDevToolsWindowIcon() override; #endif diff --git a/devel/electron23/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc b/devel/electron23/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc index 3d73e7ed5..568910bcd 100644 --- a/devel/electron23/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc +++ b/devel/electron23/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc @@ -1,6 +1,6 @@ ---- media/gpu/vaapi/vaapi_video_decoder.cc.orig 2023-02-01 18:43:22 UTC +--- media/gpu/vaapi/vaapi_video_decoder.cc.orig 2023-02-22 18:41:52 UTC +++ media/gpu/vaapi/vaapi_video_decoder.cc -@@ -769,7 +769,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree +@@ -768,7 +768,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree const gfx::Size decoder_natural_size = aspect_ratio_.GetNaturalSize(decoder_visible_rect);