Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] vscode: update to 1.54.1.
@ 2021-03-10 15:00 shizonic
  2021-03-10 20:43 ` atk
  2021-03-10 21:00 ` [PR PATCH] [Merged]: " ericonr
  0 siblings, 2 replies; 3+ messages in thread
From: shizonic @ 2021-03-10 15:00 UTC (permalink / raw)
  To: ml

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

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

https://github.com/shizonic/void-packages vscode
https://github.com/void-linux/void-packages/pull/29379

vscode: update to 1.54.1.
<!-- 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/29379.patch is attached

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

From 818b6ee449caf93bc2890abe6c7c8bbd9a59647d Mon Sep 17 00:00:00 2001
From: Toby Merz <realtiaz@gmail.com>
Date: Wed, 10 Mar 2021 16:00:38 +0100
Subject: [PATCH] vscode: update to 1.54.1.

---
 .../vscode/patches/dont-download-ffmpeg.patch    |  6 +++---
 srcpkgs/vscode/patches/gulp.patch                | 16 ++++++++--------
 srcpkgs/vscode/template                          |  4 ++--
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
index e428f74f52e..cb7993a59f0 100644
--- a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
+++ b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
@@ -1,11 +1,11 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index d046aa71ed2f..0740fc225b3f 100644
+index e3ca3514bb62..f9157b7cbc6c 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -263,7 +263,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
- 		let result = all
+@@ -285,7 +285,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
 -			.pipe(electron(_.extend({}, config, { platform, arch: arch === 'armhf' ? 'arm' : arch, ffmpegChromium: true })))
 +			.pipe(electron(_.extend({}, config, { platform, arch: arch === 'armhf' ? 'arm' : arch, ffmpegChromium: false })))
  			.pipe(filter(['**', '!LICENSE', '!LICENSES.chromium.html', '!version'], { dot: true }));
diff --git a/srcpkgs/vscode/patches/gulp.patch b/srcpkgs/vscode/patches/gulp.patch
index 360c03a8c19..0b11414bcc6 100644
--- a/srcpkgs/vscode/patches/gulp.patch
+++ b/srcpkgs/vscode/patches/gulp.patch
@@ -1,11 +1,11 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index 93a943aba0be..5ab9be8c4bb5 100644
+index e3ca3514bb62..b0942f2b9b89 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -258,7 +258,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
-				'resources/win32/code_150x150.png'
-			], { base: '.' }));
-		} else if (platform === 'linux') {
+@@ -273,7 +273,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+ 				'resources/win32/code_150x150.png'
+ 			], { base: '.' }));
+ 		} else if (platform === 'linux') {
 -			all = es.merge(all, gulp.src('resources/linux/code.png', { base: '.' }));
 +			const icon = gulp.src('resources/linux/code.png', { base: '.' });
 +
@@ -16,6 +16,6 @@ index 93a943aba0be..5ab9be8c4bb5 100644
 +				.pipe(replace('@@ICON@@', `code-oss`));
 +
 +			all = es.merge(all, icon, desktop);
-		} else if (platform === 'darwin') {
-			const shortcut = gulp.src('resources/darwin/bin/code.sh')
-				.pipe(rename('bin/code'));
+ 		} else if (platform === 'darwin') {
+ 			const shortcut = gulp.src('resources/darwin/bin/code.sh')
+ 				.pipe(rename('bin/code'));
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 47a0307f30b..27c14c84e7a 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.53.2
+version=1.54.1
 revision=1
 _electronver=9.4.1
 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=d83ec31b76815aaccb52ed10eb26a134563871f413ed21e8fe456ed89de500aa
+checksum=0afd83b04b5ab0c9f7b4cae6d10abc16ca2d36b9dabc3080734cf48a41ce5f7e
 patch_args="-Np1"
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: vscode: update to 1.54.1.
  2021-03-10 15:00 [PR PATCH] vscode: update to 1.54.1 shizonic
@ 2021-03-10 20:43 ` atk
  2021-03-10 21:00 ` [PR PATCH] [Merged]: " ericonr
  1 sibling, 0 replies; 3+ messages in thread
From: atk @ 2021-03-10 20:43 UTC (permalink / raw)
  To: ml

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

New comment by atk on void-packages repository

https://github.com/void-linux/void-packages/pull/29379#issuecomment-796071835

Comment:
I tested this build and it works for me, too.

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PR PATCH] [Merged]: vscode: update to 1.54.1.
  2021-03-10 15:00 [PR PATCH] vscode: update to 1.54.1 shizonic
  2021-03-10 20:43 ` atk
@ 2021-03-10 21:00 ` ericonr
  1 sibling, 0 replies; 3+ messages in thread
From: ericonr @ 2021-03-10 21:00 UTC (permalink / raw)
  To: ml

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

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

vscode: update to 1.54.1.
https://github.com/void-linux/void-packages/pull/29379

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] 3+ messages in thread

end of thread, other threads:[~2021-03-10 21:00 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-10 15:00 [PR PATCH] vscode: update to 1.54.1 shizonic
2021-03-10 20:43 ` atk
2021-03-10 21:00 ` [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).