vscode: update to 1.85.0

This commit is contained in:
Alex Lohr 2023-12-11 18:46:27 +01:00 committed by classabbyamp
parent eafe0f0f56
commit b895e6469c
3 changed files with 12 additions and 13 deletions

View file

@ -25,7 +25,7 @@ index 7106e0e0969..faaff89d71c 100644
Type=Application Type=Application
NoDisplay=true NoDisplay=true
diff --git a/resources/linux/code.desktop b/resources/linux/code.desktop 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 --- a/resources/linux/code.desktop
+++ b/resources/linux/code.desktop +++ b/resources/linux/code.desktop
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
@ -37,10 +37,10 @@ index 72488b67700..c16e815d59f 100755
Icon=@@ICON@@ Icon=@@ICON@@
Type=Application Type=Application
StartupNotify=false StartupNotify=false
@@ -14,5 +14,5 @@ Keywords=vscode; @@ -23,5 +23,5 @@ Name[ko]=새 빈 창
Name[ru]=Новое пустое окно
[Desktop Action new-empty-window] Name[zh_CN]=新建空窗口
Name=New Empty Window Name[zh_TW]=開新空視窗
-Exec=@@EXEC@@ --new-window %F -Exec=@@EXEC@@ --new-window %F
+Exec=/usr/lib/@@NAME@@/bin/@@NAME@@ --new-window %F +Exec=/usr/lib/@@NAME@@/bin/@@NAME@@ --new-window %F
Icon=@@ICON@@ Icon=@@ICON@@

View file

@ -1,11 +1,10 @@
diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js 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 --- a/build/npm/postinstall.js
+++ b/build/npm/postinstall.js +++ b/build/npm/postinstall.js
@@ -87,6 +87,3 @@ runtime "${runtime}"`; @@ -111,5 +111,3 @@ for (let dir of dirs) {
fs.writeFileSync(yarnrcPath, yarnrc, 'utf8'); yarnInstall(dir, opts);
yarnInstall(watchPath);
} }
-
-cp.execSync('git config pull.rebase merges'); -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');

View file

@ -1,6 +1,6 @@
# Template file for 'vscode' # Template file for 'vscode'
pkgname=vscode pkgname=vscode
version=1.84.1 version=1.85.0
revision=1 revision=1
_electronver=24.3.0 _electronver=24.3.0
_npmver=8.6.0 _npmver=8.6.0
@ -12,7 +12,7 @@ maintainer="shizonic <realtiaz@gmail.com>, Alex Lohr <alex.lohr@logmein.com>"
license="MIT" license="MIT"
homepage="https://code.visualstudio.com/" homepage="https://code.visualstudio.com/"
distfiles="https://github.com/microsoft/vscode/archive/refs/tags/${version}.tar.gz" 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 nocross=yes # x64 build does not cut it, it contains native code
if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then