Skip to content

Commit 8aa4d2e

Browse files
committed
⏰ code: auto updated to 1.100.2-3
It has been built because: * yuyichao has requested to build it * it failed last time and has been updated
1 parent 79edcf1 commit 8aa4d2e

File tree

3 files changed

+35
-25
lines changed

3 files changed

+35
-25
lines changed

alarmcn/code/PKGBUILD

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,29 @@
55
pkgname=code
66
pkgdesc='The Open Source build of Visual Studio Code (vscode) editor'
77
# Important: Remember to check https://github.com/microsoft/vscode/wiki/How-to-Contribute#prerequisites for target node version
8-
_electron=electron32
9-
pkgver=1.97.2
10-
pkgrel=1
8+
_electron=electron34
9+
pkgver=1.100.2
10+
pkgrel=3
1111
arch=(aarch64 x86_64)
1212
url='https://github.com/microsoft/vscode'
1313
license=('MIT')
1414
depends=($_electron 'libsecret' 'libx11' 'libxkbfile' 'ripgrep')
1515
optdepends=('bash-completion: Bash completions'
1616
'zsh-completions: ZSH completitons'
1717
'x11-ssh-askpass: SSH authentication')
18-
makedepends=('gulp' 'git' 'npm' 'python' 'nodejs-lts-iron' 'desktop-file-utils' 'zip' 'jq')
18+
makedepends=('git' 'nodejs-lts-iron' 'npm' 'pnpm' 'python' 'desktop-file-utils' 'zip' 'jq')
1919
provides=('vscode')
20+
options=('!strip' '!debug')
2021
source=(vscode::"git+https://github.com/microsoft/vscode.git#tag=$pkgver"
2122
'code.mjs'
2223
'code.sh'
2324
'product_json.diff'
2425
'clipath.patch')
25-
sha512sums=('25edb1985d3633f3b71a66e3f534d88ca20fd74aee43602d698307ef5e64cc8db770a5e02cf50078befefbf3208a1ef30e0242dc847d98c96ad5cf72b5ff8b1c'
26+
sha512sums=('2694841afae736d7424d9f6ed4a9eebcccd1b6e167682c454da639b37a3442e62d405b009d28e138cc56de03b0711fedf6d28f5a2b0fdd105962421d9d563b6f'
2627
'793f9ff6306e3992ac89802d98110cba288ea1181a901467333293b7d76182ef9792c2a39ff49d9347a18a174b1f42bc58862091dff583f4146c2704eea28033'
27-
'd2b3683085d98744ba4f7d8cb33fa38620b59220797917c3858cac6a0bf7962c2b7e293785a237f178e527384cc04bc19fe71d75f04fbf06be881263d4aa2b35'
28+
'937299c6cb6be2f8d25f7dbc95cf77423875c5f8353b8bd6cd7cc8e5603cbf8405b14dbf8bd615db2e3b36ed680fc8e1909410815f7f8587b7267a699e00ab37'
2829
'b1aa0d7c5b3e3e8ba1172822d75ea38e90efc431b270e0b4ca9e45bf9c0be0f60922c8618969ef071b5b6dbd9ac9f030294f1bf49bcc28c187b46d113dca63a7'
29-
'961b89334514aad68db4115f11b6e070240b1dd0567c4456c7b37a2dd6ae4be54965dbd5665cdc3b91c73d8f3269da3ba7d90ef634632ef6a252be1bfa7f967b')
30+
'e570b30cd470190aa56596913478d5fb8ba265a0f8c9d1408ea2118612cc69a360cc55e4523c3dc9c65f73e3dea53fc6620c97f6592fb9f86c3aca51ad3d9744')
3031

