Date: Tue, 11 Jun 2019 08:55:28 +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: r503947 - in head/devel/electron4: . files Message-ID: <201906110855.x5B8tSw5041868@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pizzamig Date: Tue Jun 11 08:55:28 2019 New Revision: 503947 URL: https://svnweb.freebsd.org/changeset/ports/503947 Log: devel/electron4: Update to 4.2.4 Moreover, fix the build on CURRENT and 11.3 BETA Submitted by: maintainer Added: head/devel/electron4/files/patch-mojo_core_options__validation__unittest.cc (contents, props changed) head/devel/electron4/files/patch-mojo_public_c_system_buffer.h (contents, props changed) head/devel/electron4/files/patch-mojo_public_c_system_data__pipe.h (contents, props changed) head/devel/electron4/files/patch-mojo_public_c_system_message__pipe.h (contents, props changed) Modified: head/devel/electron4/Makefile head/devel/electron4/distinfo head/devel/electron4/files/package-lock.json head/devel/electron4/files/package.json head/devel/electron4/files/patch-components_network__session__configurator_browser_network__session__configurator.cc head/devel/electron4/files/patch-electron_lib_browser_api_app.js head/devel/electron4/files/patch-v8_BUILD.gn Modified: head/devel/electron4/Makefile ============================================================================== --- head/devel/electron4/Makefile Tue Jun 11 08:52:38 2019 (r503946) +++ head/devel/electron4/Makefile Tue Jun 11 08:55:28 2019 (r503947) @@ -62,7 +62,7 @@ GH_TUPLE= electron:node:8bc5d171a0873c0ba49f9433798bc8 # yaml:pyyaml:3.12:pyyaml \ # kennethreitz:requests:e4d59bedfd3c7f4f254f4f5d036587bcd8152458:requests -ELECTRON_VER= 4.2.2 +ELECTRON_VER= 4.2.4 # See ${WRKSRC}/electron/DEPS for CHROMIUM_VER CHROMIUM_VER= 69.0.3497.128 # See ${WRKSRC}/third_party/node/node_modules.tar.gz.sha1 for CHROMIUM_NODE_MODULES_HASH @@ -106,7 +106,7 @@ GN_ARGS+= clang_use_chrome_plugins=false \ extra_cxxflags="${CXXFLAGS}" \ extra_ldflags="${LDFLAGS}" -ALL_TARGET= electron licenses version +ALL_TARGET= electron MAKE_ARGS= -C out/${BUILDTYPE} MAKE_ENV+= C_INCLUDE_PATH=${LOCALBASE}/include \ CPLUS_INCLUDE_PATH=${LOCALBASE}/include @@ -136,8 +136,7 @@ DEBUG_VARS= BUILDTYPE=Debug \ GN_ARGS+=is_component_build=false DEBUG_VARS_OFF= BUILDTYPE=Release -DIST_ALL_TARGET= dist.zip chromedriver.zip mksnapshot.zip -DIST_IMPLIES= DRIVER +DIST_IMPLIES= DRIVER DRIVER_ALL_TARGET= chromedriver @@ -153,8 +152,11 @@ TEST_DISTFILES= ${CHROMIUM_TEST_FONTS_HASH}:chromium_ TEST_ALL_TARGET= ${TEST_TARGETS} TEST_ALL_TARGET+= third_party/electron_node:headers -NPM_TIMESTAMP= 1558165815 +POST_BUILD_TARGETS= licenses version +POST_BUILD_DIST_TARGETS= dist.zip chromedriver.zip mksnapshot.zip +NPM_TIMESTAMP= 1559880317 + pre-fetch: @${MKDIR} ${DISTDIR}/${DIST_SUBDIR} if [ ! -f ${DISTDIR}/${DIST_SUBDIR}/electron-npm-modules-${ELECTRON_VER}${EXTRACT_SUFX} ]; \ @@ -221,6 +223,14 @@ do-configure: # do-build: # cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ninja -C out/${BUILDTYPE} ${ALL_TARGET} + +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} do-install: ${MKDIR} ${STAGEDIR}${DATADIR} Modified: head/devel/electron4/distinfo ============================================================================== --- head/devel/electron4/distinfo Tue Jun 11 08:52:38 2019 (r503946) +++ head/devel/electron4/distinfo Tue Jun 11 08:55:28 2019 (r503947) @@ -1,13 +1,13 @@ -TIMESTAMP = 1558659133 +TIMESTAMP = 1559880567 SHA256 (electron/chromium-69.0.3497.128.tar.xz) = af2b0ee2d16255fd28c3ef23a1481eebe58d6604f238b154594072e17ac643ed SIZE (electron/chromium-69.0.3497.128.tar.xz) = 1363607512 SHA256 (electron/050c85d20f7cedd7f5c39533c1ba89dcdfa56a08) = d2e12fe5e144628f70536d1fea30fa817b7639f067e69f6a9e926f7311c9ec00 SIZE (electron/050c85d20f7cedd7f5c39533c1ba89dcdfa56a08) = 4535767 -SHA256 (electron/electron-npm-modules-4.2.2.tar.xz) = eddd4bfc2ff327022472fbea884867501bd92d239008beb626bf45525cd6d767 -SIZE (electron/electron-npm-modules-4.2.2.tar.xz) = 15029072 +SHA256 (electron/electron-npm-modules-4.2.4.tar.xz) = df25c1edec6b490ca1f856d3924b751981c334db7f8ea369d6595ff13e863804 +SIZE (electron/electron-npm-modules-4.2.4.tar.xz) = 15028692 SHA256 (electron/a22de844e32a3f720d219e3911c3da3478039f89) = 6e331676d098a57c53c1250821dc47ed84c47f823901bf30c4704df90d8a34be SIZE (electron/a22de844e32a3f720d219e3911c3da3478039f89) = 17469927 -SHA256 (electron/electron-electron-v4.2.2_GH0.tar.gz) = 4df4e851d5f6fb2a38460618e2bdcc00542debaadca6b38da40f334de6aff616 -SIZE (electron/electron-electron-v4.2.2_GH0.tar.gz) = 6494168 +SHA256 (electron/electron-electron-v4.2.4_GH0.tar.gz) = 0f5fcf7f7385af7eb09ea64f3dab55e3bd14def9661018640c5246f6ca1ca792 +SIZE (electron/electron-electron-v4.2.4_GH0.tar.gz) = 6505894 SHA256 (electron/electron-node-8bc5d171a0873c0ba49f9433798bc8b67399788c_GH0.tar.gz) = bc94083d3904643f17181c83db83a1c7d6557044e957185d0d73d88e82472b90 SIZE (electron/electron-node-8bc5d171a0873c0ba49f9433798bc8b67399788c_GH0.tar.gz) = 56885474 Modified: head/devel/electron4/files/package-lock.json ============================================================================== --- head/devel/electron4/files/package-lock.json Tue Jun 11 08:52:38 2019 (r503946) +++ head/devel/electron4/files/package-lock.json Tue Jun 11 08:55:28 2019 (r503947) @@ -1,6 +1,6 @@ { "name": "electron", - "version": "4.2.2", + "version": "4.2.4", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -244,6 +244,7 @@ "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", "dev": true, + "optional": true, "requires": { "kind-of": "^3.0.2", "longest": "^1.0.1", @@ -2142,7 +2143,8 @@ "version": "0.3.4", "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.4.tgz", "integrity": "sha512-+7prCSORpXNeR4/fUP3rL+TzqtiFfhMvTd7uEqMdgPvLPt4+uzFUeufx5RHjGTACCargg/DiEt/moMQmvnfkog==", - "dev": true + "dev": true, + "optional": true }, "cssstyle": { "version": "0.2.37", @@ -6600,7 +6602,8 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", - "dev": true + "dev": true, + "optional": true }, "longest-streak": { "version": "2.0.2", Modified: head/devel/electron4/files/package.json ============================================================================== --- head/devel/electron4/files/package.json Tue Jun 11 08:52:38 2019 (r503946) +++ head/devel/electron4/files/package.json Tue Jun 11 08:55:28 2019 (r503947) @@ -1,6 +1,6 @@ { "name": "electron", - "version": "4.2.2", + "version": "4.2.4", "repository": "https://github.com/electron/electron", "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS", "devDependencies": { Modified: head/devel/electron4/files/patch-components_network__session__configurator_browser_network__session__configurator.cc ============================================================================== --- head/devel/electron4/files/patch-components_network__session__configurator_browser_network__session__configurator.cc Tue Jun 11 08:52:38 2019 (r503946) +++ head/devel/electron4/files/patch-components_network__session__configurator_browser_network__session__configurator.cc Tue Jun 11 08:55:28 2019 (r503947) @@ -1,6 +1,6 @@ ---- components/network_session_configurator/browser/network_session_configurator.cc.orig 2019-03-15 06:37:14 UTC +--- components/network_session_configurator/browser/network_session_configurator.cc.orig 2019-06-07 04:25:15 UTC +++ components/network_session_configurator/browser/network_session_configurator.cc -@@ -591,7 +591,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C +@@ -601,7 +601,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C } #endif // #if !defined(OS_ANDROID) Modified: head/devel/electron4/files/patch-electron_lib_browser_api_app.js ============================================================================== --- head/devel/electron4/files/patch-electron_lib_browser_api_app.js Tue Jun 11 08:52:38 2019 (r503946) +++ head/devel/electron4/files/patch-electron_lib_browser_api_app.js Tue Jun 11 08:55:28 2019 (r503947) @@ -1,6 +1,6 @@ ---- electron/lib/browser/api/app.js.orig 2019-05-23 00:26:57 UTC +--- electron/lib/browser/api/app.js.orig 2019-05-30 22:14:00 UTC +++ electron/lib/browser/api/app.js -@@ -83,7 +83,7 @@ if (process.platform === 'darwin') { +@@ -71,7 +71,7 @@ if (process.platform === 'darwin') { } } Added: head/devel/electron4/files/patch-mojo_core_options__validation__unittest.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/electron4/files/patch-mojo_core_options__validation__unittest.cc Tue Jun 11 08:55:28 2019 (r503947) @@ -0,0 +1,11 @@ +--- mojo/core/options_validation_unittest.cc.orig 2019-03-19 09:06:10 UTC ++++ mojo/core/options_validation_unittest.cc +@@ -18,7 +18,7 @@ namespace { + + using TestOptionsFlags = uint32_t; + +-static_assert(MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment"); ++static_assert(MOJO_ALIGNOF(int64_t) <= 8, "int64_t has weird alignment"); + struct MOJO_ALIGNAS(8) TestOptions { + uint32_t struct_size; + TestOptionsFlags flags; Added: head/devel/electron4/files/patch-mojo_public_c_system_buffer.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/electron4/files/patch-mojo_public_c_system_buffer.h Tue Jun 11 08:55:28 2019 (r503947) @@ -0,0 +1,11 @@ +--- mojo/public/c/system/buffer.h.orig 2019-03-19 09:06:10 UTC ++++ mojo/public/c/system/buffer.h +@@ -30,7 +30,7 @@ struct MOJO_ALIGNAS(8) MojoCreateSharedBufferOptions { + // See |MojoCreateSharedBufferFlags|. + MojoCreateSharedBufferFlags flags; + }; +-MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment"); ++MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) <= 8, "int64_t has weird alignment"); + MOJO_STATIC_ASSERT(sizeof(MojoCreateSharedBufferOptions) == 8, + "MojoCreateSharedBufferOptions has wrong size"); + Added: head/devel/electron4/files/patch-mojo_public_c_system_data__pipe.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/electron4/files/patch-mojo_public_c_system_data__pipe.h Tue Jun 11 08:55:28 2019 (r503947) @@ -0,0 +1,11 @@ +--- mojo/public/c/system/data_pipe.h.orig 2019-03-19 09:06:10 UTC ++++ mojo/public/c/system/data_pipe.h +@@ -40,7 +40,7 @@ struct MOJO_ALIGNAS(8) MojoCreateDataPipeOptions { + // system-dependent capacity of at least one element in size. + uint32_t capacity_num_bytes; + }; +-MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment"); ++MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) <= 8, "int64_t has weird alignment"); + MOJO_STATIC_ASSERT(sizeof(MojoCreateDataPipeOptions) == 16, + "MojoCreateDataPipeOptions has wrong size"); + Added: head/devel/electron4/files/patch-mojo_public_c_system_message__pipe.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/electron4/files/patch-mojo_public_c_system_message__pipe.h Tue Jun 11 08:55:28 2019 (r503947) @@ -0,0 +1,11 @@ +--- mojo/public/c/system/message_pipe.h.orig 2019-03-19 09:06:10 UTC ++++ mojo/public/c/system/message_pipe.h +@@ -35,7 +35,7 @@ struct MOJO_ALIGNAS(8) MojoCreateMessagePipeOptions { + // See |MojoCreateMessagePipeFlags|. + MojoCreateMessagePipeFlags flags; + }; +-MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment"); ++MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) <= 8, "int64_t has weird alignment"); + MOJO_STATIC_ASSERT(sizeof(MojoCreateMessagePipeOptions) == 8, + "MojoCreateMessagePipeOptions has wrong size"); + Modified: head/devel/electron4/files/patch-v8_BUILD.gn ============================================================================== --- head/devel/electron4/files/patch-v8_BUILD.gn Tue Jun 11 08:52:38 2019 (r503946) +++ head/devel/electron4/files/patch-v8_BUILD.gn Tue Jun 11 08:55:28 2019 (r503947) @@ -1,6 +1,6 @@ ---- v8/BUILD.gn.orig 2019-03-16 09:15:22 UTC +--- v8/BUILD.gn.orig 2019-06-07 04:25:16 UTC +++ v8/BUILD.gn -@@ -2606,7 +2606,7 @@ v8_source_set("v8_base") { +@@ -2610,7 +2610,7 @@ v8_source_set("v8_base") { "src/x64/simulator-x64.h", "src/x64/sse-instr.h", ] @@ -9,7 +9,7 @@ sources += [ "src/trap-handler/handler-inside-linux.cc", "src/trap-handler/handler-outside-linux.cc", -@@ -2955,7 +2955,7 @@ v8_component("v8_libbase") { +@@ -2959,7 +2959,7 @@ v8_component("v8_libbase") { } } @@ -18,7 +18,7 @@ sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -2975,6 +2975,12 @@ v8_component("v8_libbase") { +@@ -2979,6 +2979,12 @@ v8_component("v8_libbase") { "dl", "rt", ] @@ -31,7 +31,7 @@ } else if (is_android) { if (current_toolchain == host_toolchain) { libs = [ -@@ -3144,6 +3150,7 @@ if (v8_use_snapshot && current_toolchain == v8_snapsho +@@ -3148,6 +3154,7 @@ if (v8_use_snapshot && current_toolchain == v8_snapsho sources = [ "src/snapshot/mksnapshot.cc", ]
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201906110855.x5B8tSw5041868>