[PR PATCH] vscode: update to 1.85.0

[PR PATCH] vscode: update to 1.85.0

[atk]

[-- Attachment #1: Type: text/plain, Size: 1365 bytes --]

There is a new pull request by atk against master on the void-packages repository

https://github.com/atk/void-packages vscode-1.85.0
https://github.com/void-linux/void-packages/pull/47692

vscode: update to 1.85.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-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
-->

I sometimes had issues on the minification step, when there were too many open file handles. Hopefully, the CI can handle it.

A patch file from https://github.com/void-linux/void-packages/pull/47692.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vscode-1.85.0-47692.patch --]
[-- Type: text/x-diff, Size: 3134 bytes --]

From ccaa643a3485ba3e8417a0944ee5516f4eced73c Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Mon, 11 Dec 2023 18:46:27 +0100
Subject: [PATCH] vscode: update to 1.85.0

---
 srcpkgs/vscode/patches/fix_dir.patch            | 10 +++++-----
 srcpkgs/vscode/patches/remove_git_command.patch | 11 +++++------
 srcpkgs/vscode/template                         |  4 ++--
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/vscode/patches/fix_dir.patch b/srcpkgs/vscode/patches/fix_dir.patch
index 62cef243e66ef..1a79ac4115cb8 100644
--- a/srcpkgs/vscode/patches/fix_dir.patch
+++ b/srcpkgs/vscode/patches/fix_dir.patch
@@ -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 72488b67700..c16e815d59f 100755
+index e2e3f534751..8e3ee8dccb6 100755
 --- a/resources/linux/code.desktop
 +++ b/resources/linux/code.desktop
 @@ -2,7 +2,7 @@
@@ -37,10 +37,10 @@ index 72488b67700..c16e815d59f 100755
  Icon=@@ICON@@
  Type=Application
  StartupNotify=false
-@@ -14,5 +14,5 @@ Keywords=vscode;
- 
- [Desktop Action new-empty-window]
- Name=New Empty Window
+@@ -23,5 +23,5 @@ Name[ko]=새 빈 창
+ Name[ru]=Новое пустое окно
+ Name[zh_CN]=新建空窗口
+ Name[zh_TW]=開新空視窗
 -Exec=@@EXEC@@ --new-window %F
 +Exec=/usr/lib/@@NAME@@/bin/@@NAME@@ --new-window %F
  Icon=@@ICON@@
diff --git a/srcpkgs/vscode/patches/remove_git_command.patch b/srcpkgs/vscode/patches/remove_git_command.patch
index e7aeec6fcebf8..59ec4aa8ff695 100644
--- a/srcpkgs/vscode/patches/remove_git_command.patch
+++ b/srcpkgs/vscode/patches/remove_git_command.patch
@@ -1,11 +1,10 @@
 diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
-index f86ceb779a9..61acb0a4d10 100644
+index 07b4412c458..6398ed7b0b6 100644
 --- a/build/npm/postinstall.js
 +++ b/build/npm/postinstall.js
-@@ -87,6 +87,3 @@ runtime "${runtime}"`;
- 	fs.writeFileSync(yarnrcPath, yarnrc, 'utf8');
- 	yarnInstall(watchPath);
+@@ -111,5 +111,3 @@ for (let dir of dirs) {
+ 	yarnInstall(dir, opts);
  }
--
+ 
 -cp.execSync('git config pull.rebase merges');
--cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore');
+-cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore-revs');
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index a95894e1cced1..b01687f7631c8 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.84.1
+version=1.85.0
 revision=1
 _electronver=24.3.0
 _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=67f66a6bf9180912006abb54a943febb27833ee5a7888f70d3465e581988f74b
+checksum=b7fcf4fce5ce31669e93240783ff9ecfbe6d239bb2446c5eb3c11900d430a727
 nocross=yes # x64 build does not cut it, it contains native code
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then

Re: [PR PATCH] [Updated] vscode: update to 1.85.0

[atk]

[-- Attachment #1: Type: text/plain, Size: 1370 bytes --]

There is an updated pull request by atk against master on the void-packages repository

https://github.com/atk/void-packages vscode-1.85.0
https://github.com/void-linux/void-packages/pull/47692

vscode: update to 1.85.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-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
-->

I sometimes had issues on the minification step, when there were too many open file handles. Hopefully, the CI can handle it.

A patch file from https://github.com/void-linux/void-packages/pull/47692.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vscode-1.85.0-47692.patch --]
[-- Type: text/x-diff, Size: 3134 bytes --]

From af5b27a0c2d71506e3676e6be50e6fc4f6df4b7b Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Mon, 11 Dec 2023 18:46:27 +0100
Subject: [PATCH] vscode: update to 1.85.0

---
 srcpkgs/vscode/patches/fix_dir.patch            | 10 +++++-----
 srcpkgs/vscode/patches/remove_git_command.patch | 11 +++++------
 srcpkgs/vscode/template                         |  4 ++--
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/vscode/patches/fix_dir.patch b/srcpkgs/vscode/patches/fix_dir.patch
index 62cef243e66ef..1a79ac4115cb8 100644
--- a/srcpkgs/vscode/patches/fix_dir.patch
+++ b/srcpkgs/vscode/patches/fix_dir.patch
@@ -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 72488b67700..c16e815d59f 100755
+index e2e3f534751..8e3ee8dccb6 100755
 --- a/resources/linux/code.desktop
 +++ b/resources/linux/code.desktop
 @@ -2,7 +2,7 @@
@@ -37,10 +37,10 @@ index 72488b67700..c16e815d59f 100755
  Icon=@@ICON@@
  Type=Application
  StartupNotify=false
-@@ -14,5 +14,5 @@ Keywords=vscode;
- 
- [Desktop Action new-empty-window]
- Name=New Empty Window
+@@ -23,5 +23,5 @@ Name[ko]=새 빈 창
+ Name[ru]=Новое пустое окно
+ Name[zh_CN]=新建空窗口
+ Name[zh_TW]=開新空視窗
 -Exec=@@EXEC@@ --new-window %F
 +Exec=/usr/lib/@@NAME@@/bin/@@NAME@@ --new-window %F
  Icon=@@ICON@@
diff --git a/srcpkgs/vscode/patches/remove_git_command.patch b/srcpkgs/vscode/patches/remove_git_command.patch
index e7aeec6fcebf8..59ec4aa8ff695 100644
--- a/srcpkgs/vscode/patches/remove_git_command.patch
+++ b/srcpkgs/vscode/patches/remove_git_command.patch
@@ -1,11 +1,10 @@
 diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
-index f86ceb779a9..61acb0a4d10 100644
+index 07b4412c458..6398ed7b0b6 100644
 --- a/build/npm/postinstall.js
 +++ b/build/npm/postinstall.js
-@@ -87,6 +87,3 @@ runtime "${runtime}"`;
- 	fs.writeFileSync(yarnrcPath, yarnrc, 'utf8');
- 	yarnInstall(watchPath);
+@@ -111,5 +111,3 @@ for (let dir of dirs) {
+ 	yarnInstall(dir, opts);
  }
--
+ 
 -cp.execSync('git config pull.rebase merges');
--cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore');
+-cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore-revs');
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index a95894e1cced1..b01687f7631c8 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.84.1
+version=1.85.0
 revision=1
 _electronver=24.3.0
 _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=67f66a6bf9180912006abb54a943febb27833ee5a7888f70d3465e581988f74b
+checksum=b7fcf4fce5ce31669e93240783ff9ecfbe6d239bb2446c5eb3c11900d430a727
 nocross=yes # x64 build does not cut it, it contains native code
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then

Re: vscode: update to 1.85.0

[atk]

[-- Attachment #1: Type: text/plain, Size: 224 bytes --]

New comment by atk on void-packages repository

https://github.com/void-linux/void-packages/pull/47692#issuecomment-1850979214

Comment:
Some test seems to fail; this does not impede the build or the program itself, though.

Re: [PR PATCH] [Merged]: vscode: update to 1.85.0

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 1216 bytes --]

There's a merged pull request on the void-packages repository

vscode: update to 1.85.0
https://github.com/void-linux/void-packages/pull/47692

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-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
-->

I sometimes had issues on the minification step, when there were too many open file handles. Hopefully, the CI can handle it.

Re: vscode: update to 1.85.0

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 263 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/47692#issuecomment-1854918807

Comment:
build failed on `x86_64*`: https://build.voidlinux.org/builders/x86_64_builder/builds/45564/steps/shell_3/logs/stdio