Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] vscode: update to 1.60.1
@ 2021-09-14 19:11 atk
  2021-09-14 19:15 ` [PR PATCH] [Updated] " atk
                   ` (7 more replies)
  0 siblings, 8 replies; 9+ messages in thread
From: atk @ 2021-09-14 19:11 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.60.1
https://github.com/void-linux/void-packages/pull/32965

vscode: update to 1.60.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/32965.patch is attached

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

From db29fc2ea5eff07466738686598a868cfa3a9d5a Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Tue, 14 Sep 2021 21:10:43 +0200
Subject: [PATCH] vscode: update to 1.60.1

---
 srcpkgs/vscode/template | 84 ++++++++++++++++++++---------------------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index b747ed43effc..f0b95bdd69e9 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.60.0
+version=1.60.1
 revision=1
 _electronver=13.2.2
 hostmakedepends="pkg-config python nodejs yarn tar git"
@@ -11,10 +11,10 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=3f0cde58ab558cd227c61900222f4363589a81e4df2fac2bb2042229c90a7ee8
+checksum=c3c7f10c19b76465a63c6179762187e53ddf1f3cee85f82b2ec447c9b6e9407a
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
-	broken="FATAL ERROR: CALL_AND_RETRY_LAST Allocation failed - JavaScript heap out of memory"
+    broken="FATAL ERROR: CALL_AND_RETRY_LAST Allocation failed - JavaScript heap out of memory"
 fi
 
 # avoid downloading electron binaries for target platform; we use
@@ -22,49 +22,49 @@ fi
 export ELECTRON_SKIP_BINARY_DOWNLOAD=1
 
 do_configure() {
-	# Use yarn to install dependencies
-	echo "" > build/npm/preinstall.js
-
-	# redirect telemetry urls to 0.0.0.0
-	# src: vscodium/undo_telemetry.sh
-	_TELEMETRY_URLS="(dc\.services\.visualstudio\.com)|(vortex\.data\.microsoft\.com)"
-	_REPLACEMENT="s/$_TELEMETRY_URLS/0\.0\.0\.0/g"
-	grep -rl --exclude-dir=.git -E $_TELEMETRY_URLS | xargs sed -i -E $_REPLACEMENT
-
-	# set used electron version
-	sed -i "s/^target .*/target \"${_electronver}\"/" .yarnrc
+    # Use yarn to install dependencies
+    echo "" > build/npm/preinstall.js
+    
+    # redirect telemetry urls to 0.0.0.0
+    # src: vscodium/undo_telemetry.sh
+    _TELEMETRY_URLS="(dc\.services\.visualstudio\.com)|(vortex\.data\.microsoft\.com)"
+    _REPLACEMENT="s/$_TELEMETRY_URLS/0\.0\.0\.0/g"
+    grep -rl --exclude-dir=.git -E $_TELEMETRY_URLS | xargs sed -i -E $_REPLACEMENT
+    
+    # set used electron version
+    sed -i "s/^target .*/target \"${_electronver}\"/" .yarnrc
 }
 
 do_build() {
-	# The default memory limit may be too low for current versions of node
-	# to successfully build vscode.  This sets it to 4GB, but
-	# change this number if it still doesn't work for your system.
-	_mem_limit="--max_old_space_size=4095"
-
-	export NODE_OPTIONS="${_mem_limit}"
-	/usr/lib/node_modules/npm/bin/node-gyp-bin/node-gyp install \
-		--target=$_electronver \
-		--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
+    # The default memory limit may be too low for current versions of node
+    # to successfully build vscode.  This sets it to 4GB, but
+    # change this number if it still doesn't work for your system.
+    _mem_limit="--max_old_space_size=4095"
+    
+    export NODE_OPTIONS="${_mem_limit}"
+    /usr/lib/node_modules/npm/bin/node-gyp-bin/node-gyp install \
+    --target=$_electronver \
+    --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
 }
 
 do_install() {
-	vmkdir usr/lib/code-oss
-	vcopy ../VSCode-linux-x64/resources usr/lib/code-oss
-	vcopy ../VSCode-linux-x64/bin usr/lib/code-oss
-	vmkdir usr/bin
-	ln -sf /usr/lib/code-oss/bin/code-oss ${DESTDIR}/usr/bin/
-	vmkdir usr/share/applications
-	ln -sf /usr/lib/code-oss/resources/app/resources/linux/code.desktop ${DESTDIR}/usr/share/applications/code-oss.desktop
-	vmkdir usr/share/pixmaps
-	ln -sf /usr/lib/code-oss/resources/app/resources/linux/code.png ${DESTDIR}/usr/share/pixmaps/code-oss.png
-	ln -sf /usr/bin/rg ${DESTDIR}/usr/lib/code-oss/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg
-	vsed \
-		-e "s|ELECTRON=.*|ELECTRON=/usr/lib/electron${_electronver%%.*}/electron|g" \
-		-e 's|"$CLI"|"$CLI" --app="${VSCODE_PATH}/resources/app"|g' \
-		-i "$DESTDIR"/usr/lib/code-oss/bin/code-oss
-	vlicense LICENSE.txt
-	chmod -R o-w ${DESTDIR}/usr/lib/code-oss/resources/app/
+    vmkdir usr/lib/code-oss
+    vcopy ../VSCode-linux-x64/resources usr/lib/code-oss
+    vcopy ../VSCode-linux-x64/bin usr/lib/code-oss
+    vmkdir usr/bin
+    ln -sf /usr/lib/code-oss/bin/code-oss ${DESTDIR}/usr/bin/
+    vmkdir usr/share/applications
+    ln -sf /usr/lib/code-oss/resources/app/resources/linux/code.desktop ${DESTDIR}/usr/share/applications/code-oss.desktop
+    vmkdir usr/share/pixmaps
+    ln -sf /usr/lib/code-oss/resources/app/resources/linux/code.png ${DESTDIR}/usr/share/pixmaps/code-oss.png
+    ln -sf /usr/bin/rg ${DESTDIR}/usr/lib/code-oss/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg
+    vsed \
+    -e "s|ELECTRON=.*|ELECTRON=/usr/lib/electron${_electronver%%.*}/electron|g" \
+    -e 's|"$CLI"|"$CLI" --app="${VSCODE_PATH}/resources/app"|g' \
+    -i "$DESTDIR"/usr/lib/code-oss/bin/code-oss
+    vlicense LICENSE.txt
+    chmod -R o-w ${DESTDIR}/usr/lib/code-oss/resources/app/
 }

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

