Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] vscode: update to 1.49.1 + switch to electron9. [ci skip]
@ 2020-09-18  7:52 shizonic
  2020-09-18  8:00 ` [PR PATCH] [Updated] " shizonic
                   ` (6 more replies)
  0 siblings, 7 replies; 8+ messages in thread
From: shizonic @ 2020-09-18  7:52 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 343 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/24962

vscode: update to 1.49.1 + switch to electron9. [ci skip]


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

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

From 27fcc2063491a05b6615bca9d44197d78bc63830 Mon Sep 17 00:00:00 2001
From: Toby Merz <realtiaz@gmail.com>
Date: Fri, 18 Sep 2020 09:49:09 +0200
Subject: [PATCH] vscode: update to 1.49.1 + switch to electron9. [ci skip]

---
 srcpkgs/vscode/template | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index d7bf0acd83f..12127321b85 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,18 +1,17 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.49.0
+version=1.49.1
 revision=1
-# XXX: please update to electron9 next time you rebuild this package
-_electronver=7.3.3
+_electronver=9.2.1
 hostmakedepends="pkg-config python nodejs-lts-10 yarn tar git"
-makedepends="libxkbfile-devel libsecret-devel electron7"
+makedepends="libxkbfile-devel libsecret-devel electron9"
 depends="libXtst libxkbfile nss dejavu-fonts-ttf xdg-utils ripgrep electron7"
 short_desc="Microsoft Code for Linux"
 maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=b296569db14fadce08a5743a0f6628637fffb817376eb76b5c5d67fb588de29e
