Skip to content

Commit

Permalink
editors/vscode: update to 1.80.0
Browse files Browse the repository at this point in the history
Changelog: https://code.visualstudio.com/updates/v1_80

Reported by:	GitHub (watch releases)
  • Loading branch information
Hiroki Tagato authored and Hiroki Tagato committed Jul 8, 2023
1 parent 3581ffd commit 16c9688
Show file tree
Hide file tree
Showing 10 changed files with 48 additions and 47 deletions.
14 changes: 10 additions & 4 deletions editors/vscode/Makefile
@@ -1,6 +1,5 @@
PORTNAME= vscode
DISTVERSION= 1.79.2
PORTREVISION= 3
DISTVERSION= 1.80.0
CATEGORIES= editors
MASTER_SITES= https://github.com/tagattie/FreeBSD-VSCode/releases/download/${DISTVERSION}/:yarn_cache
DISTFILES= yarn-offline-cache-${DISTVERSION}${EXTRACT_SUFX}:yarn_cache \
Expand Down Expand Up @@ -63,7 +62,7 @@ USES= desktop-file-utils gl gmake gnome iconv:wchar_t jpeg \
USE_GITHUB= yes
GH_ACCOUNT= microsoft

SOURCE_COMMIT_HASH= 695af097c7bd098fbf017ce3ac85e09bbc5dda06
SOURCE_COMMIT_HASH= 660393deaaa6d1996740ff4880f1bad43768c814

BINARY_ALIAS= python=${PYTHON_CMD}

Expand All @@ -75,7 +74,7 @@ USE_GNOME= atk cairo pango gdkpixbuf2 gtk30 libxml2 libxslt
USE_LDCONFIG= ${DATADIR}

# Keep NODE_VER in sync with www/node16 DISTVERSION
NODE_VER= 16.20.0
NODE_VER= 16.20.1
NODE_VER_MAJOR= ${NODE_VER:C/\..*$//}

SHEBANG_REGEX= ./(extensions|resources|scripts|src)/.*\.sh$$
Expand Down Expand Up @@ -113,6 +112,10 @@ pre-everything::
@${ECHO_MSG} "MAX_FILES_${PORTNAME}=4096"
@${ECHO_MSG} ""

post-extract:
${CP} ${WRKSRC}/build/.moduleignore.linux \
${WRKSRC}/build/.moduleignore.freebsd

post-patch:
# force use of electron version matching port one
${REINPLACE_CMD} -E 's|^(target ").*(")$$|\1${ELECTRON_VER}\2|' \
Expand Down Expand Up @@ -207,6 +210,9 @@ do-build:
cd ${WRKDIR}/.cache/electron/${ELECTRON_DOWNLOAD_URL_HASH} && \
${SHA256} -r *-v${ELECTRON_VER}-linux-*.zip | \
${SED} -e 's/ / */' > SHASUMS256.txt
cd ${WRKDIR}/.cache/electron/${ELECTRON_DOWNLOAD_URL_HASH} && \
${SHA256} -r *-v${ELECTRON_VER}-linux-*.zip | \
${SED} -e 's/ / */' >> ${WRKSRC}/build/checksums/electron.txt
# build and package vscode
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} yarn run tsc -p build/tsconfig.build.json
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} yarn gulp vscode-linux-x64-min
Expand Down
14 changes: 7 additions & 7 deletions editors/vscode/distinfo
@@ -1,7 +1,7 @@
TIMESTAMP = 1686869185
SHA256 (vscode/yarn-offline-cache-1.79.2.tar.gz) = 4074379bf852c7c20bf27e2beea1d77671c1a8ebcbaeaeb832ba91e28a0e3804
SIZE (vscode/yarn-offline-cache-1.79.2.tar.gz) = 336482946
SHA256 (vscode/vscode-marketplace-exts-1.79.2.tar.gz) = 0fb42d69195bfc51109141b44ee5b2ef8904d394de12d70b7f29b25650e73499
SIZE (vscode/vscode-marketplace-exts-1.79.2.tar.gz) = 1726885
SHA256 (vscode/microsoft-vscode-1.79.2_GH0.tar.gz) = 2719ccbb573f5b7c174bd5bbcad97d3fe4d917e16327a6b72162ff7014c17c9b
SIZE (vscode/microsoft-vscode-1.79.2_GH0.tar.gz) = 16478966
TIMESTAMP = 1688687308
SHA256 (vscode/yarn-offline-cache-1.80.0.tar.gz) = 98c82bc36da545cf0e163f64c3c443c1f84d5c751d5506d5b58df185e569cbeb
SIZE (vscode/yarn-offline-cache-1.80.0.tar.gz) = 339888369
SHA256 (vscode/vscode-marketplace-exts-1.80.0.tar.gz) = 807a4e20d39be08fbace23db8831d65ee121555ae7e0a81b0fd3a2826ee530cc
SIZE (vscode/vscode-marketplace-exts-1.80.0.tar.gz) = 1743663
SHA256 (vscode/microsoft-vscode-1.80.0_GH0.tar.gz) = 92145abba63cd0e36876bf4c1f79ee208dca5bd272ecc31e976028feaea97c73
SIZE (vscode/microsoft-vscode-1.80.0_GH0.tar.gz) = 16708029

