Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 2 Mar 2024 02:46:27 GMT
From:      Hiroki Tagato <tagattie@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 2260b20940fa - main - editors/vscode: update to 1.87.0
Message-ID:  <202403020246.4222kRZ0011812@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by tagattie:

URL: https://cgit.FreeBSD.org/ports/commit/?id=2260b20940fa21f21bca3911fdf0d801fbcef620

commit 2260b20940fa21f21bca3911fdf0d801fbcef620
Author:     Hiroki Tagato <tagattie@FreeBSD.org>
AuthorDate: 2024-03-02 02:44:49 +0000
Commit:     Hiroki Tagato <tagattie@FreeBSD.org>
CommitDate: 2024-03-02 02:46:20 +0000

    editors/vscode: update to 1.87.0
    
    Changelog: https://code.visualstudio.com/updates/v1_87
    
    Reported by:    GitHub (watch releases)
---
 editors/vscode/Makefile                            |  5 ++-
 editors/vscode/distinfo                            | 14 ++++----
 .../patch-node__modules_node-pty_src_unix_pty.cc   | 14 ++++++++
 ...h-remote_node__modules_node-pty_src_unix_pty.cc | 14 ++++++++
 .../files/patch-build_gulpfile.extensions.js       |  4 +--
 ..._server_bin_helpers_check-requirements-linux.sh | 18 +++++-----
 editors/vscode/files/patch-scripts_code-perf.js    | 11 ++++++
 ...h_contrib_extensions_browser_extensionEditor.ts | 12 -------
 editors/vscode/pkg-plist                           | 40 +++++++++++-----------
 9 files changed, 79 insertions(+), 53 deletions(-)

diff --git a/editors/vscode/Makefile b/editors/vscode/Makefile
index a2934524babb..4e5ed8dcb2b3 100644
--- a/editors/vscode/Makefile
+++ b/editors/vscode/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	vscode
-DISTVERSION=	1.86.2
-PORTREVISION=	2
+DISTVERSION=	1.87.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 \
@@ -68,7 +67,7 @@ USES=		desktop-file-utils gl gmake gnome iconv:wchar_t jpeg \
 USE_GITHUB=	yes
 GH_ACCOUNT=	microsoft
 
-SOURCE_COMMIT_HASH=	903b1e9d8990623e3d7da1df3d33db3e42d80eda
+SOURCE_COMMIT_HASH=	019f4d1419fbc8219a181fab7892ebccf7ee29a2
 
 BINARY_ALIAS=	python=${PYTHON_CMD}
 
diff --git a/editors/vscode/distinfo b/editors/vscode/distinfo
index 562adaf33c75..ec7cbc789044 100644
--- a/editors/vscode/distinfo
+++ b/editors/vscode/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1708062695
-SHA256 (vscode/yarn-offline-cache-1.86.2.tar.gz) = 9e644009944653e89236c8d440c0dce022e861185f89a16d379d2f1044c1d5b1
-SIZE (vscode/yarn-offline-cache-1.86.2.tar.gz) = 333001133
-SHA256 (vscode/vscode-marketplace-exts-1.86.2.tar.gz) = 85fa8771c0eac906833236010274e2f057f90afd1ce3eebe70d2c1688c31e854
-SIZE (vscode/vscode-marketplace-exts-1.86.2.tar.gz) = 1821926
-SHA256 (vscode/microsoft-vscode-1.86.2_GH0.tar.gz) = c0b8fac76b0836e6cd5332387d1007c3f959c2cd4c69cd90eb25c79311708375
-SIZE (vscode/microsoft-vscode-1.86.2_GH0.tar.gz) = 17357004
+TIMESTAMP = 1709271216
+SHA256 (vscode/yarn-offline-cache-1.87.0.tar.gz) = 088e8e3467323fd91ea85e09acd9fd1855a424e80983b80e9d34bb59b19f8bb2
+SIZE (vscode/yarn-offline-cache-1.87.0.tar.gz) = 343679636
+SHA256 (vscode/vscode-marketplace-exts-1.87.0.tar.gz) = 0ba331f12d8e2e10b7df3293ec243e1e5fc72cc89118990ccc0de2d07fbba17a
+SIZE (vscode/vscode-marketplace-exts-1.87.0.tar.gz) = 1777710
+SHA256 (vscode/microsoft-vscode-1.87.0_GH0.tar.gz) = ab853075f8c399f64ded6358aa79db7ee069cbd13f4b86b00fe2cb14c02a19e9
+SIZE (vscode/microsoft-vscode-1.87.0_GH0.tar.gz) = 17481009
diff --git a/editors/vscode/files/node_modules/patch-node__modules_node-pty_src_unix_pty.cc b/editors/vscode/files/node_modules/patch-node__modules_node-pty_src_unix_pty.cc
new file mode 100644
index 000000000000..893b3fac04da
--- /dev/null
+++ b/editors/vscode/files/node_modules/patch-node__modules_node-pty_src_unix_pty.cc
@@ -0,0 +1,14 @@
+--- node_modules/node-pty/src/unix/pty.cc.orig	2024-03-01 05:59:31 UTC
++++ node_modules/node-pty/src/unix/pty.cc
+@@ -65,6 +65,11 @@
+ #include <termios.h>
+ #endif
+ 
++/* for termios */
++#if defined(__FreeBSD__)
++#include <termios.h>
++#endif
++
+ /* NSIG - macro for highest signal + 1, should be defined */
+ #ifndef NSIG
+ #define NSIG 32
diff --git a/editors/vscode/files/node_modules/patch-remote_node__modules_node-pty_src_unix_pty.cc b/editors/vscode/files/node_modules/patch-remote_node__modules_node-pty_src_unix_pty.cc
new file mode 100644
index 000000000000..fb2d34104877
--- /dev/null
+++ b/editors/vscode/files/node_modules/patch-remote_node__modules_node-pty_src_unix_pty.cc
@@ -0,0 +1,14 @@
+--- remote/node_modules/node-pty/src/unix/pty.cc.orig	2024-03-01 06:00:21 UTC
++++ remote/node_modules/node-pty/src/unix/pty.cc
+@@ -65,6 +65,11 @@
+ #include <termios.h>
+ #endif
+ 
++/* for termios */
++#if defined(__FreeBSD__)
++#include <termios.h>
++#endif
++
+ /* NSIG - macro for highest signal + 1, should be defined */
+ #ifndef NSIG
+ #define NSIG 32
diff --git a/editors/vscode/files/patch-build_gulpfile.extensions.js b/editors/vscode/files/patch-build_gulpfile.extensions.js
index 5cd509b3228f..c711663b7174 100644
--- a/editors/vscode/files/patch-build_gulpfile.extensions.js
+++ b/editors/vscode/files/patch-build_gulpfile.extensions.js
@@ -1,6 +1,6 @@
---- build/gulpfile.extensions.js.orig	2023-09-06 21:00:17 UTC
+--- build/gulpfile.extensions.js.orig	2024-02-27 22:50:23 UTC
 +++ build/gulpfile.extensions.js
