From nobody Tue Aug 20 01:07:09 2024 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 4WnrsT5tV8z5TtPq; Tue, 20 Aug 2024 01:07:09 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WnrsT556Hz59CG; Tue, 20 Aug 2024 01:07:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724116029; 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=k4CA3Zn8gzW9fHeNKY9Qj81MbZnSt07B3g06rUbi2DQ=; b=TLJTtrTmccmJrxP7U893fTvC8JOegqSlWXNjhpDbTw0BSgXgdzvdPrRJVndWah4pQDy6tL kCWBHioMU5hGAFLclEqI2mVTKeMzybIzw+PD8SGlvoNeSRTogMsLQMgFrnyb2E43zwBY4m cf8QEWZlij6ko/7L3Jn3+VJBbMj4LD0y9AjlXQ7EGrEyYxNSjAKKybLURfC3qmb2O+Pxzz a0CDruPlKKSruaPqzqXdCGkZNG+RfAsX8KyZNxGQjgb7ts8RGHAGlih/6UIjSgZbxcTuvl aQ2RbBbPycwD8AQuITp/sm8RoiC10uTcvLHjElyWpoe6frOvlYRuXs3ioVvFPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724116029; a=rsa-sha256; cv=none; b=PLtxI4+rWwvtLKgQ81O6XbQtYKblA1yb9J4ltGku6msOT+oQ8vmDctmn17M4oowKcsM8ED IJg2lkWMyEN7jRqCkKbo69wPOaZw/GmvmIv8QKatk8b3kfh86SJiL0P2FtVhbBP2/Xxvul F99q8T2zFMIvbhuiWGlEp6IRwacDsm2ITSRr+jJQ+QmBXouTQOsczhRKyoJlRkyLSoqxa9 uTmUGuXKlUUN2Jxu8UAdkF8tMvRqsymT459N1teGeIY2LRmMdl5tfVUsdASvCMoblsZret VIlB8iqOZchE+5sRqMNNR9bKakP4ETzM1AywBE6i5nYGX1ltEBIVIWCokzCFsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724116029; 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=k4CA3Zn8gzW9fHeNKY9Qj81MbZnSt07B3g06rUbi2DQ=; b=hl3C2YDN6HM/hab6My3XCVueJFy/nhJrauLeOxXChnb2kOrizcdaNr+NUE7ouye0wtD447 5bMb0qVOfliZeDvHwM1LeS7xCFZvQfy3fSJKsNrWmZJyF9iYsR/qRIeZ6915e3OvaOKqzR Wm7XB34Kt5y2OgYtyQeoaAsLfSA9nujXs4gJpODxNkBZ2xn9p8E37RiW6sZlZ7XthLg/qj Ok4RBtBJ2nKD1lPd7P+zDXByEWyjpJUBAWxdxHinyGj+iXglDjGgvGkPVuQW2ljzW/8dxn sMncN/a6ICb18B40MLdCwwSFRud7Fo9hHMbJE4KL8Ut/jnOyaddiE+FihEwXrA== 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 4WnrsT4VcbzgCY; Tue, 20 Aug 2024 01:07:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47K179Z8064803; Tue, 20 Aug 2024 01:07:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47K179Qk064800; Tue, 20 Aug 2024 01:07:09 GMT (envelope-from git) Date: Tue, 20 Aug 2024 01:07:09 GMT Message-Id: <202408200107.47K179Qk064800@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: 0dee5509536b - main - devel/electron31: update to 31.4.0 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-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: 0dee5509536bd3f01d0e98a6eca70224a441d00a Auto-Submitted: auto-generated The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=0dee5509536bd3f01d0e98a6eca70224a441d00a commit 0dee5509536bd3f01d0e98a6eca70224a441d00a Author: Hiroki Tagato AuthorDate: 2024-08-20 01:04:52 +0000 Commit: Hiroki Tagato CommitDate: 2024-08-20 01:06:57 +0000 devel/electron31: update to 31.4.0 Changelog: https://github.com/electron/electron/releases/tag/v31.4.0 Reported by: GitHub (watch releases) Security: e61af8f4-455d-4f99-8d81-fbb004929dab --- devel/electron31/Makefile | 22 ++++++++++++++++++---- devel/electron31/Makefile.version | 2 +- devel/electron31/distinfo | 22 +++++++++++++--------- .../electron31/files/patch-electron_filenames.gni | 4 ++-- ...hell_browser_api_electron__api__base__window.cc | 8 ++++---- ...browser_api_electron__api__desktop__capturer.cc | 6 +++--- ...ews_inspectable__web__contents__view__views.cc} | 6 +++--- ...electron_shell_common_api_electron__bindings.cc | 4 ++-- ...third__party_electron__node_deps_cares_BUILD.gn | 4 ++-- 9 files changed, 48 insertions(+), 30 deletions(-) diff --git a/devel/electron31/Makefile b/devel/electron31/Makefile index 58f51099e20b..ced2ce2c60b1 100644 --- a/devel/electron31/Makefile +++ b/devel/electron31/Makefile @@ -4,13 +4,18 @@ DISTVERSION= ${ELECTRON_VER:S/-beta./.b/} PULSEMV= 16 PULSEV= ${PULSEMV}.1 CATEGORIES= devel -MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/:chromium \ +MASTER_SITES= https://github.com/tagattie/FreeBSD-Electron/releases/download/v31.4.0/:chromium \ + https://commondatastorage.googleapis.com/chromium-nodejs/:chromium_node \ https://freedesktop.org/software/pulseaudio/releases/:pulseaudio PKGNAMESUFFIX= ${ELECTRON_VER_MAJOR} -DISTFILES= chromium-${CHROMIUM_VER}${EXTRACT_SUFX}:chromium \ +DISTFILES= chromium-${CHROMIUM_VER}${EXTRACT_SUFX}.0:chromium \ + chromium-${CHROMIUM_VER}${EXTRACT_SUFX}.1:chromium \ + ${CHROMIUM_NODE_MODULES_HASH}:chromium_node \ pulseaudio-${PULSEV}.tar.gz:pulseaudio \ electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX}:prefetch DIST_SUBDIR= ${PORTNAME} +EXTRACT_ONLY= chromium-${CHROMIUM_VER}${EXTRACT_SUFX} \ + ${DISTFILES:C/:[^:]+$//:C/chromium-${CHROMIUM_VER}${EXTRACT_SUFX}\.[0-9]//} MAINTAINER= tagattie@FreeBSD.org COMMENT= Build cross-platform desktop apps with JavaScript, HTML, and CSS @@ -207,9 +212,11 @@ PIPEWIRE_VARS_OFF= GN_ARGS+=rtc_use_pipewire=false \ GN_ARGS+=rtc_link_pipewire=false # See ${WRKSRC}/electron/DEPS for CHROMIUM_VER -CHROMIUM_VER= 126.0.6478.185 +CHROMIUM_VER= 126.0.6478.234 +# See ${WRKSRC}/third_party/node/node_modules.tar.gz.sha1 for CHROMIUM_NODE_MODULES_HASH +CHROMIUM_NODE_MODULES_HASH= 97a0b3c4c39cf05de1eafb6ffdec0fddd643f0a2 # See ${WRKSRC}/electron/DEPS for NODE_VER -NODE_VER= 20.15.1 +NODE_VER= 20.16.0 # See ${WRKSRC}/electron/DEPS for NAN_VER NAN_VER= e14bdcd1f72d62bca1d541b66da43130384ec213 # See ${WRKSRC}/electron/DEPS for SQUIRREL_MAC_VER @@ -312,6 +319,12 @@ pre-fetch: ${RM} -r ${WRKDIR}; \ fi +post-fetch: + @if [ ! -f ${DISTDIR}/${DIST_SUBDIR}/chromium-${CHROMIUM_VER}${EXTRACT_SUFX} ]; then \ + ${CAT} ${DISTDIR}/${DIST_SUBDIR}/chromium-${CHROMIUM_VER}${EXTRACT_SUFX}.? > \ + ${DISTDIR}/${DIST_SUBDIR}/chromium-${CHROMIUM_VER}${EXTRACT_SUFX}; \ + fi + post-extract: # Move extracted sources to appropriate locations ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/chromium-${CHROMIUM_VER} ${WRKSRC} @@ -329,6 +342,7 @@ post-extract: ${WRKSRC}/third_party/squirrel.mac/vendor/Mantle ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_reclient_configs}-${ENGFLOW_RECLIENT_CONFIGS_VER} \ ${WRKSRC}/third_party/engflow-reclient-configs + ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/node_modules ${WRKSRC}/third_party/node # Install node modules for electron ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/yarn-offline-cache ${WRKDIR} ${ECHO_CMD} 'yarn-offline-mirror "../../../yarn-offline-cache"' >> ${WRKSRC}/electron/.yarnrc diff --git a/devel/electron31/Makefile.version b/devel/electron31/Makefile.version index f16e688d19e4..4d020001fbfe 100644 --- a/devel/electron31/Makefile.version +++ b/devel/electron31/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 31.3.1 +ELECTRON_VER= 31.4.0 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron31/distinfo b/devel/electron31/distinfo index 32c07659d505..24c44fb51eb8 100644 --- a/devel/electron31/distinfo +++ b/devel/electron31/distinfo @@ -1,14 +1,18 @@ -TIMESTAMP = 1722324720 -SHA256 (electron/chromium-126.0.6478.185.tar.xz) = 8ca908730dec89aec5b34e3db16178b5c409ab9d335844530ac22dc5990ecf26 -SIZE (electron/chromium-126.0.6478.185.tar.xz) = 4174560832 +TIMESTAMP = 1724068640 +SHA256 (electron/chromium-126.0.6478.234.tar.xz.0) = 5940007a2cc926c0eac498ab5121727f903a60b87c7b5a5216921c4ee1028d07 +SIZE (electron/chromium-126.0.6478.234.tar.xz.0) = 2000000000 +SHA256 (electron/chromium-126.0.6478.234.tar.xz.1) = 977c9af967876a9a362038dea652c4be55a71a9758cb1c538bfc8a5a0ee27962 +SIZE (electron/chromium-126.0.6478.234.tar.xz.1) = 303263696 +SHA256 (electron/97a0b3c4c39cf05de1eafb6ffdec0fddd643f0a2) = dcfaea4d353d1df3d4ac2d245ea7e32ad177d4bea1351f363714c9c22ca5c4f8 +SIZE (electron/97a0b3c4c39cf05de1eafb6ffdec0fddd643f0a2) = 9761601 SHA256 (electron/pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92 SIZE (electron/pulseaudio-16.1.tar.gz) = 2763111 -SHA256 (electron/electron-yarn-cache-31.3.1.tar.xz) = 8b9a13b091dacb8b4f3ea7bb44826d7cf3062bc2700462d20a261da3d61ca189 -SIZE (electron/electron-yarn-cache-31.3.1.tar.xz) = 29172376 -SHA256 (electron/electron-electron-v31.3.1_GH0.tar.gz) = 20bd571f4282f0189170484b1e2a0018c1f171b1c0dae758974dd8b8289856e6 -SIZE (electron/electron-electron-v31.3.1_GH0.tar.gz) = 13811672 -SHA256 (electron/nodejs-node-v20.15.1_GH0.tar.gz) = 9c54c9338f78cf99227d006e65123fd9ef66cf8c271f3c25cad9a336f201507f -SIZE (electron/nodejs-node-v20.15.1_GH0.tar.gz) = 115474342 +SHA256 (electron/electron-yarn-cache-31.4.0.tar.xz) = 8b9a13b091dacb8b4f3ea7bb44826d7cf3062bc2700462d20a261da3d61ca189 +SIZE (electron/electron-yarn-cache-31.4.0.tar.xz) = 29172376 +SHA256 (electron/electron-electron-v31.4.0_GH0.tar.gz) = d98dcf735b2c9ad2a83b819ccc51b637b157102b7ff6216bb2e2fac87197a28e +SIZE (electron/electron-electron-v31.4.0_GH0.tar.gz) = 13823290 +SHA256 (electron/nodejs-node-v20.16.0_GH0.tar.gz) = d78104796225bcc150adf8ce4c486abfb390e1c71d0af7f28343803fe8588491 +SIZE (electron/nodejs-node-v20.16.0_GH0.tar.gz) = 115322530 SHA256 (electron/nodejs-nan-e14bdcd1f72d62bca1d541b66da43130384ec213_GH0.tar.gz) = 02edf8d5b3fef9af94d8a1355da60564a57e7f2c99cb422bce042400607ed2eb SIZE (electron/nodejs-nan-e14bdcd1f72d62bca1d541b66da43130384ec213_GH0.tar.gz) = 180646 SHA256 (electron/Squirrel-Squirrel.Mac-0e5d146ba13101a1302d59ea6e6e0b3cace4ae38_GH0.tar.gz) = f4ebb40a8d85dbb7ef02aa0571b2f8e22182c6d73b6992484a53c90047779d01 diff --git a/devel/electron31/files/patch-electron_filenames.gni b/devel/electron31/files/patch-electron_filenames.gni index a065ddeed995..6d00e264e763 100644 --- a/devel/electron31/files/patch-electron_filenames.gni +++ b/devel/electron31/files/patch-electron_filenames.gni @@ -1,6 +1,6 @@ ---- electron/filenames.gni.orig 2024-07-15 15:22:56 UTC +--- electron/filenames.gni.orig 2024-08-12 10:09:34 UTC +++ electron/filenames.gni -@@ -236,8 +236,8 @@ filenames = { +@@ -243,8 +243,8 @@ filenames = { "shell/app/command_line_args.h", "shell/app/electron_content_client.cc", "shell/app/electron_content_client.h", diff --git a/devel/electron31/files/patch-electron_shell_browser_api_electron__api__base__window.cc b/devel/electron31/files/patch-electron_shell_browser_api_electron__api__base__window.cc index 32005cf74a2b..fa2d043a22cf 100644 --- a/devel/electron31/files/patch-electron_shell_browser_api_electron__api__base__window.cc +++ b/devel/electron31/files/patch-electron_shell_browser_api_electron__api__base__window.cc @@ -1,4 +1,4 @@ ---- electron/shell/browser/api/electron_api_base_window.cc.orig 2024-07-15 15:22:56 UTC +--- electron/shell/browser/api/electron_api_base_window.cc.orig 2024-08-12 10:09:34 UTC +++ electron/shell/browser/api/electron_api_base_window.cc @@ -40,7 +40,7 @@ #include "shell/browser/ui/views/win_frame_view.h" @@ -9,7 +9,7 @@ #include "shell/browser/ui/views/opaque_frame_view.h" #endif -@@ -988,7 +988,7 @@ void BaseWindow::SetIconImpl(v8::Isolate* isolate, +@@ -993,7 +993,7 @@ void BaseWindow::SetIconImpl(v8::Isolate* isolate, static_cast(window_.get()) ->SetIcon(native_image->GetHICON(GetSystemMetrics(SM_CXSMICON)), native_image->GetHICON(GetSystemMetrics(SM_CXICON))); @@ -18,7 +18,7 @@ static_cast(window_.get()) ->SetIcon(native_image->image().AsImageSkia()); #endif -@@ -1045,7 +1045,7 @@ void BaseWindow::SetAppDetails(const gin_helper::Dicti +@@ -1050,7 +1050,7 @@ void BaseWindow::SetAppDetails(const gin_helper::Dicti } #endif @@ -27,7 +27,7 @@ void BaseWindow::SetTitleBarOverlay(const gin_helper::Dictionary& options, gin_helper::Arguments* args) { // Ensure WCO is already enabled on this window -@@ -1296,7 +1296,7 @@ void BaseWindow::BuildPrototype(v8::Isolate* isolate, +@@ -1301,7 +1301,7 @@ void BaseWindow::BuildPrototype(v8::Isolate* isolate, .SetMethod("setThumbnailToolTip", &BaseWindow::SetThumbnailToolTip) .SetMethod("setAppDetails", &BaseWindow::SetAppDetails) #endif diff --git a/devel/electron31/files/patch-electron_shell_browser_api_electron__api__desktop__capturer.cc b/devel/electron31/files/patch-electron_shell_browser_api_electron__api__desktop__capturer.cc index b278676a040f..8ae2b228901e 100644 --- a/devel/electron31/files/patch-electron_shell_browser_api_electron__api__desktop__capturer.cc +++ b/devel/electron31/files/patch-electron_shell_browser_api_electron__api__desktop__capturer.cc @@ -1,7 +1,7 @@ ---- electron/shell/browser/api/electron_api_desktop_capturer.cc.orig 2024-04-16 14:29:17 UTC +--- electron/shell/browser/api/electron_api_desktop_capturer.cc.orig 2024-08-12 10:09:34 UTC +++ electron/shell/browser/api/electron_api_desktop_capturer.cc -@@ -41,7 +41,7 @@ - #include "ui/gfx/x/randr.h" +@@ -45,7 +45,7 @@ + #include "ui/base/cocoa/permissions_utils.h" #endif -#if BUILDFLAG(IS_LINUX) diff --git a/devel/electron31/files/patch-electron_shell_browser_ui_inspectable__web__contents__view.cc b/devel/electron31/files/patch-electron_shell_browser_ui_views_inspectable__web__contents__view__views.cc similarity index 56% rename from devel/electron31/files/patch-electron_shell_browser_ui_inspectable__web__contents__view.cc rename to devel/electron31/files/patch-electron_shell_browser_ui_views_inspectable__web__contents__view__views.cc index f1107bbff093..dba8698e1228 100644 --- a/devel/electron31/files/patch-electron_shell_browser_ui_inspectable__web__contents__view.cc +++ b/devel/electron31/files/patch-electron_shell_browser_ui_views_inspectable__web__contents__view__views.cc @@ -1,6 +1,6 @@ ---- electron/shell/browser/ui/inspectable_web_contents_view.cc.orig 2024-06-24 09:53:23 UTC -+++ electron/shell/browser/ui/inspectable_web_contents_view.cc -@@ -175,7 +175,7 @@ void InspectableWebContentsView::SetIsDocked(bool dock +--- electron/shell/browser/ui/views/inspectable_web_contents_view_views.cc.orig 2024-08-19 07:29:02 UTC ++++ electron/shell/browser/ui/views/inspectable_web_contents_view_views.cc +@@ -183,7 +183,7 @@ void InspectableWebContentsViewViews::SetIsDocked(bool params.delegate = devtools_window_delegate_; params.bounds = inspectable_web_contents()->dev_tools_bounds(); diff --git a/devel/electron31/files/patch-electron_shell_common_api_electron__bindings.cc b/devel/electron31/files/patch-electron_shell_common_api_electron__bindings.cc index 94fccd180528..347c29b37ff0 100644 --- a/devel/electron31/files/patch-electron_shell_common_api_electron__bindings.cc +++ b/devel/electron31/files/patch-electron_shell_common_api_electron__bindings.cc @@ -1,6 +1,6 @@ ---- electron/shell/common/api/electron_bindings.cc.orig 2024-04-16 14:29:17 UTC +--- electron/shell/common/api/electron_bindings.cc.orig 2024-08-12 10:09:34 UTC +++ electron/shell/common/api/electron_bindings.cc -@@ -255,7 +255,7 @@ void ElectronBindings::DidReceiveMemoryDump( +@@ -256,7 +256,7 @@ void ElectronBindings::DidReceiveMemoryDump( if (target_pid == dump.pid()) { auto dict = gin_helper::Dictionary::CreateEmpty(isolate); const auto& osdump = dump.os_dump(); diff --git a/devel/electron31/files/patch-third__party_electron__node_deps_cares_BUILD.gn b/devel/electron31/files/patch-third__party_electron__node_deps_cares_BUILD.gn index 13e57fddd2b5..5bdbfac73b1c 100644 --- a/devel/electron31/files/patch-third__party_electron__node_deps_cares_BUILD.gn +++ b/devel/electron31/files/patch-third__party_electron__node_deps_cares_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/electron_node/deps/cares/BUILD.gn.orig 2024-06-13 08:39:37 UTC +--- third_party/electron_node/deps/cares/BUILD.gn.orig 2024-08-19 07:26:00 UTC +++ third_party/electron_node/deps/cares/BUILD.gn -@@ -151,9 +151,14 @@ static_library("cares") { +@@ -154,9 +154,14 @@ static_library("cares") { defines += [ "HAVE_CONFIG_H" ] }