Index: head/editors/vscode/Makefile =================================================================== --- head/editors/vscode/Makefile (revision 525386) +++ head/editors/vscode/Makefile (revision 525387) @@ -1,263 +1,247 @@ # $FreeBSD$ PORTNAME= vscode -DISTVERSION= 1.41.0 +DISTVERSION= 1.41.1 CATEGORIES= editors -MASTER_SITES= https://atom.io/download/electron/v${ELECTRON_VER}/:electron_headers \ - https://github.com/electron/electron/releases/download/v${ELECTRON_VER}/:electron_linux \ - https://nodejs.org/dist/v${NODE_VER}/:node_headers \ - https://registry.yarnpkg.com/vscode-ripgrep/-/:vscode_ripgrep \ +MASTER_SITES= https://nodejs.org/dist/v${NODE_VER}/:node_headers \ https://github.com/tagattie/FreeBSD-VSCode/releases/download/${DISTVERSION}/:yarn_cache -DISTFILES= node-v${ELECTRON_VER}-headers${EXTRACT_SUFX}:electron_headers \ - electron-v${ELECTRON_VER}-linux-x64.zip:electron_linux \ - ffmpeg-v${ELECTRON_VER}-linux-x64.zip:electron_linux \ - node-v${NODE_VER}-headers${EXTRACT_SUFX}:node_headers \ - vscode-ripgrep-${VSCODE_RIPGREP_VER}.tgz:vscode_ripgrep +DISTFILES= node-v${NODE_VER}-headers${EXTRACT_SUFX}:node_headers \ + yarn-offline-cache-${DISTVERSION}${EXTRACT_SUFX}:yarn_cache \ + vscode-marketplace-exts-${DISTVERSION}${EXTRACT_SUFX}:yarn_cache DIST_SUBDIR= ${PORTNAME} -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} +EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} \ + yarn-offline-cache-${DISTVERSION}${EXTRACT_SUFX} \ + vscode-marketplace-exts-${DISTVERSION}${EXTRACT_SUFX} MAINTAINER= tagattie@yandex.com COMMENT= Visual Studio Code - Open Source ("Code - OSS") LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt ONLY_FOR_ARCHS= amd64 -BUILD_DEPENDS= electron:devel/electron6 \ +BUILD_DEPENDS= zip:archivers/zip \ + electron${ELECTRON_VER_MAJOR}:devel/electron${ELECTRON_VER_MAJOR} \ rg:textproc/ripgrep \ npm:www/npm-node10 \ yarn:www/yarn-node10 LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-atk \ + libatspi.so:accessibility/at-spi2-core \ libsnappy.so:archivers/snappy \ libasound.so:audio/alsa-lib \ libFLAC.so:audio/flac \ libopus.so:audio/opus \ libdbus-1.so:devel/dbus \ libinotify.so:devel/libinotify \ libnotify.so:devel/libnotify \ libpci.so:devel/libpci \ libnspr4.so:devel/nspr \ libpcre2-8.so:devel/pcre2 \ libre2.so:devel/re2 \ + liblcms2.so:graphics/lcms2 \ libdrm.so:graphics/libdrm \ libwebp.so:graphics/webp \ libavcodec.so:multimedia/ffmpeg \ libvpx.so:multimedia/libvpx \ libopenh264.so:multimedia/openh264 \ libcups.so:print/cups \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libsecret-1.so:security/libsecret \ libnss3.so:security/nss \ libexpat.so:textproc/expat2 \ libfontconfig.so:x11-fonts/fontconfig RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \ xdg-open:devel/xdg-utils \ bash:shells/bash -TEST_DEPENDS= electron:devel/electron6 \ +TEST_DEPENDS= electron${ELECTRON_VER_MAJOR}:devel/electron${ELECTRON_VER_MAJOR} \ bash:shells/bash USES= desktop-file-utils gl gmake gnome jpeg pkgconfig \ python:2.7,build shebangfix xorg USE_GITHUB= yes GH_ACCOUNT= microsoft -SOURCE_COMMIT_HASH= 9579eda04fdb3a9bba2750f15193e5fafe16b959 +SOURCE_COMMIT_HASH= 26076a4de974ead31f97692a0d32f90d735645c0 BINARY_ALIAS= python=${PYTHON_CMD} USE_XORG= x11 xcb xcomposite xcursor xdamage xext xfixes xi xkbfile \ xrandr xrender xscrnsaver xtst USE_GL= gl glesv2 USE_GNOME= atk cairo pango gdkpixbuf2 gtk30 libxml2 libxslt USE_LDCONFIG= ${DATADIR} -ELECTRON_VER= 6.1.6 # keep in sync with devel/electron6 NODE_VER= 12.4.0 -VSCODE_RIPGREP_VER= 1.5.7 -SHEBANG_FILES= extensions/vscode-test-resolver/scripts/terminateProcess.sh \ - resources/linux/bin/code.sh \ - scripts/test.sh +SHEBANG_REGEX= ./(extensions|resources|scripts|src)/.*\.sh$$ +PATHFIX_FILES= src/vs/workbench/contrib/debug/node/terminals.ts DATADIR= ${PREFIX}/share/code-oss TMPDIR= ${WRKDIR} MAKE_ENV+= BUILD_SOURCEVERSION=${SOURCE_COMMIT_HASH} \ PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1 \ XDG_CACHE_HOME=${WRKDIR}/.cache -OPTIONS_DEFINE= POUDRIERE -POUDRIERE_DESC= Support build with poudriere (KEEP THIS ON) -OPTIONS_DEFAULT= POUDRIERE +ELECTRON_DIR= ${.CURDIR}/../../devel/electron6 +.include "${ELECTRON_DIR}/Makefile.version" -POUDRIERE_DISTFILES= yarn-offline-cache-${DISTVERSION}${EXTRACT_SUFX}:yarn_cache \ - vscode-marketplace-exts-${DISTVERSION}${EXTRACT_SUFX}:yarn_cache -POUDRIERE_EXTRACT_ONLY= yarn-offline-cache-${DISTVERSION}${EXTRACT_SUFX} \ - vscode-marketplace-exts-${DISTVERSION}${EXTRACT_SUFX} -POUDRIERE_EXTRA_PATCHES= ${FILESDIR}/extra-patch-build_gulpfile.extensions.js - pre-everything:: @${ECHO_MSG} "" @${ECHO_MSG} "The limit imposed by poudriere(8) for the maximum number of files allowed to be" @${ECHO_MSG} "opened by a jail (default 1024) is exceeded during the build of ${PORTNAME}." @${ECHO_MSG} "To successfully build ${PORTNAME} with poudriere(8), you must add the following" @${ECHO_MSG} "line to poudriere.conf:" @${ECHO_MSG} "MAX_FILES_${PORTNAME}=4096" @${ECHO_MSG} "" post-extract: - ${MKDIR} ${WRKDIR}/vscode-ripgrep - ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/vscode-ripgrep-${VSCODE_RIPGREP_VER}.tgz \ - --strip-components 1 -C ${WRKDIR}/vscode-ripgrep - # setup electron headers for node-gyp - ${MKDIR} ${WRKDIR}/.cache/node-gyp/${ELECTRON_VER} - ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/node-v${ELECTRON_VER}-headers${EXTRACT_SUFX} \ - --strip-components 1 -C ${WRKDIR}/.cache/node-gyp/${ELECTRON_VER} - ${ECHO} 9 > ${WRKDIR}/.cache/node-gyp/${ELECTRON_VER}/installVersion # setup node headers for node-gyp ${MKDIR} ${WRKDIR}/.cache/node-gyp/${NODE_VER} ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/node-v${NODE_VER}-headers${EXTRACT_SUFX} \ --strip-components 1 -C ${WRKDIR}/.cache/node-gyp/${NODE_VER} - ${ECHO} 9 > ${WRKDIR}/.cache/node-gyp/${NODE_VER}/installVersion - # setup download cache for gulp-atom-electron - ${MKDIR} ${WRKDIR}/gulp-electron-cache/atom/electron - ${CP} ${DISTDIR}/${DIST_SUBDIR}/electron-v${ELECTRON_VER}-linux-x64.zip \ - ${WRKDIR}/gulp-electron-cache/atom/electron - ${CP} ${DISTDIR}/${DIST_SUBDIR}/ffmpeg-v${ELECTRON_VER}-linux-x64.zip \ - ${WRKDIR}/gulp-electron-cache/atom/electron + ${ECHO_CMD} 9 > ${WRKDIR}/.cache/node-gyp/${NODE_VER}/installVersion # setup electron download cache for UI smoke tests # ${MKDIR} ${WRKDIR}/.cache/electron # ${SED} -e 's/freebsd${OSREL:R}/freebsd/' ${DISTDIR}/${DIST_SUBDIR}/SHASUMS256.txt > \ # ${WRKDIR}/.cache/electron/SHASUMS256.txt-${ELECTRON_VER} # ${CP} ${DISTDIR}/${DIST_SUBDIR}/electron-v${ELECTRON_VER}-freebsd${OSREL:R}-x64.zip \ # ${WRKDIR}/.cache/electron/electron-v${ELECTRON_VER}-freebsd-x64.zip post-patch: # force use of electron version matching port one ${REINPLACE_CMD} -E 's|^(target ").*(")$$|\1${ELECTRON_VER}\2|' \ ${WRKSRC}/.yarnrc + # setup yarnrc for using local node headers + ${ECHO_CMD} 'nodedir "${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR}/node_headers"' >> \ + ${WRKSRC}/.yarnrc # setup yarnrc for offline node_modules installation - ${SED} -e 's|$${WRKDIR}|${WRKDIR}|' \ - ${FILESDIR}/yarnrc-offline-mirror >> ${WRKSRC}/.yarnrc + ${ECHO_CMD} 'yarn-offline-mirror "../yarn-offline-cache"' >> \ + ${WRKSRC}/.yarnrc + (cd ${WRKSRC} && \ + ${FIND} -E . -type f -iregex '${SHEBANG_REGEX}' \ + -exec ${SED} -i '' -e "s|/usr/bin/pgrep|/bin/pgrep|g" {} ';') + (cd ${WRKSRC} && \ + ${FIND} ${PATHFIX_FILES} -type f \ + -exec ${SED} -i '' -e "s|/usr/bin/pgrep|/bin/pgrep|g" {} ';') ${REINPLACE_CMD} -e 's/@@NAME_LONG@@/Code - OSS/; \ s/@@NAME_SHORT@@/Code - OSS/; \ s/@@PRODNAME@@/Code - OSS/; \ s/@@NAME@@/code-oss/g; \ s|@@EXEC@@|${PREFIX}/bin/code-oss|; \ s/@@ICON@@/com.visualstudio.code.oss/; \ s/@@URLPROTOCOL@@/code-oss/; \ s/@@LICENSE@@/MIT/; \ s/@@APPNAME@@/code-oss/g; \ s|/usr/share|${PREFIX}/share|' \ ${WRKSRC}/resources/completions/bash/code \ ${WRKSRC}/resources/completions/zsh/_code \ ${WRKSRC}/resources/linux/bin/code.sh \ ${WRKSRC}/resources/linux/code.appdata.xml \ ${WRKSRC}/resources/linux/code.desktop \ ${WRKSRC}/resources/linux/code-url-handler.desktop + (cd ${WRKDIR}/builtInExtensions && \ + ${FIND} . -type f -name '*.sh' \ + -exec ${SED} -i '' -e "s|/usr/bin/pgrep|/bin/pgrep|g" \ + -e 's|#!/bin/bash|#!${LOCALBASE}/bin/bash|' {} ';') pre-build: - cd ${LOCALBASE}/share && \ - ${TAR} -cf - electron | ${TAR} -xf - -C ${WRKDIR} - ${CP} ${FILESDIR}/package.json-build ${WRKSRC}/package.json - ${CP} ${FILESDIR}/package.json-remote-build ${WRKSRC}/remote/package.json + # # install node_modules without executing post-installation scripts + # cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ + # yarn --frozen-lockfile --ignore-scripts --offline + # # copy rg binary files to vscode-ripgrep module directory + # ${MKDIR} ${WRKSRC}/node_modules/vscode-ripgrep/bin + # ${CP} ${LOCALBASE}/bin/rg ${WRKSRC}/node_modules/vscode-ripgrep/bin + # ${MKDIR} ${WRKSRC}/remote/node_modules/vscode-ripgrep/bin + # ${CP} ${LOCALBASE}/bin/rg ${WRKSRC}/remote/node_modules/vscode-ripgrep/bin + # install node_modules + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ + yarn --frozen-lockfile --offline + # copy rg binary files to vscode-ripgrep module directory + ${MKDIR} ${WRKSRC}/node_modules/vscode-ripgrep/bin + ${CP} ${LOCALBASE}/bin/rg ${WRKSRC}/node_modules/vscode-ripgrep/bin + ${MKDIR} ${WRKSRC}/remote/node_modules/vscode-ripgrep/bin + ${CP} ${LOCALBASE}/bin/rg ${WRKSRC}/remote/node_modules/vscode-ripgrep/bin -pre-build-POUDRIERE-on: - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} yarn --frozen-lockfile --offline # --no-progress - -pre-build-POUDRIERE-off: - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} yarn --frozen-lockfile # --no-progress - do-build: - ${MKDIR} ${WRKDIR}/vscode-ripgrep/bin - ${CP} ${LOCALBASE}/bin/rg ${WRKDIR}/vscode-ripgrep/bin - cd ${WRKDIR} && \ - ${TAR} -cf - vscode-ripgrep | ${TAR} -xf - -C ${WRKSRC}/node_modules - cd ${WRKDIR} && \ - ${TAR} -cf - vscode-ripgrep | ${TAR} -xf - -C ${WRKSRC}/remote/node_modules - ${CP} ${FILESDIR}/package.json-package ${WRKSRC}/package.json - ${CP} ${FILESDIR}/package.json-remote-package ${WRKSRC}/remote/package.json + # setup download cache for gulp-atom-electron + ${MKDIR} ${WRKDIR}/gulp-electron-cache/atom/electron + cd ${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR} && \ + zip -q -r ${WRKDIR}/gulp-electron-cache/atom/electron/electron-v${ELECTRON_VER}-linux-x64.zip . + cd ${WRKDIR}/gulp-electron-cache/atom/electron && \ + ${SHA256} -r *-v${ELECTRON_VER}-linux-*.zip | \ + ${SED} -e 's/ / */' > SHASUMS256.txt-${ELECTRON_VER} + # build and package vscode cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} yarn gulp vscode-linux-x64-min cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} yarn gulp vscode-reh-linux-x64-min cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} yarn gulp vscode-reh-web-linux-x64-min - -post-build-POUDRIERE-on: + # copy marketplace extensions ${MV} ${WRKDIR}/builtInExtensions/* ${WRKDIR}/VSCode-linux-x64/resources/app/extensions do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d ${INSTALL_DATA} ${WRKSRC}/resources/completions/bash/code \ ${STAGEDIR}${PREFIX}/etc/bash_completion.d/code-oss ${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions ${INSTALL_DATA} ${WRKSRC}/resources/completions/zsh/_code \ ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_code-oss ${MKDIR} ${STAGEDIR}${PREFIX}/share/appdata ${INSTALL_DATA} ${WRKSRC}/resources/linux/code.appdata.xml \ ${STAGEDIR}${PREFIX}/share/appdata/code-oss.appdata.xml ${MKDIR} ${STAGEDIR}${PREFIX}/share/applications .for f in code.desktop code-url-handler.desktop ${INSTALL_DATA} ${WRKSRC}/resources/linux/${f} \ ${STAGEDIR}${PREFIX}/share/applications/${f:S/code/code-oss/} .endfor ${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps ${INSTALL_DATA} ${WRKSRC}/resources/linux/code.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/com.visualstudio.code.oss.png ${MKDIR} ${STAGEDIR}${DATADIR} - ${INSTALL_PROGRAM} ${WRKDIR}/electron/electron \ - ${STAGEDIR}${DATADIR}/code-oss -.for f in libEGL.so libGLESv2.so - ${INSTALL_LIB} ${WRKDIR}/electron/${f} ${STAGEDIR}${DATADIR} -.endfor - ${MKDIR} ${STAGEDIR}${DATADIR}/swiftshader -.for f in libEGL.so libGLESv2.so - ${INSTALL_LIB} ${WRKDIR}/electron/swiftshader/${f} \ - ${STAGEDIR}${DATADIR}/swiftshader -.endfor -.for f in chrome_100_percent.pak chrome_200_percent.pak icudtl.dat natives_blob.bin resources.pak snapshot_blob.bin v8_context_snapshot.bin - ${INSTALL_DATA} ${WRKDIR}/electron/${f} ${STAGEDIR}${DATADIR} -.endfor -.for d in locales resources - cd ${WRKDIR}/electron/${d} && ${COPYTREE_SHARE} . \ - ${STAGEDIR}${DATADIR}/${d} "! -name default_app.asar" -.endfor - cd ${WRKDIR}/VSCode-linux-x64/bin && \ - ${COPYTREE_BIN} . ${STAGEDIR}${DATADIR}/bin - cd ${WRKDIR}/VSCode-linux-x64/resources/app && \ - ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/resources/app + cd ${WRKDIR}/VSCode-linux-x64 && \ + ${TAR} -cf - . | ${TAR} -xf - -C ${STAGEDIR}${DATADIR} cd ${STAGEDIR}${DATADIR}/resources/app/node_modules.asar.unpacked && \ - ${FIND} . -type f -exec ${STRIP_CMD} {} ';' \ - -exec ${CHMOD} ${BINMODE} {} ';' + ${FIND} . -type f -exec ${STRIP_CMD} {} ';' +.for f in chromedriver mksnapshot v8_context_snapshot_generator + ${RM} ${STAGEDIR}${DATADIR}/${f} +.endfor + ${RM} -r ${STAGEDIR}${DATADIR}/node_headers + ${RM} -r ${STAGEDIR}${DATADIR}/resources/completions ${RLN} ${STAGEDIR}${DATADIR}/bin/code-oss ${STAGEDIR}${PREFIX}/bin pre-test: # setup electron dependency for unit tests - ${MKDIR} ${WRKSRC}/.build - cd ${LOCALBASE}/share && \ - ${TAR} -cf - electron | ${TAR} -xf - -C ${WRKSRC}/.build + ${MKDIR} ${WRKSRC}/.build/electron + cd ${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR} && \ + ${TAR} -cf - . | ${TAR} -xf - -C ${WRKSRC}/.build/electron cd ${WRKSRC}/.build/electron && ${MV} -f electron code-oss do-test: # Note: Xvfb or something similar is necessary for headless testing # unit tests cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ./scripts/test.sh || ${TRUE} # UI smoke tests cd ${WRKSRC} && ${SETENV} ${TEST_ENV} yarn smoketest ### targets for port maintainer(s) make-yarn-cache: - # do "make build" before executing this target + # do "make configure" before executing this target + ${RM} -r ${WRKDIR}/yarn-offline-cache + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ + yarn --frozen-lockfile --ignore-scripts + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ + yarn postinstall --frozen-lockfile --ignore-scripts cd ${WRKDIR} && ${TAR} -czf \ yarn-offline-cache-${DISTVERSION}${EXTRACT_SUFX} yarn-offline-cache make-marketplace-exts: - cd ${WRKSRC} && \ - ${SETENV} ${MAKE_ENV} yarn download-builtin-extensions && \ + ${RM} -r ${WRKSRC}/.build/builtInExtensions + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ + yarn download-builtin-extensions && \ cd ${WRKSRC}/.build && ${TAR} -czf \ - vscode-marketplace-exts-${DISTVERSION}${EXTRACT_SUFX} builtInExtensions && \ - ${MV} vscode-marketplace-exts-${DISTVERSION}${EXTRACT_SUFX} ${WRKDIR} + ${WRKDIR}/vscode-marketplace-exts-${DISTVERSION}${EXTRACT_SUFX} builtInExtensions .include Index: head/editors/vscode/distinfo =================================================================== --- head/editors/vscode/distinfo (revision 525386) +++ head/editors/vscode/distinfo (revision 525387) @@ -1,17 +1,17 @@ -TIMESTAMP = 1576654213 -SHA256 (vscode/node-v6.1.6-headers.tar.gz) = 7abbb0c1a9871e79b70c69bacd8fb6af88b815dac87e1a83722c2d69581a81b9 -SIZE (vscode/node-v6.1.6-headers.tar.gz) = 193752 -SHA256 (vscode/electron-v6.1.6-linux-x64.zip) = fe73c67b2267d7f7c8c5835c2bb1cf913f1ac8dc6314f4a577c7b4502ba9d6d8 -SIZE (vscode/electron-v6.1.6-linux-x64.zip) = 62392920 -SHA256 (vscode/ffmpeg-v6.1.6-linux-x64.zip) = 9c15b53ac93243e355e3eabfdcb8e39fd4516a6dba54a88eea9ae970170301ed -SIZE (vscode/ffmpeg-v6.1.6-linux-x64.zip) = 3908671 +TIMESTAMP = 1577171243 +SHA256 (vscode/node-v6.1.7-headers.tar.gz) = 3b6c9ed60fff7deded8d4dfdc246bf98958c991f36c43f927efe79cf7dcdaf99 +SIZE (vscode/node-v6.1.7-headers.tar.gz) = 193743 +SHA256 (vscode/electron-v6.1.7-linux-x64.zip) = 7fe94fc1edebe2f5645056a4300fc642c04155e55da8dd4ee058a0c0ef835ae8 +SIZE (vscode/electron-v6.1.7-linux-x64.zip) = 62394242 +SHA256 (vscode/ffmpeg-v6.1.7-linux-x64.zip) = b25bb9a685dfa5e2cd50e01a80a891d7ea9a27d90cd2bcdc172829251c4dc29a +SIZE (vscode/ffmpeg-v6.1.7-linux-x64.zip) = 3908671 SHA256 (vscode/node-v12.4.0-headers.tar.gz) = 3a5bbb6ad1a5f3ba912981c13910d7c617bb8fa6b6ae2026d6aee2edcd590a45 SIZE (vscode/node-v12.4.0-headers.tar.gz) = 549161 SHA256 (vscode/vscode-ripgrep-1.5.7.tgz) = 4a36021ab54964e7ec9c8a299129cc6a5776c56f6e9b6182698e96f6899c27da SIZE (vscode/vscode-ripgrep-1.5.7.tgz) = 5064 -SHA256 (vscode/yarn-offline-cache-1.41.0.tar.gz) = 114679510f0b32501ab3099c63e884707f72a36b3e4544759cbd4d0e41952add -SIZE (vscode/yarn-offline-cache-1.41.0.tar.gz) = 101417336 -SHA256 (vscode/vscode-marketplace-exts-1.41.0.tar.gz) = b275bd73f3819e6a5f58602bdd693988e335b329a761c9742438513ec3f4fba1 -SIZE (vscode/vscode-marketplace-exts-1.41.0.tar.gz) = 1604382 -SHA256 (vscode/microsoft-vscode-1.41.0_GH0.tar.gz) = 53f096a29dc12ac493f46e6e743f7d3420af8104ad2de0ebcb15ffc123231ee9 -SIZE (vscode/microsoft-vscode-1.41.0_GH0.tar.gz) = 9910227 +SHA256 (vscode/yarn-offline-cache-1.41.1.tar.gz) = ca7b6d110dc199be532f0e2d7a41ed9b9300aad51078c84027d0d596fe5fb3c7 +SIZE (vscode/yarn-offline-cache-1.41.1.tar.gz) = 101417117 +SHA256 (vscode/vscode-marketplace-exts-1.41.1.tar.gz) = 5848b570de90424d717f00f4a992a468d11715d921586aeadd1861c67bb965aa +SIZE (vscode/vscode-marketplace-exts-1.41.1.tar.gz) = 1603308 +SHA256 (vscode/microsoft-vscode-1.41.1_GH0.tar.gz) = 72e2ac445cc89feac606f73c263c35d97c3980e6a13059139cc82a383a2fceae +SIZE (vscode/microsoft-vscode-1.41.1_GH0.tar.gz) = 9913231 Index: head/editors/vscode/files/package.json-remote-package =================================================================== --- head/editors/vscode/files/package.json-remote-package (revision 525386) +++ head/editors/vscode/files/package.json-remote-package (nonexistent) @@ -1,34 +0,0 @@ -{ - "name": "vscode-reh", - "version": "0.0.0", - "dependencies": { - "applicationinsights": "1.0.8", - "chokidar": "3.2.3", - "cookie": "^0.4.0", - "graceful-fs": "4.1.11", - "http-proxy-agent": "^2.1.0", - "https-proxy-agent": "^2.2.3", - "iconv-lite": "0.5.0", - "jschardet": "2.1.1", - "native-watchdog": "1.3.0", - "node-pty": "^0.10.0-beta2", - "onigasm-umd": "2.2.5", - "semver-umd": "^5.5.3", - "spdlog": "^0.11.1", - "vscode-minimist": "^1.2.2", - "vscode-nsfw": "1.2.8", - "vscode-proxy-agent": "^0.5.2", - "vscode-ripgrep": "^1.5.7", - "vscode-textmate": "4.4.0", - "xterm": "4.3.0-beta.28.vscode.1", - "xterm-addon-search": "0.4.0-beta4", - "xterm-addon-web-links": "0.2.1", - "xterm-addon-webgl": "0.4.0-beta.11", - "yauzl": "^2.9.2", - "yazl": "^2.4.3" - }, - "optionalDependencies": { - "vscode-windows-ca-certs": "0.2.0", - "vscode-windows-registry": "1.0.2" - } -} Property changes on: head/editors/vscode/files/package.json-remote-package ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/editors/vscode/files/package.json-build =================================================================== --- head/editors/vscode/files/package.json-build (revision 525386) +++ head/editors/vscode/files/package.json-build (nonexistent) @@ -1,166 +0,0 @@ -{ - "name": "code-oss-dev", - "version": "1.41.0", - "distro": "17f1b806c349d58f96b4aef97ae59d836e2c5605", - "author": { - "name": "Microsoft Corporation" - }, - "license": "MIT", - "main": "./out/main", - "private": true, - "scripts": { - "test": "mocha", - "preinstall": "node build/npm/preinstall.js", - "postinstall": "node build/npm/postinstall.js", - "compile": "gulp compile --max_old_space_size=4095", - "watch": "gulp watch --max_old_space_size=4095", - "watch-client": "gulp watch-client --max_old_space_size=4095", - "monaco-editor-test": "mocha --only-monaco-editor", - "precommit": "node build/gulpfile.hygiene.js", - "gulp": "gulp --max_old_space_size=8192", - "electron": "node build/lib/electron", - "7z": "7z", - "update-grammars": "node build/npm/update-all-grammars.js", - "update-localization-extension": "node build/npm/update-localization-extension.js", - "smoketest": "cd test/smoke && node test/index.js", - "download-builtin-extensions": "node build/lib/builtInExtensions.js", - "monaco-compile-check": "tsc -p src/tsconfig.monaco.json --noEmit", - "strict-function-types-watch": "tsc --watch -p src/tsconfig.json --noEmit --strictFunctionTypes", - "update-distro": "node build/npm/update-distro.js", - "web": "node scripts/code-web.js" - }, - "dependencies": { - "applicationinsights": "1.0.8", - "chokidar": "3.2.3", - "graceful-fs": "4.1.11", - "http-proxy-agent": "^2.1.0", - "https-proxy-agent": "^2.2.3", - "iconv-lite": "0.5.0", - "jschardet": "2.1.1", - "keytar": "^4.11.0", - "native-is-elevated": "0.4.1", - "native-keymap": "2.1.0", - "native-watchdog": "1.3.0", - "node-pty": "^0.10.0-beta2", - "onigasm-umd": "2.2.5", - "semver-umd": "^5.5.3", - "spdlog": "^0.11.1", - "sudo-prompt": "9.1.1", - "v8-inspect-profiler": "^0.0.20", - "vscode-minimist": "^1.2.2", - "vscode-nsfw": "1.2.8", - "vscode-proxy-agent": "^0.5.2", - "vscode-sqlite3": "4.0.9", - "vscode-textmate": "4.4.0", - "xterm": "4.3.0-beta.28.vscode.1", - "xterm-addon-search": "0.4.0-beta4", - "xterm-addon-web-links": "0.2.1", - "xterm-addon-webgl": "0.4.0-beta.11", - "yauzl": "^2.9.2", - "yazl": "^2.4.3" - }, - "devDependencies": { - "7zip": "0.0.6", - "@types/applicationinsights": "0.20.0", - "@types/chokidar": "2.1.3", - "@types/cookie": "^0.3.3", - "@types/graceful-fs": "4.1.2", - "@types/http-proxy-agent": "^2.0.1", - "@types/iconv-lite": "0.0.1", - "@types/keytar": "^4.4.0", - "@types/mocha": "2.2.39", - "@types/node": "^10.12.12", - "@types/semver": "^5.5.0", - "@types/sinon": "^1.16.36", - "@types/webpack": "^4.4.10", - "@types/windows-foreground-love": "^0.3.0", - "@types/windows-process-tree": "^0.2.0", - "@types/winreg": "^1.2.30", - "@types/yauzl": "^2.9.1", - "@types/yazl": "^2.4.2", - "ansi-colors": "^3.2.3", - "asar": "^0.14.0", - "chromium-pickle-js": "^0.2.0", - "copy-webpack-plugin": "^4.5.2", - "coveralls": "^2.11.11", - "cson-parser": "^1.3.3", - "debounce": "^1.0.0", - "event-stream": "3.3.4", - "express": "^4.13.1", - "fancy-log": "^1.3.3", - "fast-plist": "0.1.2", - "glob": "^5.0.13", - "gulp": "^4.0.0", - "gulp-atom-electron": "^1.22.0", - "gulp-azure-storage": "^0.10.0", - "gulp-buffer": "0.0.2", - "gulp-concat": "^2.6.1", - "gulp-cssnano": "^2.1.3", - "gulp-eslint": "^5.0.0", - "gulp-filter": "^5.1.0", - "gulp-flatmap": "^1.0.2", - "gulp-gunzip": "^1.0.0", - "gulp-json-editor": "^2.5.0", - "gulp-plumber": "^1.2.0", - "gulp-remote-retry-src": "^0.6.0", - "gulp-rename": "^1.2.0", - "gulp-replace": "^0.5.4", - "gulp-shell": "^0.6.5", - "gulp-tsb": "4.0.5", - "gulp-tslint": "^8.1.3", - "gulp-untar": "^0.0.7", - "gulp-vinyl-zip": "^2.1.2", - "husky": "^0.13.1", - "innosetup": "5.6.1", - "is": "^3.1.0", - "istanbul-lib-coverage": "^2.0.5", - "istanbul-lib-instrument": "^3.3.0", - "istanbul-lib-report": "^2.0.8", - "istanbul-lib-source-maps": "^3.0.6", - "istanbul-reports": "^2.2.6", - "jsdom-no-contextify": "^3.1.0", - "lazy.js": "^0.4.2", - "merge-options": "^1.0.1", - "mime": "^1.4.1", - "minimatch": "^3.0.4", - "mkdirp": "^0.5.0", - "mocha": "^2.2.5", - "mocha-junit-reporter": "^1.17.0", - "opn": "^6.0.0", - "optimist": "0.3.5", - "p-all": "^1.0.0", - "pump": "^1.0.1", - "queue": "3.0.6", - "rcedit": "^1.1.0", - "rimraf": "^2.2.8", - "sinon": "^1.17.2", - "source-map": "^0.4.4", - "ts-loader": "^4.4.2", - "tslint": "^5.16.0", - "typescript": "3.7.2", - "typescript-formatter": "7.1.0", - "underscore": "^1.8.2", - "vinyl": "^2.0.0", - "vinyl-fs": "^3.0.0", - "vsce": "1.48.0", - "vscode-debugprotocol": "1.37.0", - "vscode-nls-dev": "^3.3.1", - "webpack": "^4.16.5", - "webpack-cli": "^3.3.8", - "webpack-stream": "^5.1.1" - }, - "repository": { - "type": "git", - "url": "https://github.com/Microsoft/vscode.git" - }, - "bugs": { - "url": "https://github.com/Microsoft/vscode/issues" - }, - "optionalDependencies": { - "vscode-windows-ca-certs": "0.2.0", - "vscode-windows-registry": "1.0.2", - "windows-foreground-love": "0.2.0", - "windows-mutex": "0.3.0", - "windows-process-tree": "0.2.4" - } -} Property changes on: head/editors/vscode/files/package.json-build ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/editors/vscode/files/patch-extensions_vscode-test-resolver_scripts_terminateProcess.sh =================================================================== --- head/editors/vscode/files/patch-extensions_vscode-test-resolver_scripts_terminateProcess.sh (revision 525386) +++ head/editors/vscode/files/patch-extensions_vscode-test-resolver_scripts_terminateProcess.sh (nonexistent) @@ -1,18 +0,0 @@ ---- extensions/vscode-test-resolver/scripts/terminateProcess.sh.orig 2019-12-18 06:39:18 UTC -+++ extensions/vscode-test-resolver/scripts/terminateProcess.sh -@@ -1,7 +1,7 @@ - #!/bin/bash - - terminateTree() { -- for cpid in $(/usr/bin/pgrep -P $1); do -+ for cpid in $(/bin/pgrep -P $1); do - terminateTree $cpid - done - kill -9 $1 > /dev/null 2>&1 -@@ -9,4 +9,4 @@ terminateTree() { - - for pid in $*; do - terminateTree $pid --done -\ No newline at end of file -+done Property changes on: head/editors/vscode/files/patch-extensions_vscode-test-resolver_scripts_terminateProcess.sh ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/editors/vscode/files/yarnrc-offline-mirror =================================================================== --- head/editors/vscode/files/yarnrc-offline-mirror (revision 525386) +++ head/editors/vscode/files/yarnrc-offline-mirror (nonexistent) @@ -1 +0,0 @@ -yarn-offline-mirror "${WRKDIR}/yarn-offline-cache" Property changes on: head/editors/vscode/files/yarnrc-offline-mirror ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/editors/vscode/files/package.json-remote-build =================================================================== --- head/editors/vscode/files/package.json-remote-build (revision 525386) +++ head/editors/vscode/files/package.json-remote-build (nonexistent) @@ -1,33 +0,0 @@ -{ - "name": "vscode-reh", - "version": "0.0.0", - "dependencies": { - "applicationinsights": "1.0.8", - "chokidar": "3.2.3", - "cookie": "^0.4.0", - "graceful-fs": "4.1.11", - "http-proxy-agent": "^2.1.0", - "https-proxy-agent": "^2.2.3", - "iconv-lite": "0.5.0", - "jschardet": "2.1.1", - "native-watchdog": "1.3.0", - "node-pty": "^0.10.0-beta2", - "onigasm-umd": "2.2.5", - "semver-umd": "^5.5.3", - "spdlog": "^0.11.1", - "vscode-minimist": "^1.2.2", - "vscode-nsfw": "1.2.8", - "vscode-proxy-agent": "^0.5.2", - "vscode-textmate": "4.4.0", - "xterm": "4.3.0-beta.28.vscode.1", - "xterm-addon-search": "0.4.0-beta4", - "xterm-addon-web-links": "0.2.1", - "xterm-addon-webgl": "0.4.0-beta.11", - "yauzl": "^2.9.2", - "yazl": "^2.4.3" - }, - "optionalDependencies": { - "vscode-windows-ca-certs": "0.2.0", - "vscode-windows-registry": "1.0.2" - } -} Property changes on: head/editors/vscode/files/package.json-remote-build ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/editors/vscode/files/package.json-package =================================================================== --- head/editors/vscode/files/package.json-package (revision 525386) +++ head/editors/vscode/files/package.json-package (nonexistent) @@ -1,167 +0,0 @@ -{ - "name": "code-oss-dev", - "version": "1.41.0", - "distro": "17f1b806c349d58f96b4aef97ae59d836e2c5605", - "author": { - "name": "Microsoft Corporation" - }, - "license": "MIT", - "main": "./out/main", - "private": true, - "scripts": { - "test": "mocha", - "preinstall": "node build/npm/preinstall.js", - "postinstall": "node build/npm/postinstall.js", - "compile": "gulp compile --max_old_space_size=4095", - "watch": "gulp watch --max_old_space_size=4095", - "watch-client": "gulp watch-client --max_old_space_size=4095", - "monaco-editor-test": "mocha --only-monaco-editor", - "precommit": "node build/gulpfile.hygiene.js", - "gulp": "gulp --max_old_space_size=8192", - "electron": "node build/lib/electron", - "7z": "7z", - "update-grammars": "node build/npm/update-all-grammars.js", - "update-localization-extension": "node build/npm/update-localization-extension.js", - "smoketest": "cd test/smoke && node test/index.js", - "download-builtin-extensions": "node build/lib/builtInExtensions.js", - "monaco-compile-check": "tsc -p src/tsconfig.monaco.json --noEmit", - "strict-function-types-watch": "tsc --watch -p src/tsconfig.json --noEmit --strictFunctionTypes", - "update-distro": "node build/npm/update-distro.js", - "web": "node scripts/code-web.js" - }, - "dependencies": { - "applicationinsights": "1.0.8", - "chokidar": "3.2.3", - "graceful-fs": "4.1.11", - "http-proxy-agent": "^2.1.0", - "https-proxy-agent": "^2.2.3", - "iconv-lite": "0.5.0", - "jschardet": "2.1.1", - "keytar": "^4.11.0", - "native-is-elevated": "0.4.1", - "native-keymap": "2.1.0", - "native-watchdog": "1.3.0", - "node-pty": "^0.10.0-beta2", - "onigasm-umd": "2.2.5", - "semver-umd": "^5.5.3", - "spdlog": "^0.11.1", - "sudo-prompt": "9.1.1", - "v8-inspect-profiler": "^0.0.20", - "vscode-minimist": "^1.2.2", - "vscode-nsfw": "1.2.8", - "vscode-proxy-agent": "^0.5.2", - "vscode-ripgrep": "^1.5.7", - "vscode-sqlite3": "4.0.9", - "vscode-textmate": "4.4.0", - "xterm": "4.3.0-beta.28.vscode.1", - "xterm-addon-search": "0.4.0-beta4", - "xterm-addon-web-links": "0.2.1", - "xterm-addon-webgl": "0.4.0-beta.11", - "yauzl": "^2.9.2", - "yazl": "^2.4.3" - }, - "devDependencies": { - "7zip": "0.0.6", - "@types/applicationinsights": "0.20.0", - "@types/chokidar": "2.1.3", - "@types/cookie": "^0.3.3", - "@types/graceful-fs": "4.1.2", - "@types/http-proxy-agent": "^2.0.1", - "@types/iconv-lite": "0.0.1", - "@types/keytar": "^4.4.0", - "@types/mocha": "2.2.39", - "@types/node": "^10.12.12", - "@types/semver": "^5.5.0", - "@types/sinon": "^1.16.36", - "@types/webpack": "^4.4.10", - "@types/windows-foreground-love": "^0.3.0", - "@types/windows-process-tree": "^0.2.0", - "@types/winreg": "^1.2.30", - "@types/yauzl": "^2.9.1", - "@types/yazl": "^2.4.2", - "ansi-colors": "^3.2.3", - "asar": "^0.14.0", - "chromium-pickle-js": "^0.2.0", - "copy-webpack-plugin": "^4.5.2", - "coveralls": "^2.11.11", - "cson-parser": "^1.3.3", - "debounce": "^1.0.0", - "event-stream": "3.3.4", - "express": "^4.13.1", - "fancy-log": "^1.3.3", - "fast-plist": "0.1.2", - "glob": "^5.0.13", - "gulp": "^4.0.0", - "gulp-atom-electron": "^1.22.0", - "gulp-azure-storage": "^0.10.0", - "gulp-buffer": "0.0.2", - "gulp-concat": "^2.6.1", - "gulp-cssnano": "^2.1.3", - "gulp-eslint": "^5.0.0", - "gulp-filter": "^5.1.0", - "gulp-flatmap": "^1.0.2", - "gulp-gunzip": "^1.0.0", - "gulp-json-editor": "^2.5.0", - "gulp-plumber": "^1.2.0", - "gulp-remote-retry-src": "^0.6.0", - "gulp-rename": "^1.2.0", - "gulp-replace": "^0.5.4", - "gulp-shell": "^0.6.5", - "gulp-tsb": "4.0.5", - "gulp-tslint": "^8.1.3", - "gulp-untar": "^0.0.7", - "gulp-vinyl-zip": "^2.1.2", - "husky": "^0.13.1", - "innosetup": "5.6.1", - "is": "^3.1.0", - "istanbul-lib-coverage": "^2.0.5", - "istanbul-lib-instrument": "^3.3.0", - "istanbul-lib-report": "^2.0.8", - "istanbul-lib-source-maps": "^3.0.6", - "istanbul-reports": "^2.2.6", - "jsdom-no-contextify": "^3.1.0", - "lazy.js": "^0.4.2", - "merge-options": "^1.0.1", - "mime": "^1.4.1", - "minimatch": "^3.0.4", - "mkdirp": "^0.5.0", - "mocha": "^2.2.5", - "mocha-junit-reporter": "^1.17.0", - "opn": "^6.0.0", - "optimist": "0.3.5", - "p-all": "^1.0.0", - "pump": "^1.0.1", - "queue": "3.0.6", - "rcedit": "^1.1.0", - "rimraf": "^2.2.8", - "sinon": "^1.17.2", - "source-map": "^0.4.4", - "ts-loader": "^4.4.2", - "tslint": "^5.16.0", - "typescript": "3.7.2", - "typescript-formatter": "7.1.0", - "underscore": "^1.8.2", - "vinyl": "^2.0.0", - "vinyl-fs": "^3.0.0", - "vsce": "1.48.0", - "vscode-debugprotocol": "1.37.0", - "vscode-nls-dev": "^3.3.1", - "webpack": "^4.16.5", - "webpack-cli": "^3.3.8", - "webpack-stream": "^5.1.1" - }, - "repository": { - "type": "git", - "url": "https://github.com/Microsoft/vscode.git" - }, - "bugs": { - "url": "https://github.com/Microsoft/vscode/issues" - }, - "optionalDependencies": { - "vscode-windows-ca-certs": "0.2.0", - "vscode-windows-registry": "1.0.2", - "windows-foreground-love": "0.2.0", - "windows-mutex": "0.3.0", - "windows-process-tree": "0.2.4" - } -} Property changes on: head/editors/vscode/files/package.json-package ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/editors/vscode/files/patch-build_gulpfile.vscode.js =================================================================== --- head/editors/vscode/files/patch-build_gulpfile.vscode.js (nonexistent) +++ head/editors/vscode/files/patch-build_gulpfile.vscode.js (revision 525387) @@ -0,0 +1,11 @@ +--- build/gulpfile.vscode.js.orig 2019-12-31 07:38:33 UTC ++++ build/gulpfile.vscode.js +@@ -269,7 +269,7 @@ function packageTask(platform, arch, sourceFolderName, + let result = all + .pipe(util.skipDirectories()) + .pipe(util.fixWin32DirectoryPermissions()) +- .pipe(electron(_.extend({}, config, { platform, arch, ffmpegChromium: true }))) ++ .pipe(electron(_.extend({}, config, { platform, arch, ffmpegChromium: false }))) + .pipe(filter(['**', '!LICENSE', '!LICENSES.chromium.html', '!version'], { dot: true })); + + if (platform === 'linux') { Property changes on: head/editors/vscode/files/patch-build_gulpfile.vscode.js ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property