diff --git a/devel/electron11/Makefile b/devel/electron11/Makefile index d859559bc1c5..4024486c7b06 100644 --- a/devel/electron11/Makefile +++ b/devel/electron11/Makefile @@ -1,305 +1,304 @@ PORTNAME= electron DISTVERSIONPREFIX= v DISTVERSION= ${ELECTRON_VER:S/-beta./.b/} -PORTREVISION= 1 CATEGORIES= devel java MASTER_SITES= 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= ${ELECTRON_VER_MAJOR} DISTFILES= 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} MAINTAINER= tagattie@FreeBSD.org COMMENT= Build cross-platform desktop apps with JavaScript, HTML, and CSS LICENSE= MIT LICENSE_FILE= ${WRKSRC}/electron/LICENSE 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 \ 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 \ libFLAC.so:audio/flac \ libopus.so:audio/opus \ libdbus-1.so:devel/dbus \ libnotify.so:devel/libnotify \ libpci.so:devel/libpci \ libnspr4.so:devel/nspr \ libre2.so:devel/re2 \ libdrm.so:graphics/libdrm \ libpng.so:graphics/png \ libwebp.so:graphics/webp \ libavcodec.so:multimedia/ffmpeg \ libopenh264.so:multimedia/openh264 \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libsecret-1.so:security/libsecret \ libnss3.so:security/nss \ libexpat.so:textproc/expat2 \ libxkbcommon.so:x11/libxkbcommon \ libfontconfig.so:x11-fonts/fontconfig RUN_DEPENDS= xdg-open:devel/xdg-utils TEST_DEPENDS= git:devel/git \ ${PYTHON_PKGNAMEPREFIX}python-dbusmock>0:devel/py-python-dbusmock@${PY_FLAVOR} \ npm-node12>0:www/npm-node12 USES= bison dos2unix gettext-tools gl gnome jpeg localbase:ldflags \ ninja pkgconfig python:2.7,build,test shebangfix tar:xz xorg DOS2UNIX_FILES= third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h USE_GITHUB= yes GH_TAGNAME= ${DISTVERSIONPREFIX}${ELECTRON_VER} GH_TUPLE= nodejs:node:v${NODE_VER}:node \ nodejs:nan:${NAN_VER}:nan USE_GL= gbm gl glesv2 USE_GNOME= atk cairo gdkpixbuf2 gtk30 libxml2 libxslt pango USE_JAVA= yes JAVA_VERSION= 1.8 JAVA_BUILD= yes USE_LDCONFIG= ${DATADIR} USE_XORG= x11 xcb xcomposite xcursor xdamage xext xfixes xi xrandr \ xrender xscrnsaver xtst SHEBANG_FILES= buildtools/freebsd/clang-format MAKE_ARGS= -C out/${BUILDTYPE} MAKE_ENV+= C_INCLUDE_PATH=${LOCALBASE}/include \ CPLUS_INCLUDE_PATH=${LOCALBASE}/include ALL_TARGET= electron third_party/electron_node:headers POST_BUILD_TARGETS= licenses version POST_BUILD_DIST_TARGETS= electron_dist_zip electron_chromedriver_zip \ electron_mksnapshot_zip DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} BINARY_ALIAS= python=${PYTHON_CMD} NO_WRKSUBDIR= yes WRKSRC_SUBDIR= src PLIST_SUB= ELECTRON_VER=${ELECTRON_VER} \ ELECTRON_VER_MAJOR=${ELECTRON_VER_MAJOR} OPTIONS_DEFINE= CUPS DEBUG DIST DRIVER KERBEROS OPTIONS_DEFAULT= CUPS DRIVER KERBEROS ALSA OPTIONS_GROUP= AUDIO OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO OPTIONS_SUB= yes DIST_DESC= Build distribution zip files DRIVER_DESC= Install chromedriver 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 ALSA_VARS_OFF= GN_ARGS+=use_alsa=false CUPS_LIB_DEPENDS= libcups.so:print/cups CUPS_VARS= GN_ARGS+=use_cups=true CUPS_VARS_OFF= GN_ARGS+=use_cups=false DEBUG_VARS= BUILDTYPE=Testing DEBUG_VARS_OFF= BUILDTYPE=Release DIST_IMPLIES= DRIVER DRIVER_ALL_TARGET= chromedriver KERBEROS_VARS= GN_ARGS+=use_kerberos=true KERBEROS_VARS_OFF= GN_ARGS+=use_kerberos=false PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_VARS= GN_ARGS+=use_pulseaudio=true PULSEAUDIO_VARS_OFF= GN_ARGS+=use_pulseaudio=false # Official chromium version containing "gn" which is known to work CHROMIUM_OFFICIAL_VER= 87.0.4280.141 # See ${WRKSRC}/electron/DEPS for CHROMIUM_VER CHROMIUM_VER= 87.0.4280.141 # See ${WRKSRC}/third_party/node/node_modules.tar.gz.sha1 for CHROMIUM_NODE_MODULES_HASH CHROMIUM_NODE_MODULES_HASH= a9603a3dc03fa41af9cc5c8ac28d23d1f98dfe3c # See ${WRKSRC}/third_party/test_fonts/test_fonts.tar.gz.sha1 for CHROMIUM_TEST_FONTS_HASH CHROMIUM_TEST_FONTS_HASH= cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb # See ${WRKSRC}/electron/DEPS for NODE_VER NODE_VER= 12.18.3 # See ${WRKSRC}/electron/DEPS for NAN_VER NAN_VER= 2c4ee8a32a299eada3cd6e468bbd0a473bfea96d -YARN_TIMESTAMP= 1617522362 +YARN_TIMESTAMP= 1618728633 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 \ toolkit_views=true \ treat_warnings_as_errors=false \ use_allocator="none" \ use_allocator_shim=false \ use_aura=true \ use_custom_libcxx=false \ use_gnome_keyring=false \ use_lld=true \ use_sysroot=false \ use_system_freetype=true \ use_system_harfbuzz=true \ use_system_libjpeg=true \ extra_cxxflags="${CXXFLAGS}" \ extra_ldflags="${LDFLAGS}" GN_BOOTSTRAP_FLAGS= --no-clean --no-rebuild --skip-generate-buildfiles .include "Makefile.version" .include .if ${ARCH} == "amd64" PLIST_SUB+= AMD64="" .else PLIST_SUB+= AMD64="@comment " .endif .if ${ARCH} == "i386" PLIST_SUB+= I386="" .else PLIST_SUB+= I386="@comment " .endif pre-fetch: @${MKDIR} ${DISTDIR}/${DIST_SUBDIR} if [ ! -f ${DISTDIR}/${DIST_SUBDIR}/electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX} ]; \ then ${MKDIR} ${WRKDIR}; \ ${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 --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' \ -e 's:flags=.*:flags=none:' \ -e 's:^\.:./yarn-offline-cache:' > yarn-offline-cache.mtree; \ ${TAR} cJf ${DISTDIR}/${DIST_SUBDIR}/electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX} \ @yarn-offline-cache.mtree; \ ${RM} -r ${WRKDIR}; \ fi post-extract: # Move extracted sources to appropriate locations ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/chromium-${CHROMIUM_VER} ${WRKSRC} ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${PORTNAME}-${ELECTRON_VER} ${WRKSRC}/electron ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_nan}-${NAN_VER} \ ${WRKSRC}/third_party/nan ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_node}-${NODE_VER} \ ${WRKSRC}/third_party/electron_node # ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/node_modules ${WRKSRC}/third_party/node ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/test_fonts ${WRKSRC}/third_party/test_fonts # Take in clang-format from official chromium distribution ${MKDIR} ${WRKSRC}/buildtools/freebsd # ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/chromium-${CHROMIUM_OFFICIAL_VER}/buildtools/linux64/clang-format \ # ${WRKSRC}/buildtools/freebsd ${CP} ${WRKSRC}/buildtools/linux64/clang-format ${WRKSRC}/buildtools/freebsd # Take in gn source files from official chromium distribution # ${RM} -r ${WRKSRC}/tools/gn # ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/chromium-${CHROMIUM_OFFICIAL_VER}/tools/gn \ # ${WRKSRC}/tools/gn # Remove unnecessary files ${RM} -r ${WRKSRC}/third_party/jdk/current ${RM} -r ${WRKSRC}/third_party/jdk/extras # 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 cd ${WRKSRC}/electron && \ ${SETENV} HOME=${WRKDIR} XDG_CACHE_HOME=${WRKDIR}/.cache yarn --frozen-lockfile --offline pre-patch: ${SH} ${FILESDIR}/apply-electron-patches.sh ${WRKSRC} # ${FIND} ${WRKSRC} -type f -name '*.orig' -print -delete # ${FIND} ${WRKSRC} -type f -name '*~' -print -delete pre-configure: # We used to remove bundled libraries to be sure that chromium uses # system libraries and not shipped ones. # cd ${WRKSRC} && ${PYTHON_CMD} \ #./build/linux/unbundle/remove_bundled_libraries.py [list of preserved] cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \ ./build/linux/unbundle/replace_gn_files.py --system-libraries \ ffmpeg flac fontconfig freetype harfbuzz-ng libdrm libpng \ libusb libwebp libxml libxslt openh264 opus snappy || ${FALSE} do-configure: # GN generator bootstrapping and generating ninja files cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} CC=${CC} CXX=${CXX} LD=${CXX} \ READELF=${READELF} AR=${AR} NM=${NM} ${PYTHON_CMD} \ ./tools/gn/bootstrap/bootstrap.py ${GN_BOOTSTRAP_FLAGS} cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./out/Release/gn gen out/${BUILDTYPE} \ --args='import("//electron/build/args/${BUILDTYPE:tl}.gn") ${GN_ARGS}' # Setup nodejs dependency ${MKDIR} ${WRKSRC}/third_party/node/freebsd/node-freebsd-x64/bin ${LN} -sf ${LOCALBASE}/bin/node ${WRKSRC}/third_party/node/freebsd/node-freebsd-x64/bin/node # Setup java dependency ${MKDIR} ${WRKDIR}/bin ${LN} -sf ${LOCALBASE}/openjdk8/bin/java ${WRKDIR}/bin/java post-build: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ ${MAKE_CMD} ${MAKE_ARGS} ${POST_BUILD_TARGETS} post-build-DIST-on: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ ${MAKE_CMD} ${MAKE_ARGS} ${POST_BUILD_DIST_TARGETS} cd ${WRKSRC}/out/${BUILDTYPE} && \ ${CP} chromedriver.zip chromedriver-v${ELECTRON_VER}-freebsd-${ARCH:S/amd64/x64/:S/i386/ia32/}.zip && \ ${CP} dist.zip electron-v${ELECTRON_VER}-freebsd-${ARCH:S/amd64/x64/:S/i386/ia32/}.zip && \ ${CP} mksnapshot.zip mksnapshot-v${ELECTRON_VER}-freebsd-${ARCH:S/amd64/x64/:S/i386/ia32/}.zip && \ ${SHA256} -r *-v${ELECTRON_VER}-freebsd-*.zip | ${SED} -e 's/ / */' > SHASUMS256.txt do-install: ${MKDIR} ${STAGEDIR}${DATADIR} .for f in electron mksnapshot v8_context_snapshot_generator ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR} .endfor .for f in libEGL.so libGLESv2.so libvk_swiftshader.so libvulkan.so ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR} .endfor ${MKDIR} ${STAGEDIR}${DATADIR}/swiftshader .for f in libEGL.so libGLESv2.so ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/swiftshader/${f} ${STAGEDIR}${DATADIR}/swiftshader .endfor .for f in LICENSE LICENSES.chromium.html icudtl.dat snapshot_blob.bin v8_context_snapshot.bin version vk_swiftshader_icd.json ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR} .endfor .for f in chrome_100_percent.pak chrome_200_percent.pak resources.pak ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR} .endfor ${MKDIR} ${STAGEDIR}${DATADIR}/locales ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/locales/*.pak ${STAGEDIR}${DATADIR}/locales ${MKDIR} ${STAGEDIR}${DATADIR}/resources .for f in default_app.asar ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/resources/${f} ${STAGEDIR}${DATADIR}/resources .endfor cd ${WRKSRC}/out/${BUILDTYPE}/gen && ${COPYTREE_SHARE} node_headers ${STAGEDIR}${DATADIR} cd ${WRKSRC}/out/${BUILDTYPE} && ${COPYTREE_SHARE} gen/electron/buildflags ${STAGEDIR}${DATADIR} cd ${WRKSRC}/out/${BUILDTYPE} && ${COPYTREE_SHARE} gen/v8/embedded.S ${STAGEDIR}${DATADIR} ${RLN} ${STAGEDIR}${DATADIR}/electron ${STAGEDIR}${PREFIX}/bin/electron${PKGNAMESUFFIX} post-install-DIST-on: ${MKDIR} ${STAGEDIR}${DATADIR}/releases ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/SHASUMS256.txt ${STAGEDIR}${DATADIR}/releases ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*-v${ELECTRON_VER}-freebsd-*.zip ${STAGEDIR}${DATADIR}/releases post-install-DRIVER-on: ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chromedriver ${STAGEDIR}${DATADIR} do-test: # Note 1: "npm install" will run before actual tests are executed # Note 2: Xvfb or something similar is necessary for headless testing cd ${WRKSRC}/electron && \ ${SETENV} ${TEST_ENV} ELECTRON_OUT_DIR=${BUILDTYPE} LOCAL_GIT_DIRECTORY=${LOCALBASE} \ npm run test -- --ci .include diff --git a/devel/electron11/Makefile.version b/devel/electron11/Makefile.version index 66d2e6475e6b..2821d542dc52 100644 --- a/devel/electron11/Makefile.version +++ b/devel/electron11/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 11.4.2 +ELECTRON_VER= 11.4.3 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron11/distinfo b/devel/electron11/distinfo index b5ffef1fe850..1b12fbc46f2f 100644 --- a/devel/electron11/distinfo +++ b/devel/electron11/distinfo @@ -1,15 +1,15 @@ -TIMESTAMP = 1617522634 +TIMESTAMP = 1618729325 SHA256 (electron/chromium-87.0.4280.141.tar.xz) = 147591d7fc21e1a173701d28bbf35baddb91e64dd96ec16d8eee9a5113403375 SIZE (electron/chromium-87.0.4280.141.tar.xz) = 856467564 SHA256 (electron/a9603a3dc03fa41af9cc5c8ac28d23d1f98dfe3c) = b8b23fa102ddea8b6b4b6b9161c76636fd48b37e6bcfe955e56bfe04e31ba13b SIZE (electron/a9603a3dc03fa41af9cc5c8ac28d23d1f98dfe3c) = 8072260 SHA256 (electron/cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb) = ec973eccd669d417fbf2d0a4dac730744a3174268ff062db5451b55c82bc3492 SIZE (electron/cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb) = 26759650 -SHA256 (electron/electron-yarn-cache-11.4.2.tar.xz) = 6855781d438f4f542604faffb84f53a8405457ca4f824a45c88b708d20d19de2 -SIZE (electron/electron-yarn-cache-11.4.2.tar.xz) = 27493860 -SHA256 (electron/electron-electron-v11.4.2_GH0.tar.gz) = 807383d378243b7a11ec94c47c7384e1b5963c0b1a0abd8667f1e4525d224f60 -SIZE (electron/electron-electron-v11.4.2_GH0.tar.gz) = 6392036 +SHA256 (electron/electron-yarn-cache-11.4.3.tar.xz) = 38b30ba8ede35ff78b807496bd914502413c1f9764622c1ed662d8a68bde5439 +SIZE (electron/electron-yarn-cache-11.4.3.tar.xz) = 27493852 +SHA256 (electron/electron-electron-v11.4.3_GH0.tar.gz) = 9da9c9a19c968588e9db0a10bed785e65032c2b429ab49056891c731c4695067 +SIZE (electron/electron-electron-v11.4.3_GH0.tar.gz) = 6394367 SHA256 (electron/nodejs-node-v12.18.3_GH0.tar.gz) = 6e2730c9284906a0f34cd7c64540c891c0e363323c46e9fc005c6366ddf389c6 SIZE (electron/nodejs-node-v12.18.3_GH0.tar.gz) = 77078855 SHA256 (electron/nodejs-nan-2c4ee8a32a299eada3cd6e468bbd0a473bfea96d_GH0.tar.gz) = e4ff33afb043329429c9551d3cc983786553a310a7d61ee313485ba3ac9b2b15 SIZE (electron/nodejs-nan-2c4ee8a32a299eada3cd6e468bbd0a473bfea96d_GH0.tar.gz) = 178328 diff --git a/devel/electron11/files/package.json b/devel/electron11/files/package.json index 26ee6fed432a..904972d0e499 100644 --- a/devel/electron11/files/package.json +++ b/devel/electron11/files/package.json @@ -1,143 +1,143 @@ { "name": "electron", - "version": "11.4.2", + "version": "11.4.3", "repository": "https://github.com/electron/electron", "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS", "devDependencies": { "@electron/docs-parser": "^0.10.0", "@electron/typescript-definitions": "^8.7.5", "@octokit/auth-app": "^2.10.0", "@octokit/rest": "^18.0.3", "@primer/octicons": "^10.0.0", "@types/basic-auth": "^1.1.3", "@types/busboy": "^0.2.3", "@types/chai": "^4.2.12", "@types/chai-as-promised": "^7.1.3", "@types/dirty-chai": "^2.0.2", "@types/express": "^4.17.7", "@types/fs-extra": "^9.0.1", "@types/mocha": "^7.0.2", "@types/node": "^12.12.6", "@types/semver": "^7.3.3", "@types/send": "^0.14.5", "@types/split": "^1.0.0", "@types/uuid": "^3.4.6", "@types/webpack": "^4.41.21", "@types/webpack-env": "^1.15.2", "@typescript-eslint/eslint-plugin": "^3.9.1", "@typescript-eslint/parser": "^3.9.1", "asar": "^3.0.3", "check-for-leaks": "^1.2.1", "colors": "^1.4.0", "dotenv-safe": "^4.0.4", "dugite": "^1.45.0", "eslint": "^7.4.0", "eslint-config-standard": "^14.1.1", "eslint-plugin-import": "^2.22.0", "eslint-plugin-mocha": "^7.0.1", "eslint-plugin-node": "^11.1.0", "eslint-plugin-standard": "^4.0.1", "eslint-plugin-typescript": "^0.14.0", "express": "^4.16.4", "folder-hash": "^2.1.1", "fs-extra": "^9.0.1", "husky": "^2.2.0", "klaw": "^3.0.0", "lint": "^1.1.2", "lint-staged": "^10.2.11", "minimist": "^1.2.5", "nugget": "^2.0.1", "null-loader": "^4.0.0", "pre-flight": "^1.1.0", "remark-cli": "^4.0.0", "remark-preset-lint-markdown-style-guide": "^2.1.1", "request": "^2.88.2", "semver": "^5.6.0", "shx": "^0.3.2", "standard-markdown": "^6.0.0", "sumchecker": "^2.0.2", "tap-xunit": "^2.4.1", "temp": "^0.8.3", "timers-browserify": "1.4.2", "ts-loader": "^8.0.2", "ts-node": "6.2.0", "typescript": "^4.0.2", "webpack": "^4.43.0", "webpack-cli": "^3.3.12" }, "private": true, "scripts": { "asar": "asar", "generate-version-json": "node script/generate-version-json.js", "lint": "node ./script/lint.js && npm run lint:clang-format && npm run lint:docs", "lint:js": "node ./script/lint.js --js", "lint:clang-format": "python script/run-clang-format.py -r -c atom/ chromium_src/ || (echo \"\\nCode not formatted correctly.\" && exit 1)", "lint:cpp": "node ./script/lint.js --cc", "lint:objc": "node ./script/lint.js --objc", "lint:py": "node ./script/lint.js --py", "lint:gn": "node ./script/lint.js --gn", "lint:docs": "remark docs -qf && npm run lint:js-in-markdown && npm run create-typescript-definitions && npm run lint:docs-relative-links && npm run lint:check-trailing-whitespace", "lint:docs-relative-links": "python ./script/check-relative-doc-links.py", "lint:check-trailing-whitespace": "python ./script/check-trailing-whitespace.py", "lint:js-in-markdown": "standard-markdown docs", "create-api-json": "electron-docs-parser --dir=./", "create-typescript-definitions": "npm run create-api-json && electron-typescript-definitions --api=electron-api.json && node spec/ts-smoke/runner.js", "gn-typescript-definitions": "npm run create-typescript-definitions && shx cp electron.d.ts", "pre-flight": "pre-flight", "gn-check": "node ./script/gn-check.js", "preinstall": "node -e 'process.exit(0)'", "prepack": "check-for-leaks", "repl": "node ./script/start.js --interactive", "start": "node ./script/start.js", "test": "node ./script/spec-runner.js", "tsc": "tsc", "webpack": "node build/webpack/run-compiler" }, "license": "MIT", "author": "Electron Community", "keywords": [ "electron" ], "husky": { "hooks": { "pre-commit": "lint-staged", "pre-push": "check-for-leaks" } }, "lint-staged": { "*.{js,ts}": [ "node script/lint.js --js --fix --only --" ], "*.{js,ts,d.ts}": [ "ts-node script/gen-filenames.ts" ], "*.{cc,mm,c,h}": [ "python script/run-clang-format.py -r -c --fix" ], "*.md": [ "npm run lint:docs" ], "*.{gn,gni}": [ "npm run gn-check", "python script/run-gn-format.py" ], "*.py": [ "node script/lint.js --py --fix --only --" ], "docs/api/**/*.md": [ "ts-node script/gen-filenames.ts", "python script/check-trailing-whitespace.py --fix", "git add filenames.auto.gni" ], "{*.patch,.patches}": [ "node script/lint.js --patches --only --", "ts-node script/check-patch-diff.ts" ], "DEPS": [ "node script/gen-hunspell-filenames.js" ] }, "dependencies": { "@types/temp": "^0.8.34" } } diff --git a/devel/electron11/files/patch-electron_shell_browser_native__window__views.cc b/devel/electron11/files/patch-electron_shell_browser_native__window__views.cc index 3e42d3f2e795..c92d6d780cc6 100644 --- a/devel/electron11/files/patch-electron_shell_browser_native__window__views.cc +++ b/devel/electron11/files/patch-electron_shell_browser_native__window__views.cc @@ -1,47 +1,47 @@ ---- electron/shell/browser/native_window_views.cc.orig 2021-04-02 17:02:59 UTC +--- electron/shell/browser/native_window_views.cc.orig 2021-04-13 20:38:27 UTC +++ electron/shell/browser/native_window_views.cc @@ -306,7 +306,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: last_window_state_ = ui::SHOW_STATE_NORMAL; #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // Listen to move events. aura::Window* window = GetNativeWindow(); if (window) @@ -322,7 +322,7 @@ NativeWindowViews::~NativeWindowViews() { SetForwardMouseMessages(false); #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) aura::Window* window = GetNativeWindow(); if (window) window->RemovePreTargetHandler(this); -@@ -1386,7 +1386,7 @@ void NativeWindowViews::OnWidgetBoundsChanged(views::W +@@ -1387,7 +1387,7 @@ void NativeWindowViews::OnWidgetBoundsChanged(views::W } void NativeWindowViews::OnWidgetDestroying(views::Widget* widget) { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) aura::Window* window = GetNativeWindow(); if (window) window->RemovePreTargetHandler(this); -@@ -1496,7 +1496,7 @@ void NativeWindowViews::HandleKeyboardEvent( +@@ -1497,7 +1497,7 @@ void NativeWindowViews::HandleKeyboardEvent( if (widget_destroyed_) return; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) if (event.windows_key_code == ui::VKEY_BROWSER_BACK) NotifyWindowExecuteAppCommand(kBrowserBackward); else if (event.windows_key_code == ui::VKEY_BROWSER_FORWARD) -@@ -1508,7 +1508,7 @@ void NativeWindowViews::HandleKeyboardEvent( +@@ -1509,7 +1509,7 @@ void NativeWindowViews::HandleKeyboardEvent( root_view_->HandleKeyEvent(event); } -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) void NativeWindowViews::OnMouseEvent(ui::MouseEvent* event) { if (event->type() != ui::ET_MOUSE_PRESSED) return; diff --git a/devel/electron11/files/patch-electron_spec-main_chromium-spec.ts b/devel/electron11/files/patch-electron_spec-main_chromium-spec.ts index 2365370206a4..0a270776284b 100644 --- a/devel/electron11/files/patch-electron_spec-main_chromium-spec.ts +++ b/devel/electron11/files/patch-electron_spec-main_chromium-spec.ts @@ -1,33 +1,33 @@ ---- electron/spec-main/chromium-spec.ts.orig 2021-01-22 23:55:24 UTC +--- electron/spec-main/chromium-spec.ts.orig 2021-04-13 20:38:27 UTC +++ electron/spec-main/chromium-spec.ts -@@ -321,13 +321,13 @@ describe('command line switches', () => { +@@ -392,13 +392,13 @@ describe('command line switches', () => { it('should not set an invalid locale', async () => testLocale('asdfkl', currentLocale)); const lcAll = String(process.env.LC_ALL); - ifit(process.platform === 'linux')('current process has a valid LC_ALL env', async () => { + ifit(process.platform === 'linux' || process.platform === 'freebsd')('current process has a valid LC_ALL env', async () => { // The LC_ALL env should not be set to DOM locale string. expect(lcAll).to.not.equal(app.getLocale()); }); - ifit(process.platform === 'linux')('should not change LC_ALL', async () => testLocale('fr', lcAll, true)); - ifit(process.platform === 'linux')('should not change LC_ALL when setting invalid locale', async () => testLocale('asdfkl', lcAll, true)); - ifit(process.platform === 'linux')('should not change LC_ALL when --lang is not set', async () => testLocale('', lcAll, true)); + ifit(process.platform === 'linux' || process.platform === 'freebsd')('should not change LC_ALL', async () => testLocale('fr', lcAll, true)); + ifit(process.platform === 'linux' || process.platform === 'freebsd')('should not change LC_ALL when setting invalid locale', async () => testLocale('asdfkl', lcAll, true)); + ifit(process.platform === 'linux' || process.platform === 'freebsd')('should not change LC_ALL when --lang is not set', async () => testLocale('', lcAll, true)); }); describe('--remote-debugging-pipe switch', () => { -@@ -1384,10 +1384,10 @@ describe('font fallback', () => { +@@ -1455,10 +1455,10 @@ describe('font fallback', () => { const fonts = await getRenderedFonts(html); expect(fonts).to.be.an('array'); expect(fonts).to.have.length(1); - if (process.platform === 'win32') { expect(fonts[0].familyName).to.equal('Arial'); } else if (process.platform === 'darwin') { expect(fonts[0].familyName).to.equal('Helvetica'); } else if (process.platform === 'linux') { expect(fonts[0].familyName).to.equal('DejaVu Sans'); } // I think this depends on the distro? We don't specify a default. + if (process.platform === 'win32') { expect(fonts[0].familyName).to.equal('Arial'); } else if (process.platform === 'darwin') { expect(fonts[0].familyName).to.equal('Helvetica'); } else if (process.platform === 'linux' || process.platform === 'freebsd') { expect(fonts[0].familyName).to.equal('DejaVu Sans'); } // I think this depends on the distro? We don't specify a default. }); - ifit(process.platform !== 'linux')('should fall back to Japanese font for sans-serif Japanese script', async function () { + ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('should fall back to Japanese font for sans-serif Japanese script', async function () { const html = ` diff --git a/devel/electron11/files/patch-services_network_network__context.cc b/devel/electron11/files/patch-services_network_network__context.cc index d058a48f7934..463ebb40a0a7 100644 --- a/devel/electron11/files/patch-services_network_network__context.cc +++ b/devel/electron11/files/patch-services_network_network__context.cc @@ -1,20 +1,11 @@ ---- services/network/network_context.cc.orig 2021-01-25 12:36:59 UTC +--- services/network/network_context.cc.orig 2021-04-18 07:12:19 UTC +++ services/network/network_context.cc -@@ -1962,7 +1962,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestC - temp_verifier = base::WrapUnique(cert_verifier_with_trust_anchors_); - #endif // defined(OS_CHROMEOS) - if (!temp_verifier) { --#if !defined(OS_LINUX) -+#if !defined(OS_LINUX) && !defined(OS_BSD) - temp_verifier = std::make_unique( - net::CertVerifyProc::CreateSystemVerifyProc(std::move(cert_net_fetcher_))); - #else -@@ -2023,7 +2023,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestC +@@ -2012,7 +2012,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestC net::CookieCryptoDelegate* crypto_delegate = nullptr; if (params_->enable_encrypted_cookies) { -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_CHROMECAST) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_CHROMECAST) DCHECK(network_service_->os_crypt_config_set()) << "NetworkService::SetCryptConfig must be called before creating a " "NetworkContext with encrypted cookies."; diff --git a/devel/electron11/files/patch-third__party_zlib_cpu__features.c b/devel/electron11/files/patch-third__party_zlib_cpu__features.c index 511ce4c485ef..aa2535481810 100644 --- a/devel/electron11/files/patch-third__party_zlib_cpu__features.c +++ b/devel/electron11/files/patch-third__party_zlib_cpu__features.c @@ -1,48 +1,48 @@ --- third_party/zlib/cpu_features.c.orig 2021-01-07 00:37:24 UTC +++ third_party/zlib/cpu_features.c @@ -31,11 +31,20 @@ int ZLIB_INTERNAL x86_cpu_enable_simd = 0; #ifndef CPU_NO_SIMD -#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_FUCHSIA) +#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_FUCHSIA) || defined(ARMV8_OS_FREEBSD) #include #endif -#if defined(ARMV8_OS_ANDROID) +#if defined(ARMV8_OS_FREEBSD) +#include +#include +#ifndef ID_AA64ISAR0_AES_VAL +#define ID_AA64ISAR0_AES_VAL ID_AA64ISAR0_AES +#endif +#ifndef ID_AA64ISAR0_CRC32_VAL +#define ID_AA64ISAR0_CRC32_VAL ID_AA64ISAR0_CRC32 +#endif +#elif defined(ARMV8_OS_ANDROID) #include #elif defined(ARMV8_OS_LINUX) #include -@@ -65,7 +65,7 @@ int ZLIB_INTERNAL x86_cpu_enable_simd = 0; +@@ -56,7 +65,7 @@ int ZLIB_INTERNAL x86_cpu_enable_simd = 0; static void _cpu_check_features(void); #endif -#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_MACOS) || defined(ARMV8_OS_FUCHSIA) || defined(X86_NOT_WINDOWS) +#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_FREEBSD) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_MACOS) || defined(ARMV8_OS_FUCHSIA) || defined(X86_NOT_WINDOWS) #if !defined(ARMV8_OS_MACOS) // _cpu_check_features() doesn't need to do anything on mac/arm since all // features are known at build time, so don't call it. @@ -123,6 +132,13 @@ static void _cpu_check_features(void) #elif defined(ARMV8_OS_WINDOWS) arm_cpu_enable_crc32 = IsProcessorFeaturePresent(PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE); arm_cpu_enable_pmull = IsProcessorFeaturePresent(PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE); +#elif defined(ARMV8_OS_FREEBSD) + uint64_t id_aa64isar0; + id_aa64isar0 = READ_SPECIALREG(id_aa64isar0_el1); + if (ID_AA64ISAR0_AES_VAL(id_aa64isar0) == ID_AA64ISAR0_AES_PMULL) + arm_cpu_enable_pmull = 1; + if (ID_AA64ISAR0_CRC32_VAL(id_aa64isar0) == ID_AA64ISAR0_CRC32_BASE) + arm_cpu_enable_crc32 = 1; #endif } #endif