* Re: [PR PATCH] [Updated] vscode: update to 1.60.1
  2021-09-14 19:11 [PR PATCH] vscode: update to 1.60.1 atk
@ 2021-09-14 19:15 ` atk
  2021-09-14 19:18 ` atk
                   ` (6 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: atk @ 2021-09-14 19:15 UTC (permalink / raw)
  To: ml

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

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

https://github.com/atk/void-packages vscode-1.60.1
https://github.com/void-linux/void-packages/pull/32965

vscode: update to 1.60.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/32965.patch is attached

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

From afd9131c6e0f0fbbc6170bf915e204ba4d2ab99b Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Tue, 14 Sep 2021 21:10:43 +0200
Subject: [PATCH] vscode: update to 1.60.1

---
 srcpkgs/vscode/template | 78 ++++++++++++++++++++---------------------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index b747ed43effc..e6b44ac269d5 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.60.0
+version=1.60.1
 revision=1
 _electronver=13.2.2
 hostmakedepends="pkg-config python nodejs yarn tar git"
@@ -11,10 +11,10 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=3f0cde58ab558cd227c61900222f4363589a81e4df2fac2bb2042229c90a7ee8
+checksum=c3c7f10c19b76465a63c6179762187e53ddf1f3cee85f82b2ec447c9b6e9407a
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
-	broken="FATAL ERROR: CALL_AND_RETRY_LAST Allocation failed - JavaScript heap out of memory"
+    broken="FATAL ERROR: CALL_AND_RETRY_LAST Allocation failed - JavaScript heap out of memory"
 fi
 
 # avoid downloading electron binaries for target platform; we use
@@ -22,49 +22,49 @@ fi
 export ELECTRON_SKIP_BINARY_DOWNLOAD=1
 
 do_configure() {
-	# Use yarn to install dependencies
-	echo "" > build/npm/preinstall.js
+    # Use yarn to install dependencies
+    echo "" > build/npm/preinstall.js
 
-	# redirect telemetry urls to 0.0.0.0
-	# src: vscodium/undo_telemetry.sh
-	_TELEMETRY_URLS="(dc\.services\.visualstudio\.com)|(vortex\.data\.microsoft\.com)"
-	_REPLACEMENT="s/$_TELEMETRY_URLS/0\.0\.0\.0/g"
-	grep -rl --exclude-dir=.git -E $_TELEMETRY_URLS | xargs sed -i -E $_REPLACEMENT
+    # redirect telemetry urls to 0.0.0.0
+    # src: vscodium/undo_telemetry.sh
+    _TELEMETRY_URLS="(dc\.services\.visualstudio\.com)|(vortex\.data\.microsoft\.com)"
+    _REPLACEMENT="s/$_TELEMETRY_URLS/0\.0\.0\.0/g"
+    grep -rl --exclude-dir=.git -E $_TELEMETRY_URLS | xargs sed -i -E $_REPLACEMENT
 
-	# set used electron version
-	sed -i "s/^target .*/target \"${_electronver}\"/" .yarnrc
+    # set used electron version
+    sed -i "s/^target .*/target \"${_electronver}\"/" .yarnrc
 }
 
 do_build() {
-	# The default memory limit may be too low for current versions of node
-	# to successfully build vscode.  This sets it to 4GB, but
-	# change this number if it still doesn't work for your system.
-	_mem_limit="--max_old_space_size=4095"
+    # The default memory limit may be too low for current versions of node
+    # to successfully build vscode.  This sets it to 4GB, but
+    # change this number if it still doesn't work for your system.
+    _mem_limit="--max_old_space_size=4095"
 
-	export NODE_OPTIONS="${_mem_limit}"
-	/usr/lib/node_modules/npm/bin/node-gyp-bin/node-gyp install \
-		--target=$_electronver \
-		--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
+    export NODE_OPTIONS="${_mem_limit}"
+    /usr/lib/node_modules/npm/bin/node-gyp-bin/node-gyp install \
+    --target=$_electronver \
+    --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
 }
 
 do_install() {
-	vmkdir usr/lib/code-oss
-	vcopy ../VSCode-linux-x64/resources usr/lib/code-oss
-	vcopy ../VSCode-linux-x64/bin usr/lib/code-oss
-	vmkdir usr/bin
-	ln -sf /usr/lib/code-oss/bin/code-oss ${DESTDIR}/usr/bin/
-	vmkdir usr/share/applications
-	ln -sf /usr/lib/code-oss/resources/app/resources/linux/code.desktop ${DESTDIR}/usr/share/applications/code-oss.desktop
-	vmkdir usr/share/pixmaps
-	ln -sf /usr/lib/code-oss/resources/app/resources/linux/code.png ${DESTDIR}/usr/share/pixmaps/code-oss.png
-	ln -sf /usr/bin/rg ${DESTDIR}/usr/lib/code-oss/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg
-	vsed \
-		-e "s|ELECTRON=.*|ELECTRON=/usr/lib/electron${_electronver%%.*}/electron|g" \
-		-e 's|"$CLI"|"$CLI" --app="${VSCODE_PATH}/resources/app"|g' \
-		-i "$DESTDIR"/usr/lib/code-oss/bin/code-oss
-	vlicense LICENSE.txt
-	chmod -R o-w ${DESTDIR}/usr/lib/code-oss/resources/app/
+    vmkdir usr/lib/code-oss
+    vcopy ../VSCode-linux-x64/resources usr/lib/code-oss
+    vcopy ../VSCode-linux-x64/bin usr/lib/code-oss
+    vmkdir usr/bin
+    ln -sf /usr/lib/code-oss/bin/code-oss ${DESTDIR}/usr/bin/
+    vmkdir usr/share/applications
+    ln -sf /usr/lib/code-oss/resources/app/resources/linux/code.desktop ${DESTDIR}/usr/share/applications/code-oss.desktop
+    vmkdir usr/share/pixmaps
+    ln -sf /usr/lib/code-oss/resources/app/resources/linux/code.png ${DESTDIR}/usr/share/pixmaps/code-oss.png
+    ln -sf /usr/bin/rg ${DESTDIR}/usr/lib/code-oss/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg
+    vsed \
+    -e "s|ELECTRON=.*|ELECTRON=/usr/lib/electron${_electronver%%.*}/electron|g" \
+    -e 's|"$CLI"|"$CLI" --app="${VSCODE_PATH}/resources/app"|g' \
+    -i "$DESTDIR"/usr/lib/code-oss/bin/code-oss
+    vlicense LICENSE.txt
+    chmod -R o-w ${DESTDIR}/usr/lib/code-oss/resources/app/
 }

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

* Re: [PR PATCH] [Updated] vscode: update to 1.60.1
  2021-09-14 19:11 [PR PATCH] vscode: update to 1.60.1 atk
  2021-09-14 19:15 ` [PR PATCH] [Updated] " atk
