Date: Thu, 6 Feb 2020 16:24:36 +0000 (UTC) From: Luca Pizzamiglio <pizzamig@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r525385 - in head/devel/electron6: . files Message-ID: <202002061624.016GOa27028386@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pizzamig Date: Thu Feb 6 16:24:35 2020 New Revision: 525385 URL: https://svnweb.freebsd.org/changeset/ports/525385 Log: devel/electron6: Update to 6.1.7 Minor fix. Version put in a different Makefile for better integration with vscode Submitted by: maintainer (via github) Added: head/devel/electron6/Makefile.version (contents, props changed) head/devel/electron6/files/patch-electron_atom_browser_atom__browser__main__parts.cc (contents, props changed) head/devel/electron6/files/patch-electron_script_lib_config.py (contents, props changed) head/devel/electron6/files/patch-electron_script_spec-runner.js (contents, props changed) head/devel/electron6/files/patch-electron_spec_fixtures_api_crash-restart.html (contents, props changed) Deleted: head/devel/electron6/files/yarnrc-offline-mirror Modified: head/devel/electron6/Makefile head/devel/electron6/distinfo head/devel/electron6/files/package.json head/devel/electron6/files/patch-electron_atom_app_atom__main__delegate.cc head/devel/electron6/files/patch-electron_atom_browser_api_atom__api__web__contents.cc head/devel/electron6/files/patch-electron_chromium__src_chrome_browser_process__singleton__posix.cc head/devel/electron6/files/patch-electron_lib_browser_rpc-server.js head/devel/electron6/files/patch-electron_script_lib_utils.js head/devel/electron6/files/patch-electron_spec-main_api-app-spec.ts head/devel/electron6/files/patch-electron_spec_api-notification-dbus-spec.js head/devel/electron6/pkg-plist Modified: head/devel/electron6/Makefile ============================================================================== --- head/devel/electron6/Makefile Thu Feb 6 16:06:27 2020 (r525384) +++ head/devel/electron6/Makefile Thu Feb 6 16:24:35 2020 (r525385) @@ -8,10 +8,11 @@ MASTER_SITES= https://github.com/tagattie/FreeBSD-Elec https://commondatastorage.googleapis.com/chromium-browser-official/:chromium_official \ https://commondatastorage.googleapis.com/chromium-nodejs/:chromium_node \ https://commondatastorage.googleapis.com/chromium-fonts/:chromium_testfonts -PKGNAMESUFFIX= 6 +PKGNAMESUFFIX= ${ELECTRON_VER_MAJOR} DISTFILES= chromium-${CHROMIUM_VER}${EXTRACT_SUFX}:chromium \ chromium-${CHROMIUM_OFFICIAL_VER}${EXTRACT_SUFX}:chromium_official \ ${CHROMIUM_NODE_MODULES_HASH}:chromium_node \ + ${CHROMIUM_TEST_FONTS_HASH}:chromium_testfonts \ electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX}:prefetch DIST_SUBDIR= ${PORTNAME} @@ -31,6 +32,7 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/ar:devel/binutils \ node:www/node12 \ npm:www/npm-node12 LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-atk \ + libatspi.so:accessibility/at-spi2-core \ libsnappy.so:archivers/snappy \ libFLAC.so:audio/flac \ libopus.so:audio/opus \ @@ -39,6 +41,7 @@ LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi libpci.so:devel/libpci \ libnspr4.so:devel/nspr \ libre2.so:devel/re2 \ + liblcms2.so:graphics/lcms2 \ libdrm.so:graphics/libdrm \ libwebp.so:graphics/webp \ libavcodec.so:multimedia/ffmpeg \ @@ -51,13 +54,12 @@ LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi libexpat.so:textproc/expat2 \ libfontconfig.so:x11-fonts/fontconfig RUN_DEPENDS= xdg-open:devel/xdg-utils -TEST_DEPENDS= yarn:www/yarn-node12 +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-dbusmock>0:devel/py-python-dbusmock@${PY_FLAVOR} \ + npm:www/npm-node12 USES= bison dos2unix gettext-tools gl gnome jpeg localbase:ldflags \ - ninja pkgconfig python:2.7,build tar:xz xorg + ninja pkgconfig python:2.7,build,test tar:xz xorg -CONFLICTS_INSTALL= electron4 electron5 - USE_GITHUB= yes GH_TAGNAME= ${DISTVERSIONPREFIX}${ELECTRON_VER} GH_TUPLE= nodejs:node:v${NODE_VER}:node @@ -65,7 +67,6 @@ GH_TUPLE= nodejs:node:v${NODE_VER}:node # yaml:pyyaml:3.12:pyyaml \ # kennethreitz:requests:e4d59bedfd3c7f4f254f4f5d036587bcd8152458:requests -ELECTRON_VER= 6.1.6 # Official chromium version containing "gn" which is known to work CHROMIUM_OFFICIAL_VER= 76.0.3809.132 # See ${WRKSRC}/electron/DEPS for CHROMIUM_VER @@ -80,6 +81,8 @@ NODE_VER= 12.4.0 NO_WRKSUBDIR= yes WRKSRC_SUBDIR= src +DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} + DOS2UNIX_FILES= third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h BINARY_ALIAS= python=${PYTHON_CMD} @@ -96,6 +99,7 @@ USE_LDCONFIG= ${DATADIR} GN_ARGS+= clang_use_chrome_plugins=false \ enable_hangout_services_extension=true \ enable_nacl=false \ + enable_one_click_signin=true \ enable_remoting=false \ fieldtrial_testing_like_official_build=true \ is_clang=true \ @@ -118,12 +122,12 @@ GN_ARGS+= clang_use_chrome_plugins=false \ extra_ldflags="${LDFLAGS}" GN_BOOTSTRAP_FLAGS= --no-clean --no-rebuild --skip-generate-buildfiles -ALL_TARGET= electron +ALL_TARGET= electron third_party/electron_node:headers MAKE_ARGS= -C out/${BUILDTYPE} MAKE_ENV+= C_INCLUDE_PATH=${LOCALBASE}/include \ CPLUS_INCLUDE_PATH=${LOCALBASE}/include -OPTIONS_DEFINE= CUPS DEBUG DIST DRIVER KERBEROS TEST +OPTIONS_DEFINE= CUPS DEBUG DIST DRIVER KERBEROS DIST_DESC= Build distribution zip files DRIVER_DESC= Install chromedriver OPTIONS_GROUP= AUDIO @@ -131,10 +135,6 @@ OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO OPTIONS_DEFAULT= CUPS DRIVER KERBEROS ALSA OPTIONS_SUB= yes -.if make(makesum) -.MAKEFLAGS: WITH="${OPTIONS_DEFINE}" -.endif - ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins ALSA_VARS= GN_ARGS+=use_alsa=true @@ -159,18 +159,15 @@ PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_VARS= GN_ARGS+=use_pulseaudio=true PULSEAUDIO_VARS_OFF= GN_ARGS+=use_pulseaudio=false -.include "Makefile.tests" -TEST_DISTFILES= ${CHROMIUM_TEST_FONTS_HASH}:chromium_testfonts -TEST_ALL_TARGET= ${TEST_TARGETS} -TEST_ALL_TARGET+= third_party/electron_node:headers - POST_BUILD_TARGETS= licenses version -POST_BUILD_DIST_TARGETS= dist.zip chromedriver.zip mksnapshot.zip +POST_BUILD_DIST_TARGETS= electron_dist_zip electron_chromedriver_zip electron_mksnapshot_zip -YARN_TIMESTAMP= 1576123123 +YARN_TIMESTAMP= 1576819964 -PLIST_SUB= ELECTRON_VER=${ELECTRON_VER} +PLIST_SUB= ELECTRON_VER=${ELECTRON_VER} \ + PKGNAMESUFFIX=${PKGNAMESUFFIX} +.include "Makefile.version" .include <bsd.port.pre.mk> .if ${ARCH} == "amd64" @@ -189,11 +186,11 @@ pre-fetch: @${MKDIR} ${DISTDIR}/${DIST_SUBDIR} if [ ! -f ${DISTDIR}/${DIST_SUBDIR}/electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX} ]; \ then ${MKDIR} ${WRKDIR}; \ - ${SED} -e 's|$${WRKDIR}|${WRKDIR}|' \ - ${FILESDIR}/yarnrc-offline-mirror >> ${WRKDIR}/.yarnrc; \ + ${ECHO_CMD} 'yarn-offline-mirror "./yarn-offline-cache"' >> \ + ${WRKDIR}/.yarnrc; \ ${CP} ${FILESDIR}/package.json ${FILESDIR}/yarn.lock ${WRKDIR}; \ cd ${WRKDIR} && ${SETENV} HOME=${WRKDIR} XDG_CACHE_HOME=${WRKDIR}/.cache \ - yarn --frozen-lockfile; \ + yarn --frozen-lockfile --ignore-scripts; \ ${MTREE_CMD} -cbnSp yarn-offline-cache | ${MTREE_CMD} -C | ${SED} \ -e 's:time=[0-9.]*:time=${YARN_TIMESTAMP}.000000000:' \ -e 's:\([gu]id\)=[0-9]*:\1=0:g' \ @@ -213,7 +210,7 @@ post-extract: ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_node}-${NODE_VER} \ ${WRKSRC}/third_party/electron_node ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/yarn-offline-cache ${WRKDIR} - ${SED} -e 's|$${WRKDIR}|${WRKDIR}|' ${FILESDIR}/yarnrc-offline-mirror >> ${WRKSRC}/electron/.yarnrc + ${ECHO_CMD} 'yarn-offline-mirror "../../../yarn-offline-cache"' >> ${WRKSRC}/electron/.yarnrc cd ${WRKSRC}/electron && \ ${SETENV} HOME=${WRKDIR} XDG_CACHE_HOME=${WRKDIR}/.cache yarn --frozen-lockfile --offline # ${RMDIR} ${WRKSRC}/electron/vendor/${GH_PROJECT_boto} @@ -225,8 +222,6 @@ post-extract: # ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_requests}-${GH_TAGNAME_requests} \ # ${WRKSRC}/electron/vendor/${GH_PROJECT_requests} ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/node_modules ${WRKSRC}/third_party/node - -post-extract-TEST-on: ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/test_fonts ${WRKSRC}/third_party/test_fonts pre-patch: @@ -303,7 +298,8 @@ do-install: .for f in default_app.asar electron.asar ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/resources/${f} ${STAGEDIR}${DATADIR}/resources .endfor - ${RLN} ${STAGEDIR}${DATADIR}/electron ${STAGEDIR}${PREFIX}/bin + cd ${WRKSRC}/out/${BUILDTYPE}/gen && ${COPYTREE_SHARE} node_headers ${STAGEDIR}${DATADIR} + ${RLN} ${STAGEDIR}${DATADIR}/electron ${STAGEDIR}${PREFIX}/bin/electron${PKGNAMESUFFIX} post-install-DIST-on: ${MKDIR} ${STAGEDIR}${DATADIR}/releases @@ -313,20 +309,11 @@ post-install-DIST-on: post-install-DRIVER-on: ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chromedriver ${STAGEDIR}${DATADIR} -do-test-TEST-on: - # chromium unit tests -# .for t in ${TEST_ALL_TARGET} -# cd ${WRKSRC}/out/${BUILDTYPE} && ${SETENV} LC_ALL=en_US.UTF-8 \ -# ./${t} --gtest_filter=-${EXCLUDE_${t}:ts:} || ${TRUE} -# .endfor - # electron unit tests +do-test: # Note 1: "npm install" will run before actual tests are executed # Note 2: Xvfb or something similar is necessary for headless testing - # **Note 3: unit test won't run yet. (robotjs doesn't build with node 12).** -.for t in ${TEST_MODULES} cd ${WRKSRC}/electron && \ ${SETENV} ${TEST_ENV} ELECTRON_OUT_DIR=${BUILDTYPE} \ - npm run test -- --ci -g '${t}' || ${TRUE} -.endfor + npm run test -- --ci .include <bsd.port.post.mk> Added: head/devel/electron6/Makefile.version ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/electron6/Makefile.version Thu Feb 6 16:24:35 2020 (r525385) @@ -0,0 +1,4 @@ +# $FreeBSD$ + +ELECTRON_VER= 6.1.7 +ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/^([0-9]+)\..+$$/\1/} Modified: head/devel/electron6/distinfo ============================================================================== --- head/devel/electron6/distinfo Thu Feb 6 16:06:27 2020 (r525384) +++ head/devel/electron6/distinfo Thu Feb 6 16:24:35 2020 (r525385) @@ -1,15 +1,15 @@ -TIMESTAMP = 1576123689 +TIMESTAMP = 1576820832 SHA256 (electron/chromium-76.0.3809.146.tar.xz) = 1538c7118fb94c1ba6b6da18f4b8f6a6d303dee855ee0e5c3f9025f17563f3cd SIZE (electron/chromium-76.0.3809.146.tar.xz) = 1355929024 SHA256 (electron/chromium-76.0.3809.132.tar.xz) = d54e4640b5e399d170dffbc5bcff65157eb1b29314b94b5d808f727d9ce45241 SIZE (electron/chromium-76.0.3809.132.tar.xz) = 728899912 SHA256 (electron/2dd750e768cec597fc018509009637819ae4549c) = d63b5953e3e8a0d6b7ed344043f9ffe7a49ddcf4e591d59aebaf87e299360730 SIZE (electron/2dd750e768cec597fc018509009637819ae4549c) = 4182260 -SHA256 (electron/electron-yarn-cache-6.1.6.tar.xz) = d6a9eb531928c36b557459ed8bf7403744dfd871a75b4df949c959ea6f162f0d -SIZE (electron/electron-yarn-cache-6.1.6.tar.xz) = 36875392 +SHA256 (electron/electron-yarn-cache-6.1.7.tar.xz) = dfad626b40a789c524c23bd99f556c5ca45872f8e1f54261fff63d7628d855d4 +SIZE (electron/electron-yarn-cache-6.1.7.tar.xz) = 36875936 SHA256 (electron/a22de844e32a3f720d219e3911c3da3478039f89) = 6e331676d098a57c53c1250821dc47ed84c47f823901bf30c4704df90d8a34be SIZE (electron/a22de844e32a3f720d219e3911c3da3478039f89) = 17469927 -SHA256 (electron/electron-electron-v6.1.6_GH0.tar.gz) = 3fcd9148c8493f8ab18149ce1a983904825b0b76529291d974147d69f8dea494 -SIZE (electron/electron-electron-v6.1.6_GH0.tar.gz) = 4157128 +SHA256 (electron/electron-electron-v6.1.7_GH0.tar.gz) = 0fc08bacdaf7600ea7ac0d876ec807e00122cd73b875167350a8b1213c56dd48 +SIZE (electron/electron-electron-v6.1.7_GH0.tar.gz) = 4163933 SHA256 (electron/nodejs-node-v12.4.0_GH0.tar.gz) = fc7df2a5cdb43b7a186f07a04e6b0f5c5c3b4c117f08185ffec3345613c71d94 SIZE (electron/nodejs-node-v12.4.0_GH0.tar.gz) = 70296027 Modified: head/devel/electron6/files/package.json ============================================================================== --- head/devel/electron6/files/package.json Thu Feb 6 16:06:27 2020 (r525384) +++ head/devel/electron6/files/package.json Thu Feb 6 16:24:35 2020 (r525385) @@ -1,6 +1,6 @@ { "name": "electron", - "version": "6.1.6", + "version": "6.1.7", "repository": "https://github.com/electron/electron", "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS", "devDependencies": { Modified: head/devel/electron6/files/patch-electron_atom_app_atom__main__delegate.cc ============================================================================== --- head/devel/electron6/files/patch-electron_atom_app_atom__main__delegate.cc Thu Feb 6 16:06:27 2020 (r525384) +++ head/devel/electron6/files/patch-electron_atom_app_atom__main__delegate.cc Thu Feb 6 16:24:35 2020 (r525385) @@ -1,4 +1,4 @@ ---- electron/atom/app/atom_main_delegate.cc.orig 2019-09-11 17:30:11 UTC +--- electron/atom/app/atom_main_delegate.cc.orig 2019-12-17 00:40:10 UTC +++ electron/atom/app/atom_main_delegate.cc @@ -8,7 +8,7 @@ #include <memory> @@ -9,6 +9,15 @@ #include <glib.h> // for g_setenv() #endif +@@ -204,7 +204,7 @@ bool AtomMainDelegate::BasicStartupComplete(int* exit_ + base::win::PinUser32(); + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Check for --no-sandbox parameter when running as root. + if (getuid() == 0 && IsSandboxEnabled(command_line)) + LOG(FATAL) << "Running as root without --" @@ -229,7 +229,7 @@ void AtomMainDelegate::PostEarlyInitialization(bool is ui::ResourceBundle::GetSharedInstance().GetLocaleFilePath(locale, true); if (!locale_file_path.empty()) { Modified: head/devel/electron6/files/patch-electron_atom_browser_api_atom__api__web__contents.cc ============================================================================== --- head/devel/electron6/files/patch-electron_atom_browser_api_atom__api__web__contents.cc Thu Feb 6 16:06:27 2020 (r525384) +++ head/devel/electron6/files/patch-electron_atom_browser_api_atom__api__web__contents.cc Thu Feb 6 16:24:35 2020 (r525385) @@ -1,6 +1,11 @@ ---- electron/atom/browser/api/atom_api_web_contents.cc.orig 2019-12-11 16:30:56 UTC +--- electron/atom/browser/api/atom_api_web_contents.cc.orig 2019-12-17 00:40:10 UTC +++ electron/atom/browser/api/atom_api_web_contents.cc -@@ -108,7 +108,7 @@ +@@ -104,11 +104,11 @@ + #include "ui/base/cocoa/defaults_utils.h" + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) #include "ui/views/linux_ui/linux_ui.h" #endif @@ -18,3 +23,12 @@ // Update font settings. static const base::NoDestructor<gfx::FontRenderParams> params( gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), nullptr)); +@@ -438,7 +438,7 @@ void WebContents::InitWithSessionAndOptions( + base::TimeDelta interval; + if (ui::TextInsertionCaretBlinkPeriod(&interval)) + prefs->caret_blink_interval = interval; +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + views::LinuxUI* linux_ui = views::LinuxUI::instance(); + if (linux_ui) + prefs->caret_blink_interval = linux_ui->GetCursorBlinkInterval(); Added: head/devel/electron6/files/patch-electron_atom_browser_atom__browser__main__parts.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/electron6/files/patch-electron_atom_browser_atom__browser__main__parts.cc Thu Feb 6 16:24:35 2020 (r525385) @@ -0,0 +1,11 @@ +--- electron/atom/browser/atom_browser_main_parts.cc.orig 2019-12-20 06:04:31 UTC ++++ electron/atom/browser/atom_browser_main_parts.cc +@@ -6,7 +6,7 @@ + + #include <utility> + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include <glib.h> // for g_setenv() + #endif + Modified: head/devel/electron6/files/patch-electron_chromium__src_chrome_browser_process__singleton__posix.cc ============================================================================== --- head/devel/electron6/files/patch-electron_chromium__src_chrome_browser_process__singleton__posix.cc Thu Feb 6 16:06:27 2020 (r525384) +++ head/devel/electron6/files/patch-electron_chromium__src_chrome_browser_process__singleton__posix.cc Thu Feb 6 16:24:35 2020 (r525385) @@ -1,11 +1,11 @@ ---- electron/chromium_src/chrome/browser/process_singleton_posix.cc.orig 2019-09-11 17:30:11 UTC +--- electron/chromium_src/chrome/browser/process_singleton_posix.cc.orig 2019-12-17 00:40:10 UTC +++ electron/chromium_src/chrome/browser/process_singleton_posix.cc @@ -95,7 +95,7 @@ #include "net/base/network_interfaces.h" #include "ui/base/l10n/l10n_util.h" -#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if defined(TOOLKIT_VIEWS) && (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) ++#if defined(TOOLKIT_VIEWS) && ((defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)) #include "ui/views/linux_ui/linux_ui.h" #endif Modified: head/devel/electron6/files/patch-electron_lib_browser_rpc-server.js ============================================================================== --- head/devel/electron6/files/patch-electron_lib_browser_rpc-server.js Thu Feb 6 16:06:27 2020 (r525384) +++ head/devel/electron6/files/patch-electron_lib_browser_rpc-server.js Thu Feb 6 16:24:35 2020 (r525385) @@ -1,10 +1,11 @@ ---- electron/lib/browser/rpc-server.js.orig 2019-12-02 12:19:45 UTC +--- electron/lib/browser/rpc-server.js.orig 2019-12-17 00:40:10 UTC +++ electron/lib/browser/rpc-server.js -@@ -482,6 +482,7 @@ const allowedClipboardMethods = (() => { +@@ -481,7 +481,7 @@ const allowedClipboardMethods = (() => { + switch (process.platform) { case 'darwin': return new Set(['readFindText', 'writeFindText']) - case 'linux': -+ case 'freebsd': +- case 'linux': ++ case 'linux': case 'freebsd': return new Set(Object.keys(clipboard)) default: return new Set() Added: head/devel/electron6/files/patch-electron_script_lib_config.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/electron6/files/patch-electron_script_lib_config.py Thu Feb 6 16:24:35 2020 (r525385) @@ -0,0 +1,12 @@ +--- electron/script/lib/config.py.orig 2019-12-20 06:16:27 UTC ++++ electron/script/lib/config.py +@@ -21,6 +21,9 @@ PLATFORM = { + 'cygwin': 'win32', + 'darwin': 'darwin', + 'linux2': 'linux', ++ 'freebsd11': 'freebsd', ++ 'freebsd12': 'freebsd', ++ 'freebsd13': 'freebsd', + 'win32': 'win32', + }[sys.platform] + Modified: head/devel/electron6/files/patch-electron_script_lib_utils.js ============================================================================== --- head/devel/electron6/files/patch-electron_script_lib_utils.js Thu Feb 6 16:06:27 2020 (r525384) +++ head/devel/electron6/files/patch-electron_script_lib_utils.js Thu Feb 6 16:24:35 2020 (r525385) @@ -1,10 +1,11 @@ ---- electron/script/lib/utils.js.orig 2019-09-11 17:30:11 UTC +--- electron/script/lib/utils.js.orig 2019-12-17 00:40:10 UTC +++ electron/script/lib/utils.js -@@ -15,6 +15,7 @@ function getElectronExec () { +@@ -14,7 +14,7 @@ function getElectronExec () { + return `out/${OUT_DIR}/Electron.app/Contents/MacOS/Electron` case 'win32': return `out/${OUT_DIR}/electron.exe` - case 'linux': -+ case 'freebsd': +- case 'linux': ++ case 'linux': case 'freebsd': return `out/${OUT_DIR}/electron` default: throw new Error('Unknown platform') Added: head/devel/electron6/files/patch-electron_script_spec-runner.js ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/electron6/files/patch-electron_script_spec-runner.js Thu Feb 6 16:24:35 2020 (r525385) @@ -0,0 +1,11 @@ +--- electron/script/spec-runner.js.orig 2019-12-20 06:08:27 UTC ++++ electron/script/spec-runner.js +@@ -114,7 +114,7 @@ async function runElectronTests () { + async function runRemoteBasedElectronTests () { + 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' + } Modified: head/devel/electron6/files/patch-electron_spec-main_api-app-spec.ts ============================================================================== --- head/devel/electron6/files/patch-electron_spec-main_api-app-spec.ts Thu Feb 6 16:06:27 2020 (r525384) +++ head/devel/electron6/files/patch-electron_spec-main_api-app-spec.ts Thu Feb 6 16:24:35 2020 (r525385) @@ -1,4 +1,4 @@ ---- electron/spec-main/api-app-spec.ts.orig 2019-11-05 00:13:02 UTC +--- electron/spec-main/api-app-spec.ts.orig 2019-12-17 00:40:10 UTC +++ electron/spec-main/api-app-spec.ts @@ -112,7 +112,7 @@ describe('app module', () => { describe('app.getLocaleCountryCode()', () => { @@ -72,3 +72,12 @@ // For linux and macOS complete info is same as basic info await verifyBasicGPUInfo(completeInfo) const basicInfo = await getGPUInfo('basic') +@@ -1095,7 +1095,7 @@ describe('app module', () => { + const socketPath = process.platform === 'win32' ? '\\\\.\\pipe\\electron-mixed-sandbox' : '/tmp/electron-mixed-sandbox' + + beforeEach(function (done) { +- if (process.platform === 'linux' && (process.arch === 'arm64' || process.arch === 'arm')) { ++ if ((process.platform === 'linux' || process.platform === 'freebsd') && (process.arch === 'arm64' || process.arch === 'arm')) { + // Our ARM tests are run on VSTS rather than CircleCI, and the Docker + // setup on VSTS disallows syscalls that Chrome requires for setting up + // sandboxing. Modified: head/devel/electron6/files/patch-electron_spec_api-notification-dbus-spec.js ============================================================================== --- head/devel/electron6/files/patch-electron_spec_api-notification-dbus-spec.js Thu Feb 6 16:06:27 2020 (r525384) +++ head/devel/electron6/files/patch-electron_spec_api-notification-dbus-spec.js Thu Feb 6 16:24:35 2020 (r525385) @@ -1,10 +1,11 @@ ---- electron/spec/api-notification-dbus-spec.js.orig 2019-09-11 17:30:11 UTC +--- electron/spec/api-notification-dbus-spec.js.orig 2019-12-17 00:40:10 UTC +++ electron/spec/api-notification-dbus-spec.js -@@ -14,6 +14,7 @@ const { remote } = require('electron') +@@ -13,7 +13,7 @@ const Promise = require('bluebird') + const { remote } = require('electron') const { app } = remote - const skip = process.platform !== 'linux' || -+ process.platform !== 'freebsd' || +-const skip = process.platform !== 'linux' || ++const skip = process.platform !== 'linux' || process.platform !== 'freebsd' || process.arch === 'ia32' || process.arch.indexOf('arm') === 0 || !process.env.DBUS_SESSION_BUS_ADDRESS; Added: head/devel/electron6/files/patch-electron_spec_fixtures_api_crash-restart.html ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/electron6/files/patch-electron_spec_fixtures_api_crash-restart.html Thu Feb 6 16:24:35 2020 (r525385) @@ -0,0 +1,11 @@ +--- electron/spec/fixtures/api/crash-restart.html.orig 2019-12-20 06:13:48 UTC ++++ electron/spec/fixtures/api/crash-restart.html +@@ -19,7 +19,7 @@ crashReporter.start({ + }) + + setImmediate(() => { +- if (process.platform !== 'linux') { ++ if (process.platform !== 'linux' && process.platform !== 'freebsd') { + crashReporter.addExtraParameter('extra2', 'extra2') + crashReporter.removeExtraParameter('extra3') + } else { Modified: head/devel/electron6/pkg-plist ============================================================================== --- head/devel/electron6/pkg-plist Thu Feb 6 16:06:27 2020 (r525384) +++ head/devel/electron6/pkg-plist Thu Feb 6 16:24:35 2020 (r525385) @@ -1,9 +1,9 @@ -bin/electron +bin/electron%%PKGNAMESUFFIX%% %%DATADIR%%/LICENSE %%DATADIR%%/LICENSES.chromium.html %%DATADIR%%/chrome_100_percent.pak %%DATADIR%%/chrome_200_percent.pak -%%DATADIR%%/chromedriver +%%DRIVER%%%%DATADIR%%/chromedriver %%DATADIR%%/electron %%DATADIR%%/icudtl.dat %%DATADIR%%/libEGL.so @@ -63,6 +63,56 @@ bin/electron %%DATADIR%%/locales/zh-TW.pak %%DATADIR%%/mksnapshot %%DATADIR%%/natives_blob.bin +%%DATADIR%%/node_headers/include/node/common.gypi +%%DATADIR%%/node_headers/include/node/config.gypi +%%DATADIR%%/node_headers/include/node/js_native_api.h +%%DATADIR%%/node_headers/include/node/js_native_api_types.h +%%DATADIR%%/node_headers/include/node/libplatform/libplatform-export.h +%%DATADIR%%/node_headers/include/node/libplatform/libplatform.h +%%DATADIR%%/node_headers/include/node/libplatform/v8-tracing.h +%%DATADIR%%/node_headers/include/node/node.h +%%DATADIR%%/node_headers/include/node/node_api.h +%%DATADIR%%/node_headers/include/node/node_api_types.h +%%DATADIR%%/node_headers/include/node/node_buffer.h +%%DATADIR%%/node_headers/include/node/node_object_wrap.h +%%DATADIR%%/node_headers/include/node/node_version.h +%%DATADIR%%/node_headers/include/node/uv.h +%%DATADIR%%/node_headers/include/node/uv/aix.h +%%DATADIR%%/node_headers/include/node/uv/android-ifaddrs.h +%%DATADIR%%/node_headers/include/node/uv/bsd.h +%%DATADIR%%/node_headers/include/node/uv/darwin.h +%%DATADIR%%/node_headers/include/node/uv/errno.h +%%DATADIR%%/node_headers/include/node/uv/linux.h +%%DATADIR%%/node_headers/include/node/uv/os390.h +%%DATADIR%%/node_headers/include/node/uv/posix.h +%%DATADIR%%/node_headers/include/node/uv/stdint-msvc2008.h +%%DATADIR%%/node_headers/include/node/uv/sunos.h +%%DATADIR%%/node_headers/include/node/uv/threadpool.h +%%DATADIR%%/node_headers/include/node/uv/tree.h +%%DATADIR%%/node_headers/include/node/uv/unix.h +%%DATADIR%%/node_headers/include/node/uv/version.h +%%DATADIR%%/node_headers/include/node/uv/win.h +%%DATADIR%%/node_headers/include/node/v8-internal.h +%%DATADIR%%/node_headers/include/node/v8-platform.h +%%DATADIR%%/node_headers/include/node/v8-profiler.h +%%DATADIR%%/node_headers/include/node/v8-testing.h +%%DATADIR%%/node_headers/include/node/v8-util.h +%%DATADIR%%/node_headers/include/node/v8-value-serializer-version.h +%%DATADIR%%/node_headers/include/node/v8-version-string.h +%%DATADIR%%/node_headers/include/node/v8-version.h +%%DATADIR%%/node_headers/include/node/v8-wasm-trap-handler-posix.h +%%DATADIR%%/node_headers/include/node/v8-wasm-trap-handler-win.h +%%DATADIR%%/node_headers/include/node/v8.h +%%DATADIR%%/node_headers/include/node/v8config.h +%%DATADIR%%/node_headers/include/node/zconf.h +%%DATADIR%%/node_headers/include/node/zlib.h +%%DIST%%%%DATADIR%%/releases/SHASUMS256.txt +%%DIST%%%%AMD64%%%%DATADIR%%/releases/chromedriver-v%%ELECTRON_VER%%-freebsd-x64.zip +%%DIST%%%%I386%%%%DATADIR%%/releases/chromedriver-v%%ELECTRON_VER%%-freebsd-ia32.zip +%%DIST%%%%AMD64%%%%DATADIR%%/releases/electron-v%%ELECTRON_VER%%-freebsd-x64.zip +%%DIST%%%%I386%%%%DATADIR%%/releases/electron-v%%ELECTRON_VER%%-freebsd-ia32.zip +%%DIST%%%%AMD64%%%%DATADIR%%/releases/mksnapshot-v%%ELECTRON_VER%%-freebsd-x64.zip +%%DIST%%%%I386%%%%DATADIR%%/releases/mksnapshot-v%%ELECTRON_VER%%-freebsd-ia32.zip %%DATADIR%%/resources.pak %%DATADIR%%/resources/default_app.asar %%DATADIR%%/resources/electron.asar
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002061624.016GOa27028386>