Date: Fri, 17 Apr 2020 10:18:45 +0000 (UTC) From: Hiroki Tagato <tagattie@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r531915 - in head/devel/electron7: . files Message-ID: <202004171018.03HAIju2022707@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tagattie Date: Fri Apr 17 10:18:45 2020 New Revision: 531915 URL: https://svnweb.freebsd.org/changeset/ports/531915 Log: - Update to 7.2.2 - Change node and npm dependencies to specify package name [1] Approved by: ehaupt (mentor) Suggested by: 0mp (via ports) [1] Relnotes: https://github.com/electron/electron/releases/tag/v7.2.0 https://github.com/electron/electron/releases/tag/v7.2.1 https://github.com/electron/electron/releases/tag/v7.2.2 Modified: head/devel/electron7/Makefile head/devel/electron7/Makefile.version head/devel/electron7/distinfo head/devel/electron7/files/package.json head/devel/electron7/files/patch-electron_default__app_default__app.ts head/devel/electron7/files/patch-electron_lib_browser_api_app.ts head/devel/electron7/files/patch-electron_lib_browser_api_dialog.js head/devel/electron7/files/patch-electron_lib_browser_api_menu-item-roles.js head/devel/electron7/files/patch-electron_lib_browser_init.ts head/devel/electron7/files/patch-electron_lib_browser_rpc-server.js head/devel/electron7/files/patch-electron_lib_common_api_clipboard.js head/devel/electron7/files/patch-electron_script_lib_utils.js head/devel/electron7/files/patch-electron_script_spec-runner.js head/devel/electron7/files/patch-electron_shell_browser_api_atom__api__web__contents.cc head/devel/electron7/files/patch-electron_spec-main_api-browser-window-spec.ts head/devel/electron7/files/patch-electron_spec_api-clipboard-spec.js head/devel/electron7/files/patch-electron_spec_api-crash-reporter-spec.js head/devel/electron7/files/patch-electron_spec_api-notification-dbus-spec.js head/devel/electron7/files/patch-electron_spec_api-power-monitor-spec.js head/devel/electron7/files/patch-electron_spec_api-process-spec.js head/devel/electron7/files/patch-electron_spec_api-shell-spec.js head/devel/electron7/files/patch-electron_spec_api-subframe-spec.js head/devel/electron7/files/patch-electron_spec_chromium-spec.js head/devel/electron7/files/patch-electron_spec_fixtures_module_crash.js head/devel/electron7/files/patch-electron_spec_node-spec.js Modified: head/devel/electron7/Makefile ============================================================================== --- head/devel/electron7/Makefile Fri Apr 17 09:43:48 2020 (r531914) +++ head/devel/electron7/Makefile Fri Apr 17 10:18:45 2020 (r531915) @@ -3,7 +3,6 @@ PORTNAME= electron DISTVERSIONPREFIX= v DISTVERSION= ${ELECTRON_VER:S/-beta./.b/} -PORTREVISION= 2 CATEGORIES= devel java MASTER_SITES= https://github.com/tagattie/FreeBSD-Electron/releases/download/v7.1.5/:chromium \ https://commondatastorage.googleapis.com/chromium-browser-official/:chromium_official \ @@ -23,15 +22,15 @@ COMMENT= Build cross-platform desktop apps with JavaSc LICENSE= MIT LICENSE_FILE= ${WRKSRC}/electron/LICENSE -FETCH_DEPENDS= yarn:www/yarn-node12 -EXTRACT_DEPENDS= yarn:www/yarn-node12 +FETCH_DEPENDS= yarn-node12>0:www/yarn-node12 +EXTRACT_DEPENDS= yarn-node12>0:www/yarn-node12 PATCH_DEPENDS= git:devel/git BUILD_DEPENDS= ${LOCALBASE}/bin/ar:devel/binutils \ gperf:devel/gperf \ yasm:devel/yasm \ ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \ - node:www/node12 \ - npm:www/npm-node12 + node12>0:www/node12 \ + npm-node12>0:www/npm-node12 LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-atk \ libatspi.so:accessibility/at-spi2-core \ libsnappy.so:archivers/snappy \ @@ -55,7 +54,7 @@ LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi RUN_DEPENDS= xdg-open:devel/xdg-utils TEST_DEPENDS= git:devel/git \ ${PYTHON_PKGNAMEPREFIX}python-dbusmock>0:devel/py-python-dbusmock@${PY_FLAVOR} \ - npm:www/npm-node12 + npm-node12>0:www/npm-node12 USES= bison dos2unix gettext-tools gl gnome jpeg localbase:ldflags \ ninja pkgconfig python:2.7,build,test tar:xz xorg @@ -164,7 +163,7 @@ PULSEAUDIO_VARS_OFF= GN_ARGS+=use_pulseaudio=false POST_BUILD_TARGETS= licenses version POST_BUILD_DIST_TARGETS= electron_dist_zip electron_chromedriver_zip electron_mksnapshot_zip -YARN_TIMESTAMP= 1583472449 +YARN_TIMESTAMP= 1586951847 PLIST_SUB= ELECTRON_VER=${ELECTRON_VER} \ ELECTRON_VER_MAJOR=${ELECTRON_VER_MAJOR} Modified: head/devel/electron7/Makefile.version ============================================================================== --- head/devel/electron7/Makefile.version Fri Apr 17 09:43:48 2020 (r531914) +++ head/devel/electron7/Makefile.version Fri Apr 17 10:18:45 2020 (r531915) @@ -1,4 +1,4 @@ # $FreeBSD$ -ELECTRON_VER= 7.1.14 +ELECTRON_VER= 7.2.2 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} Modified: head/devel/electron7/distinfo ============================================================================== --- head/devel/electron7/distinfo Fri Apr 17 09:43:48 2020 (r531914) +++ head/devel/electron7/distinfo Fri Apr 17 10:18:45 2020 (r531915) @@ -1,4 +1,4 @@ -TIMESTAMP = 1583473295 +TIMESTAMP = 1586954429 SHA256 (electron/chromium-78.0.3904.130.tar.xz) = 6f9656a345e8cd4938520a70d1979672190f386ac710421be8d32cb542008fc2 SIZE (electron/chromium-78.0.3904.130.tar.xz) = 1405077664 SHA256 (electron/chromium-78.0.3904.108.tar.xz) = f9c53839f306d2973de27723360024f7904101d426b9e7e9cdb56e8bcc775b0e @@ -7,10 +7,10 @@ SHA256 (electron/ab7f28fee456b5af5fbd3fcb5bcc7c6142078 SIZE (electron/ab7f28fee456b5af5fbd3fcb5bcc7c61420788c9) = 4593699 SHA256 (electron/a22de844e32a3f720d219e3911c3da3478039f89) = 6e331676d098a57c53c1250821dc47ed84c47f823901bf30c4704df90d8a34be SIZE (electron/a22de844e32a3f720d219e3911c3da3478039f89) = 17469927 -SHA256 (electron/electron-yarn-cache-7.1.14.tar.xz) = e644591cc785c3a9f3057e7b05028371881de3fb8a354c4cb85fa30f4cbd8ac1 -SIZE (electron/electron-yarn-cache-7.1.14.tar.xz) = 24834332 -SHA256 (electron/electron-electron-v7.1.14_GH0.tar.gz) = 19cfa14b74f8180731334dfb2efe5725f4d9f7d35b708051352ecbee9de499cd -SIZE (electron/electron-electron-v7.1.14_GH0.tar.gz) = 5391932 +SHA256 (electron/electron-yarn-cache-7.2.2.tar.xz) = 8e37911c8d309c21923e04ef46ae2d5634072bfb8ccfe5dccbe12d387cae5435 +SIZE (electron/electron-yarn-cache-7.2.2.tar.xz) = 24834312 +SHA256 (electron/electron-electron-v7.2.2_GH0.tar.gz) = 9051cca3a1f422a7c81d83ef66e4d67dfd89b4aa948185d73a02c9f941e40bdb +SIZE (electron/electron-electron-v7.2.2_GH0.tar.gz) = 5420867 SHA256 (electron/nodejs-node-v12.8.1_GH0.tar.gz) = 11648d586f68ee5fc38e4cadf3974541aac4a67709fa028e9075aff42e28d9b9 SIZE (electron/nodejs-node-v12.8.1_GH0.tar.gz) = 72104419 SHA256 (electron/nodejs-nan-2ee313aaca52e2b478965ac50eb5082520380d1b_GH0.tar.gz) = e6d0727f2f33d6c0fdbee3182543cb23679551dc15318cc8a2489901eabe9915 Modified: head/devel/electron7/files/package.json ============================================================================== --- head/devel/electron7/files/package.json Fri Apr 17 09:43:48 2020 (r531914) +++ head/devel/electron7/files/package.json Fri Apr 17 10:18:45 2020 (r531915) @@ -1,6 +1,6 @@ { "name": "electron", - "version": "7.1.14", + "version": "7.2.2", "repository": "https://github.com/electron/electron", "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS", "devDependencies": { Modified: head/devel/electron7/files/patch-electron_default__app_default__app.ts ============================================================================== --- head/devel/electron7/files/patch-electron_default__app_default__app.ts Fri Apr 17 09:43:48 2020 (r531914) +++ head/devel/electron7/files/patch-electron_default__app_default__app.ts Fri Apr 17 10:18:45 2020 (r531915) @@ -1,11 +1,11 @@ ---- electron/default_app/default_app.ts.orig 2019-12-13 19:48:14 UTC +--- electron/default_app/default_app.ts.orig 2020-03-24 05:00:48 UTC +++ electron/default_app/default_app.ts @@ -59,7 +59,7 @@ async function createWindow () { show: false - } + }; - if (process.platform === 'linux') { + if (process.platform === 'linux' || process.platform === 'freebsd') { - options.icon = path.join(__dirname, 'icon.png') + options.icon = path.join(__dirname, 'icon.png'); } Modified: head/devel/electron7/files/patch-electron_lib_browser_api_app.ts ============================================================================== --- head/devel/electron7/files/patch-electron_lib_browser_api_app.ts Fri Apr 17 09:43:48 2020 (r531914) +++ head/devel/electron7/files/patch-electron_lib_browser_api_app.ts Fri Apr 17 10:18:45 2020 (r531915) @@ -1,11 +1,11 @@ ---- electron/lib/browser/api/app.ts.orig 2019-12-13 19:48:14 UTC +--- electron/lib/browser/api/app.ts.orig 2020-03-24 05:00:48 UTC +++ electron/lib/browser/api/app.ts @@ -67,7 +67,7 @@ if (process.platform === 'darwin') { - app.dock!.getMenu = () => dockMenu + app.dock!.getMenu = () => dockMenu; } -if (process.platform === 'linux') { +if (process.platform === 'linux' || process.platform === 'freebsd') { - const patternVmRSS = /^VmRSS:\s*(\d+) kB$/m - const patternVmHWM = /^VmHWM:\s*(\d+) kB$/m + const patternVmRSS = /^VmRSS:\s*(\d+) kB$/m; + const patternVmHWM = /^VmHWM:\s*(\d+) kB$/m; Modified: head/devel/electron7/files/patch-electron_lib_browser_api_dialog.js ============================================================================== --- head/devel/electron7/files/patch-electron_lib_browser_api_dialog.js Fri Apr 17 09:43:48 2020 (r531914) +++ head/devel/electron7/files/patch-electron_lib_browser_api_dialog.js Fri Apr 17 10:18:45 2020 (r531915) @@ -1,4 +1,4 @@ ---- electron/lib/browser/api/dialog.js.orig 2019-12-13 19:48:14 UTC +--- electron/lib/browser/api/dialog.js.orig 2020-03-24 05:00:48 UTC +++ electron/lib/browser/api/dialog.js @@ -28,7 +28,7 @@ const normalizeAccessKey = (text) => { // existing single underscores with a second underscore, replace double @@ -7,5 +7,5 @@ - if (process.platform === 'linux') { + if (process.platform === 'linux' || process.platform === 'freebsd') { return text.replace(/_/g, '__').replace(/&(.?)/g, (match, after) => { - if (after === '&') return after - return `_${after}` + if (after === '&') return after; + return `_${after}`; Modified: head/devel/electron7/files/patch-electron_lib_browser_api_menu-item-roles.js ============================================================================== --- head/devel/electron7/files/patch-electron_lib_browser_api_menu-item-roles.js Fri Apr 17 09:43:48 2020 (r531914) +++ head/devel/electron7/files/patch-electron_lib_browser_api_menu-item-roles.js Fri Apr 17 10:18:45 2020 (r531915) @@ -1,11 +1,11 @@ ---- electron/lib/browser/api/menu-item-roles.js.orig 2019-12-13 19:48:14 UTC +--- electron/lib/browser/api/menu-item-roles.js.orig 2020-03-24 05:00:48 UTC +++ electron/lib/browser/api/menu-item-roles.js -@@ -4,7 +4,7 @@ const { app } = require('electron') +@@ -4,7 +4,7 @@ const { app } = require('electron'); - const isMac = process.platform === 'darwin' - const isWindows = process.platform === 'win32' --const isLinux = process.platform === 'linux' -+const isLinux = (process.platform === 'linux' || process.platform === 'freebsd') + const isMac = process.platform === 'darwin'; + const isWindows = process.platform === 'win32'; +-const isLinux = process.platform === 'linux'; ++const isLinux = (process.platform === 'linux' || process.platform === 'freebsd'); const roles = { about: { Modified: head/devel/electron7/files/patch-electron_lib_browser_init.ts ============================================================================== --- head/devel/electron7/files/patch-electron_lib_browser_init.ts Fri Apr 17 09:43:48 2020 (r531914) +++ head/devel/electron7/files/patch-electron_lib_browser_init.ts Fri Apr 17 10:18:45 2020 (r531915) @@ -1,11 +1,11 @@ ---- electron/lib/browser/init.ts.orig 2020-02-20 17:38:02 UTC +--- electron/lib/browser/init.ts.orig 2020-03-24 05:00:48 UTC +++ electron/lib/browser/init.ts @@ -165,7 +165,7 @@ const mainStartupScript = packageJson.main || 'index.j - const KNOWN_XDG_DESKTOP_VALUES = ['Pantheon', 'Unity:Unity7', 'pop:GNOME'] + const KNOWN_XDG_DESKTOP_VALUES = ['Pantheon', 'Unity:Unity7', 'pop:GNOME']; function currentPlatformSupportsAppIndicator () { -- if (process.platform !== 'linux') return false -+ if (process.platform !== 'linux' && process.platform !== 'freebsd') return false - const currentDesktop = process.env.XDG_CURRENT_DESKTOP +- if (process.platform !== 'linux') return false; ++ if (process.platform !== 'linux' && process.platform !== 'freebsd') return false; + const currentDesktop = process.env.XDG_CURRENT_DESKTOP; - if (!currentDesktop) return false + if (!currentDesktop) return false; Modified: head/devel/electron7/files/patch-electron_lib_browser_rpc-server.js ============================================================================== --- head/devel/electron7/files/patch-electron_lib_browser_rpc-server.js Fri Apr 17 09:43:48 2020 (r531914) +++ head/devel/electron7/files/patch-electron_lib_browser_rpc-server.js Fri Apr 17 10:18:45 2020 (r531915) @@ -1,11 +1,11 @@ ---- electron/lib/browser/rpc-server.js.orig 2019-12-13 19:48:14 UTC +--- electron/lib/browser/rpc-server.js.orig 2020-03-24 05:00:48 UTC +++ electron/lib/browser/rpc-server.js @@ -484,7 +484,7 @@ const allowedClipboardMethods = (() => { switch (process.platform) { case 'darwin': - return new Set(['readFindText', 'writeFindText']) + return new Set(['readFindText', 'writeFindText']); - case 'linux': + case 'linux': case 'freebsd': - return new Set(Object.keys(clipboard)) + return new Set(Object.keys(clipboard)); default: - return new Set() + return new Set(); Modified: head/devel/electron7/files/patch-electron_lib_common_api_clipboard.js ============================================================================== --- head/devel/electron7/files/patch-electron_lib_common_api_clipboard.js Fri Apr 17 09:43:48 2020 (r531914) +++ head/devel/electron7/files/patch-electron_lib_common_api_clipboard.js Fri Apr 17 10:18:45 2020 (r531915) @@ -1,11 +1,11 @@ ---- electron/lib/common/api/clipboard.js.orig 2019-12-13 19:48:14 UTC +--- electron/lib/common/api/clipboard.js.orig 2020-03-24 05:00:48 UTC +++ electron/lib/common/api/clipboard.js @@ -14,7 +14,7 @@ if (process.type === 'renderer') { - } - } + }; + }; - if (process.platform === 'linux') { + if (process.platform === 'linux' || process.platform === 'freebsd') { // On Linux we could not access clipboard in renderer process. for (const method of Object.keys(clipboard)) { - clipboard[method] = makeRemoteMethod(method) + clipboard[method] = makeRemoteMethod(method); Modified: head/devel/electron7/files/patch-electron_script_lib_utils.js ============================================================================== --- head/devel/electron7/files/patch-electron_script_lib_utils.js Fri Apr 17 09:43:48 2020 (r531914) +++ head/devel/electron7/files/patch-electron_script_lib_utils.js Fri Apr 17 10:18:45 2020 (r531915) @@ -1,11 +1,11 @@ ---- electron/script/lib/utils.js.orig 2019-12-13 19:48:14 UTC +--- electron/script/lib/utils.js.orig 2020-03-24 05:00:48 UTC +++ electron/script/lib/utils.js @@ -16,7 +16,7 @@ function getElectronExec () { - return `out/${OUT_DIR}/Electron.app/Contents/MacOS/Electron` + return `out/${OUT_DIR}/Electron.app/Contents/MacOS/Electron`; case 'win32': - return `out/${OUT_DIR}/electron.exe` + return `out/${OUT_DIR}/electron.exe`; - case 'linux': + case 'linux': case 'freebsd': - return `out/${OUT_DIR}/electron` + return `out/${OUT_DIR}/electron`; default: - throw new Error('Unknown platform') + throw new Error('Unknown platform'); Modified: head/devel/electron7/files/patch-electron_script_spec-runner.js ============================================================================== --- head/devel/electron7/files/patch-electron_script_spec-runner.js Fri Apr 17 09:43:48 2020 (r531914) +++ head/devel/electron7/files/patch-electron_script_spec-runner.js Fri Apr 17 10:18:45 2020 (r531915) @@ -1,11 +1,11 @@ ---- electron/script/spec-runner.js.orig 2020-02-20 17:38:02 UTC +--- electron/script/spec-runner.js.orig 2020-03-24 05:00:48 UTC +++ electron/script/spec-runner.js @@ -115,7 +115,7 @@ async function runElectronTests () { async function runRemoteBasedElectronTests () { - let exe = path.resolve(BASE, utils.getElectronExec()) - const runnerArgs = ['electron/spec', ...unknownArgs.slice(2)] + let exe = path.resolve(BASE, utils.getElectronExec()); + const runnerArgs = ['electron/spec', ...unknownArgs.slice(2)]; - if (process.platform === 'linux') { + if (process.platform === 'linux' || process.platform === 'freebsd') { - runnerArgs.unshift(path.resolve(__dirname, 'dbus_mock.py'), exe) - exe = 'python' + runnerArgs.unshift(path.resolve(__dirname, 'dbus_mock.py'), exe); + exe = 'python'; } Modified: head/devel/electron7/files/patch-electron_shell_browser_api_atom__api__web__contents.cc ============================================================================== --- head/devel/electron7/files/patch-electron_shell_browser_api_atom__api__web__contents.cc Fri Apr 17 09:43:48 2020 (r531914) +++ head/devel/electron7/files/patch-electron_shell_browser_api_atom__api__web__contents.cc Fri Apr 17 10:18:45 2020 (r531915) @@ -1,6 +1,6 @@ ---- electron/shell/browser/api/atom_api_web_contents.cc.orig 2020-02-20 17:38:02 UTC +--- electron/shell/browser/api/atom_api_web_contents.cc.orig 2020-04-14 14:59:21 UTC +++ electron/shell/browser/api/atom_api_web_contents.cc -@@ -104,11 +104,11 @@ +@@ -105,11 +105,11 @@ #include "ui/base/cocoa/defaults_utils.h" #endif @@ -14,7 +14,7 @@ #include "third_party/blink/public/mojom/renderer_preferences.mojom.h" #include "ui/gfx/font_render_params.h" #endif -@@ -482,7 +482,7 @@ void WebContents::InitWithSessionAndOptions( +@@ -483,7 +483,7 @@ void WebContents::InitWithSessionAndOptions( auto* prefs = web_contents()->GetMutableRendererPrefs(); prefs->accept_languages = g_browser_process->GetApplicationLocale(); @@ -23,7 +23,7 @@ // Update font settings. static const base::NoDestructor<gfx::FontRenderParams> params( gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), nullptr)); -@@ -499,7 +499,7 @@ void WebContents::InitWithSessionAndOptions( +@@ -500,7 +500,7 @@ void WebContents::InitWithSessionAndOptions( base::TimeDelta interval; if (ui::TextInsertionCaretBlinkPeriod(&interval)) prefs->caret_blink_interval = interval; Modified: head/devel/electron7/files/patch-electron_spec-main_api-browser-window-spec.ts ============================================================================== --- head/devel/electron7/files/patch-electron_spec-main_api-browser-window-spec.ts Fri Apr 17 09:43:48 2020 (r531914) +++ head/devel/electron7/files/patch-electron_spec-main_api-browser-window-spec.ts Fri Apr 17 10:18:45 2020 (r531915) @@ -1,4 +1,4 @@ ---- electron/spec-main/api-browser-window-spec.ts.orig 2020-02-28 00:07:16 UTC +--- electron/spec-main/api-browser-window-spec.ts.orig 2020-03-24 05:00:48 UTC +++ electron/spec-main/api-browser-window-spec.ts @@ -881,7 +881,7 @@ describe('BrowserWindow module', () => { w.setPosition(pos[0], pos[1]) @@ -63,7 +63,7 @@ afterEach(closeAllWindows) it('emits an event when window is maximized', (done) => { const w = new BrowserWindow({show: false}) -@@ -3195,7 +3195,7 @@ describe('BrowserWindow module', () => { +@@ -3235,7 +3235,7 @@ describe('BrowserWindow module', () => { }) }) Modified: head/devel/electron7/files/patch-electron_spec_api-clipboard-spec.js ============================================================================== --- head/devel/electron7/files/patch-electron_spec_api-clipboard-spec.js Fri Apr 17 09:43:48 2020 (r531914) +++ head/devel/electron7/files/patch-electron_spec_api-clipboard-spec.js Fri Apr 17 10:18:45 2020 (r531915) @@ -1,38 +1,38 @@ ---- electron/spec/api-clipboard-spec.js.orig 2020-02-28 00:07:16 UTC +--- electron/spec/api-clipboard-spec.js.orig 2020-03-24 05:00:48 UTC +++ electron/spec/api-clipboard-spec.js @@ -34,7 +34,7 @@ describe('clipboard module', () => { describe('clipboard.readHTML()', () => { it('returns markup correctly', () => { - const text = '<string>Hi</string>' -- const markup = process.platform === 'darwin' ? "<meta charset='utf-8'><string>Hi</string>" : process.platform === 'linux' ? '<meta http-equiv="content-type" ' + 'content="text/html; charset=utf-8"><string>Hi</string>' : '<string>Hi</string>' -+ const markup = process.platform === 'darwin' ? "<meta charset='utf-8'><string>Hi</string>" : (process.platform === 'linux' || process.platform === 'freebsd') ? '<meta http-equiv="content-type" ' + 'content="text/html; charset=utf-8"><string>Hi</string>' : '<string>Hi</string>' - clipboard.writeHTML(text) - expect(clipboard.readHTML()).to.equal(markup) - }) + const text = '<string>Hi</string>'; +- const markup = process.platform === 'darwin' ? "<meta charset='utf-8'><string>Hi</string>" : process.platform === 'linux' ? '<meta http-equiv="content-type" ' + 'content="text/html; charset=utf-8"><string>Hi</string>' : '<string>Hi</string>'; ++ const markup = process.platform === 'darwin' ? "<meta charset='utf-8'><string>Hi</string>" : (process.platform === 'linux' || process.platform === 'freebsd') ? '<meta http-equiv="content-type" ' + 'content="text/html; charset=utf-8"><string>Hi</string>' : '<string>Hi</string>'; + clipboard.writeHTML(text); + expect(clipboard.readHTML()).to.equal(markup); + }); @@ -50,7 +50,7 @@ describe('clipboard module', () => { describe('clipboard.readBookmark', () => { before(function () { - if (process.platform === 'linux') { + if (process.platform === 'linux' || process.platform === 'freebsd') { - this.skip() + this.skip(); } - }) + }); @@ -76,7 +76,7 @@ describe('clipboard module', () => { - const rtf = '{\\rtf1\\utf8 text}' - const p = path.join(fixtures, 'assets', 'logo.png') - const i = nativeImage.createFromPath(p) -- const markup = process.platform === 'darwin' ? "<meta charset='utf-8'><b>Hi</b>" : process.platform === 'linux' ? '<meta http-equiv="content-type" ' + 'content="text/html; charset=utf-8"><b>Hi</b>' : '<b>Hi</b>' -+ const markup = process.platform === 'darwin' ? "<meta charset='utf-8'><b>Hi</b>" : (process.platform === 'linux' || process.platform === 'freebsd') ? '<meta http-equiv="content-type" ' + 'content="text/html; charset=utf-8"><b>Hi</b>' : '<b>Hi</b>' - const bookmark = { title: 'a title', url: 'test' } + const rtf = '{\\rtf1\\utf8 text}'; + const p = path.join(fixtures, 'assets', 'logo.png'); + const i = nativeImage.createFromPath(p); +- const markup = process.platform === 'darwin' ? "<meta charset='utf-8'><b>Hi</b>" : process.platform === 'linux' ? '<meta http-equiv="content-type" ' + 'content="text/html; charset=utf-8"><b>Hi</b>' : '<b>Hi</b>'; ++ const markup = process.platform === 'darwin' ? "<meta charset='utf-8'><b>Hi</b>" : (process.platform === 'linux' || process.platform === 'freebsd') ? '<meta http-equiv="content-type" ' + 'content="text/html; charset=utf-8"><b>Hi</b>' : '<b>Hi</b>'; + const bookmark = { title: 'a title', url: 'test' }; clipboard.write({ text: 'test', @@ -91,7 +91,7 @@ describe('clipboard module', () => { - expect(clipboard.readRTF()).to.equal(rtf) - expect(clipboard.readImage().toDataURL()).to.equal(i.toDataURL()) + expect(clipboard.readRTF()).to.equal(rtf); + expect(clipboard.readImage().toDataURL()).to.equal(i.toDataURL()); - if (process.platform !== 'linux') { + if (process.platform !== 'linux' && process.platform !== 'freebsd') { - expect(clipboard.readBookmark()).to.deep.equal(bookmark) + expect(clipboard.readBookmark()).to.deep.equal(bookmark); } - }) + }); Modified: head/devel/electron7/files/patch-electron_spec_api-crash-reporter-spec.js ============================================================================== --- head/devel/electron7/files/patch-electron_spec_api-crash-reporter-spec.js Fri Apr 17 09:43:48 2020 (r531914) +++ head/devel/electron7/files/patch-electron_spec_api-crash-reporter-spec.js Fri Apr 17 10:18:45 2020 (r531915) @@ -1,99 +1,99 @@ ---- electron/spec/api-crash-reporter-spec.js.orig 2019-12-13 19:48:14 UTC +--- electron/spec/api-crash-reporter-spec.js.orig 2020-03-24 05:00:48 UTC +++ electron/spec/api-crash-reporter-spec.js @@ -19,7 +19,7 @@ describe('crashReporter module', () => { - if (process.mas || process.env.DISABLE_CRASH_REPORTER_TESTS) return + if (process.mas || process.env.DISABLE_CRASH_REPORTER_TESTS) return; // TODO(alexeykuzmin): [Ch66] Fails. Fix it and enable back. -- if (process.platform === 'linux') return -+ if (process.platform === 'linux' || process.platform === 'freebsd') return +- if (process.platform === 'linux') return; ++ if (process.platform === 'linux' || process.platform === 'freebsd') return; - let originalTempDirectory = null - let tempDirectory = null + let originalTempDirectory = null; + let tempDirectory = null; @@ -90,7 +90,7 @@ describe('crashReporter module', () => { - let dumpFile - let crashesDir = crashReporter.getCrashesDirectory() - const existingDumpFiles = new Set() + let dumpFile; + let crashesDir = crashReporter.getCrashesDirectory(); + const existingDumpFiles = new Set(); - if (process.platform !== 'linux') { + if (process.platform !== 'linux' && process.platform !== 'freebsd') { // crashpad puts the dump files in the "completed" subdirectory if (process.platform === 'darwin') { - crashesDir = path.join(crashesDir, 'completed') + crashesDir = path.join(crashesDir, 'completed'); @@ -101,7 +101,7 @@ describe('crashReporter module', () => { } const testDone = (uploaded) => { - if (uploaded) return done(new Error('Uploaded crash report')) -- if (process.platform !== 'linux') crashReporter.setUploadToServer(true) -+ if (process.platform !== 'linux' && process.platform !== 'freebsd') crashReporter.setUploadToServer(true) - expect(fs.existsSync(dumpFile)).to.be.true() - done() - } + if (uploaded) return done(new Error('Uploaded crash report')); +- if (process.platform !== 'linux') crashReporter.setUploadToServer(true); ++ if (process.platform !== 'linux' && process.platform !== 'freebsd') crashReporter.setUploadToServer(true); + expect(fs.existsSync(dumpFile)).to.be.true(); + done(); + }; @@ -151,7 +151,7 @@ describe('crashReporter module', () => { - }) + }); it('should send minidump with updated extra parameters when node processes crash', function (done) { - if (process.platform === 'linux') { + if (process.platform === 'linux' || process.platform === 'freebsd') { // FIXME(alexeykuzmin): Skip the test. // this.skip() - return + return; @@ -305,7 +305,7 @@ describe('crashReporter module', () => { - expect(() => require('electron').crashReporter.getUploadToServer()).to.throw() - }) + expect(() => require('electron').crashReporter.getUploadToServer()).to.throw(); + }); it('returns true when uploadToServer is set to true', function () { - if (process.platform === 'linux') { + if (process.platform === 'linux' || process.platform === 'freebsd') { // FIXME(alexeykuzmin): Skip the test. // this.skip() - return + return; @@ -319,7 +319,7 @@ describe('crashReporter module', () => { - expect(crashReporter.getUploadToServer()).to.be.true() - }) + expect(crashReporter.getUploadToServer()).to.be.true(); + }); it('returns false when uploadToServer is set to false', function () { - if (process.platform === 'linux') { + if (process.platform === 'linux' || process.platform === 'freebsd') { // FIXME(alexeykuzmin): Skip the test. // this.skip() - return + return; @@ -340,7 +340,7 @@ describe('crashReporter module', () => { - expect(() => require('electron').crashReporter.setUploadToServer('arg')).to.throw() - }) + expect(() => require('electron').crashReporter.setUploadToServer('arg')).to.throw(); + }); it('sets uploadToServer false when called with false', function () { - if (process.platform === 'linux') { + if (process.platform === 'linux' || process.platform === 'freebsd') { // FIXME(alexeykuzmin): Skip the test. // this.skip() - return + return; @@ -355,7 +355,7 @@ describe('crashReporter module', () => { - expect(crashReporter.getUploadToServer()).to.be.false() - }) + expect(crashReporter.getUploadToServer()).to.be.false(); + }); it('sets uploadToServer true when called with true', function () { - if (process.platform === 'linux') { + if (process.platform === 'linux' || process.platform === 'freebsd') { // FIXME(alexeykuzmin): Skip the test. // this.skip() - return + return; @@ -382,7 +382,7 @@ describe('crashReporter module', () => { - expect(parameters).to.be.an('object') - }) + expect(parameters).to.be.an('object'); + }); it('adds a parameter to current parameters', function () { - if (process.platform === 'linux') { + if (process.platform === 'linux' || process.platform === 'freebsd') { // FIXME(alexeykuzmin): Skip the test. // this.skip() - return + return; @@ -397,7 +397,7 @@ describe('crashReporter module', () => { - expect(crashReporter.getParameters()).to.have.a.property('hello') - }) + expect(crashReporter.getParameters()).to.have.a.property('hello'); + }); it('removes a parameter from current parameters', function () { - if (process.platform === 'linux') { + if (process.platform === 'linux' || process.platform === 'freebsd') { // FIXME(alexeykuzmin): Skip the test. // this.skip() - return + return; @@ -490,7 +490,7 @@ const startServer = ({ callback, processType, done, pr server.listen(port, '127.0.0.1', () => { - port = server.address().port - remote.process.port = port + port = server.address().port; + remote.process.port = port; - if (process.platform !== 'linux') { + if (process.platform !== 'linux' && process.platform !== 'freebsd') { crashReporter.start({ Modified: head/devel/electron7/files/patch-electron_spec_api-notification-dbus-spec.js ============================================================================== --- head/devel/electron7/files/patch-electron_spec_api-notification-dbus-spec.js Fri Apr 17 09:43:48 2020 (r531914) +++ head/devel/electron7/files/patch-electron_spec_api-notification-dbus-spec.js Fri Apr 17 10:18:45 2020 (r531915) @@ -1,7 +1,7 @@ ---- electron/spec/api-notification-dbus-spec.js.orig 2019-12-13 19:48:14 UTC +--- electron/spec/api-notification-dbus-spec.js.orig 2020-03-24 05:00:48 UTC +++ electron/spec/api-notification-dbus-spec.js -@@ -14,6 +14,7 @@ const { remote } = require('electron') - const { app } = remote +@@ -14,6 +14,7 @@ const { remote } = require('electron'); + const { app } = remote; const skip = process.platform !== 'linux' || + process.platform !== 'freebsd' || Modified: head/devel/electron7/files/patch-electron_spec_api-power-monitor-spec.js ============================================================================== --- head/devel/electron7/files/patch-electron_spec_api-power-monitor-spec.js Fri Apr 17 09:43:48 2020 (r531914) +++ head/devel/electron7/files/patch-electron_spec_api-power-monitor-spec.js Fri Apr 17 10:18:45 2020 (r531915) @@ -1,11 +1,11 @@ ---- electron/spec/api-power-monitor-spec.js.orig 2019-12-13 19:48:14 UTC +--- electron/spec/api-power-monitor-spec.js.orig 2020-03-24 05:00:48 UTC +++ electron/spec/api-power-monitor-spec.js -@@ -14,7 +14,7 @@ const Promise = require('bluebird') - const { expect } = chai - chai.use(dirtyChai) +@@ -14,7 +14,7 @@ const Promise = require('bluebird'); + const { expect } = chai; + chai.use(dirtyChai); --const skip = process.platform !== 'linux' || !process.env.DBUS_SYSTEM_BUS_ADDRESS -+const skip = (process.platform !== 'linux' && process.platform !== 'freebsd') || !process.env.DBUS_SYSTEM_BUS_ADDRESS +-const skip = process.platform !== 'linux' || !process.env.DBUS_SYSTEM_BUS_ADDRESS; ++const skip = (process.platform !== 'linux' && process.platform !== 'freebsd') || !process.env.DBUS_SYSTEM_BUS_ADDRESS; describe('powerMonitor', () => { - let logindMock, dbusMockPowerMonitor, getCalls, emitSignal, reset + let logindMock, dbusMockPowerMonitor, getCalls, emitSignal, reset; Modified: head/devel/electron7/files/patch-electron_spec_api-process-spec.js ============================================================================== --- head/devel/electron7/files/patch-electron_spec_api-process-spec.js Fri Apr 17 09:43:48 2020 (r531914) +++ head/devel/electron7/files/patch-electron_spec_api-process-spec.js Fri Apr 17 10:18:45 2020 (r531915) @@ -1,11 +1,11 @@ ---- electron/spec/api-process-spec.js.orig 2019-12-13 19:48:14 UTC +--- electron/spec/api-process-spec.js.orig 2020-03-24 05:00:48 UTC +++ electron/spec/api-process-spec.js @@ -50,7 +50,7 @@ describe('process module', () => { it('resolves promise successfully with valid data', async () => { - const memoryInfo = await process.getProcessMemoryInfo() - expect(memoryInfo).to.be.an('object') + const memoryInfo = await process.getProcessMemoryInfo(); + expect(memoryInfo).to.be.an('object'); - if (process.platform === 'linux' || process.platform === 'windows') { + if (process.platform === 'linux' || process.platform === 'freebsd' || process.platform === 'windows') { - expect(memoryInfo.residentSet).to.be.a('number').greaterThan(0) + expect(memoryInfo.residentSet).to.be.a('number').greaterThan(0); } - expect(memoryInfo.private).to.be.a('number').greaterThan(0) + expect(memoryInfo.private).to.be.a('number').greaterThan(0); Modified: head/devel/electron7/files/patch-electron_spec_api-shell-spec.js ============================================================================== --- head/devel/electron7/files/patch-electron_spec_api-shell-spec.js Fri Apr 17 09:43:48 2020 (r531914) +++ head/devel/electron7/files/patch-electron_spec_api-shell-spec.js Fri Apr 17 10:18:45 2020 (r531915) @@ -1,23 +1,23 @@ ---- electron/spec/api-shell-spec.js.orig 2019-12-13 19:48:14 UTC +--- electron/spec/api-shell-spec.js.orig 2020-03-24 05:00:48 UTC +++ electron/spec/api-shell-spec.js @@ -42,7 +42,7 @@ describe('shell module', () => { - await closeWindow(w) - w = null + await closeWindow(w); + w = null; // reset env vars to prevent side effects - if (process.platform === 'linux') { + if (process.platform === 'linux' || process.platform === 'freebsd') { - process.env.DE = envVars.de - process.env.BROWSER = envVars.browser - process.env.DISPLAY = envVars.display + process.env.DE = envVars.de; + process.env.BROWSER = envVars.browser; + process.env.DISPLAY = envVars.display; @@ -54,6 +54,11 @@ describe('shell module', () => { - let requestReceived + let requestReceived; if (process.platform === 'linux') { - process.env.BROWSER = '/bin/true' -+ process.env.DE = 'generic' -+ process.env.DISPLAY = '' -+ requestReceived = Promise.resolve() + process.env.BROWSER = '/bin/true'; ++ process.env.DE = 'generic'; ++ process.env.DISPLAY = ''; ++ requestReceived = Promise.resolve(); + } else if (process.platform === 'freebsd') { -+ process.env.BROWSER = '/usr/bin/true' - process.env.DE = 'generic' - process.env.DISPLAY = '' - requestReceived = Promise.resolve() ++ process.env.BROWSER = '/usr/bin/true'; + process.env.DE = 'generic'; + process.env.DISPLAY = ''; + requestReceived = Promise.resolve(); Modified: head/devel/electron7/files/patch-electron_spec_api-subframe-spec.js ============================================================================== --- head/devel/electron7/files/patch-electron_spec_api-subframe-spec.js Fri Apr 17 09:43:48 2020 (r531914) +++ head/devel/electron7/files/patch-electron_spec_api-subframe-spec.js Fri Apr 17 10:18:45 2020 (r531915) @@ -1,11 +1,11 @@ ---- electron/spec/api-subframe-spec.js.orig 2019-12-13 19:48:14 UTC +--- electron/spec/api-subframe-spec.js.orig 2020-03-24 05:00:48 UTC +++ electron/spec/api-subframe-spec.js @@ -188,7 +188,7 @@ describe('cross-site frame sandboxing', () => { - let server = null + let server = null; beforeEach(function () { - if (process.platform === 'linux') { + if (process.platform === 'linux' || process.platform === 'freebsd') { - this.skip() + this.skip(); } - }) + }); Modified: head/devel/electron7/files/patch-electron_spec_chromium-spec.js ============================================================================== --- head/devel/electron7/files/patch-electron_spec_chromium-spec.js Fri Apr 17 09:43:48 2020 (r531914) +++ head/devel/electron7/files/patch-electron_spec_chromium-spec.js Fri Apr 17 10:18:45 2020 (r531915) @@ -1,14 +1,14 @@ ---- electron/spec/chromium-spec.js.orig 2019-12-13 19:48:14 UTC +--- electron/spec/chromium-spec.js.orig 2020-03-24 05:00:48 UTC +++ electron/spec/chromium-spec.js @@ -831,7 +831,7 @@ describe('chromium feature', () => { - }) + }); it('can be get as context in canvas', () => { - if (process.platform === 'linux') { + if (process.platform === 'linux' || process.platform === 'freebsd') { // FIXME(alexeykuzmin): Skip the test. // this.skip() - return + return; @@ -1416,12 +1416,13 @@ describe('font fallback', () => { expect(fonts[0].familyName).to.equal({ 'win32': 'Arial', @@ -16,12 +16,12 @@ - 'linux': 'DejaVu Sans' // I think this depends on the distro? We don't specify a default. + 'linux': 'DejaVu Sans', // I think this depends on the distro? We don't specify a default. + 'freebsd': 'DejaVu Sans' - }[process.platform]) - }) + }[process.platform]); + }); it('should fall back to Japanese font for sans-serif Japanese script', async function () { - if (process.platform === 'linux') { + if (process.platform === 'linux' || process.platform === 'freebsd') { - return this.skip() + return this.skip(); } const html = ` Modified: head/devel/electron7/files/patch-electron_spec_fixtures_module_crash.js ============================================================================== --- head/devel/electron7/files/patch-electron_spec_fixtures_module_crash.js Fri Apr 17 09:43:48 2020 (r531914) +++ head/devel/electron7/files/patch-electron_spec_fixtures_module_crash.js Fri Apr 17 10:18:45 2020 (r531915) @@ -1,11 +1,11 @@ ---- electron/spec/fixtures/module/crash.js.orig 2019-12-13 19:48:14 UTC +--- electron/spec/fixtures/module/crash.js.orig 2020-03-24 05:00:48 UTC +++ electron/spec/fixtures/module/crash.js @@ -10,7 +10,7 @@ process.crashReporter.start({ } - }) + }); -if (process.platform !== 'linux') { +if (process.platform !== 'linux' && process.platform !== 'freebsd') { - process.crashReporter.addExtraParameter('newExtra', 'newExtra') - process.crashReporter.addExtraParameter('removeExtra', 'removeExtra') - process.crashReporter.removeExtraParameter('removeExtra') + process.crashReporter.addExtraParameter('newExtra', 'newExtra'); + process.crashReporter.addExtraParameter('removeExtra', 'removeExtra'); + process.crashReporter.removeExtraParameter('removeExtra'); Modified: head/devel/electron7/files/patch-electron_spec_node-spec.js ============================================================================== --- head/devel/electron7/files/patch-electron_spec_node-spec.js Fri Apr 17 09:43:48 2020 (r531914) +++ head/devel/electron7/files/patch-electron_spec_node-spec.js Fri Apr 17 10:18:45 2020 (r531915) @@ -1,7 +1,7 @@ ---- electron/spec/node-spec.js.orig 2020-02-10 19:08:32 UTC +--- electron/spec/node-spec.js.orig 2020-03-24 05:00:48 UTC +++ electron/spec/node-spec.js @@ -193,7 +193,7 @@ describe('node feature', () => { - }) + }); describe('child_process.exec', () => { - (process.platform === 'linux' ? it : it.skip)('allows executing a setuid binary from non-sandboxed renderer', () => {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004171018.03HAIju2022707>