@ 2021-09-14 19:18 ` atk
  2021-09-14 19:20 ` [PR REVIEW] " ericonr
                   ` (5 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: atk @ 2021-09-14 19:18 UTC (permalink / raw)
  To: ml

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

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

https://github.com/atk/void-packages vscode-1.60.1
https://github.com/void-linux/void-packages/pull/32965

vscode: update to 1.60.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/32965.patch is attached

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

From f93deca5efd765034a72401b0f246e60caf1efa7 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Tue, 14 Sep 2021 21:10:43 +0200
Subject: [PATCH] vscode: update to 1.60.1

---
 srcpkgs/vscode/template | 78 ++++++++++++++++++++---------------------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index b747ed43effc..e6b44ac269d5 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.60.0
+version=1.60.1
 revision=1
 _electronver=13.2.2
 hostmakedepends="pkg-config python nodejs yarn tar git"
@@ -11,10 +11,10 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=3f0cde58ab558cd227c61900222f4363589a81e4df2fac2bb2042229c90a7ee8
+checksum=c3c7f10c19b76465a63c6179762187e53ddf1f3cee85f82b2ec447c9b6e9407a
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
-	broken="FATAL ERROR: CALL_AND_RETRY_LAST Allocation failed - JavaScript heap out of memory"
+    broken="FATAL ERROR: CALL_AND_RETRY_LAST Allocation failed - JavaScript heap out of memory"
 fi
 
 # avoid downloading electron binaries for target platform; we use
@@ -22,49 +22,49 @@ fi
 export ELECTRON_SKIP_BINARY_DOWNLOAD=1
 
 do_configure() {
-	# Use yarn to install dependencies
-	echo "" > build/npm/preinstall.js
+    # Use yarn to install dependencies
+    echo "" > build/npm/preinstall.js
 
-	# redirect telemetry urls to 0.0.0.0
-	# src: vscodium/undo_telemetry.sh
-	_TELEMETRY_URLS="(dc\.services\.visualstudio\.com)|(vortex\.data\.microsoft\.com)"
-	_REPLACEMENT="s/$_TELEMETRY_URLS/0\.0\.0\.0/g"
-	grep -rl --exclude-dir=.git -E $_TELEMETRY_URLS | xargs sed -i -E $_REPLACEMENT
+    # redirect telemetry urls to 0.0.0.0
+    # src: vscodium/undo_telemetry.sh
+    _TELEMETRY_URLS="(dc\.services\.visualstudio\.com)|(vortex\.data\.microsoft\.com)"
+    _REPLACEMENT="s/$_TELEMETRY_URLS/0\.0\.0\.0/g"
+    grep -rl --exclude-dir=.git -E $_TELEMETRY_URLS | xargs sed -i -E $_REPLACEMENT
 
-	# set used electron version
-	sed -i "s/^target .*/target \"${_electronver}\"/" .yarnrc
+    # set used electron version
+    sed -i "s/^target .*/target \"${_electronver}\"/" .yarnrc
 }
 
 do_build() {
-	# The default memory limit may be too low for current versions of node
-	# to successfully build vscode.  This sets it to 4GB, but
-	# change this number if it still doesn't work for your system.
-	_mem_limit="--max_old_space_size=4095"
+    # The default memory limit may be too low for current versions of node
+    # to successfully build vscode.  This sets it to 4GB, but
+    # change this number if it still doesn't work for your system.
+    _mem_limit="--max_old_space_size=4095"
 
-	export NODE_OPTIONS="${_mem_limit}"
-	/usr/lib/node_modules/npm/bin/node-gyp-bin/node-gyp install \
-		--target=$_electronver \
-		--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
+    export NODE_OPTIONS="${_mem_limit}"
+    /usr/lib/node_modules/npm/bin/node-gyp-bin/node-gyp install \
+    --target=$_electronver \
+    --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
 }
 
 do_install() {
-	vmkdir usr/lib/code-oss
-	vcopy ../VSCode-linux-x64/resources usr/lib/code-oss
-	vcopy ../VSCode-linux-x64/bin usr/lib/code-oss
-	vmkdir usr/bin
-	ln -sf /usr/lib/code-oss/bin/code-oss ${DESTDIR}/usr/bin/
-	vmkdir usr/share/applications
-	ln -sf /usr/lib/code-oss/resources/app/resources/linux/code.desktop ${DESTDIR}/usr/share/applications/code-oss.desktop
-	vmkdir usr/share/pixmaps
-	ln -sf /usr/lib/code-oss/resources/app/resources/linux/code.png ${DESTDIR}/usr/share/pixmaps/code-oss.png
-	ln -sf /usr/bin/rg ${DESTDIR}/usr/lib/code-oss/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg
-	vsed \
-		-e "s|ELECTRON=.*|ELECTRON=/usr/lib/electron${_electronver%%.*}/electron|g" \
-		-e 's|"$CLI"|"$CLI" --app="${VSCODE_PATH}/resources/app"|g' \
-		-i "$DESTDIR"/usr/lib/code-oss/bin/code-oss
-	vlicense LICENSE.txt
-	chmod -R o-w ${DESTDIR}/usr/lib/code-oss/resources/app/
+    vmkdir usr/lib/code-oss
+    vcopy ../VSCode-linux-x64/resources usr/lib/code-oss
+    vcopy ../VSCode-linux-x64/bin usr/lib/code-oss
+    vmkdir usr/bin
+    ln -sf /usr/lib/code-oss/bin/code-oss ${DESTDIR}/usr/bin/
+    vmkdir usr/share/applications
+    ln -sf /usr/lib/code-oss/resources/app/resources/linux/code.desktop ${DESTDIR}/usr/share/applications/code-oss.desktop
+    vmkdir usr/share/pixmaps
+    ln -sf /usr/lib/code-oss/resources/app/resources/linux/code.png ${DESTDIR}/usr/share/pixmaps/code-oss.png
+    ln -sf /usr/bin/rg ${DESTDIR}/usr/lib/code-oss/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg
+    vsed \
+    -e "s|ELECTRON=.*|ELECTRON=/usr/lib/electron${_electronver%%.*}/electron|g" \
+    -e 's|"$CLI"|"$CLI" --app="${VSCODE_PATH}/resources/app"|g' \
+    -i "$DESTDIR"/usr/lib/code-oss/bin/code-oss
+    vlicense LICENSE.txt
+    chmod -R o-w ${DESTDIR}/usr/lib/code-oss/resources/app/
 }

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

* Re: [PR REVIEW] vscode: update to 1.60.1
  2021-09-14 19:11 [PR PATCH] vscode: update to 1.60.1 atk
  2021-09-14 19:15 ` [PR PATCH] [Updated] " atk
  2021-09-14 19:18 ` atk
@ 2021-09-14 19:20 ` ericonr
  2021-09-14 19:21 ` ericonr
                   ` (4 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: ericonr @ 2021-09-14 19:20 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32965#discussion_r708563632

Comment:
Please revert indentation change, it should be tab.

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

* Re: [PR REVIEW] vscode: update to 1.60.1
  2021-09-14 19:11 [PR PATCH] vscode: update to 1.60.1 atk
                   ` (2 preceding siblings ...)
  2021-09-14 19:20 ` [PR REVIEW] " ericonr
@ 2021-09-14 19:21 ` ericonr
  2021-09-14 19:23 ` paper42
                   ` (3 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: ericonr @ 2021-09-14 19:21 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32965#discussion_r708563881

Comment:
And really in all other places, I think your editor had a field day :p

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

* Re: vscode: update to 1.60.1
  2021-09-14 19:11 [PR PATCH] vscode: update to 1.60.1 atk
                   ` (3 preceding siblings ...)
  2021-09-14 19:21 ` ericonr
@ 2021-09-14 19:23 ` paper42
  2021-09-14 19:23 ` [PR PATCH] [Updated] " atk
                   ` (2 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: paper42 @ 2021-09-14 19:23 UTC (permalink / raw)
  To: ml

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32965#issuecomment-919448240

Comment:
Could you add the email you are using for commits to your GitHub profile? GitHub will then be able to properly link your profile from the commit.

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

* Re: [PR PATCH] [Updated] vscode: update to 1.60.1
  2021-09-14 19:11 [PR PATCH] vscode: update to 1.60.1 atk
                   ` (4 preceding siblings ...)
  2021-09-14 19:23 ` paper42
@ 2021-09-14 19:23 ` atk
  2021-09-14 19:25 ` [PR REVIEW] " atk
  2021-09-14 19:33 ` atk
  7 siblings, 0 replies; 9+ messages in thread
From: atk @ 2021-09-14 19:23 UTC (permalink / raw)
  To: ml

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

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

https://github.com/atk/void-packages vscode-1.60.1
https://github.com/void-linux/void-packages/pull/32965

vscode: update to 1.60.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/32965.patch is attached

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

From b2f3cb171d1956ec132017c2b30d8a67439fb285 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Tue, 14 Sep 2021 21:10:43 +0200
Subject: [PATCH] vscode: update to 1.60.1

---
 srcpkgs/vscode/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index b747ed43effc..653fc69a7ac6 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.60.0
+version=1.60.1
 revision=1
 _electronver=13.2.2
 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=3f0cde58ab558cd227c61900222f4363589a81e4df2fac2bb2042229c90a7ee8
+checksum=c3c7f10c19b76465a63c6179762187e53ddf1f3cee85f82b2ec447c9b6e9407a
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	broken="FATAL ERROR: CALL_AND_RETRY_LAST Allocation failed - JavaScript heap out of memory"
@@ -43,8 +43,8 @@ do_build() {
 
 	export NODE_OPTIONS="${_mem_limit}"
 	/usr/lib/node_modules/npm/bin/node-gyp-bin/node-gyp install \
-		--target=$_electronver \
-		--tarball=/usr/include/electron${_electronver%%.*}/node_headers.tar.gz
+	--target=$_electronver \
+	--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
@@ -62,9 +62,9 @@ do_install() {
 	ln -sf /usr/lib/code-oss/resources/app/resources/linux/code.png ${DESTDIR}/usr/share/pixmaps/code-oss.png
 	ln -sf /usr/bin/rg ${DESTDIR}/usr/lib/code-oss/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg
 	vsed \
-		-e "s|ELECTRON=.*|ELECTRON=/usr/lib/electron${_electronver%%.*}/electron|g" \
-		-e 's|"$CLI"|"$CLI" --app="${VSCODE_PATH}/resources/app"|g' \
-		-i "$DESTDIR"/usr/lib/code-oss/bin/code-oss
+	-e "s|ELECTRON=.*|ELECTRON=/usr/lib/electron${_electronver%%.*}/electron|g" \
+	-e 's|"$CLI"|"$CLI" --app="${VSCODE_PATH}/resources/app"|g' \
+	-i "$DESTDIR"/usr/lib/code-oss/bin/code-oss
 	vlicense LICENSE.txt
 	chmod -R o-w ${DESTDIR}/usr/lib/code-oss/resources/app/
 }

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

* Re: [PR REVIEW] vscode: update to 1.60.1
  2021-09-14 19:11 [PR PATCH] vscode: update to 1.60.1 atk
                   ` (5 preceding siblings ...)
  2021-09-14 19:23 ` [PR PATCH] [Updated] " atk
@ 2021-09-14 19:25 ` atk
  2021-09-14 19:33 ` atk
  7 siblings, 0 replies; 9+ messages in thread
From: atk @ 2021-09-14 19:25 UTC (permalink / raw)
  To: ml

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

New review comment by atk on void-packages repository

https://github.com/void-linux/void-packages/pull/32965#discussion_r708566789

Comment:
Just did it. The new version turned the autoformatter on by default, it seems.

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

* Re: vscode: update to 1.60.1
  2021-09-14 19:11 [PR PATCH] vscode: update to 1.60.1 atk
                   ` (6 preceding siblings ...)
  2021-09-14 19:25 ` [PR REVIEW] " atk
@ 2021-09-14 19:33 ` atk
  7 siblings, 0 replies; 9+ messages in thread
From: atk @ 2021-09-14 19:33 UTC (permalink / raw)
  To: ml

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

New comment by atk on void-packages repository

https://github.com/void-linux/void-packages/pull/32965#issuecomment-919454073

Comment:
> Could you add the email you are using for commits to your GitHub profile? GitHub will then be able to properly link your profile from the commit.

Did it for the next commit.

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

end of thread, other threads:[~2021-09-14 19:33 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-14 19:11 [PR PATCH] vscode: update to 1.60.1 atk
2021-09-14 19:15 ` [PR PATCH] [Updated] " atk
2021-09-14 19:18 ` atk
2021-09-14 19:20 ` [PR REVIEW] " ericonr
2021-09-14 19:21 ` ericonr
2021-09-14 19:23 ` paper42
2021-09-14 19:23 ` [PR PATCH] [Updated] " atk
2021-09-14 19:25 ` [PR REVIEW] " atk
2021-09-14 19:33 ` atk

Github messages for voidlinux

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://inbox.vuxu.org/voidlinux-github

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 voidlinux-github voidlinux-github/ https://inbox.vuxu.org/voidlinux-github \
		voidlinux-github@inbox.vuxu.org
	public-inbox-index voidlinux-github

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.github.voidlinux


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git