From owner-svn-ports-all@freebsd.org Mon Jul 15 09:44:24 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 92B87B580B; Mon, 15 Jul 2019 09:44:24 +0000 (UTC) (envelope-from pizzamig@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7514D88405; Mon, 15 Jul 2019 09:44:24 +0000 (UTC) (envelope-from pizzamig@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4B71F1BC0F; Mon, 15 Jul 2019 09:44:24 +0000 (UTC) (envelope-from pizzamig@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x6F9iOoR037339; Mon, 15 Jul 2019 09:44:24 GMT (envelope-from pizzamig@FreeBSD.org) Received: (from pizzamig@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6F9iNtE037330; Mon, 15 Jul 2019 09:44:23 GMT (envelope-from pizzamig@FreeBSD.org) Message-Id: <201907150944.x6F9iNtE037330@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pizzamig set sender to pizzamig@FreeBSD.org using -f From: Luca Pizzamiglio Date: Mon, 15 Jul 2019 09:44:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r506651 - in head/devel/electron4: . files X-SVN-Group: ports-head X-SVN-Commit-Author: pizzamig X-SVN-Commit-Paths: in head/devel/electron4: . files X-SVN-Commit-Revision: 506651 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 7514D88405 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.965,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Jul 2019 09:44:24 -0000 Author: pizzamig Date: Mon Jul 15 09:44:22 2019 New Revision: 506651 URL: https://svnweb.freebsd.org/changeset/ports/506651 Log: devel/electron4: Update to 4.2.6 Changes: https://github.com/electron/electron/releases/tag/v4.2.6 Submitted by: maintainer 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-electron_spec_api-app-spec.js head/devel/electron4/pkg-plist Modified: head/devel/electron4/Makefile ============================================================================== --- head/devel/electron4/Makefile Mon Jul 15 09:32:13 2019 (r506650) +++ head/devel/electron4/Makefile Mon Jul 15 09:44:22 2019 (r506651) @@ -62,7 +62,7 @@ GH_TUPLE= electron:node:8bc5d171a0873c0ba49f9433798bc8 # yaml:pyyaml:3.12:pyyaml \ # kennethreitz:requests:e4d59bedfd3c7f4f254f4f5d036587bcd8152458:requests -ELECTRON_VER= 4.2.5 +ELECTRON_VER= 4.2.6 # 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 @@ -116,7 +116,7 @@ DIST_DESC= Build distribution zip files DRIVER_DESC= Install chromedriver OPTIONS_GROUP= AUDIO OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO -OPTIONS_DEFAULT= CUPS DRIVER KERBEROS ALSA +OPTIONS_DEFAULT= CUPS DIST DRIVER KERBEROS ALSA OPTIONS_SUB= yes .if make(makesum) @@ -155,8 +155,24 @@ TEST_ALL_TARGET+= third_party/electron_node:headers POST_BUILD_TARGETS= licenses version POST_BUILD_DIST_TARGETS= dist.zip chromedriver.zip mksnapshot.zip -NPM_TIMESTAMP= 1561192435 +NPM_TIMESTAMP= 1562065273 +PLIST_SUB= ELECTRON_VER=${ELECTRON_VER} + +.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-npm-modules-${ELECTRON_VER}${EXTRACT_SUFX} ]; \ @@ -231,6 +247,11 @@ post-build: 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} @@ -258,6 +279,11 @@ do-install: .endfor ${RLN} ${STAGEDIR}${DATADIR}/electron ${STAGEDIR}${PREFIX}/bin +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} @@ -276,4 +302,4 @@ do-test-TEST-on: npm run test -- --ci -g '${t}' || ${TRUE} .endfor -.include +.include Modified: head/devel/electron4/distinfo ============================================================================== --- head/devel/electron4/distinfo Mon Jul 15 09:32:13 2019 (r506650) +++ head/devel/electron4/distinfo Mon Jul 15 09:44:22 2019 (r506651) @@ -1,13 +1,13 @@ -TIMESTAMP = 1561192567 +TIMESTAMP = 1562065465 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.5.tar.xz) = 6e7b09c66290dac5a2703de18e00ae61d0c669181fca1c7241cdc54b415942e2 -SIZE (electron/electron-npm-modules-4.2.5.tar.xz) = 15031028 +SHA256 (electron/electron-npm-modules-4.2.6.tar.xz) = 542ece76c0db618306be82ee4b34ba49f031ffea0da77ce7691c6a8930fe6452 +SIZE (electron/electron-npm-modules-4.2.6.tar.xz) = 15027272 SHA256 (electron/a22de844e32a3f720d219e3911c3da3478039f89) = 6e331676d098a57c53c1250821dc47ed84c47f823901bf30c4704df90d8a34be SIZE (electron/a22de844e32a3f720d219e3911c3da3478039f89) = 17469927 -SHA256 (electron/electron-electron-v4.2.5_GH0.tar.gz) = 34a87ad955a0330f66fd359ccf16e4f9611eee1330cf235b8819293ec72d6729 -SIZE (electron/electron-electron-v4.2.5_GH0.tar.gz) = 6518382 +SHA256 (electron/electron-electron-v4.2.6_GH0.tar.gz) = 5f328197951914c6ffdcd381188b4cd7c6f79e062b53f337a6961f1d6183c16f +SIZE (electron/electron-electron-v4.2.6_GH0.tar.gz) = 6519044 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 Mon Jul 15 09:32:13 2019 (r506650) +++ head/devel/electron4/files/package-lock.json Mon Jul 15 09:44:22 2019 (r506651) @@ -1,6 +1,6 @@ { "name": "electron", - "version": "4.2.5", + "version": "4.2.6", "lockfileVersion": 1, "requires": true, "dependencies": { Modified: head/devel/electron4/files/package.json ============================================================================== --- head/devel/electron4/files/package.json Mon Jul 15 09:32:13 2019 (r506650) +++ head/devel/electron4/files/package.json Mon Jul 15 09:44:22 2019 (r506651) @@ -1,6 +1,6 @@ { "name": "electron", - "version": "4.2.5", + "version": "4.2.6", "repository": "https://github.com/electron/electron", "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS", "devDependencies": { Modified: head/devel/electron4/files/patch-electron_spec_api-app-spec.js ============================================================================== --- head/devel/electron4/files/patch-electron_spec_api-app-spec.js Mon Jul 15 09:32:13 2019 (r506650) +++ head/devel/electron4/files/patch-electron_spec_api-app-spec.js Mon Jul 15 09:44:22 2019 (r506651) @@ -1,6 +1,6 @@ ---- electron/spec/api-app-spec.js.orig 2019-05-02 21:34:52 UTC +--- electron/spec/api-app-spec.js.orig 2019-07-01 21:24:47 UTC +++ electron/spec/api-app-spec.js -@@ -174,7 +174,7 @@ describe('app module', () => { +@@ -175,7 +175,7 @@ describe('app module', () => { }) it('exits gracefully', async function () { @@ -9,7 +9,7 @@ this.skip() return } -@@ -274,7 +274,7 @@ describe('app module', () => { +@@ -275,7 +275,7 @@ describe('app module', () => { let w = null before(function () { @@ -18,7 +18,7 @@ this.skip() } }) -@@ -421,7 +421,8 @@ describe('app module', () => { +@@ -422,7 +422,8 @@ describe('app module', () => { describe('app.setBadgeCount', () => { const platformIsNotSupported = (process.platform === 'win32') || @@ -28,7 +28,7 @@ const platformIsSupported = !platformIsNotSupported const expectedBadgeCount = 42 -@@ -475,7 +476,7 @@ describe('app module', () => { +@@ -476,7 +477,7 @@ describe('app module', () => { ] before(function () { @@ -37,7 +37,7 @@ }) beforeEach(() => { -@@ -582,7 +583,7 @@ describe('app module', () => { +@@ -605,7 +606,7 @@ describe('app module', () => { let w = null before(function () { @@ -46,7 +46,7 @@ this.skip() } }) -@@ -775,7 +776,7 @@ describe('app module', () => { +@@ -798,7 +799,7 @@ describe('app module', () => { // doesn't affect nested `describe`s. beforeEach(function () { // FIXME Get these specs running on Linux CI @@ -55,7 +55,7 @@ this.skip() } }) -@@ -913,7 +914,7 @@ describe('app module', () => { +@@ -936,7 +937,7 @@ describe('app module', () => { it('succeeds with complete GPUInfo', async () => { const completeInfo = await getGPUInfo('complete') @@ -64,7 +64,7 @@ // For linux and macOS complete info is same as basic info await verifyBasicGPUInfo(completeInfo) const basicInfo = await getGPUInfo('basic') -@@ -944,7 +945,7 @@ describe('app module', () => { +@@ -967,7 +968,7 @@ describe('app module', () => { // XXX(alexeykuzmin): Calling `.skip()` inside a `before` hook // doesn't affect nested `describe`s. // FIXME Get these specs running on Linux Modified: head/devel/electron4/pkg-plist ============================================================================== --- head/devel/electron4/pkg-plist Mon Jul 15 09:32:13 2019 (r506650) +++ head/devel/electron4/pkg-plist Mon Jul 15 09:44:22 2019 (r506651) @@ -63,6 +63,13 @@ bin/electron %%DATADIR%%/locales/zh-TW.pak %%DATADIR%%/mksnapshot %%DATADIR%%/natives_blob.bin +%%DATADIR%%/releases/SHASUMS256.txt +%%AMD64%%%%DATADIR%%/releases/chromedriver-v%%ELECTRON_VER%%-freebsd-x64.zip +%%I386%%%%DATADIR%%/releases/chromedriver-v%%ELECTRON_VER%%-freebsd-ia32.zip +%%AMD64%%%%DATADIR%%/releases/electron-v%%ELECTRON_VER%%-freebsd-x64.zip +%%I386%%%%DATADIR%%/releases/electron-v%%ELECTRON_VER%%-freebsd-ia32.zip +%%AMD64%%%%DATADIR%%/releases/mksnapshot-v%%ELECTRON_VER%%-freebsd-x64.zip +%%I386%%%%DATADIR%%/releases/mksnapshot-v%%ELECTRON_VER%%-freebsd-ia32.zip %%DATADIR%%/resources.pak %%DATADIR%%/resources/default_app.asar %%DATADIR%%/resources/electron.asar