[-- Attachment #1: Type: text/plain, Size: 1267 bytes --] There is a new pull request by atk against master on the void-packages repository https://github.com/atk/void-packages vscode-1.67.0 https://github.com/void-linux/void-packages/pull/36991 vscode: update to 1.67.0 + take care of new tracking server <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES** <!-- #### New package - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO** --> <!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> <!-- #### Local build testing - I built this PR locally for my native architecture, (ARCH-LIBC) - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/36991.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-vscode-1.67.0-36991.patch --] [-- Type: text/x-diff, Size: 3922 bytes --] From 0b6404e61deb0f75092f169c37f55f4b886d6f96 Mon Sep 17 00:00:00 2001 From: Alex Lohr <alexthkloss@web.de> Date: Thu, 5 May 2022 21:58:04 +0200 Subject: [PATCH] vscode: update to 1.67.0 take care of new tracking server --- srcpkgs/vscode/patches/product.patch | 4 ++-- srcpkgs/vscode/patches/ripgrep.patch | 6 +++--- srcpkgs/vscode/template | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/srcpkgs/vscode/patches/product.patch b/srcpkgs/vscode/patches/product.patch index 624ca63afcbe..c40fb38c55d9 100644 --- a/srcpkgs/vscode/patches/product.patch +++ b/srcpkgs/vscode/patches/product.patch @@ -1,5 +1,5 @@ diff --git a/product.json b/product.json -index df18127dcc67..d3006752bd98 100644 +index 30cbf2a9825..d9956271065 100644 --- a/product.json +++ b/product.json @@ -27,7 +27,15 @@ @@ -9,7 +9,7 @@ index df18127dcc67..d3006752bd98 100644 + "quality": "stable", + "documentationUrl": "https://github.com/microsoft/vscode-docs", + "requestFeatureUrl": "https://github.com/Microsoft/vscode/issues", - "webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-webview.net/insider/181b43c0e2949e36ecb623d8cc6de29d4fa2bae8/out/vs/workbench/contrib/webview/browser/pre/", + "webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-cdn.net/insider/181b43c0e2949e36ecb623d8cc6de29d4fa2bae8/out/vs/workbench/contrib/webview/browser/pre/", + "extensionsGallery": { + "serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery", + "cacheUrl": "https://vscode.blob.core.windows.net/gallery/index", diff --git a/srcpkgs/vscode/patches/ripgrep.patch b/srcpkgs/vscode/patches/ripgrep.patch index 3fdc568a9e54..f87bc5eaab5a 100644 --- a/srcpkgs/vscode/patches/ripgrep.patch +++ b/srcpkgs/vscode/patches/ripgrep.patch @@ -5,7 +5,7 @@ during build, which unbreaks build on platforms where MS deos not ship a prebuilt ripgrep. diff --git a/package.json b/package.json -index de2cf9e04a9b..1995e3bb9a7e 100644 +index 39c3e9f5b10..198dbf3e421 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ @@ -14,11 +14,11 @@ index de2cf9e04a9b..1995e3bb9a7e 100644 "@vscode/iconv-lite-umd": "0.7.0", - "@vscode/ripgrep": "^1.14.2", + "@vscode/ripgrep": "https://github.com/atk/void-vscode-ripgrep.git", - "@vscode/sqlite3": "5.0.7", + "@vscode/sqlite3": "5.0.8", "@vscode/sudo-prompt": "9.3.1", "@vscode/vscode-languagedetection": "1.0.21", diff --git a/remote/package.json b/remote/package.json -index c7fc7a2e931f..8842b784df2c 100644 +index 936aa5f5bab..152ba516795 100644 --- a/remote/package.json +++ b/remote/package.json @@ -6,7 +6,7 @@ diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template index 6d3b3d72d00c..4e6f1c4c215f 100644 --- a/srcpkgs/vscode/template +++ b/srcpkgs/vscode/template @@ -1,6 +1,6 @@ # Template file for 'vscode' pkgname=vscode -version=1.66.2 +version=1.67.0 revision=1 _electronver=13.6.7 _npmver=8.6.0 @@ -12,7 +12,7 @@ maintainer="shizonic <realtiaz@gmail.com>, Alex Lohr <alex.lohr@logmein.com>" license="MIT" homepage="https://code.visualstudio.com/" distfiles="https://github.com/Microsoft/vscode/archive/refs/tags/${version}.tar.gz" -checksum=1b70f202b570763e85f67abd8693eeb9c88c6a066a4b579aca5c0c42ecb1b47f +checksum=14039bbb6f16acc36e73c6fca0fcc1728ebda4bb8eca7acec22377da5ea73104 nocross=yes # x64 build does not cut it, it contains native code if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then @@ -29,7 +29,7 @@ do_configure() { # redirect telemetry urls to 0.0.0.0 # src: vscodium/undo_telemetry.sh - _TELEMETRY_URLS="(dc\.services\.visualstudio\.com)|(vortex\.data\.microsoft\.com)" + _TELEMETRY_URLS="(dc\.services\.visualstudio\.com)|(vortex\.data\.microsoft\.com)|(mobile\.events\.data\.microsoft\.com)" _REPLACEMENT="s/$_TELEMETRY_URLS/0\.0\.0\.0/g" grep -rl --exclude-dir=.git -E $_TELEMETRY_URLS | xargs sed -i -E $_REPLACEMENT
[-- Attachment #1: Type: text/plain, Size: 251 bytes --] New comment by atk on void-packages repository https://github.com/void-linux/void-packages/pull/36991#issuecomment-1119033319 Comment: @shizonic if you have any idea about the terminal, I'm currently too tired to have a closer look. Maybe tomorrow.
[-- Attachment #1: Type: text/plain, Size: 247 bytes --] New comment by cevdetardaharan on void-packages repository https://github.com/void-linux/void-packages/pull/36991#issuecomment-1126782129 Comment: https://code.visualstudio.com/docs/supporting/troubleshoot-terminal-launch#_troubleshooting-steps
[-- Attachment #1: Type: text/plain, Size: 1355 bytes --] There is an updated pull request by atk against master on the void-packages repository https://github.com/atk/void-packages vscode-1.67.0 https://github.com/void-linux/void-packages/pull/36991 WIP: vscode: update to 1.67.0 + take care of new tracking server <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES**, but one error was found: at the moment, the internal terminal does not work. <!-- #### New package - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO** --> <!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> <!-- #### Local build testing - I built this PR locally for my native architecture, (ARCH-LIBC) - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/36991.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-vscode-1.67.0-36991.patch --] [-- Type: text/x-diff, Size: 3922 bytes --] From 414fab0815610e60a602a61a3449fd762524a21f Mon Sep 17 00:00:00 2001 From: Alex Lohr <alexthkloss@web.de> Date: Thu, 5 May 2022 21:58:04 +0200 Subject: [PATCH] vscode: update to 1.67.1 take care of new tracking server --- srcpkgs/vscode/patches/product.patch | 4 ++-- srcpkgs/vscode/patches/ripgrep.patch | 6 +++--- srcpkgs/vscode/template | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/srcpkgs/vscode/patches/product.patch b/srcpkgs/vscode/patches/product.patch index 624ca63afcbe..c40fb38c55d9 100644 --- a/srcpkgs/vscode/patches/product.patch +++ b/srcpkgs/vscode/patches/product.patch @@ -1,5 +1,5 @@ diff --git a/product.json b/product.json -index df18127dcc67..d3006752bd98 100644 +index 30cbf2a9825..d9956271065 100644 --- a/product.json +++ b/product.json @@ -27,7 +27,15 @@ @@ -9,7 +9,7 @@ index df18127dcc67..d3006752bd98 100644 + "quality": "stable", + "documentationUrl": "https://github.com/microsoft/vscode-docs", + "requestFeatureUrl": "https://github.com/Microsoft/vscode/issues", - "webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-webview.net/insider/181b43c0e2949e36ecb623d8cc6de29d4fa2bae8/out/vs/workbench/contrib/webview/browser/pre/", + "webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-cdn.net/insider/181b43c0e2949e36ecb623d8cc6de29d4fa2bae8/out/vs/workbench/contrib/webview/browser/pre/", + "extensionsGallery": { + "serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery", + "cacheUrl": "https://vscode.blob.core.windows.net/gallery/index", diff --git a/srcpkgs/vscode/patches/ripgrep.patch b/srcpkgs/vscode/patches/ripgrep.patch index 3fdc568a9e54..f87bc5eaab5a 100644 --- a/srcpkgs/vscode/patches/ripgrep.patch +++ b/srcpkgs/vscode/patches/ripgrep.patch @@ -5,7 +5,7 @@ during build, which unbreaks build on platforms where MS deos not ship a prebuilt ripgrep. diff --git a/package.json b/package.json -index de2cf9e04a9b..1995e3bb9a7e 100644 +index 39c3e9f5b10..198dbf3e421 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ @@ -14,11 +14,11 @@ index de2cf9e04a9b..1995e3bb9a7e 100644 "@vscode/iconv-lite-umd": "0.7.0", - "@vscode/ripgrep": "^1.14.2", + "@vscode/ripgrep": "https://github.com/atk/void-vscode-ripgrep.git", - "@vscode/sqlite3": "5.0.7", + "@vscode/sqlite3": "5.0.8", "@vscode/sudo-prompt": "9.3.1", "@vscode/vscode-languagedetection": "1.0.21", diff --git a/remote/package.json b/remote/package.json -index c7fc7a2e931f..8842b784df2c 100644 +index 936aa5f5bab..152ba516795 100644 --- a/remote/package.json +++ b/remote/package.json @@ -6,7 +6,7 @@ diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template index 6d3b3d72d00c..24ab9b6f9f4a 100644 --- a/srcpkgs/vscode/template +++ b/srcpkgs/vscode/template @@ -1,6 +1,6 @@ # Template file for 'vscode' pkgname=vscode -version=1.66.2 +version=1.67.1 revision=1 _electronver=13.6.7 _npmver=8.6.0 @@ -12,7 +12,7 @@ maintainer="shizonic <realtiaz@gmail.com>, Alex Lohr <alex.lohr@logmein.com>" license="MIT" homepage="https://code.visualstudio.com/" distfiles="https://github.com/Microsoft/vscode/archive/refs/tags/${version}.tar.gz" -checksum=1b70f202b570763e85f67abd8693eeb9c88c6a066a4b579aca5c0c42ecb1b47f +checksum=9d6299a597aa79870a89434594446a3c744d374208523b26914799397738cdc3 nocross=yes # x64 build does not cut it, it contains native code if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then @@ -29,7 +29,7 @@ do_configure() { # redirect telemetry urls to 0.0.0.0 # src: vscodium/undo_telemetry.sh - _TELEMETRY_URLS="(dc\.services\.visualstudio\.com)|(vortex\.data\.microsoft\.com)" + _TELEMETRY_URLS="(dc\.services\.visualstudio\.com)|(vortex\.data\.microsoft\.com)|(mobile\.events\.data\.microsoft\.com)" _REPLACEMENT="s/$_TELEMETRY_URLS/0\.0\.0\.0/g" grep -rl --exclude-dir=.git -E $_TELEMETRY_URLS | xargs sed -i -E $_REPLACEMENT
[-- Attachment #1: Type: text/plain, Size: 247 bytes --] New comment by cevdetardaharan on void-packages repository https://github.com/void-linux/void-packages/pull/36991#issuecomment-1126782129 Comment: https://code.visualstudio.com/docs/supporting/troubleshoot-terminal-launch#_troubleshooting-steps
[-- Attachment #1: Type: text/plain, Size: 1355 bytes --] There is an updated pull request by atk against master on the void-packages repository https://github.com/atk/void-packages vscode-1.67.0 https://github.com/void-linux/void-packages/pull/36991 WIP: vscode: update to 1.67.0 + take care of new tracking server <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES**, but one error was found: at the moment, the internal terminal does not work. <!-- #### New package - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO** --> <!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> <!-- #### Local build testing - I built this PR locally for my native architecture, (ARCH-LIBC) - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/36991.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-vscode-1.67.0-36991.patch --] [-- Type: text/x-diff, Size: 3922 bytes --] From edcdf4879078e6ab56511994d58ec367c24746e9 Mon Sep 17 00:00:00 2001 From: Alex Lohr <alexthkloss@web.de> Date: Thu, 5 May 2022 21:58:04 +0200 Subject: [PATCH] vscode: update to 1.67.2 take care of new tracking server --- srcpkgs/vscode/patches/product.patch | 4 ++-- srcpkgs/vscode/patches/ripgrep.patch | 6 +++--- srcpkgs/vscode/template | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/srcpkgs/vscode/patches/product.patch b/srcpkgs/vscode/patches/product.patch index 624ca63afcbe..c40fb38c55d9 100644 --- a/srcpkgs/vscode/patches/product.patch +++ b/srcpkgs/vscode/patches/product.patch @@ -1,5 +1,5 @@ diff --git a/product.json b/product.json -index df18127dcc67..d3006752bd98 100644 +index 30cbf2a9825..d9956271065 100644 --- a/product.json +++ b/product.json @@ -27,7 +27,15 @@ @@ -9,7 +9,7 @@ index df18127dcc67..d3006752bd98 100644 + "quality": "stable", + "documentationUrl": "https://github.com/microsoft/vscode-docs", + "requestFeatureUrl": "https://github.com/Microsoft/vscode/issues", - "webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-webview.net/insider/181b43c0e2949e36ecb623d8cc6de29d4fa2bae8/out/vs/workbench/contrib/webview/browser/pre/", + "webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-cdn.net/insider/181b43c0e2949e36ecb623d8cc6de29d4fa2bae8/out/vs/workbench/contrib/webview/browser/pre/", + "extensionsGallery": { + "serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery", + "cacheUrl": "https://vscode.blob.core.windows.net/gallery/index", diff --git a/srcpkgs/vscode/patches/ripgrep.patch b/srcpkgs/vscode/patches/ripgrep.patch index 3fdc568a9e54..f87bc5eaab5a 100644 --- a/srcpkgs/vscode/patches/ripgrep.patch +++ b/srcpkgs/vscode/patches/ripgrep.patch @@ -5,7 +5,7 @@ during build, which unbreaks build on platforms where MS deos not ship a prebuilt ripgrep. diff --git a/package.json b/package.json -index de2cf9e04a9b..1995e3bb9a7e 100644 +index 39c3e9f5b10..198dbf3e421 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ @@ -14,11 +14,11 @@ index de2cf9e04a9b..1995e3bb9a7e 100644 "@vscode/iconv-lite-umd": "0.7.0", - "@vscode/ripgrep": "^1.14.2", + "@vscode/ripgrep": "https://github.com/atk/void-vscode-ripgrep.git", - "@vscode/sqlite3": "5.0.7", + "@vscode/sqlite3": "5.0.8", "@vscode/sudo-prompt": "9.3.1", "@vscode/vscode-languagedetection": "1.0.21", diff --git a/remote/package.json b/remote/package.json -index c7fc7a2e931f..8842b784df2c 100644 +index 936aa5f5bab..152ba516795 100644 --- a/remote/package.json +++ b/remote/package.json @@ -6,7 +6,7 @@ diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template index 6d3b3d72d00c..6e602f1b8beb 100644 --- a/srcpkgs/vscode/template +++ b/srcpkgs/vscode/template @@ -1,6 +1,6 @@ # Template file for 'vscode' pkgname=vscode -version=1.66.2 +version=1.67.2 revision=1 _electronver=13.6.7 _npmver=8.6.0 @@ -12,7 +12,7 @@ maintainer="shizonic <realtiaz@gmail.com>, Alex Lohr <alex.lohr@logmein.com>" license="MIT" homepage="https://code.visualstudio.com/" distfiles="https://github.com/Microsoft/vscode/archive/refs/tags/${version}.tar.gz" -checksum=1b70f202b570763e85f67abd8693eeb9c88c6a066a4b579aca5c0c42ecb1b47f +checksum=3edf6b340a9d49721d170ac14884a73502091122aac8c3a6190047d3ef9b15c8 nocross=yes # x64 build does not cut it, it contains native code if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then @@ -29,7 +29,7 @@ do_configure() { # redirect telemetry urls to 0.0.0.0 # src: vscodium/undo_telemetry.sh - _TELEMETRY_URLS="(dc\.services\.visualstudio\.com)|(vortex\.data\.microsoft\.com)" + _TELEMETRY_URLS="(dc\.services\.visualstudio\.com)|(vortex\.data\.microsoft\.com)|(mobile\.events\.data\.microsoft\.com)" _REPLACEMENT="s/$_TELEMETRY_URLS/0\.0\.0\.0/g" grep -rl --exclude-dir=.git -E $_TELEMETRY_URLS | xargs sed -i -E $_REPLACEMENT
[-- Attachment #1: Type: text/plain, Size: 221 bytes --] New comment by shizonic on void-packages repository https://github.com/void-linux/void-packages/pull/36991#issuecomment-1175986901 Comment: @atk Sorry I am too busy for months... Any progress for newest release 1.68.1?
[-- Attachment #1: Type: text/plain, Size: 254 bytes --] New comment by atk on void-packages repository https://github.com/void-linux/void-packages/pull/36991#issuecomment-1175996568 Comment: We're currently blocked by the missing electron-18 update; using an older electron version breaks the terminal view.
[-- Attachment #1: Type: text/plain, Size: 234 bytes --] New comment by shizonic on void-packages repository https://github.com/void-linux/void-packages/pull/36991#issuecomment-1176014394 Comment: @atk Oh I see. Thanks for informing. Any idea if and when electron 18 lands in the repo?
[-- Attachment #1: Type: text/plain, Size: 234 bytes --] New comment by atk on void-packages repository https://github.com/void-linux/void-packages/pull/36991#issuecomment-1176053094 Comment: I had opened a package request issue, but unfortunately, there's currently no one to pick it up.
[-- Attachment #1: Type: text/plain, Size: 185 bytes --] New comment by paper42 on void-packages repository https://github.com/void-linux/void-packages/pull/36991#issuecomment-1179787633 Comment: Electron 19 is now packaged, can we use it?
[-- Attachment #1: Type: text/plain, Size: 230 bytes --] New comment by shizonic on void-packages repository https://github.com/void-linux/void-packages/pull/36991#issuecomment-1179795934 Comment: > Electron 19 is now packaged, can we use it? Gonna have a look into it by tomorrow.
[-- Attachment #1: Type: text/plain, Size: 1355 bytes --] There is an updated pull request by atk against master on the void-packages repository https://github.com/atk/void-packages vscode-1.67.0 https://github.com/void-linux/void-packages/pull/36991 WIP: vscode: update to 1.67.2 + take care of new tracking server <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES**, but one error was found: at the moment, the internal terminal does not work. <!-- #### New package - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO** --> <!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> <!-- #### Local build testing - I built this PR locally for my native architecture, (ARCH-LIBC) - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/36991.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-vscode-1.67.0-36991.patch --] [-- Type: text/x-diff, Size: 5807 bytes --] From f743b03a3a12529f7e5df36b563f76b7a0cf3e5f Mon Sep 17 00:00:00 2001 From: Alex Lohr <alexthkloss@web.de> Date: Thu, 5 May 2022 21:58:04 +0200 Subject: [PATCH] vscode: update to 1.69.0 take care of new tracking server --- srcpkgs/vscode/patches/fix_dir.patch | 10 +++++----- srcpkgs/vscode/patches/product.patch | 6 +++--- srcpkgs/vscode/patches/ripgrep.patch | 6 +++--- srcpkgs/vscode/template | 14 +++++++------- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/srcpkgs/vscode/patches/fix_dir.patch b/srcpkgs/vscode/patches/fix_dir.patch index da193e702524..62cef243e66e 100644 --- a/srcpkgs/vscode/patches/fix_dir.patch +++ b/srcpkgs/vscode/patches/fix_dir.patch @@ -1,13 +1,13 @@ diff --git a/resources/linux/bin/code.sh b/resources/linux/bin/code.sh -index 06973937f14..78f72c9e9ed 100755 +index 5fe68cb4f3e..2f7eba7b9a3 100755 --- a/resources/linux/bin/code.sh +++ b/resources/linux/bin/code.sh -@@ -44,7 +44,7 @@ else +@@ -53,7 +53,7 @@ else VSCODE_PATH="$(dirname "$(readlink -f "$0")")/.." else # else use the standard install location -- VSCODE_PATH="/usr/share/@@NAME@@" -+ VSCODE_PATH="/usr/lib/@@NAME@@" +- VSCODE_PATH="/usr/share/@@APPNAME@@" ++ VSCODE_PATH="/usr/lib/@@APPNAME@@" fi fi @@ -25,7 +25,7 @@ index 7106e0e0969..faaff89d71c 100644 Type=Application NoDisplay=true diff --git a/resources/linux/code.desktop b/resources/linux/code.desktop -index ab3b79a011b..cdc88ef68a4 100755 +index 72488b67700..c16e815d59f 100755 --- a/resources/linux/code.desktop +++ b/resources/linux/code.desktop @@ -2,7 +2,7 @@ diff --git a/srcpkgs/vscode/patches/product.patch b/srcpkgs/vscode/patches/product.patch index 624ca63afcbe..8ed252e575e7 100644 --- a/srcpkgs/vscode/patches/product.patch +++ b/srcpkgs/vscode/patches/product.patch @@ -1,5 +1,5 @@ diff --git a/product.json b/product.json -index df18127dcc67..d3006752bd98 100644 +index a50c00f6cf3..8dd13191377 100644 --- a/product.json +++ b/product.json @@ -27,7 +27,15 @@ @@ -9,7 +9,7 @@ index df18127dcc67..d3006752bd98 100644 + "quality": "stable", + "documentationUrl": "https://github.com/microsoft/vscode-docs", + "requestFeatureUrl": "https://github.com/Microsoft/vscode/issues", - "webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-webview.net/insider/181b43c0e2949e36ecb623d8cc6de29d4fa2bae8/out/vs/workbench/contrib/webview/browser/pre/", + "webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-cdn.net/insider/3c8520fab514b9f56070214496b26ff68d1b1cb5/out/vs/workbench/contrib/webview/browser/pre/", + "extensionsGallery": { + "serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery", + "cacheUrl": "https://vscode.blob.core.windows.net/gallery/index", @@ -17,4 +17,4 @@ index df18127dcc67..d3006752bd98 100644 + }, "builtInExtensions": [ { - "name": "ms-vscode.references-view", + "name": "ms-vscode.js-debug-companion", diff --git a/srcpkgs/vscode/patches/ripgrep.patch b/srcpkgs/vscode/patches/ripgrep.patch index 3fdc568a9e54..f87bc5eaab5a 100644 --- a/srcpkgs/vscode/patches/ripgrep.patch +++ b/srcpkgs/vscode/patches/ripgrep.patch @@ -5,7 +5,7 @@ during build, which unbreaks build on platforms where MS deos not ship a prebuilt ripgrep. diff --git a/package.json b/package.json -index de2cf9e04a9b..1995e3bb9a7e 100644 +index 39c3e9f5b10..198dbf3e421 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ @@ -14,11 +14,11 @@ index de2cf9e04a9b..1995e3bb9a7e 100644 "@vscode/iconv-lite-umd": "0.7.0", - "@vscode/ripgrep": "^1.14.2", + "@vscode/ripgrep": "https://github.com/atk/void-vscode-ripgrep.git", - "@vscode/sqlite3": "5.0.7", + "@vscode/sqlite3": "5.0.8", "@vscode/sudo-prompt": "9.3.1", "@vscode/vscode-languagedetection": "1.0.21", diff --git a/remote/package.json b/remote/package.json -index c7fc7a2e931f..8842b784df2c 100644 +index 936aa5f5bab..152ba516795 100644 --- a/remote/package.json +++ b/remote/package.json @@ -6,7 +6,7 @@ diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template index 6d3b3d72d00c..9f11f7989152 100644 --- a/srcpkgs/vscode/template +++ b/srcpkgs/vscode/template @@ -1,18 +1,18 @@ # Template file for 'vscode' pkgname=vscode -version=1.66.2 +version=1.69.0 revision=1 -_electronver=13.6.7 +_electronver=19.0.8 _npmver=8.6.0 hostmakedepends="pkg-config python3 nodejs yarn tar git ripgrep" -makedepends="libxkbfile-devel libsecret-devel libxml2-devel ncurses-devel electron13" -depends="libXtst ncurses nss dejavu-fonts-ttf xdg-utils ripgrep electron13" +makedepends="libxkbfile-devel libsecret-devel libxml2-devel ncurses-devel electron19" +depends="libXtst ncurses nss dejavu-fonts-ttf xdg-utils ripgrep electron19" short_desc="Microsoft Code for Linux" maintainer="shizonic <realtiaz@gmail.com>, Alex Lohr <alex.lohr@logmein.com>" license="MIT" homepage="https://code.visualstudio.com/" -distfiles="https://github.com/Microsoft/vscode/archive/refs/tags/${version}.tar.gz" -checksum=1b70f202b570763e85f67abd8693eeb9c88c6a066a4b579aca5c0c42ecb1b47f +distfiles="https://github.com/microsoft/vscode/archive/refs/tags/${version}.tar.gz" +checksum=982af5d93198b5437c3c211276c7b5fd7e3ecf19359c9605df2d6feddee93151 nocross=yes # x64 build does not cut it, it contains native code if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then @@ -29,7 +29,7 @@ do_configure() { # redirect telemetry urls to 0.0.0.0 # src: vscodium/undo_telemetry.sh - _TELEMETRY_URLS="(dc\.services\.visualstudio\.com)|(vortex\.data\.microsoft\.com)" + _TELEMETRY_URLS="(dc\.services\.visualstudio\.com)|(vortex\.data\.microsoft\.com)|(mobile\.events\.data\.microsoft\.com)" _REPLACEMENT="s/$_TELEMETRY_URLS/0\.0\.0\.0/g" grep -rl --exclude-dir=.git -E $_TELEMETRY_URLS | xargs sed -i -E $_REPLACEMENT
[-- Attachment #1: Type: text/plain, Size: 295 bytes --] New comment by atk on void-packages repository https://github.com/void-linux/void-packages/pull/36991#issuecomment-1179806014 Comment: I guess I beat you to it :) And my assumption that electron13 was breaking the terminal seems to have been right, because with electron19, it works again.
[-- Attachment #1: Type: text/plain, Size: 337 bytes --] New comment by shizonic on void-packages repository https://github.com/void-linux/void-packages/pull/36991#issuecomment-1179938301 Comment: > I guess I beat you to it :) > > And my assumption that electron13 was breaking the terminal seems to have been right, because with electron19, it works again. Nice work, dude. Thank you!
[-- Attachment #1: Type: text/plain, Size: 1196 bytes --] There's a merged pull request on the void-packages repository vscode: update to 1.69.0 https://github.com/void-linux/void-packages/pull/36991 Description: + take care of new tracking server <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES**, but one error was found: at the moment, the internal terminal does not work. <!-- #### New package - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO** --> <!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> <!-- #### Local build testing - I built this PR locally for my native architecture, (ARCH-LIBC) - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl -->
[-- Attachment #1: Type: text/plain, Size: 294 bytes --] New comment by negativeExponent on void-packages repository https://github.com/void-linux/void-packages/pull/36991#issuecomment-1180320461 Comment: i'm having issue running this version of vscode (including the 1.69.0_1 on main repo). the app closes as soon as you click on File on menu bar.
[-- Attachment #1: Type: text/plain, Size: 371 bytes --] New comment by negativeExponent on void-packages repository https://github.com/void-linux/void-packages/pull/36991#issuecomment-1180320461 Comment: i'm having issue running this version of vscode (including the 1.69.0_1 on main repo). the app closes as soon as you click on File on menu bar. maybe this verbose log will help something: https://pastebin.com/A2W7TQ4S
[-- Attachment #1: Type: text/plain, Size: 401 bytes --] New comment by Johnnynator on void-packages repository https://github.com/void-linux/void-packages/pull/36991#issuecomment-1180466076 Comment: > i'm having issue running this version of vscode (including the 1.69.0_1 on main repo). the app closes as soon as you click on File on menu bar. > > maybe this verbose log will help something: https://pastebin.com/A2W7TQ4S Are you on musl or glibc?
[-- Attachment #1: Type: text/plain, Size: 156 bytes --] New comment by negativeExponent on void-packages repository https://github.com/void-linux/void-packages/pull/36991#issuecomment-1180468376 Comment: glibc
[-- Attachment #1: Type: text/plain, Size: 977 bytes --] New comment by brxken128 on void-packages repository https://github.com/void-linux/void-packages/pull/36991#issuecomment-1180691444 Comment: > i'm having issue running this version of vscode (including the 1.69.0_1 on main repo). the app closes as soon as you click on File on menu bar. > > maybe this verbose log will help something: https://pastebin.com/A2W7TQ4S This happens for me also, on `1.69.0_1` with glibc. In addition to this, scrolling and just about everything else is slow/sluggish and has large response times. The context menu/text also seems to be broken with gnome `42.0_1`, although I don't know if it's limited to gnome. The bar with the blue box is supposed to be the menu bar, and clicking the first part (which I assume is the File button) will indeed crash the program. I've tried with all extensions disabled too - no dice. ![image](https://user-images.githubusercontent.com/77554505/178325469-02108689-4c37-4663-9adc-34df38b4af90.png)