3132
# Even though we don't officially support other archs, let's
3233
# allow the user to use this PKGBUILD to compile the package
@@ -50,6 +51,10 @@ case "$CARCH" in
5051
_vscode_arch=arm
5152
_electron_arch=armv7l
5253
;;
54+
aarch64)
55+
_vscode_arch=arm64
56+
_electron_arch=arm64
57+
;;
5358
riscv64)
5459
_vscode_arch=riscv64
5560
_electron_arch=riscv64
@@ -71,6 +76,9 @@ prepare() {
7176
fi
7277
_electronver=$(jq -r '.packages[""].devDependencies.electron' package-lock.json)
7378

79+
# Add vsce-sign necessary for extensions' signature verification
80+
pnpm add @vscode/vsce-sign @vscode/vsce-sign-linux-$_vscode_arch
81+
7482
# Change electron binary name to the target electron
7583
sed -e "s|name=electron|name=$_electron |" \
7684
-e '/PKGBUILD/d' \
@@ -113,13 +121,13 @@ prepare() {
113121

114122
patch -p1 -i "$srcdir/clipath.patch"
115123

116-
# The build process wants a zipped electron, let's construct one from system electron and put it in cache.
124+
# Put a fake of zipped electron required by the build process.
117125
local _hash=$(echo -n "https://github.com/electron/electron/releases/download/v$_electronver" | sha256sum | cut -d ' ' -f 1)
118126
export XDG_CACHE_HOME="$srcdir" # Don't let our manually created electron zip appear in users' cache dir
119127
local _cache_dir="$XDG_CACHE_HOME/electron/$_hash"
120128
mkdir -p "$_cache_dir"
121129
local _electron_zip="electron-v$_electronver-linux-$_electron_arch.zip"
122-
cd "/usr/lib/$_electron" && zip -r "$_cache_dir/$_electron_zip" . && cd -
130+
zip -q "$_cache_dir/$_electron_zip" . -i .
123131
echo "$(sha256sum "$_cache_dir/$_electron_zip" | cut -d " " -f 1) *$_electron_zip" > build/checksums/electron.txt
124132
}
125133

@@ -128,9 +136,9 @@ build() {
128136
export ELECTRON_SKIP_BINARY_DOWNLOAD=1 PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
129137
export XDG_CACHE_HOME="$srcdir"
130138
npm install --cpu=$_vscode_arch
131-
gulp --max_old_space_size=8192 \
139+
npm run gulp \
132140
--openssl-legacy-provider \
133-
vscode-linux-$_vscode_arch-min
141+
vscode-linux-${_vscode_arch}-min
134142
}
135143

136144
package() {

alarmcn/code/clipath.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/src/vs/code/node/cli.ts b/src/vs/code/node/cli.ts
2-
index b25377a804d..cd690d9a230 100644
2+
index 312df0c1f92..33d115a3f7b 100644
33
--- a/src/vs/code/node/cli.ts
44
+++ b/src/vs/code/node/cli.ts
5-
@@ -43,7 +43,7 @@ export async function main(argv: string[]): Promise<any> {
5+
@@ -44,7 +44,7 @@ export async function main(argv: string[]): Promise<any> {
66
let args: NativeParsedArgs;
77

88
try {
@@ -12,10 +12,10 @@ index b25377a804d..cd690d9a230 100644
1212
console.error(err.message);
1313
return;
1414
diff --git a/src/vs/platform/lifecycle/electron-main/lifecycleMainService.ts b/src/vs/platform/lifecycle/electron-main/lifecycleMainService.ts
15-
index 0016baac80f..0974953cc92 100644
15+
index 4912966c79c..5b75bcd5973 100644
1616
--- a/src/vs/platform/lifecycle/electron-main/lifecycleMainService.ts
1717
+++ b/src/vs/platform/lifecycle/electron-main/lifecycleMainService.ts
18-
@@ -690,7 +690,7 @@ export class LifecycleMainService extends Disposable implements ILifecycleMainSe
18+
@@ -691,7 +691,7 @@ export class LifecycleMainService extends Disposable implements ILifecycleMainSe
1919
const quitListener = () => {
2020
if (!this.relaunchHandler?.handleRelaunch(options)) {
2121
this.trace('Lifecycle#relaunch() - calling app.relaunch()');
@@ -25,10 +25,10 @@ index 0016baac80f..0974953cc92 100644
2525
};
2626
electron.app.once('quit', quitListener);
2727
diff --git a/src/vs/platform/native/electron-main/nativeHostMainService.ts b/src/vs/platform/native/electron-main/nativeHostMainService.ts
28-
index 6f57b9a7b44..4a05b88edf1 100644
28+
index 45964bcdcc2..1ef23c64a1a 100644
2929
--- a/src/vs/platform/native/electron-main/nativeHostMainService.ts
3030
+++ b/src/vs/platform/native/electron-main/nativeHostMainService.ts
31-
@@ -609,31 +609,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
31+
@@ -686,31 +686,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
3232

3333
@memoize
3434
private get cliPath(): string {

alarmcn/code/code.sh

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,32 @@ set -euo pipefail
44

55
flags_file="${XDG_CONFIG_HOME:-$HOME/.config}/code-flags.conf"
66

7-
declare -a codeflags
8-
97
if [[ -f "${flags_file}" ]]; then
108
mapfile -t < "${flags_file}" CODEMAPFILE
119
fi
1210

11+
codeflags=()
1312
for line in "${CODEMAPFILE[@]}"; do
14-
if [[ ! "${line}" =~ ^[[:space:]]*#.* ]]; then
13+
if [[ ! "${line}" =~ ^[[:space:]]*#.* ]] && [[ -n "${line}" ]]; then
1514
codeflags+=("${line}")
1615
fi
1716
done
1817

1918
# don't edit the electron binary name here! simply change the variable in the PKGBUILD and we will sed it into the correct one :)
2019
name=electron
2120
flags_file="${XDG_CONFIG_HOME:-$HOME/.config}/${name}-flags.conf"
21+
fallback_file="${XDG_CONFIG_HOME:-$HOME/.config}/electron-flags.conf"
2222

23-
declare -a electronflags
24-
23+
lines=()
2524
if [[ -f "${flags_file}" ]]; then
26-
mapfile -t < "${flags_file}" ELECTRONMAPFILE
25+
mapfile -t lines < "${flags_file}"
26+
elif [[ -f "${fallback_file}" ]]; then
27+
mapfile -t lines < "${fallback_file}"
2728
fi
2829

29-
for line in "${ELECTRONMAPFILE[@]}"; do
30-
if [[ ! "${line}" =~ ^[[:space:]]*#.* ]]; then
30+
electronflags=()
31+
for line in "${lines[@]}"; do
32+
if [[ ! "${line}" =~ ^[[:space:]]*#.* ]] && [[ -n "${line}" ]]; then
3133
electronflags+=("${line}")
3234
fi
3335
done

0 commit comments

Comments
 (0)