+checksum=0fb3829c19db0bea17cf0fd83859ff8f9aef0d092cad4abe2a4d1b26c985b628
 patch_args="-Np1"
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
@@ -46,7 +45,7 @@ do_build() {
 	export NODE_OPTIONS="${_mem_limit}"
 	/usr/lib/node_modules/npm/bin/node-gyp-bin/node-gyp install \
 		--target=$_electronver \
-		--tarball=/usr/include/electron7/node_headers.tar.gz
+		--tarball=/usr/include/electron9/node_headers.tar.gz
 	yarn install --ignore-engines --frozen-lockfile --arch=x64
 	export CFLAGS="$CFLAGS -I/usr/include/node"
 	yarn run gulp vscode-linux-x64-min

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

* Re: [PR PATCH] [Updated] vscode: update to 1.49.1 + switch to electron9. [ci skip]
  2020-09-18  7:52 [PR PATCH] vscode: update to 1.49.1 + switch to electron9. [ci skip] shizonic
@ 2020-09-18  8:00 ` shizonic
  2020-09-19  2:46 ` [PR REVIEW] " fosslinux
                   ` (5 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: shizonic @ 2020-09-18  8:00 UTC (permalink / raw)
  To: ml

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

There is an updated 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/24962

vscode: update to 1.49.1 + switch to electron9. [ci skip]


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

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

From d00427fcd5572ec9522fc9dca1bed931871e9a9e Mon Sep 17 00:00:00 2001
From: Toby Merz <realtiaz@gmail.com>
Date: Fri, 18 Sep 2020 09:49:09 +0200
Subject: [PATCH] vscode: update to 1.49.1 + switch to electron9. [ci skip]

---
 srcpkgs/vscode/template | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index d7bf0acd83f..e790e4c830f 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,27 +1,26 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.49.0
+version=1.49.1
 revision=1
-# XXX: please update to electron9 next time you rebuild this package
-_electronver=7.3.3
+_electronver=9.2.1
 hostmakedepends="pkg-config python nodejs-lts-10 yarn tar git"
-makedepends="libxkbfile-devel libsecret-devel electron7"
+makedepends="libxkbfile-devel libsecret-devel electron9"
 depends="libXtst libxkbfile nss dejavu-fonts-ttf xdg-utils ripgrep electron7"
 short_desc="Microsoft Code for Linux"
 maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=b296569db14fadce08a5743a0f6628637fffb817376eb76b5c5d67fb588de29e
+checksum=0fb3829c19db0bea17cf0fd83859ff8f9aef0d092cad4abe2a4d1b26c985b628
 patch_args="-Np1"
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	broken="FATAL ERROR: CALL_AND_RETRY_LAST Allocation failed - JavaScript heap out of memory"
 fi
 
-+# avoid downloading electron binaries for target platform; we use
-+# the system electron, and downloading does not work for all archs
-+export ELECTRON_SKIP_BINARY_DOWNLOAD=1
+# avoid downloading electron binaries for target platform; we use
+# the system electron, and downloading does not work for all archs
+export ELECTRON_SKIP_BINARY_DOWNLOAD=1
 
 do_configure() {
 	# Use yarn to install dependencies
@@ -46,7 +45,7 @@ do_build() {
 	export NODE_OPTIONS="${_mem_limit}"
 	/usr/lib/node_modules/npm/bin/node-gyp-bin/node-gyp install \
 		--target=$_electronver \
-		--tarball=/usr/include/electron7/node_headers.tar.gz
+		--tarball=/usr/include/electron9/node_headers.tar.gz
 	yarn install --ignore-engines --frozen-lockfile --arch=x64
 	export CFLAGS="$CFLAGS -I/usr/include/node"
 	yarn run gulp vscode-linux-x64-min

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

* Re: [PR REVIEW] vscode: update to 1.49.1 + switch to electron9. [ci skip]
  2020-09-18  7:52 [PR PATCH] vscode: update to 1.49.1 + switch to electron9. [ci skip] shizonic
  2020-09-18  8:00 ` [PR PATCH] [Updated] " shizonic
@ 2020-09-19  2:46 ` fosslinux
  2020-09-19  3:37 ` shizonic
                   ` (4 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: fosslinux @ 2020-09-19  2:46 UTC (permalink / raw)
  To: ml

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

New review comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/24962#discussion_r491259371

Comment:
I think this could be programatically set, `"${_electronver%%.*}` i think

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

* Re: [PR REVIEW] vscode: update to 1.49.1 + switch to electron9. [ci skip]
  2020-09-18  7:52 [PR PATCH] vscode: update to 1.49.1 + switch to electron9. [ci skip] shizonic
  2020-09-18  8:00 ` [PR PATCH] [Updated] " shizonic
  2020-09-19  2:46 ` [PR REVIEW] " fosslinux
@ 2020-09-19  3:37 ` shizonic
  2020-09-20 13:56 ` Johnnynator
                   ` (3 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: shizonic @ 2020-09-19  3:37 UTC (permalink / raw)
  To: ml

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

New review comment by shizonic on void-packages repository

https://github.com/void-linux/void-packages/pull/24962#discussion_r491263707

Comment:
Absolutely. Thx. Gonna update this ASAP.

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

* Re: [PR REVIEW] vscode: update to 1.49.1 + switch to electron9. [ci skip]
  2020-09-18  7:52 [PR PATCH] vscode: update to 1.49.1 + switch to electron9. [ci skip] shizonic
                   ` (2 preceding siblings ...)
  2020-09-19  3:37 ` shizonic
@ 2020-09-20 13:56 ` Johnnynator
  2020-09-20 15:34 ` Johnnynator
                   ` (2 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: Johnnynator @ 2020-09-20 13:56 UTC (permalink / raw)
  To: ml

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

New review comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/24962#discussion_r491694066

Comment:
```suggestion
depends="libXtst libxkbfile nss dejavu-fonts-ttf xdg-utils ripgrep electron9"
```
You forgot to update the runtime dep.

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

* Re: [PR REVIEW] vscode: update to 1.49.1 + switch to electron9. [ci skip]
  2020-09-18  7:52 [PR PATCH] vscode: update to 1.49.1 + switch to electron9. [ci skip] shizonic
                   ` (3 preceding siblings ...)
  2020-09-20 13:56 ` Johnnynator
@ 2020-09-20 15:34 ` Johnnynator
  2020-09-21  7:13 ` [PR PATCH] [Updated] " shizonic
  2020-09-21 16:06 ` [PR PATCH] [Merged]: " Johnnynator
  6 siblings, 0 replies; 8+ messages in thread
From: Johnnynator @ 2020-09-20 15:34 UTC (permalink / raw)
  To: ml

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

New review comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/24962#discussion_r491702798

Comment:
You could also only specify the major version as variable and read the full version from `/usr/lib/electron${electon_major}/version`

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

* Re: [PR PATCH] [Updated] vscode: update to 1.49.1 + switch to electron9. [ci skip]
  2020-09-18  7:52 [PR PATCH] vscode: update to 1.49.1 + switch to electron9. [ci skip] shizonic
                   ` (4 preceding siblings ...)
  2020-09-20 15:34 ` Johnnynator
@ 2020-09-21  7:13 ` shizonic
  2020-09-21 16:06 ` [PR PATCH] [Merged]: " Johnnynator
  6 siblings, 0 replies; 8+ messages in thread
From: shizonic @ 2020-09-21  7:13 UTC (permalink / raw)
  To: ml

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

There is an updated 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/24962

vscode: update to 1.49.1 + switch to electron9. [ci skip]


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

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

From 233943d51708dbaab805af44197ff90809a65184 Mon Sep 17 00:00:00 2001
From: Toby Merz <realtiaz@gmail.com>
Date: Fri, 18 Sep 2020 09:49:09 +0200
Subject: [PATCH] vscode: update to 1.49.1 + switch to electron9. [ci skip]

---
 srcpkgs/vscode/template | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index d7bf0acd83f..267433ca6f3 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,27 +1,26 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.49.0
+version=1.49.1
 revision=1
-# XXX: please update to electron9 next time you rebuild this package
-_electronver=7.3.3
+_electronver=9.2.1
 hostmakedepends="pkg-config python nodejs-lts-10 yarn tar git"
-makedepends="libxkbfile-devel libsecret-devel electron7"
-depends="libXtst libxkbfile nss dejavu-fonts-ttf xdg-utils ripgrep electron7"
+makedepends="libxkbfile-devel libsecret-devel electron9"
+depends="libXtst libxkbfile nss dejavu-fonts-ttf xdg-utils ripgrep electron9"
 short_desc="Microsoft Code for Linux"
 maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=b296569db14fadce08a5743a0f6628637fffb817376eb76b5c5d67fb588de29e
+checksum=0fb3829c19db0bea17cf0fd83859ff8f9aef0d092cad4abe2a4d1b26c985b628
 patch_args="-Np1"
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	broken="FATAL ERROR: CALL_AND_RETRY_LAST Allocation failed - JavaScript heap out of memory"
 fi
 
-+# avoid downloading electron binaries for target platform; we use
-+# the system electron, and downloading does not work for all archs
-+export ELECTRON_SKIP_BINARY_DOWNLOAD=1
+# avoid downloading electron binaries for target platform; we use
+# the system electron, and downloading does not work for all archs
+export ELECTRON_SKIP_BINARY_DOWNLOAD=1
 
 do_configure() {
 	# Use yarn to install dependencies
@@ -46,7 +45,7 @@ do_build() {
 	export NODE_OPTIONS="${_mem_limit}"
 	/usr/lib/node_modules/npm/bin/node-gyp-bin/node-gyp install \
 		--target=$_electronver \
-		--tarball=/usr/include/electron7/node_headers.tar.gz
+		--tarball=/usr/include/electron${_electronver%%.*}/node_headers.tar.gz
 	yarn install --ignore-engines --frozen-lockfile --arch=x64
 	export CFLAGS="$CFLAGS -I/usr/include/node"
 	yarn run gulp vscode-linux-x64-min

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

* Re: [PR PATCH] [Merged]: vscode: update to 1.49.1 + switch to electron9. [ci skip]
  2020-09-18  7:52 [PR PATCH] vscode: update to 1.49.1 + switch to electron9. [ci skip] shizonic
                   ` (5 preceding siblings ...)
  2020-09-21  7:13 ` [PR PATCH] [Updated] " shizonic
@ 2020-09-21 16:06 ` Johnnynator
  6 siblings, 0 replies; 8+ messages in thread
From: Johnnynator @ 2020-09-21 16:06 UTC (permalink / raw)
  To: ml

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

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

vscode: update to 1.49.1 + switch to electron9. [ci skip]
https://github.com/void-linux/void-packages/pull/24962

Description:


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

end of thread, other threads:[~2020-09-21 16:06 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-18  7:52 [PR PATCH] vscode: update to 1.49.1 + switch to electron9. [ci skip] shizonic
2020-09-18  8:00 ` [PR PATCH] [Updated] " shizonic
2020-09-19  2:46 ` [PR REVIEW] " fosslinux
2020-09-19  3:37 ` shizonic
2020-09-20 13:56 ` Johnnynator
2020-09-20 15:34 ` Johnnynator
2020-09-21  7:13 ` [PR PATCH] [Updated] " shizonic
2020-09-21 16:06 ` [PR PATCH] [Merged]: " Johnnynator

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).