This file was deleted.

This file was deleted.

6 changes: 3 additions & 3 deletions editors/vscode/files/patch-build_gulpfile.extensions.js
@@ -1,11 +1,11 @@
--- build/gulpfile.extensions.js.orig 2023-03-29 09:14:46 UTC
--- build/gulpfile.extensions.js.orig 2023-07-04 10:23:33 UTC
+++ build/gulpfile.extensions.js
@@ -237,7 +237,7 @@ exports.compileExtensionMediaBuildTask = compileExtens
const cleanExtensionsBuildTask = task.define('clean-extensions-build', util.rimraf('.build/extensions'));
const compileExtensionsBuildTask = task.define('compile-extensions-build', task.series(
cleanExtensionsBuildTask,
- task.define('bundle-marketplace-extensions-build', () => ext.packageMarketplaceExtensionsStream(false).pipe(gulp.dest('.build'))),
+// task.define('bundle-marketplace-extensions-build', () => ext.packageMarketplaceExtensionsStream(false).pipe(gulp.dest('.build'))),
task.define('bundle-extensions-build', () => ext.packageLocalExtensionsStream(false).pipe(gulp.dest('.build'))),
+ // task.define('bundle-marketplace-extensions-build', () => ext.packageMarketplaceExtensionsStream(false).pipe(gulp.dest('.build'))),
task.define('bundle-extensions-build', () => ext.packageLocalExtensionsStream(false, false).pipe(gulp.dest('.build'))),
));

