Date: Mon, 11 May 2020 11:15:15 +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: r534908 - in head/editors/atom: . files files/atom files/node Message-ID: <202005111115.04BBFFHd056070@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tagattie Date: Mon May 11 11:15:14 2020 New Revision: 534908 URL: https://svnweb.freebsd.org/changeset/ports/534908 Log: - Update to 1.46.0 - Fix build on -CURRENT (clang 10) - Change node and npm dependencies to specify package name [1] Approved by: ehaupt (mentor) Suggested by: 0mp (via ports) [1] Changelog: https://github.com/atom/atom/releases/tag/v1.46.0 Added: head/editors/atom/files/atom/patch-node__modules_spell-check_lib_checker-env.coffee (contents, props changed) head/editors/atom/files/atom/patch-node__modules_spell-check_lib_locale-checker.coffee (contents, props changed) head/editors/atom/files/node/ head/editors/atom/files/node/patch-common.gypi (contents, props changed) head/editors/atom/files/node/patch-configure (contents, props changed) Deleted: head/editors/atom/files/atom/patch-node__modules_spell-check_lib_system-checker.coffee Modified: head/editors/atom/Makefile head/editors/atom/distinfo head/editors/atom/files/atom/patch-node__modules_github_test_git-strategies.test.js head/editors/atom/files/patch-package.json head/editors/atom/files/patch-script_build Modified: head/editors/atom/Makefile ============================================================================== --- head/editors/atom/Makefile Mon May 11 11:11:26 2020 (r534907) +++ head/editors/atom/Makefile Mon May 11 11:15:14 2020 (r534908) @@ -2,7 +2,7 @@ PORTNAME= atom DISTVERSIONPREFIX= v -DISTVERSION= 1.45.0 +DISTVERSION= 1.46.0 CATEGORIES= editors MASTER_SITES= https://nodejs.org/dist/v${APM_NODE_VER}/:node \ https://github.com/tagattie/FreeBSD-Atom/releases/download/v1.42.0/:jasmine_tagged \ @@ -25,8 +25,8 @@ BUILD_DEPENDS= zip:archivers/zip \ electron${ELECTRON_VER_MAJOR}:devel/electron${ELECTRON_VER_MAJOR} \ bash:shells/bash \ rg:textproc/ripgrep \ - node:www/node10 \ - npm:www/npm-node10 + node10>:www/node10 \ + npm-node10>0:www/npm-node10 LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-atk \ libsnappy.so:archivers/snappy \ libasound.so:audio/alsa-lib \ @@ -111,6 +111,9 @@ post-patch: pre-build: build-apm-node bootstrap-script bootstrap-apm bootstrap-atom clean-backup build-apm-node: + for p in ${PATCHDIR}/node/patch-*; do \ + ${PATCH} -p0 -d ${WRKDIR}/node-v${APM_NODE_VER} < $${p}; \ + done cd ${WRKDIR}/node-v${APM_NODE_VER} && \ ${SETENV} ${CONFIGURE_ENV} CC=${CC} CXX=${CXX} ./configure && \ ${SETENV} ${MAKE_ENV} ${BSDMAKE} -j ${MAKE_JOBS_NUMBER} Modified: head/editors/atom/distinfo ============================================================================== --- head/editors/atom/distinfo Mon May 11 11:11:26 2020 (r534907) +++ head/editors/atom/distinfo Mon May 11 11:15:14 2020 (r534908) @@ -1,11 +1,11 @@ -TIMESTAMP = 1584423742 +TIMESTAMP = 1589005815 SHA256 (node-v10.2.1.tar.gz) = dcdba29f6b933969d6a8a36ea91cfd44bcb500a1e582a3273ac3d4d930e721e4 SIZE (node-v10.2.1.tar.gz) = 35757099 SHA256 (jasmine-tagged-1.1.4.tar.gz) = 8988597858ddf9e9ba3333a19d8651691c8384117bf2e362e8a5ba193ed47585 SIZE (jasmine-tagged-1.1.4.tar.gz) = 3071259 -SHA256 (atom-npm-cache-1.45.0.tar.gz) = ebeb3e4df2e149a3935306ac826a045af6be6ded6b90aaca252278479da8f414 -SIZE (atom-npm-cache-1.45.0.tar.gz) = 42498756 -SHA256 (atom-apm-cache-1.45.0.tar.gz) = 7f3cb00b4fa1dd4e4ba5741bd890b93d3486cdba59e77991d3f4e190807bbc3a -SIZE (atom-apm-cache-1.45.0.tar.gz) = 118410560 -SHA256 (atom-atom-v1.45.0_GH0.tar.gz) = 9d50468ef1c8e1027881f245d205f3ab8446dcf6c40726a3f562de035f46af52 -SIZE (atom-atom-v1.45.0_GH0.tar.gz) = 11909782 +SHA256 (atom-npm-cache-1.46.0.tar.gz) = 9f8175e833cf1e9474fd75d8843f892ee85abdf0302b8b56eab1bbf1de349ec2 +SIZE (atom-npm-cache-1.46.0.tar.gz) = 42511955 +SHA256 (atom-apm-cache-1.46.0.tar.gz) = 1877ee61481756f7e40b93d3930a67bcdcce2588f5be7ff5a7738c267709a63e +SIZE (atom-apm-cache-1.46.0.tar.gz) = 116830823 +SHA256 (atom-atom-v1.46.0_GH0.tar.gz) = 328b52d012b9ee27c33dda42a2d94c9793a7899b2429db1c71b5d5680ee7f68e +SIZE (atom-atom-v1.46.0_GH0.tar.gz) = 11915127 Modified: head/editors/atom/files/atom/patch-node__modules_github_test_git-strategies.test.js ============================================================================== --- head/editors/atom/files/atom/patch-node__modules_github_test_git-strategies.test.js Mon May 11 11:11:26 2020 (r534907) +++ head/editors/atom/files/atom/patch-node__modules_github_test_git-strategies.test.js Mon May 11 11:15:14 2020 (r534908) @@ -1,6 +1,6 @@ ---- node_modules/github/test/git-strategies.test.js.orig 2019-12-11 03:24:32 UTC +--- node_modules/github/test/git-strategies.test.js.orig 2020-04-22 18:35:27 UTC +++ node_modules/github/test/git-strategies.test.js -@@ -1535,7 +1535,7 @@ import * as reporterProxy from '../lib/reporter-proxy' +@@ -1536,7 +1536,7 @@ import * as reporterProxy from '../lib/reporter-proxy' assert.match(options.env.DISPLAY, /^.+$/); assert.match(options.env.SSH_ASKPASS, /git-askpass-atom\.sh$/); assert.match(options.env.GIT_ASKPASS, /git-askpass-atom\.sh$/); Added: head/editors/atom/files/atom/patch-node__modules_spell-check_lib_checker-env.coffee ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/atom/files/atom/patch-node__modules_spell-check_lib_checker-env.coffee Mon May 11 11:15:14 2020 (r534908) @@ -0,0 +1,9 @@ +--- node_modules/spell-check/lib/checker-env.coffee.orig 2020-05-09 06:40:15 UTC ++++ node_modules/spell-check/lib/checker-env.coffee +@@ -1,5 +1,5 @@ + module.exports = +- isLinux: -> /linux/.test process.platform ++ isLinux: -> /(linux|freebsd)/.test process.platform + isWindows: -> /win32/.test process.platform # TODO: Windows < 8 or >= 8 + isDarwin: -> /darwin/.test process.platform + preferHunspell: -> !!process.env.SPELLCHECKER_PREFER_HUNSPELL Added: head/editors/atom/files/atom/patch-node__modules_spell-check_lib_locale-checker.coffee ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/atom/files/atom/patch-node__modules_spell-check_lib_locale-checker.coffee Mon May 11 11:15:14 2020 (r534908) @@ -0,0 +1,10 @@ +--- node_modules/spell-check/lib/locale-checker.coffee.orig 2020-05-09 06:41:08 UTC ++++ node_modules/spell-check/lib/locale-checker.coffee +@@ -78,6 +78,7 @@ class LocaleChecker + searchPaths.push "/usr/share/hunspell" + searchPaths.push "/usr/share/myspell" + searchPaths.push "/usr/share/myspell/dicts" ++ searchPaths.push "/usr/local/share/hunspell" + + # OS X uses the following paths. + if env.isDarwin() Added: head/editors/atom/files/node/patch-common.gypi ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/atom/files/node/patch-common.gypi Mon May 11 11:15:14 2020 (r534908) @@ -0,0 +1,18 @@ +--- common.gypi.orig 2020-05-09 05:51:01 UTC ++++ common.gypi +@@ -455,15 +455,6 @@ + 'libraries': [ '-lelf' ], + }], + ['OS=="freebsd"', { +- 'conditions': [ +- ['"0" < llvm_version < "4.0"', { +- # Use this flag because on FreeBSD std::pairs copy constructor is non-trivial. +- # Doesn't apply to llvm 4.0 (FreeBSD 11.1) or later. +- # Refs: https://lists.freebsd.org/pipermail/freebsd-toolchain/2016-March/002094.html +- # Refs: https://svnweb.freebsd.org/ports/head/www/node/Makefile?revision=444555&view=markup +- 'cflags': [ '-D_LIBCPP_TRIVIAL_PAIR_COPY_CTOR=1' ], +- }], +- ], + 'ldflags': [ + '-Wl,--export-dynamic', + ], Added: head/editors/atom/files/node/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/atom/files/node/patch-configure Mon May 11 11:15:14 2020 (r534908) @@ -0,0 +1,11 @@ +--- configure.orig 2020-05-09 05:50:03 UTC ++++ configure +@@ -668,7 +668,7 @@ def get_nasm_version(asm): + + def get_llvm_version(cc): + return get_version_helper( +- cc, r"(^(?:FreeBSD )?clang version|based on LLVM) ([3-9]\.[0-9]+)") ++ cc, r"(^(?:FreeBSD )?clang version|based on LLVM) ([0-9]+\.[0-9]+)") + + def get_xcode_version(cc): + return get_version_helper( Modified: head/editors/atom/files/patch-package.json ============================================================================== --- head/editors/atom/files/patch-package.json Mon May 11 11:11:26 2020 (r534907) +++ head/editors/atom/files/patch-package.json Mon May 11 11:15:14 2020 (r534908) @@ -1,6 +1,6 @@ ---- package.json.orig 2019-12-29 05:23:50 UTC +--- package.json.orig 2020-04-22 18:42:32 UTC +++ package.json -@@ -74,7 +74,7 @@ +@@ -76,7 +76,7 @@ "incompatible-packages": "file:packages/incompatible-packages", "jasmine-json": "~0.0", "jasmine-reporters": "1.1.0", Modified: head/editors/atom/files/patch-script_build ============================================================================== --- head/editors/atom/files/patch-script_build Mon May 11 11:11:26 2020 (r534907) +++ head/editors/atom/files/patch-script_build Mon May 11 11:15:14 2020 (r534908) @@ -1,6 +1,6 @@ ---- script/build.orig 2019-10-21 17:33:40 UTC +--- script/build.orig 2020-04-22 18:42:32 UTC +++ script/build -@@ -68,7 +68,7 @@ process.env.ELECTRON_VERSION = CONFIG.appMetadata.elec +@@ -69,7 +69,7 @@ process.env.ELECTRON_VERSION = CONFIG.appMetadata.elec let binariesPromise = Promise.resolve() if (!argv.existingBinaries) { @@ -9,12 +9,12 @@ cleanOutputDirectory() copyAssets() transpilePackagesWithCustomTranspilerPaths() -@@ -88,7 +88,7 @@ if (!argv.existingBinaries) { +@@ -89,7 +89,7 @@ if (!argv.existingBinaries) { if (!argv.generateApiDocs) { binariesPromise .then(packageApplication) - .then(packagedAppPath => generateStartupSnapshot(packagedAppPath).then(() => packagedAppPath)) + // .then(packagedAppPath => generateStartupSnapshot(packagedAppPath).then(() => packagedAppPath)) - .then(packagedAppPath => { + .then(async packagedAppPath => { switch (process.platform) { case 'darwin': {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005111115.04BBFFHd056070>