Massimiliano Torromeo pushed to branch main at Arch Linux / Packaging / Packages / code
Commits: 68717076 by q234rty at 2024-03-01T21:07:23+08:00 Build from git to fix language packs Fixes https://gitlab.archlinux.org/archlinux/packaging/packages/code/-/issues/2 - - - - - 2 changed files: - PKGBUILD - − build-no-git.patch Changes: ===================================== PKGBUILD ===================================== @@ -16,15 +16,15 @@ depends=($_electron 'libsecret' 'libx11' 'libxkbfile' 'ripgrep') optdepends=('bash-completion: Bash completions' 'zsh-completions: ZSH completitons' 'x11-ssh-askpass: SSH authentication') -makedepends=('gulp' 'npm' 'python' 'yarn' 'nodejs-lts-hydrogen' 'desktop-file-utils') +makedepends=('gulp' 'git' 'npm' 'python' 'yarn' 'nodejs-lts-hydrogen' 'desktop-file-utils') provides=('vscode') -source=("https://github.com/microsoft/vscode/archive/refs/tags/$pkgver/$pkgname-$pkgver.tar.gz" +source=(vscode::"git+https://github.com/microsoft/vscode.git#commit=$_commit" 'code.js' 'code.sh' 'product_json.diff' 'clipath.patch' 'build-no-git.patch') -sha512sums=('d55d42139060278fe72221d154a291abd00382043d4589cb69579ed50adad2fd945e84f79866994bddd4628f3eb872e638a5861115c5ce536ef5479172675c67' +sha512sums=('SKIP' 'c8a3528f88a198e45c8c201940c55a56f1344f0d0d5352cf04348d083027d828f42f1a76b82cb595d3372f7d62859e3b64e3109d5fedf8f97c7b517415df9ad5' '425fbb7588020c2fce15d9be43e34f57ea0de327ebdf7693dc90d2b24a86df67bbc1ddfd7224e8579c17d0f34ad3cbfaacbf0e2044685a356e0cb662c0e1a2d0' 'b1aa0d7c5b3e3e8ba1172822d75ea38e90efc431b270e0b4ca9e45bf9c0be0f60922c8618969ef071b5b6dbd9ac9f030294f1bf49bcc28c187b46d113dca63a7' @@ -51,7 +51,7 @@ case "$CARCH" in esac prepare() { - cd vscode-$pkgver + cd vscode _electronver=$(awk '{if ($1 == "target") {gsub(/"|\..*"/, "", $2); print $2}}' .yarnrc) if [[ "electron$_electronver" != "$_electron" ]]; then @@ -108,7 +108,7 @@ prepare() { } build() { - cd vscode-$pkgver + cd vscode yarn install --arch=$_vscode_arch gulp --max_old_space_size=8192 \ --openssl-legacy-provider \ @@ -119,7 +119,7 @@ package() { # Install resource files install -dm 755 "$pkgdir"/usr/lib/$pkgname cp -r --no-preserve=ownership --preserve=mode VSCode-linux-$_vscode_arch/resources/app/* "$pkgdir"/usr/lib/$pkgname/ - + chmod -R u=rwX,go=rX "$pkgdir" # Replace statically included binary with system copy ln -sf /usr/bin/rg "$pkgdir"/usr/lib/code/node_modules.asar.unpacked/@vscode/ripgrep/bin/rg @@ -129,17 +129,17 @@ package() { ln -sf code-oss "$pkgdir"/usr/bin/code # Install appdata and desktop file - install -Dm 644 vscode-$pkgver/resources/linux/code.appdata.xml "$pkgdir"/usr/share/metainfo/code-oss.appdata.xml - install -Dm 644 vscode-$pkgver/resources/linux/code.desktop "$pkgdir"/usr/share/applications/code-oss.desktop - install -Dm 644 vscode-$pkgver/resources/linux/code-url-handler.desktop "$pkgdir"/usr/share/applications/code-url-handler.desktop - install -Dm 644 vscode-$pkgver/resources/linux/code-oss-url-handler.desktop "$pkgdir"/usr/share/applications/code-oss-url-handler.desktop + install -Dm 644 vscode/resources/linux/code.appdata.xml "$pkgdir"/usr/share/metainfo/code-oss.appdata.xml + install -Dm 644 vscode/resources/linux/code.desktop "$pkgdir"/usr/share/applications/code-oss.desktop + install -Dm 644 vscode/resources/linux/code-url-handler.desktop "$pkgdir"/usr/share/applications/code-url-handler.desktop + install -Dm 644 vscode/resources/linux/code-oss-url-handler.desktop "$pkgdir"/usr/share/applications/code-oss-url-handler.desktop install -Dm 644 VSCode-linux-$_vscode_arch/resources/app/resources/linux/code.png "$pkgdir"/usr/share/pixmaps/com.visualstudio.code.oss.png # Install bash and zsh completions - install -Dm 644 vscode-$pkgver/resources/completions/bash/code "$pkgdir"/usr/share/bash-completion/completions/code - install -Dm 644 vscode-$pkgver/resources/completions/bash/code-oss "$pkgdir"/usr/share/bash-completion/completions/code-oss - install -Dm 644 vscode-$pkgver/resources/completions/zsh/_code "$pkgdir"/usr/share/zsh/site-functions/_code - install -Dm 644 vscode-$pkgver/resources/completions/zsh/_code-oss "$pkgdir"/usr/share/zsh/site-functions/_code-oss + install -Dm 644 vscode/resources/completions/bash/code "$pkgdir"/usr/share/bash-completion/completions/code + install -Dm 644 vscode/resources/completions/bash/code-oss "$pkgdir"/usr/share/bash-completion/completions/code-oss + install -Dm 644 vscode/resources/completions/zsh/_code "$pkgdir"/usr/share/zsh/site-functions/_code + install -Dm 644 vscode/resources/completions/zsh/_code-oss "$pkgdir"/usr/share/zsh/site-functions/_code-oss # Install license files install -Dm 644 VSCode-linux-$_vscode_arch/resources/app/LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE ===================================== build-no-git.patch deleted ===================================== @@ -1,9 +0,0 @@ ---- a/build/npm/postinstall.js -+++ b/build/npm/postinstall.js -@@ -110,6 +110,3 @@ for (let dir of dirs) { - - yarnInstall(dir, opts); - } -- --cp.execSync('git config pull.rebase merges'); --cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore-revs'); View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/code/-/commit/6871707623c6552416f6ea536f1c4e0b7ab00a9c -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/code/-/commit/6871707623c6552416f6ea536f1c4e0b7ab00a9c You're receiving this email because of your account on gitlab.archlinux.org.