From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] vscode: update to 1.40.0.
Date: Sun, 10 Nov 2019 08:14:28 +0100 [thread overview]
Message-ID: <20191110071428.KphPq-5TUWxjcbmiVDNUcs2bhmsoTD5AZDb5WUsaZKk@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-15382@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 325 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/15382
vscode: update to 1.40.0.
(ci skip)
A patch file from https://github.com/void-linux/void-packages/pull/15382.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vscode-15382.patch --]
[-- Type: text/x-diff, Size: 5640 bytes --]
From 330240401892d1f2de5a3041ac65cc8eac62ae95 Mon Sep 17 00:00:00 2001
From: Toby Merz <realtiaz@gmail.com>
Date: Sun, 10 Nov 2019 08:11:51 +0100
Subject: [PATCH] vscode: update to 1.40.0. (skip ci)
---
srcpkgs/vscode/patches/fix_dir.patch | 29 ++++++++++++++++++++--------
srcpkgs/vscode/patches/gulp.patch | 16 +++++++--------
srcpkgs/vscode/patches/product.patch | 14 +++++++-------
srcpkgs/vscode/template | 4 ++--
4 files changed, 38 insertions(+), 25 deletions(-)
diff --git a/srcpkgs/vscode/patches/fix_dir.patch b/srcpkgs/vscode/patches/fix_dir.patch
index 685e04f71d0..799f7ec9159 100644
--- a/srcpkgs/vscode/patches/fix_dir.patch
+++ b/srcpkgs/vscode/patches/fix_dir.patch
@@ -1,5 +1,5 @@
diff --git a/resources/linux/bin/code.sh b/resources/linux/bin/code.sh
-index 564f13ef95..0aa2b48fab 100755
+index 516c05e4ee08..bddc6f0cef22 100755
--- a/resources/linux/bin/code.sh
+++ b/resources/linux/bin/code.sh
@@ -35,7 +35,7 @@ else
@@ -10,24 +10,37 @@ index 564f13ef95..0aa2b48fab 100755
+ VSCODE_PATH="/usr/lib/@@NAME@@"
fi
fi
-
+
+diff --git a/resources/linux/code-url-handler.desktop b/resources/linux/code-url-handler.desktop
+index b85525fbd042..dc7617051b95 100644
+--- a/resources/linux/code-url-handler.desktop
++++ b/resources/linux/code-url-handler.desktop
+@@ -2,7 +2,7 @@
+ Name=@@NAME_LONG@@ - URL Handler
+ Comment=Code Editing. Redefined.
+ GenericName=Text Editor
+-Exec=@@EXEC@@ --no-sandbox --open-url %U
++Exec=/usr/lib/@@NAME@@/@@NAME@@ --no-sandbox --open-url %U
+ Icon=@@ICON@@
+ Type=Application
+ NoDisplay=true
diff --git a/resources/linux/code.desktop b/resources/linux/code.desktop
-index 1273bb2db7..eefe01f433 100644
+index b975e1094a2c..a094cc36e810 100644
--- a/resources/linux/code.desktop
+++ b/resources/linux/code.desktop
@@ -2,7 +2,7 @@
Name=@@NAME_LONG@@
Comment=Code Editing. Redefined.
GenericName=Text Editor
--Exec=@@EXEC@@ --unity-launch %F
-+Exec=/usr/lib/@@NAME@@/@@NAME@@ --unity-launch %F
+-Exec=@@EXEC@@ --no-sandbox --unity-launch %F
++Exec=/usr/lib/@@NAME@@/@@NAME@@ --no-sandbox --unity-launch %F
Icon=@@ICON@@
Type=Application
StartupNotify=false
@@ -14,5 +14,5 @@ Keywords=vscode;
-
+
[Desktop Action new-empty-window]
Name=New Empty Window
--Exec=@@EXEC@@ --new-window %F
-+Exec=/usr/lib/@@NAME@@/@@NAME@@ --new-window %F
+-Exec=@@EXEC@@ --no-sandbox --new-window %F
++Exec=/usr/lib/@@NAME@@/@@NAME@@ --no-sandbox --new-window %F
Icon=@@ICON@@
diff --git a/srcpkgs/vscode/patches/gulp.patch b/srcpkgs/vscode/patches/gulp.patch
index cb1e22fc2e5..daa7f9c3d24 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 090db00ffebb..0c54098d2601 100644
+index 93a943aba0be..5ab9be8c4bb5 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
-@@ -323,7 +323,15 @@ function packageTask(platform, arch, opts) {
- if (platform === 'win32') {
- all = es.merge(all, gulp.src(['resources/win32/code_file.ico', 'resources/win32/code_70x70.png', 'resources/win32/code_150x150.png'], { base: '.' }));
- } else if (platform === 'linux') {
+@@ -257,7 +257,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 090db00ffebb..0c54098d2601 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/patches/product.patch b/srcpkgs/vscode/patches/product.patch
index 58c7e9d6327..94e7c8de844 100644
--- a/srcpkgs/vscode/patches/product.patch
+++ b/srcpkgs/vscode/patches/product.patch
@@ -1,14 +1,14 @@
diff --git a/product.json b/product.json
-index eb6526c2d8f6..2d7088359f0b 100644
+index 759d76553339..6dccc0906900 100644
--- a/product.json
+++ b/product.json
-@@ -18,7 +18,15 @@
- "darwinBundleIdentifier": "com.visualstudio.code.oss",
- "reportIssueUrl": "https://github.com/Microsoft/vscode/issues/new",
- "urlProtocol": "code-oss",
+@@ -20,7 +20,15 @@
+ "licenseFileName": "LICENSE.txt",
+ "reportIssueUrl": "https://github.com/Microsoft/vscode/issues/new",
+ "urlProtocol": "code-oss",
+ "quality": "stable",
- "extensionAllowedProposedApi": [
- "ms-vscode.references-view"
+ "extensionAllowedProposedApi": [
+ "ms-vscode.references-view"
- ]
+ ],
+ "extensionsGallery": {
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index a428c44986a..94c17f40386 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
# Template file for 'vscode'
pkgname=vscode
-version=1.39.0
+version=1.40.0
revision=1
hostmakedepends="pkg-config python nodejs-lts yarn"
makedepends="libxkbfile-devel libsecret-devel"
@@ -10,7 +10,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
license="MIT"
homepage="https://code.visualstudio.com/"
distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=a2e3a718e3b10af4b4022315e35e6e144beea37b03deb3874054acbc9f86b514
+checksum=7fde41577334082b30b82cd9df5aa8c943ad1e99cff28ab095009c7fba4b6271
patch_args="-Np1"
# Due to electron
prev parent reply other threads:[~2019-11-10 7:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-12 8:28 [PR PATCH] vscode: update to 1.39.1 voidlinux-github
2019-10-17 6:40 ` [PR PATCH] [Updated] " voidlinux-github
2019-10-17 6:40 ` voidlinux-github
2019-10-17 6:40 ` voidlinux-github
2019-10-17 6:40 ` voidlinux-github
2019-11-10 7:12 ` [PR PATCH] [Updated] vscode: update to 1.39.2 voidlinux-github
2019-11-10 7:14 ` voidlinux-github [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191110071428.KphPq-5TUWxjcbmiVDNUcs2bhmsoTD5AZDb5WUsaZKk@z \
--to=voidlinux-github@inbox.vuxu.org \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).