From nobody Sat May 28 03:37:59 2022 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 551831B40914; Sat, 28 May 2022 03:38:00 +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 4L96nh1kpFz4tcG; Sat, 28 May 2022 03:38:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653709080; 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=cM2X+UqYZ8niz7sWkbFmBGlB9ZGTnPVkMUjIqr6NnjY=; b=o6zMsiY36Ev3OfKNiCszXYZVh0+4cO15HBGqpZZarjDfttTqJ5+l1OrZOPp3EmX/NPs2NY OQEPzAQOmRGFm3iSEz/bmYb51rZhbZ+XlLA9xRD2fdfQaBOoGPCsBS0QxWSQC5MMV0lSf4 lXAVOAW2ptCrdIelsB9ywTu39TDuRktD/ve/IRuEKr6wgyfbySOZOBBoP4jkgmBUxH4Ydp do4K9CEPWuOkWpk4BiPXvDUMkyba6TZ4jvCxmWa0GB3cqTPZ48ykSmnl5IEpI7ZhjtrSlH YAUOJWyqDdOafwnVwcBo4Bk6+Y6vkDqoPsBltvSXmTBVVeOX8w/IT/73S9iy1Q== 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 1B5C32EA7D; Sat, 28 May 2022 03:38:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24S3c0mn000511; Sat, 28 May 2022 03:38:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24S3bxs2000510; Sat, 28 May 2022 03:37:59 GMT (envelope-from git) Date: Sat, 28 May 2022 03:37:59 GMT Message-Id: <202205280337.24S3bxs2000510@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: 812daaca0f04 - main - devel/electron17: update to 17.4.6 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: 812daaca0f04f79580e0203eb349722c2c750431 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653709080; 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=cM2X+UqYZ8niz7sWkbFmBGlB9ZGTnPVkMUjIqr6NnjY=; b=JOXsGdmPEQtcS7pzLxbY4/UXmNl3hCegnAHwVNVwtO9n8ybiJa7W6sybzYGgIzfq/an1a2 bR3vsoYUGiYocIeWnPG4y3i3OrsKiT5M9yfUUwuoxBKaI/pQyer3GJ3kichZm9c1AK8kYR q8V9Jt8uu8sKlWygdgYi2LWaqTpLf+XPwCLkzDQdQqdWB3R5o1AorNlJaj7XSzMc3Ua4OS eT5bfwIT+iPveqXuwKbdDbOKXMbUVyf3llLXnCa7Tfsz5QNn27BJvjZUcuYxWJ8vXrxTPT WHv8PHUJUumlAtDGB87jUYuBYDgUpuvW1wRGlMCt0HFXMKURvAHMd+06/CkLJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653709080; a=rsa-sha256; cv=none; b=YMFwj98gk7WRsPnyG8Zl1+675Hl+3k1rP5TXHNf5EN2edyFqyssmFXVJPi/w3aczmsNZ+J CruTZq+o1q37IGOAbl5oRh6tYbNc91zGcdOJIunQ0/0SVwnnNWftDoWTo6pfWYCA7I2Y1c FKcNfxtGTHKeRTscirvTrk5mtf38cMX5ueyyUoUgu6rwU7drce+kYnAAnUFgb4Zxo1K9B5 yZhc8DCc2oUNPt8WVV9q779Ca2w13eCYsVl2v/U1JzMaHNWbRVZb1ggTI9b6Bjs0OOo6T6 zg+6bEg3JWfDTY6WHNksH4VzGiPvbKnB4pIkB6umDrEWJJL0KH8jGHQJAsdTMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=812daaca0f04f79580e0203eb349722c2c750431 commit 812daaca0f04f79580e0203eb349722c2c750431 Author: Hiroki Tagato AuthorDate: 2022-05-28 03:36:24 +0000 Commit: Hiroki Tagato CommitDate: 2022-05-28 03:37:48 +0000 devel/electron17: update to 17.4.6 Changelog: https://github.com/electron/electron/releases/tag/v17.4.6 --- devel/electron17/Makefile | 2 +- devel/electron17/Makefile.version | 2 +- devel/electron17/distinfo | 10 +++++----- devel/electron17/files/package.json | 2 +- ...shell_browser_api_electron__api__crash__reporter.cc | 18 +++++++++--------- ...ron_shell_browser_electron__browser__main__parts.cc | 14 ++++++++++++-- .../files/patch-electron_spec-main_chromium-spec.ts | 4 ++-- editors/vscode/Makefile | 2 +- 8 files changed, 32 insertions(+), 22 deletions(-) diff --git a/devel/electron17/Makefile b/devel/electron17/Makefile index 9e938c610428..a0af2e4a9b54 100644 --- a/devel/electron17/Makefile +++ b/devel/electron17/Makefile @@ -153,7 +153,7 @@ REACTIVEOBJC_VER= 74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76 # See ${WRKSRC}/electron/DEPS for MANTLE_VER MANTLE_VER= 78d3966b3c331292ea29ec38661b25df0a245948 -YARN_TIMESTAMP= 1653284700 +YARN_TIMESTAMP= 1653630240 GN_ARGS+= clang_use_chrome_plugins=false \ enable_hangout_services_extension=true \ diff --git a/devel/electron17/Makefile.version b/devel/electron17/Makefile.version index 5b6d579ec30f..035f77f06a77 100644 --- a/devel/electron17/Makefile.version +++ b/devel/electron17/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 17.4.5 +ELECTRON_VER= 17.4.6 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron17/distinfo b/devel/electron17/distinfo index e428e22a3f93..a0a931ca41ed 100644 --- a/devel/electron17/distinfo +++ b/devel/electron17/distinfo @@ -1,14 +1,14 @@ -TIMESTAMP = 1653285870 +TIMESTAMP = 1653631146 SHA256 (electron/chromium-98.0.4758.141.tar.xz) = 0b712acb66c69b78b011c19ba07b2696ee36335e9712066ff5d74aedeb8fbb16 SIZE (electron/chromium-98.0.4758.141.tar.xz) = 1115175012 SHA256 (electron/31d731fb82ea62a6dae24d2bdfe6f0aa6164b949) = fc35bf178fb99ae9fca39191d7eb054a985824b8bf16f588ed6c03edfa96d4f9 SIZE (electron/31d731fb82ea62a6dae24d2bdfe6f0aa6164b949) = 11461198 SHA256 (electron/cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb) = ec973eccd669d417fbf2d0a4dac730744a3174268ff062db5451b55c82bc3492 SIZE (electron/cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb) = 26759650 -SHA256 (electron/electron-yarn-cache-17.4.5.tar.xz) = 1b8347eaec672b0e1486a18458d6907321c38755013ca8aaa4a84346a5972f98 -SIZE (electron/electron-yarn-cache-17.4.5.tar.xz) = 36632532 -SHA256 (electron/electron-electron-v17.4.5_GH0.tar.gz) = b37e49c4006a224b557bd6accaa3bad567b34088755deb46bb24db8c362fc73e -SIZE (electron/electron-electron-v17.4.5_GH0.tar.gz) = 10237334 +SHA256 (electron/electron-yarn-cache-17.4.6.tar.xz) = b6a1d73311ec0697676a08e3881d7c0a290d12d101d83bbbde5edaf350f06b28 +SIZE (electron/electron-yarn-cache-17.4.6.tar.xz) = 36631728 +SHA256 (electron/electron-electron-v17.4.6_GH0.tar.gz) = 01b87ef59d18f828886b676f540a0584e298464308bcd92fa6eb19b78175a517 +SIZE (electron/electron-electron-v17.4.6_GH0.tar.gz) = 10237558 SHA256 (electron/nodejs-node-v16.13.0_GH0.tar.gz) = f0327e99f730bf2506a1f13dbd452ec80b33667a7ce1c77a2dacd6babc8643c7 SIZE (electron/nodejs-node-v16.13.0_GH0.tar.gz) = 87424981 SHA256 (electron/nodejs-nan-65b32af46e9d7fab2e4ff657751205b3865f4920_GH0.tar.gz) = a649b75bfa9c1a0254c73d022c6e98924b9471f593bcc83832daaf68da4cae8d diff --git a/devel/electron17/files/package.json b/devel/electron17/files/package.json index 61975e52bbef..6562413f652d 100644 --- a/devel/electron17/files/package.json +++ b/devel/electron17/files/package.json @@ -1,6 +1,6 @@ { "name": "electron", - "version": "17.4.5", + "version": "17.4.6", "repository": "https://github.com/electron/electron", "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS", "devDependencies": { diff --git a/devel/electron17/files/patch-electron_shell_browser_api_electron__api__crash__reporter.cc b/devel/electron17/files/patch-electron_shell_browser_api_electron__api__crash__reporter.cc index 791b0fc23195..d98b308ef010 100644 --- a/devel/electron17/files/patch-electron_shell_browser_api_electron__api__crash__reporter.cc +++ b/devel/electron17/files/patch-electron_shell_browser_api_electron__api__crash__reporter.cc @@ -1,6 +1,6 @@ ---- electron/shell/browser/api/electron_api_crash_reporter.cc.orig 2021-11-15 23:45:07 UTC +--- electron/shell/browser/api/electron_api_crash_reporter.cc.orig 2022-05-25 15:32:53 UTC +++ electron/shell/browser/api/electron_api_crash_reporter.cc -@@ -29,7 +29,7 @@ +@@ -30,7 +30,7 @@ #include "shell/common/gin_helper/dictionary.h" #include "shell/common/node_includes.h" @@ -9,7 +9,7 @@ #include "components/crash/core/app/crashpad.h" // nogncheck #include "components/crash/core/browser/crash_upload_list_crashpad.h" // nogncheck #include "components/crash/core/common/crash_key.h" -@@ -69,7 +69,7 @@ namespace api { +@@ -70,7 +70,7 @@ namespace api { namespace crash_reporter { @@ -18,16 +18,16 @@ namespace { void NoOp() {} -@@ -135,7 +135,7 @@ void Start(const std::string& submit_url, - const std::map& global_extra, +@@ -137,7 +137,7 @@ void Start(const std::string& submit_url, const std::map& extra, bool is_node_process) { + TRACE_EVENT0("electron", "crash_reporter::Start"); -#if !defined(MAS_BUILD) +#if !defined(MAS_BUILD) && !defined(OS_BSD) if (g_crash_reporter_initialized) return; g_crash_reporter_initialized = true; -@@ -202,7 +202,7 @@ void Start(const std::string& submit_url, +@@ -204,7 +204,7 @@ void Start(const std::string& submit_url, namespace { @@ -36,7 +36,7 @@ void GetUploadedReports( v8::Isolate* isolate, base::OnceCallback)> callback) { -@@ -259,13 +259,13 @@ v8::Local GetUploadedReports(v8::Isolate* i +@@ -261,13 +261,13 @@ v8::Local GetUploadedReports(v8::Isolate* i #endif void SetUploadToServer(bool upload) { @@ -52,7 +52,7 @@ return false; #else return ElectronCrashReporterClient::Get()->GetCollectStatsConsent(); -@@ -274,7 +274,7 @@ bool GetUploadToServer() { +@@ -276,7 +276,7 @@ bool GetUploadToServer() { v8::Local GetParameters(v8::Isolate* isolate) { std::map keys; @@ -61,7 +61,7 @@ electron::crash_keys::GetCrashKeys(&keys); #endif return gin::ConvertToV8(isolate, keys); -@@ -286,7 +286,7 @@ void Initialize(v8::Local exports, +@@ -288,7 +288,7 @@ void Initialize(v8::Local exports, void* priv) { gin_helper::Dictionary dict(context->GetIsolate(), exports); dict.SetMethod("start", &electron::api::crash_reporter::Start); diff --git a/devel/electron17/files/patch-electron_shell_browser_electron__browser__main__parts.cc b/devel/electron17/files/patch-electron_shell_browser_electron__browser__main__parts.cc index 829a139172c4..04857aef9e61 100644 --- a/devel/electron17/files/patch-electron_shell_browser_electron__browser__main__parts.cc +++ b/devel/electron17/files/patch-electron_shell_browser_electron__browser__main__parts.cc @@ -1,4 +1,4 @@ ---- electron/shell/browser/electron_browser_main_parts.cc.orig 2022-05-18 15:35:00 UTC +--- electron/shell/browser/electron_browser_main_parts.cc.orig 2022-05-25 15:32:53 UTC +++ electron/shell/browser/electron_browser_main_parts.cc @@ -64,7 +64,7 @@ #include "ui/wm/core/wm_state.h" @@ -72,7 +72,17 @@ auto linux_ui = BuildGtkUi(); linux_ui->Initialize(); DCHECK(ui::LinuxInputMethodContextFactory::instance()); -@@ -528,7 +528,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun( +@@ -469,7 +469,9 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo + ui::OzonePlatform::GetInstance()->PostCreateMainMessageLoop( + std::move(shutdown_cb)); + bluez::DBusBluezManagerWrapperLinux::Initialize(); ++#endif + ++#if defined(OS_LINUX) || defined(OS_BSD) + // 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. +@@ -528,7 +530,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun( fake_browser_process_->PostMainMessageLoopRun(); content::DevToolsAgentHost::StopRemoteDebuggingPipeHandler(); diff --git a/devel/electron17/files/patch-electron_spec-main_chromium-spec.ts b/devel/electron17/files/patch-electron_spec-main_chromium-spec.ts index 30eb1ac31ca9..95dfd27ff2bf 100644 --- a/devel/electron17/files/patch-electron_spec-main_chromium-spec.ts +++ b/devel/electron17/files/patch-electron_spec-main_chromium-spec.ts @@ -1,4 +1,4 @@ ---- electron/spec-main/chromium-spec.ts.orig 2022-05-11 15:32:29 UTC +--- electron/spec-main/chromium-spec.ts.orig 2022-05-25 15:32:53 UTC +++ electron/spec-main/chromium-spec.ts @@ -404,13 +404,13 @@ describe('command line switches', () => { it('should not set an invalid locale', async () => testLocale('asdfkl', currentLocale)); @@ -33,7 +33,7 @@ const html = ` -@@ -1783,7 +1783,7 @@ describe('navigator.clipboard', () => { +@@ -1811,7 +1811,7 @@ describe('navigator.clipboard', () => { }); }); diff --git a/editors/vscode/Makefile b/editors/vscode/Makefile index 0b99a5151177..5acf62a73156 100644 --- a/editors/vscode/Makefile +++ b/editors/vscode/Makefile @@ -1,6 +1,6 @@ PORTNAME= vscode DISTVERSION= 1.67.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors MASTER_SITES= https://registry.npmjs.org/esbuild-freebsd-64/-/:esbuild_binary \ https://nodejs.org/dist/v${NODE_VER}/:node_headers \