From nobody Fri Jun 30 07:44:55 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QsnQv5YVTz4kyPY; Fri, 30 Jun 2023 07:44:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QsnQv4gttz4M47; Fri, 30 Jun 2023 07:44:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688111095; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QN75VYY98ZYDdCK33hjxDIuDYsKpP3JeBu4Q2GrYjvE=; b=h6GljctL0tNZmzHCaq13GGZVagY3TVgMD7a8zDPS9JXvsrEh8Il4TiWQs2g5LajQBkaePs RWw1G/dcBLLLbp3GuJunShmfa2BgiSBh45S+FDIVmo00CNdr+E23DH81+tA8+nSulyA9J/ J6j1o5Uw7FHA4s5cOKwRv54G8iJueuINvVW/SO2pYUbWWRplFyj7+1m3hmj+VFuswwigFM +UycbNAzAxOWaVgLIYPMtsT5mRqX2gPicRMIwsLKj2O+y5hoPm4RhNgHX7FrYSm1iDcx7D 39Vti7N7M8G1x1puJVjFFoiHZUWONRqaRR5EUPUyqGdxz1VBvrcoiN2Ug9erxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688111095; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QN75VYY98ZYDdCK33hjxDIuDYsKpP3JeBu4Q2GrYjvE=; b=gRWP+ljEyaYgvEAXWoK5BJsbFHJ2+GXyvClDeYDYXwUCrQToHhSVnPJRTJMmR/fgzYBcdH ySibfMA3kRNLEMy0cjp4oKTT81/5ub2xv+IT8d7no0KoabKpKF9qR74A99vHA+XRe+nCGC fZS1ScZYi0zMIFSnyoC0pm7Ru2Bebh1xJTW9QkhTtGK0AJO2JK2rWGqA6G3rK+IyjBNccr w+nxtG0tyT7kzKrUGl7mVOSlSso6/IJ1l08QpHMKw1czmC9yEtgbvaTDT7+NK4G67eHlvH VaGd46pgzrQiupVWWk6eGD5BG93XYwln7Ufcm+ILaOuLIP8iQ8bAoRdg+tL3AQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688111095; a=rsa-sha256; cv=none; b=f3BBExewtIcmZKpuv41nbuNkxLaO5OkHfXfsd03BZpw8CwLHp6V1OYqESbpR5Z7mbg+8Ee z4b59Z2S5mKXvG7h8AUMPvvhlYCswZU1CjwWMF5DuXroicIylk0ATpImOHnSvbqhbKhFnG gJQ3jmoJdXtx/IF8fMhJkUjAYfP5G9mBiuj7jl9PN/9c9KY7WIh3rxfWJ2tOjPCYHbEXaI dqwrSEOFzh9l/2ouDcjLnLxiB7K++43iY8hBJRVOv60hAhGO5ysRG7LK+0s0bE6XcpmfRe 887sfr5vLmaPT67t5ntdSMoYT2Rjnx2CG9L5b5RUvLoWrU5mZl85Dg5oFaiLqg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QsnQv3VvTzr7g; Fri, 30 Jun 2023 07:44:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 35U7itM5019923; Fri, 30 Jun 2023 07:44:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 35U7itq9019922; Fri, 30 Jun 2023 07:44:55 GMT (envelope-from git) Date: Fri, 30 Jun 2023 07:44:55 GMT Message-Id: <202306300744.35U7itq9019922@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Hiroki Tagato Subject: git: e117bf7a7cd5 - main - devel/electron24: update to 24.6.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tagattie X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e117bf7a7cd510a0dd414c0dc63a8ee0856f6887 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=e117bf7a7cd510a0dd414c0dc63a8ee0856f6887 commit e117bf7a7cd510a0dd414c0dc63a8ee0856f6887 Author: Hiroki Tagato AuthorDate: 2023-06-30 07:43:35 +0000 Commit: Hiroki Tagato CommitDate: 2023-06-30 07:44:49 +0000 devel/electron24: update to 24.6.1 Changelog: https://github.com/electron/electron/releases/tag/v24.6.1 Reported by: GitHub (watch releases) --- devel/electron24/Makefile | 2 +- devel/electron24/Makefile.version | 2 +- devel/electron24/distinfo | 10 +++++----- ...shell_browser_api_electron__api__web__contents.cc | 14 +++++++------- .../patch-electron_shell_browser_native__window.cc | 4 ++-- ...h-electron_shell_browser_native__window__views.cc | 20 ++++++++++---------- ...tron_shell_common_api_electron__api__clipboard.cc | 8 ++++---- .../files/patch-electron_spec_chromium-spec.ts | 6 +++--- 8 files changed, 33 insertions(+), 33 deletions(-) diff --git a/devel/electron24/Makefile b/devel/electron24/Makefile index 410253e63629..e175350668ba 100644 --- a/devel/electron24/Makefile +++ b/devel/electron24/Makefile @@ -221,7 +221,7 @@ REACTIVEOBJC_VER= 74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76 # See ${WRKSRC}/electron/DEPS for MANTLE_VER MANTLE_VER= 78d3966b3c331292ea29ec38661b25df0a245948 -YARN_TIMESTAMP= 1687605823 +YARN_TIMESTAMP= 1688077933 .include "Makefile.version" .include diff --git a/devel/electron24/Makefile.version b/devel/electron24/Makefile.version index 3a2882823eba..9e21cdfc6f21 100644 --- a/devel/electron24/Makefile.version +++ b/devel/electron24/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 24.6.0 +ELECTRON_VER= 24.6.1 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron24/distinfo b/devel/electron24/distinfo index 1f1ef8ec40e5..12153a875e82 100644 --- a/devel/electron24/distinfo +++ b/devel/electron24/distinfo @@ -1,14 +1,14 @@ -TIMESTAMP = 1687606092 +TIMESTAMP = 1688078702 SHA256 (electron/chromium-112.0.5615.204.tar.xz) = 4eb23f689df9685fc4ce38fe751023ac98aab2ca21af1ee7ebe47fa5c095a09d SIZE (electron/chromium-112.0.5615.204.tar.xz) = 1572906744 SHA256 (electron/a98dcca3c46a718770b2cb3430785ea4ed7e3f09) = 386332ab89cbe19c427a3febcf2e93ee89a3007243da3e3e466823f50d00eba5 SIZE (electron/a98dcca3c46a718770b2cb3430785ea4ed7e3f09) = 9822544 SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8 SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734 -SHA256 (electron/electron-yarn-cache-24.6.0.tar.xz) = 8665ed5c603629ebd64e26a1545dee8230cc887ac0eb03d15218925da4af1d49 -SIZE (electron/electron-yarn-cache-24.6.0.tar.xz) = 41637148 -SHA256 (electron/electron-electron-v24.6.0_GH0.tar.gz) = 89bb6fcea7975c24f207568e9cb4cba3ee48d1f1f6658e83ee18ea74a87de0d6 -SIZE (electron/electron-electron-v24.6.0_GH0.tar.gz) = 10490089 +SHA256 (electron/electron-yarn-cache-24.6.1.tar.xz) = 6ae62041d7c72b5a9f50934ef73ae6a8c6a6f99f672fa1f4d75f259189f47794 +SIZE (electron/electron-yarn-cache-24.6.1.tar.xz) = 41637148 +SHA256 (electron/electron-electron-v24.6.1_GH0.tar.gz) = 6ae50626258ba22c80873bbcc745f9bd6f4df4f9320f12888afa43f1c7ad4abf +SIZE (electron/electron-electron-v24.6.1_GH0.tar.gz) = 10490399 SHA256 (electron/nodejs-node-v18.14.0_GH0.tar.gz) = 31bbccdff73269baebcc9f32c2ffe428f28be79841527c63e95da93e8c630829 SIZE (electron/nodejs-node-v18.14.0_GH0.tar.gz) = 113058999 SHA256 (electron/nodejs-nan-16fa32231e2ccd89d2804b3f765319128b20c4ac_GH0.tar.gz) = 3807ae6a1e451a29f068540472f100f9718d457c60ac62f2f8469d1d57475d39 diff --git a/devel/electron24/files/patch-electron_shell_browser_api_electron__api__web__contents.cc b/devel/electron24/files/patch-electron_shell_browser_api_electron__api__web__contents.cc index f7fc2653ca79..f51ec35af845 100644 --- a/devel/electron24/files/patch-electron_shell_browser_api_electron__api__web__contents.cc +++ b/devel/electron24/files/patch-electron_shell_browser_api_electron__api__web__contents.cc @@ -1,6 +1,6 @@ ---- electron/shell/browser/api/electron_api_web_contents.cc.orig 2023-06-13 21:28:30 UTC +--- electron/shell/browser/api/electron_api_web_contents.cc.orig 2023-06-27 15:34:12 UTC +++ electron/shell/browser/api/electron_api_web_contents.cc -@@ -151,11 +151,11 @@ +@@ -152,11 +152,11 @@ #include "ui/base/cocoa/defaults_utils.h" #endif @@ -14,7 +14,7 @@ #include "ui/gfx/font_render_params.h" #endif -@@ -517,7 +517,7 @@ absl::optional GetCursorBlinkInterval +@@ -518,7 +518,7 @@ absl::optional GetCursorBlinkInterval ui::TextInsertionCaretBlinkPeriodFromDefaults()); if (system_value) return *system_value; @@ -23,7 +23,7 @@ if (auto* linux_ui = ui::LinuxUi::instance()) return linux_ui->GetCursorBlinkInterval(); #elif BUILDFLAG(IS_WIN) -@@ -971,7 +971,7 @@ void WebContents::InitWithSessionAndOptions( +@@ -957,7 +957,7 @@ void WebContents::InitWithSessionAndOptions( accept_languages.pop_back(); prefs->accept_languages = accept_languages; @@ -32,7 +32,7 @@ // Update font settings. static const gfx::FontRenderParams params( gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), nullptr)); -@@ -2511,7 +2511,7 @@ void WebContents::ForcefullyCrashRenderer() { +@@ -2497,7 +2497,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(); -@@ -3154,7 +3154,7 @@ void WebContents::CopyImageAt(int x, int y) { +@@ -3140,7 +3140,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 -@@ -3960,7 +3960,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { +@@ -3946,7 +3946,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { } #endif diff --git a/devel/electron24/files/patch-electron_shell_browser_native__window.cc b/devel/electron24/files/patch-electron_shell_browser_native__window.cc index 95f77ea24f67..aafe256dca8d 100644 --- a/devel/electron24/files/patch-electron_shell_browser_native__window.cc +++ b/devel/electron24/files/patch-electron_shell_browser_native__window.cc @@ -1,6 +1,6 @@ ---- electron/shell/browser/native_window.cc.orig 2023-02-06 19:29:11 UTC +--- electron/shell/browser/native_window.cc.orig 2023-06-27 15:34:12 UTC +++ electron/shell/browser/native_window.cc -@@ -196,7 +196,7 @@ void NativeWindow::InitFromOptions(const gin_helper::D +@@ -197,7 +197,7 @@ void NativeWindow::InitFromOptions(const gin_helper::D } else { SetSizeConstraints(size_constraints); } diff --git a/devel/electron24/files/patch-electron_shell_browser_native__window__views.cc b/devel/electron24/files/patch-electron_shell_browser_native__window__views.cc index fa42cbf9374d..563ae679293b 100644 --- a/devel/electron24/files/patch-electron_shell_browser_native__window__views.cc +++ b/devel/electron24/files/patch-electron_shell_browser_native__window__views.cc @@ -1,6 +1,6 @@ ---- electron/shell/browser/native_window_views.cc.orig 2023-06-13 21:28:30 UTC +--- electron/shell/browser/native_window_views.cc.orig 2023-06-27 15:34:12 UTC +++ electron/shell/browser/native_window_views.cc -@@ -42,7 +42,7 @@ +@@ -43,7 +43,7 @@ #include "ui/wm/core/shadow_types.h" #include "ui/wm/core/window_util.h" @@ -9,7 +9,7 @@ #include "base/strings/string_util.h" #include "shell/browser/browser.h" #include "shell/browser/linux/unity_service.h" -@@ -276,7 +276,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: +@@ -277,7 +277,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: params.parent = parent->GetNativeWindow(); params.native_widget = new ElectronDesktopNativeWidgetAura(this); @@ -18,7 +18,7 @@ std::string name = Browser::Get()->GetName(); // Set WM_WINDOW_ROLE. params.wm_role_name = "browser-window"; -@@ -301,7 +301,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: +@@ -302,7 +302,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: std::string window_type; options.Get(options::kType, &window_type); @@ -27,7 +27,7 @@ // Set _GTK_THEME_VARIANT to dark if we have "dark-theme" option set. bool use_dark_theme = false; if (options.Get(options::kDarkTheme, &use_dark_theme) && use_dark_theme) { -@@ -403,7 +403,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: +@@ -404,7 +404,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: if (window) window->AddPreTargetHandler(this); @@ -36,7 +36,7 @@ // On linux after the widget is initialized we might have to force set the // bounds if the bounds are smaller than the current display SetBounds(gfx::Rect(GetPosition(), bounds.size()), false); -@@ -563,7 +563,7 @@ bool NativeWindowViews::IsVisible() { +@@ -564,7 +564,7 @@ bool NativeWindowViews::IsVisible() { bool NativeWindowViews::IsEnabled() { #if BUILDFLAG(IS_WIN) return ::IsWindowEnabled(GetAcceleratedWidget()); @@ -45,7 +45,7 @@ #if defined(USE_OZONE_PLATFORM_X11) if (IsX11()) return !event_disabler_.get(); -@@ -621,7 +621,7 @@ void NativeWindowViews::SetEnabledInternal(bool enable +@@ -622,7 +622,7 @@ void NativeWindowViews::SetEnabledInternal(bool enable #endif } @@ -54,7 +54,7 @@ void NativeWindowViews::Maximize() { if (IsVisible()) { widget()->Maximize(); -@@ -752,7 +752,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou +@@ -753,7 +753,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou } #endif @@ -63,7 +63,7 @@ // On Linux and Windows the minimum and maximum size should be updated with // window size when window is not resizable. if (!resizable_) { -@@ -988,7 +988,7 @@ bool NativeWindowViews::IsClosable() { +@@ -989,7 +989,7 @@ bool NativeWindowViews::IsClosable() { return false; } return !(info.fState & MFS_DISABLED); @@ -72,7 +72,7 @@ return true; #endif } -@@ -1376,7 +1376,7 @@ void NativeWindowViews::SetProgressBar(double progress +@@ -1377,7 +1377,7 @@ void NativeWindowViews::SetProgressBar(double progress NativeWindow::ProgressState state) { #if BUILDFLAG(IS_WIN) taskbar_host_.SetProgressBar(GetAcceleratedWidget(), progress, state); diff --git a/devel/electron24/files/patch-electron_shell_common_api_electron__api__clipboard.cc b/devel/electron24/files/patch-electron_shell_common_api_electron__api__clipboard.cc index 5211303d05b6..7a0d057e5fce 100644 --- a/devel/electron24/files/patch-electron_shell_common_api_electron__api__clipboard.cc +++ b/devel/electron24/files/patch-electron_shell_common_api_electron__api__clipboard.cc @@ -1,6 +1,6 @@ ---- electron/shell/common/api/electron_api_clipboard.cc.orig 2023-01-24 16:58:16 UTC +--- electron/shell/common/api/electron_api_clipboard.cc.orig 2023-06-27 15:34:12 UTC +++ electron/shell/common/api/electron_api_clipboard.cc -@@ -54,7 +54,7 @@ std::string Clipboard::Read(const std::string& format_ +@@ -55,7 +55,7 @@ std::string Clipboard::Read(const std::string& format_ ui::ClipboardFormatType::CustomPlatformType(format_string)); bool rawFormatAvailable = clipboard->IsFormatAvailable( rawFormat, ui::ClipboardBuffer::kCopyPaste, /* data_dst = */ nullptr); @@ -9,12 +9,12 @@ if (!rawFormatAvailable) { rawFormatAvailable = clipboard->IsFormatAvailable( rawFormat, ui::ClipboardBuffer::kSelection, /* data_dst = */ nullptr); -@@ -70,7 +70,7 @@ std::string Clipboard::Read(const std::string& format_ +@@ -71,7 +71,7 @@ std::string Clipboard::Read(const std::string& format_ custom_format_names = clipboard->ExtractCustomPlatformNames(ui::ClipboardBuffer::kCopyPaste, /* data_dst = */ nullptr); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (custom_format_names.find(format_string) == custom_format_names.end()) { + if (!base::Contains(custom_format_names, format_string)) { custom_format_names = clipboard->ExtractCustomPlatformNames(ui::ClipboardBuffer::kSelection, diff --git a/devel/electron24/files/patch-electron_spec_chromium-spec.ts b/devel/electron24/files/patch-electron_spec_chromium-spec.ts index d55efac4f8c1..bc1a516f4b49 100644 --- a/devel/electron24/files/patch-electron_spec_chromium-spec.ts +++ b/devel/electron24/files/patch-electron_spec_chromium-spec.ts @@ -1,4 +1,4 @@ ---- electron/spec/chromium-spec.ts.orig 2023-04-11 16:23:26 UTC +--- electron/spec/chromium-spec.ts.orig 2023-06-27 15:34:12 UTC +++ electron/spec/chromium-spec.ts @@ -473,13 +473,13 @@ describe('command line switches', () => { it('should not set an invalid locale', async () => testLocale('asdfkl', `${currentLocale}|${currentSystemLocale}|${currentPreferredLanguages}`)); @@ -18,7 +18,7 @@ }); describe('--remote-debugging-pipe switch', () => { -@@ -2289,12 +2289,12 @@ describe('font fallback', () => { +@@ -2306,12 +2306,12 @@ describe('font fallback', () => { expect(fonts[0].familyName).to.equal('Arial'); } else if (process.platform === 'darwin') { expect(fonts[0].familyName).to.equal('Helvetica'); @@ -33,7 +33,7 @@ const html = ` -@@ -2689,7 +2689,7 @@ describe('navigator.clipboard.write', () => { +@@ -2706,7 +2706,7 @@ describe('navigator.clipboard.write', () => { }); });