Date: Tue, 18 Apr 2023 06:43:42 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: db078015b34f - main - devel/electron22: update to 22.3.6 Message-ID: <202304180643.33I6hgfj054367@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=db078015b34f54d5c733664f172ca1d471159c07 commit db078015b34f54d5c733664f172ca1d471159c07 Author: Hiroki Tagato <tagattie@FreeBSD.org> AuthorDate: 2023-04-18 06:41:22 +0000 Commit: Hiroki Tagato <tagattie@FreeBSD.org> CommitDate: 2023-04-18 06:43:20 +0000 devel/electron22: update to 22.3.6 While here, switch to USES=iconv:wchar_t to make stage-qa happy. Changelog: https://github.com/electron/electron/releases/tag/v22.3.6 Reported by: GitHub (watch releases) --- devel/electron22/Makefile | 9 ++++----- devel/electron22/Makefile.version | 2 +- devel/electron22/distinfo | 10 +++++----- devel/electron22/files/patch-electron_script_spec-runner.js | 4 ++-- .../files/patch-electron_shell_common_node__bindings.cc | 4 ++-- devel/electron22/files/patch-electron_spec_chromium-spec.ts | 10 +++++----- 6 files changed, 19 insertions(+), 20 deletions(-) diff --git a/devel/electron22/Makefile b/devel/electron22/Makefile index 9a1f7b143292..6129ad74175f 100644 --- a/devel/electron22/Makefile +++ b/devel/electron22/Makefile @@ -1,7 +1,6 @@ PORTNAME= electron DISTVERSIONPREFIX= v DISTVERSION= ${ELECTRON_VER:S/-beta./.b/} -PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= https://github.com/tagattie/FreeBSD-Electron/releases/download/v22.2.0/:chromium \ https://commondatastorage.googleapis.com/chromium-nodejs/:chromium_node \ @@ -63,9 +62,9 @@ TEST_DEPENDS= git:devel/git \ ${PYTHON_PKGNAMEPREFIX}python-dbusmock>0:devel/py-python-dbusmock@${PY_FLAVOR} \ npm-node16>0:www/npm-node16 -USES= bison compiler:c++17-lang cpe gettext-tools gl gnome iconv \ - jpeg localbase:ldflags ninja pkgconfig python:build,test \ - shebangfix tar:xz xorg +USES= bison compiler:c++17-lang cpe gettext-tools gl gnome \ + iconv:wchar_t jpeg localbase:ldflags ninja pkgconfig \ + python:build,test shebangfix tar:xz xorg CPE_VENDOR= electronjs USE_GITHUB= yes @@ -222,7 +221,7 @@ REACTIVEOBJC_VER= 74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76 # See ${WRKSRC}/electron/DEPS for MANTLE_VER MANTLE_VER= 78d3966b3c331292ea29ec38661b25df0a245948 -YARN_TIMESTAMP= 1680156343 +YARN_TIMESTAMP= 1681568942 .include "Makefile.version" .include <bsd.port.pre.mk> # required for COMPILER_VERSION diff --git a/devel/electron22/Makefile.version b/devel/electron22/Makefile.version index 6897812dae2c..37de820c4fe7 100644 --- a/devel/electron22/Makefile.version +++ b/devel/electron22/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 22.3.5 +ELECTRON_VER= 22.3.6 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron22/distinfo b/devel/electron22/distinfo index 6b0938205d34..d65639a77cd7 100644 --- a/devel/electron22/distinfo +++ b/devel/electron22/distinfo @@ -1,14 +1,14 @@ -TIMESTAMP = 1680157181 +TIMESTAMP = 1681569109 SHA256 (electron/chromium-108.0.5359.215.tar.xz) = aba0730b347269efda217affe804f6fced296aa02f810c8c9a6fd7d46cd7bf9a SIZE (electron/chromium-108.0.5359.215.tar.xz) = 1584734880 SHA256 (electron/f8b5da24d33317766d3933fb6711b0603fc4fb6f) = 63706737ca75e0e5c97885186b2a7ab019ca71d1315ee08870193bbfa7486bfc SIZE (electron/f8b5da24d33317766d3933fb6711b0603fc4fb6f) = 9900677 SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8 SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734 -SHA256 (electron/electron-yarn-cache-22.3.5.tar.xz) = 75d8fe319a9694149158ebbc9388ac541029c7572287909a0006ec8ec9dd581a -SIZE (electron/electron-yarn-cache-22.3.5.tar.xz) = 38902228 -SHA256 (electron/electron-electron-v22.3.5_GH0.tar.gz) = bc3b6a1572b14510fa1343da338e64240796a94743f6ba7dd30c3b23bb2d59cd -SIZE (electron/electron-electron-v22.3.5_GH0.tar.gz) = 10569244 +SHA256 (electron/electron-yarn-cache-22.3.6.tar.xz) = 21cd90eea32dc0902831f9c5680b0cadc6388e9e9d44fcdf21bf65450e4b2979 +SIZE (electron/electron-yarn-cache-22.3.6.tar.xz) = 38901104 +SHA256 (electron/electron-electron-v22.3.6_GH0.tar.gz) = 58018da98189a0a0c35a4e89db2e3dd4f6af9ab923297dbf63e3e5ade8dd74dc +SIZE (electron/electron-electron-v22.3.6_GH0.tar.gz) = 10574442 SHA256 (electron/nodejs-node-v16.17.1_GH0.tar.gz) = e63378aa6aa18b9e05486e46eaca6c6e09904366e5100d7e04c6dbd344a42f60 SIZE (electron/nodejs-node-v16.17.1_GH0.tar.gz) = 90485310 SHA256 (electron/nodejs-nan-16fa32231e2ccd89d2804b3f765319128b20c4ac_GH0.tar.gz) = 3807ae6a1e451a29f068540472f100f9718d457c60ac62f2f8469d1d57475d39 diff --git a/devel/electron22/files/patch-electron_script_spec-runner.js b/devel/electron22/files/patch-electron_script_spec-runner.js index 13a0f8187e2f..4916302582de 100644 --- a/devel/electron22/files/patch-electron_script_spec-runner.js +++ b/devel/electron22/files/patch-electron_script_spec-runner.js @@ -1,6 +1,6 @@ ---- electron/script/spec-runner.js.orig 2023-01-24 16:58:16 UTC +--- electron/script/spec-runner.js.orig 2023-04-13 06:10:54 UTC +++ electron/script/spec-runner.js -@@ -148,7 +148,7 @@ async function runTestUsingElectron (specDir, testName +@@ -162,7 +162,7 @@ async function runTestUsingElectron (specDir, testName exe = path.resolve(BASE, utils.getElectronExec()); } const runnerArgs = [`electron/${specDir}`, ...unknownArgs.slice(2)]; diff --git a/devel/electron22/files/patch-electron_shell_common_node__bindings.cc b/devel/electron22/files/patch-electron_shell_common_node__bindings.cc index 5b88fe147505..8caafc529d9f 100644 --- a/devel/electron22/files/patch-electron_shell_common_node__bindings.cc +++ b/devel/electron22/files/patch-electron_shell_common_node__bindings.cc @@ -1,4 +1,4 @@ ---- electron/shell/common/node_bindings.cc.orig 2023-02-08 13:34:58 UTC +--- electron/shell/common/node_bindings.cc.orig 2023-04-13 06:10:54 UTC +++ electron/shell/common/node_bindings.cc @@ -40,7 +40,7 @@ #include "third_party/blink/renderer/bindings/core/v8/v8_initializer.h" // nogncheck @@ -18,7 +18,7 @@ electron::crash_keys::SetCrashKey("electron.v8-fatal.message", message); electron::crash_keys::SetCrashKey("electron.v8-fatal.location", location); #endif -@@ -412,7 +412,7 @@ void NodeBindings::Initialize() { +@@ -429,7 +429,7 @@ void NodeBindings::Initialize() { TRACE_EVENT0("electron", "NodeBindings::Initialize"); // Open node's error reporting system for browser process. diff --git a/devel/electron22/files/patch-electron_spec_chromium-spec.ts b/devel/electron22/files/patch-electron_spec_chromium-spec.ts index 82ec1834d8d5..c8db528ec90e 100644 --- a/devel/electron22/files/patch-electron_spec_chromium-spec.ts +++ b/devel/electron22/files/patch-electron_spec_chromium-spec.ts @@ -1,6 +1,6 @@ ---- electron/spec/chromium-spec.ts.orig 2023-02-16 01:50:10 UTC +--- electron/spec/chromium-spec.ts.orig 2023-04-13 06:10:54 UTC +++ electron/spec/chromium-spec.ts -@@ -427,13 +427,13 @@ describe('command line switches', () => { +@@ -473,13 +473,13 @@ describe('command line switches', () => { it('should not set an invalid locale', async () => testLocale('asdfkl', `${currentLocale}|${currentSystemLocale}|${currentPreferredLanguages}`)); const lcAll = String(process.env.LC_ALL); @@ -18,7 +18,7 @@ }); describe('--remote-debugging-pipe switch', () => { -@@ -2027,7 +2027,7 @@ describe('chromium features', () => { +@@ -2073,7 +2073,7 @@ describe('chromium features', () => { }); }); @@ -27,7 +27,7 @@ it('can be gotten as context in canvas', async () => { const w = new BrowserWindow({ show: false }); w.loadURL('about:blank'); -@@ -2242,12 +2242,12 @@ describe('font fallback', () => { +@@ -2288,12 +2288,12 @@ describe('font fallback', () => { expect(fonts[0].familyName).to.equal('Arial'); } else if (process.platform === 'darwin') { expect(fonts[0].familyName).to.equal('Helvetica'); @@ -42,7 +42,7 @@ const html = ` <html lang="ja-JP"> <head> -@@ -2638,7 +2638,7 @@ describe('navigator.clipboard.write', () => { +@@ -2684,7 +2684,7 @@ describe('navigator.clipboard.write', () => { }); });
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304180643.33I6hgfj054367>