* [PR PATCH] vscode: update to 1.59.0
@ 2021-08-06 19:36 atk
2021-08-06 19:56 ` [PR PATCH] [Merged]: " ericonr
0 siblings, 1 reply; 2+ messages in thread
From: atk @ 2021-08-06 19:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1584 bytes --]
There is a new pull request by atk against master on the void-packages repository
https://github.com/atk/void-packages vscode-1.59.0
https://github.com/void-linux/void-packages/pull/32373
vscode: update to 1.59.0
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/32373.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vscode-1.59.0-32373.patch --]
[-- Type: text/x-diff, Size: 3716 bytes --]
From a51abcda51e6b37eeba9544e47c036c25d48343d Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Fri, 6 Aug 2021 21:36:05 +0200
Subject: [PATCH] vscode: update to 1.59.0
---
srcpkgs/vscode/patches/dont-download-ffmpeg.patch | 4 ++--
srcpkgs/vscode/patches/gulp.patch | 4 ++--
srcpkgs/vscode/patches/remove_git_command.patch | 5 +++--
srcpkgs/vscode/template | 4 ++--
4 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
index b56c51aeb168..a6a4bb073dd2 100644
--- a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
+++ b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
@@ -1,8 +1,8 @@
diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index a6e043f122c..2c537818fca 100644
+index ad0e4717a66..4b301e85c3d 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
-@@ -292,7 +292,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -293,7 +293,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
.pipe(util.skipDirectories())
.pipe(util.fixWin32DirectoryPermissions())
.pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523
diff --git a/srcpkgs/vscode/patches/gulp.patch b/srcpkgs/vscode/patches/gulp.patch
index 5bb43078fcea..5abb59ec0b65 100644
--- a/srcpkgs/vscode/patches/gulp.patch
+++ b/srcpkgs/vscode/patches/gulp.patch
@@ -1,8 +1,8 @@
diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index a6e043f122c..276823dede9 100644
+index ad0e4717a66..d3c34a95ec9 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
-@@ -280,7 +280,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -281,7 +281,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
'resources/win32/code_150x150.png'
], { base: '.' }));
} else if (platform === 'linux') {
diff --git a/srcpkgs/vscode/patches/remove_git_command.patch b/srcpkgs/vscode/patches/remove_git_command.patch
index 93298f56bec2..e7aeec6fcebf 100644
--- a/srcpkgs/vscode/patches/remove_git_command.patch
+++ b/srcpkgs/vscode/patches/remove_git_command.patch
@@ -1,10 +1,11 @@
diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
-index 2d973599343..61acb0a4d10 100644
+index f86ceb779a9..61acb0a4d10 100644
--- a/build/npm/postinstall.js
+++ b/build/npm/postinstall.js
-@@ -87,5 +87,3 @@ runtime "${runtime}"`;
+@@ -87,6 +87,3 @@ runtime "${runtime}"`;
fs.writeFileSync(yarnrcPath, yarnrc, 'utf8');
yarnInstall(watchPath);
}
-
-cp.execSync('git config pull.rebase merges');
+-cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore');
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index ade24d3a1088..24e5aca3b26a 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
# Template file for 'vscode'
pkgname=vscode
-version=1.58.2
+version=1.59.0
revision=1
_electronver=12.0.9
hostmakedepends="pkg-config python nodejs yarn tar git"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
license="MIT"
homepage="https://code.visualstudio.com/"
distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=1f474b6e4e397e9de17eab51818bb34b9870d718466217d5a5ed170c312dda6d
+checksum=7472d9e13f88a17d9e934307f8f2545f9a30dcdf6ef41ca83224b9ab8b6f5344
if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
broken="FATAL ERROR: CALL_AND_RETRY_LAST Allocation failed - JavaScript heap out of memory"
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: vscode: update to 1.59.0
2021-08-06 19:36 [PR PATCH] vscode: update to 1.59.0 atk
@ 2021-08-06 19:56 ` ericonr
0 siblings, 0 replies; 2+ messages in thread
From: ericonr @ 2021-08-06 19:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1435 bytes --]
There's a merged pull request on the void-packages repository
vscode: update to 1.59.0
https://github.com/void-linux/void-packages/pull/32373
Description:
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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
-->
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-08-06 19:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-06 19:36 [PR PATCH] vscode: update to 1.59.0 atk
2021-08-06 19:56 ` [PR PATCH] [Merged]: " ericonr
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).