6 changes: 3 additions & 3 deletions editors/vscode/files/patch-product.json
@@ -1,7 +1,7 @@
--- product.json.orig 2023-05-03 19:37:04 UTC
--- product.json.orig 2023-07-04 10:23:33 UTC
+++ product.json
@@ -32,6 +32,16 @@
"reportIssueUrl": "https://github.com/microsoft/vscode/issues/new",
@@ -33,6 +33,16 @@
"nodejsRepository": "https://nodejs.org",
"urlProtocol": "code-oss",
"webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-cdn.net/insider/ef65ac1ba57f57f2a3961bfe94aa20481caca4c6/out/vs/workbench/contrib/webview/browser/pre/",
+ "documentationUrl": "https://go.microsoft.com/fwlink/?LinkID=533484",
Expand Down
15 changes: 12 additions & 3 deletions editors/vscode/files/patch-src_main.js
@@ -1,7 +1,16 @@
--- src/main.js.orig 2023-06-14 08:28:08 UTC
--- src/main.js.orig 2023-07-04 10:23:33 UTC
+++ src/main.js
@@ -193,7 +193,7 @@ function configureCommandlineSwitchesSync(cliArgs) {
'force-color-profile'
@@ -139,7 +139,7 @@ if (locale) {
// Pseudo Language Language Pack is being used.
// In that case, use `en` as the Electron locale.

-if (process.platform === 'win32' || process.platform === 'linux') {
+if (process.platform === 'win32' || process.platform === 'linux' || process.platform === 'freebsd') {
const electronLocale = (!locale || locale === 'qps-ploc') ? 'en' : locale;
app.commandLine.appendSwitch('lang', electronLocale);
}
@@ -207,7 +207,7 @@ function configureCommandlineSwitchesSync(cliArgs) {
'password-store'
];

- if (process.platform === 'linux') {
Expand Down
6 changes: 3 additions & 3 deletions editors/vscode/files/patch-src_vs_base_node_ps.ts
@@ -1,6 +1,6 @@
--- src/vs/base/node/ps.ts.orig 2023-05-03 19:37:04 UTC
--- src/vs/base/node/ps.ts.orig 2023-07-04 10:23:33 UTC
+++ src/vs/base/node/ps.ts
@@ -217,7 +217,7 @@ export function listProcesses(rootPid: number): Promis
@@ -214,7 +214,7 @@ export function listProcesses(rootPid: number): Promis

exec('which ps', {}, (err, stdout, stderr) => {
if (err || stderr) {
Expand All @@ -9,7 +9,7 @@
reject(err || new Error(stderr.toString()));
} else {
const cmd = JSON.stringify(FileAccess.asFileUri('vs/base/node/ps.sh').fsPath);
@@ -232,7 +232,8 @@ export function listProcesses(rootPid: number): Promis
@@ -229,7 +229,8 @@ export function listProcesses(rootPid: number): Promis
}
} else {
const ps = stdout.toString().trim();
Expand Down
4 changes: 2 additions & 2 deletions editors/vscode/files/patch-src_vs_code_electron-main_app.ts
@@ -1,6 +1,6 @@
--- src/vs/code/electron-main/app.ts.orig 2023-06-07 13:23:47 UTC
--- src/vs/code/electron-main/app.ts.orig 2023-07-04 10:23:33 UTC
+++ src/vs/code/electron-main/app.ts
@@ -872,7 +872,7 @@ export class CodeApplication extends Disposable {
@@ -899,7 +899,7 @@ export class CodeApplication extends Disposable {
services.set(IUpdateService, new SyncDescriptor(Win32UpdateService));
break;

Expand Down
8 changes: 8 additions & 0 deletions editors/vscode/pkg-plist
Expand Up @@ -436,6 +436,7 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug-companion/resources/logo.png
%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/LICENSE.txt
%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/README.md
%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/ThirdPartyNotices.txt
%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/package.json
%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/package.nls.json
%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/resources/dark/configure.svg
Expand Down Expand Up @@ -860,6 +861,12 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/out/vs/editor/common/services/editorSimpleWorker.nls.js
%%DATADIR%%/resources/app/out/vs/loader.js
%%DATADIR%%/resources/app/out/vs/platform/audioCues/browser/media/break.mp3
%%DATADIR%%/resources/app/out/vs/platform/audioCues/browser/media/chatRequestSent.mp3
%%DATADIR%%/resources/app/out/vs/platform/audioCues/browser/media/chatResponsePending.mp3
%%DATADIR%%/resources/app/out/vs/platform/audioCues/browser/media/chatResponseReceived1.mp3
%%DATADIR%%/resources/app/out/vs/platform/audioCues/browser/media/chatResponseReceived2.mp3
%%DATADIR%%/resources/app/out/vs/platform/audioCues/browser/media/chatResponseReceived3.mp3
%%DATADIR%%/resources/app/out/vs/platform/audioCues/browser/media/chatResponseReceived4.mp3
%%DATADIR%%/resources/app/out/vs/platform/audioCues/browser/media/diffLineDeleted.mp3
%%DATADIR%%/resources/app/out/vs/platform/audioCues/browser/media/diffLineInserted.mp3
%%DATADIR%%/resources/app/out/vs/platform/audioCues/browser/media/diffLineModified.mp3
Expand Down Expand Up @@ -926,6 +933,7 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/notebookThemes/default.png
%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/notebookThemes/jupyter.png
%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/openFolder.svg
%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/profiles.svg
%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/runTask.svg
%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/search.svg
%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/settings.svg
Expand Down

0 comments on commit 16c9688

Please sign in to comment.