-@@ -238,7 +238,7 @@ exports.compileExtensionMediaBuildTask = compileExtens
+@@ -239,7 +239,7 @@ const compileExtensionsBuildTask = task.define('compil
  const cleanExtensionsBuildTask = task.define('clean-extensions-build', util.rimraf('.build/extensions'));
  const compileExtensionsBuildTask = task.define('compile-extensions-build', task.series(
  	cleanExtensionsBuildTask,
diff --git a/editors/vscode/files/patch-resources_server_bin_helpers_check-requirements-linux.sh b/editors/vscode/files/patch-resources_server_bin_helpers_check-requirements-linux.sh
index 848e10d93a4c..4b5ceedaa168 100644
--- a/editors/vscode/files/patch-resources_server_bin_helpers_check-requirements-linux.sh
+++ b/editors/vscode/files/patch-resources_server_bin_helpers_check-requirements-linux.sh
@@ -1,12 +1,12 @@
---- resources/server/bin/helpers/check-requirements-linux.sh.orig	2024-02-16 05:42:44 UTC
+--- resources/server/bin/helpers/check-requirements-linux.sh.orig	2024-02-27 22:50:23 UTC
 +++ resources/server/bin/helpers/check-requirements-linux.sh
-@@ -29,6 +29,9 @@ if [ "$OS_ID" = "nixos" ]; then
- if [ "$OS_ID" = "nixos" ]; then
-   echo "Warning: NixOS detected, skipping GLIBC check"
-   exit 0
-+elif [ "$OS_ID" = "freebsd" ]; then
-+  echo "Warning: FreeBSD detected, skipping GLIBC check"
-+  exit 0
+@@ -29,6 +29,9 @@ if [ -f /etc/os-release ]; then
+     if [ "$OS_ID" = "nixos" ]; then
+         echo "Warning: NixOS detected, skipping GLIBC check"
+         exit 0
++    elif [ "$OS_ID" = "freebsd" ]; then
++        echo "Warning: FreeBSD detected, skipping GLIBC check"
++        exit 0
+     fi
  fi
  
- # Based on https://github.com/bminor/glibc/blob/520b1df08de68a3de328b65a25b86300a7ddf512/elf/cache.c#L162-L245
diff --git a/editors/vscode/files/patch-scripts_code-perf.js b/editors/vscode/files/patch-scripts_code-perf.js
new file mode 100644
index 000000000000..50a32a8d434a
--- /dev/null
+++ b/editors/vscode/files/patch-scripts_code-perf.js
@@ -0,0 +1,11 @@
+--- scripts/code-perf.js.orig	2024-03-01 05:22:09 UTC
++++ scripts/code-perf.js
+@@ -65,7 +65,7 @@ function getExePath(buildPath) {
+ 		case 'darwin':
+ 			relativeExePath = path.join('Contents', 'MacOS', 'Electron');
+ 			break;
+-		case 'linux': {
++		case 'linux': case 'freebsd': {
+ 			const product = require(path.join(buildPath, 'resources', 'app', 'product.json'));
+ 			relativeExePath = product.applicationName;
+ 			break;
diff --git a/editors/vscode/files/patch-src_vs_workbench_contrib_extensions_browser_extensionEditor.ts b/editors/vscode/files/patch-src_vs_workbench_contrib_extensions_browser_extensionEditor.ts
deleted file mode 100644
index e5097dc606d0..000000000000
--- a/editors/vscode/files/patch-src_vs_workbench_contrib_extensions_browser_extensionEditor.ts
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/vs/workbench/contrib/extensions/browser/extensionEditor.ts.orig	2024-01-31 22:36:21 UTC
-+++ src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
-@@ -1775,7 +1775,8 @@ export class ExtensionEditor extends EditorPane {
- 
- 		switch (platform) {
- 			case 'win32': key = rawKeyBinding.win; break;
--			case 'linux': key = rawKeyBinding.linux; break;
-+			case 'linux': case 'freebsd':
-+				key = rawKeyBinding.linux; break;
- 			case 'darwin': key = rawKeyBinding.mac; break;
- 		}
- 
diff --git a/editors/vscode/pkg-plist b/editors/vscode/pkg-plist
index 63f2c2d04d61..b9af75e5883e 100644
--- a/editors/vscode/pkg-plist
+++ b/editors/vscode/pkg-plist
@@ -876,26 +876,26 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/out/vs/code/node/sharedProcess/sharedProcessMain.nls.js
 %%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/clear.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
-%%DATADIR%%/resources/app/out/vs/platform/audioCues/browser/media/error.mp3
-%%DATADIR%%/resources/app/out/vs/platform/audioCues/browser/media/foldedAreas.mp3
-%%DATADIR%%/resources/app/out/vs/platform/audioCues/browser/media/format.mp3
-%%DATADIR%%/resources/app/out/vs/platform/audioCues/browser/media/quickFixes.mp3
-%%DATADIR%%/resources/app/out/vs/platform/audioCues/browser/media/save.mp3
-%%DATADIR%%/resources/app/out/vs/platform/audioCues/browser/media/taskCompleted.mp3
-%%DATADIR%%/resources/app/out/vs/platform/audioCues/browser/media/taskFailed.mp3
-%%DATADIR%%/resources/app/out/vs/platform/audioCues/browser/media/terminalBell.mp3
-%%DATADIR%%/resources/app/out/vs/platform/audioCues/browser/media/warning.mp3
+%%DATADIR%%/resources/app/out/vs/platform/accessibilitySignal/browser/media/break.mp3
+%%DATADIR%%/resources/app/out/vs/platform/accessibilitySignal/browser/media/chatRequestSent.mp3
+%%DATADIR%%/resources/app/out/vs/platform/accessibilitySignal/browser/media/chatResponsePending.mp3
+%%DATADIR%%/resources/app/out/vs/platform/accessibilitySignal/browser/media/chatResponseReceived1.mp3
+%%DATADIR%%/resources/app/out/vs/platform/accessibilitySignal/browser/media/chatResponseReceived2.mp3
+%%DATADIR%%/resources/app/out/vs/platform/accessibilitySignal/browser/media/chatResponseReceived3.mp3
+%%DATADIR%%/resources/app/out/vs/platform/accessibilitySignal/browser/media/chatResponseReceived4.mp3
+%%DATADIR%%/resources/app/out/vs/platform/accessibilitySignal/browser/media/clear.mp3
+%%DATADIR%%/resources/app/out/vs/platform/accessibilitySignal/browser/media/diffLineDeleted.mp3
+%%DATADIR%%/resources/app/out/vs/platform/accessibilitySignal/browser/media/diffLineInserted.mp3
+%%DATADIR%%/resources/app/out/vs/platform/accessibilitySignal/browser/media/diffLineModified.mp3
+%%DATADIR%%/resources/app/out/vs/platform/accessibilitySignal/browser/media/error.mp3
+%%DATADIR%%/resources/app/out/vs/platform/accessibilitySignal/browser/media/foldedAreas.mp3
+%%DATADIR%%/resources/app/out/vs/platform/accessibilitySignal/browser/media/format.mp3
+%%DATADIR%%/resources/app/out/vs/platform/accessibilitySignal/browser/media/quickFixes.mp3
+%%DATADIR%%/resources/app/out/vs/platform/accessibilitySignal/browser/media/save.mp3
+%%DATADIR%%/resources/app/out/vs/platform/accessibilitySignal/browser/media/taskCompleted.mp3
+%%DATADIR%%/resources/app/out/vs/platform/accessibilitySignal/browser/media/taskFailed.mp3
+%%DATADIR%%/resources/app/out/vs/platform/accessibilitySignal/browser/media/terminalBell.mp3
+%%DATADIR%%/resources/app/out/vs/platform/accessibilitySignal/browser/media/warning.mp3
 %%DATADIR%%/resources/app/out/vs/platform/files/node/watcher/watcherMain.js
 %%DATADIR%%/resources/app/out/vs/platform/files/node/watcher/watcherMain.nls.js
 %%DATADIR%%/resources/app/out/vs/platform/profiling/electron-sandbox/profileAnalysisWorker.js



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403020246.4222kRZ0011812>