Massimiliano Torromeo pushed to branch main at Arch Linux / Packaging / 
Packages / code


Commits:
e7e11eb5 by Massimiliano Torromeo at 2023-09-28T14:57:29+02:00
upgpkg: 1.82.2-3: Fixed command line argument parsing (FS#79744) and support 
for the --disable-features flag (FS#79797)

- - - - -


3 changed files:

- + .SRCINFO
- PKGBUILD
- code.js


Changes:

=====================================
.SRCINFO
=====================================
@@ -0,0 +1,37 @@
+pkgbase = code
+       pkgdesc = The Open Source build of Visual Studio Code (vscode) editor
+       pkgver = 1.82.2
+       pkgrel = 3
+       url = https://github.com/microsoft/vscode
+       arch = x86_64
+       license = MIT
+       makedepends = git
+       makedepends = gulp
+       makedepends = npm
+       makedepends = python
+       makedepends = yarn
+       makedepends = nodejs-lts-hydrogen
+       makedepends = desktop-file-utils
+       depends = electron25
+       depends = libsecret
+       depends = libx11
+       depends = libxkbfile
+       depends = ripgrep
+       optdepends = bash-completion: Bash completions
+       optdepends = zsh-completions: ZSH completitons
+       optdepends = x11-ssh-askpass: SSH authentication
+       provides = vscode
+       source = code::git+https://github.com/microsoft/vscode.git#tag=1.82.2
+       source = 
https://patch-diff.githubusercontent.com/raw/microsoft/vscode/pull/193795/code-disable-features.patch
+       source = code.js
+       source = code.sh
+       source = product_json.diff
+       source = clipath.patch
+       sha512sums = SKIP
+       sha512sums = 
e0619f22771f5bf9d1a567e1be63c318c7a783e21621d3eff0766caf01f2882b23bd6c4c273319035ae9495700f0aad643e658f1eee92728815b6b7800471ba0
+       sha512sums = 
c8a3528f88a198e45c8c201940c55a56f1344f0d0d5352cf04348d083027d828f42f1a76b82cb595d3372f7d62859e3b64e3109d5fedf8f97c7b517415df9ad5
+       sha512sums = 
425fbb7588020c2fce15d9be43e34f57ea0de327ebdf7693dc90d2b24a86df67bbc1ddfd7224e8579c17d0f34ad3cbfaacbf0e2044685a356e0cb662c0e1a2d0
+       sha512sums = 
b1aa0d7c5b3e3e8ba1172822d75ea38e90efc431b270e0b4ca9e45bf9c0be0f60922c8618969ef071b5b6dbd9ac9f030294f1bf49bcc28c187b46d113dca63a7
+       sha512sums = 
9809c9719b04c00d46477e2786a64ec40867096d287d68c97b31a881545e734d4f97d73c7c75e8fc0727f288ef696d169bbaf989a0cb9f8d5c8e2f045b89c60f
+
+pkgname = code


=====================================
PKGBUILD
=====================================
@@ -8,7 +8,7 @@ pkgdesc='The Open Source build of Visual Studio Code (vscode) 
editor'
 # Important: Remember to check 
https://github.com/microsoft/vscode/blob/master/.yarnrc (choose correct tag) 
for target electron version
 _electron=electron25
 pkgver=1.82.2
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 url='https://github.com/microsoft/vscode'
 license=('MIT')
@@ -19,12 +19,14 @@ optdepends=('bash-completion: Bash completions'
 makedepends=('git' 'gulp' 'npm' 'python' 'yarn' 'nodejs-lts-hydrogen' 
'desktop-file-utils')
 provides=('vscode')
 source=("$pkgname::git+$url.git#tag=$pkgver"
+        
'https://patch-diff.githubusercontent.com/raw/microsoft/vscode/pull/193795/code-disable-features.patch'
         'code.js'
         'code.sh'
         'product_json.diff'
         'clipath.patch')
 sha512sums=('SKIP'
-            
'6e8ee1df4dd982434a8295ca99e786a536457c86c34212546e548b115081798c5492a79f99cd5a3f1fa30fb71d29983aaabc2c79f4895d4a709d8354e9e2eade'
+            
'e0619f22771f5bf9d1a567e1be63c318c7a783e21621d3eff0766caf01f2882b23bd6c4c273319035ae9495700f0aad643e658f1eee92728815b6b7800471ba0'
+            
'c8a3528f88a198e45c8c201940c55a56f1344f0d0d5352cf04348d083027d828f42f1a76b82cb595d3372f7d62859e3b64e3109d5fedf8f97c7b517415df9ad5'
             
'425fbb7588020c2fce15d9be43e34f57ea0de327ebdf7693dc90d2b24a86df67bbc1ddfd7224e8579c17d0f34ad3cbfaacbf0e2044685a356e0cb662c0e1a2d0'
             
'b1aa0d7c5b3e3e8ba1172822d75ea38e90efc431b270e0b4ca9e45bf9c0be0f60922c8618969ef071b5b6dbd9ac9f030294f1bf49bcc28c187b46d113dca63a7'
             
'9809c9719b04c00d46477e2786a64ec40867096d287d68c97b31a881545e734d4f97d73c7c75e8fc0727f288ef696d169bbaf989a0cb9f8d5c8e2f045b89c60f')
@@ -51,6 +53,8 @@ esac
 prepare() {
   cd $pkgname
 
+  patch -p1 -i ../code-disable-features.patch
+
   # Change electron binary name to the target electron
   sed -e "s|name=electron|name=$_electron |" \
       -e '/PKGBUILD/d' \


=====================================
code.js
=====================================
@@ -12,8 +12,8 @@ const fd = fs.openSync("/proc/self/comm", 
fs.constants.O_WRONLY);
 fs.writeSync(fd, name);
 fs.closeSync(fd);
 
-// Remove first command line argument (/usr/lib/code/code.js). - We call the 
CLI file first
-process.argv.splice(0, 1);
+// Remove all extra prefix arguments
+process.argv.splice(0, process.argv.findIndex(arg => 
arg.endsWith('/code.js')));
 
 // Set application paths.
 const appPath = __dirname;
@@ -27,4 +27,3 @@ app.setVersion(packageJson.version);
 
 // Run the application.
 require('module')._load(appPath, module, true);
-



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/code/-/commit/e7e11eb52b86037944375d2c4966cde4867cbed7

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/code/-/commit/e7e11eb52b86037944375d2c4966cde4867cbed7
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to