timamsk/vscodium
1
0
Fork 0
mirror of https://github.com/VSCodium/vscodium.git synced 2026-04-11 16:27:18 +10:00
Code Issues Packages Projects Releases Wiki Activity

fix(linux): patch dependencies [skip ci]

Browse Source
This commit is contained in:
Baptiste Augrain
2025-09-30 14:54:46 +02:00
parent 20382726b4
commit 578df58363
2 changed files with 88 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dev/update_patches.sh
View File

@@ -64,7 +64,7 @@ fi
for ARCH in alpine linux osx windows; do
for FILE in "../patches/${ARCH}/"*.patch; do
if [[ "${ARCH}" == "linux" && "${FILE}" == *"/arch-"* ]] || [[ "${ARCH}" == "windows" && "${FILE}" == *"/cli"* ]]; then
if [[ "${ARCH}" == "linux" && "${FILE}" == *"/arch-"* ]] || [[ "${ARCH}" == "linux" && "${FILE}" == *"/fix-dependencies.patch" ]] || [[ "${ARCH}" == "windows" && "${FILE}" == *"/cli"* ]]; then
echo "skip ${FILE}"
else
check_file "${FILE}"
@@ -72,6 +72,8 @@ for ARCH in alpine linux osx windows; do
done
if [[ "${ARCH}" == "linux" ]]; then
check_file "../patches/optional-tree-sitter.patch" "../patches/linux/fix-dependencies.patch"
check_file "../patches/cli.patch" "../patches/linux/arch-0-support.patch"
check_file "../patches/cli.patch" "../patches/linux/arch-0-support.patch" "../patches/linux/arch-1-ppc64le.patch"
check_file "../patches/cli.patch" "../patches/linux/arch-0-support.patch" "../patches/linux/arch-1-ppc64le.patch" "../patches/linux/arch-2-riscv64.patch"

194
patches/linux/fix-dependencies.patch
View File

@@ -1,5 +1,5 @@
diff --git a/build/package-lock.json b/build/package-lock.json
index 9faa5f8..1c8e52c 100644
index 923b4ae..bd7647b 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -17,3 +17,2 @@
@@ -935,13 +935,14 @@ index 9faa5f8..1c8e52c 100644
- "tmp": "^0.2.3",
+ "tmp": "^0.2.1",
"typed-rest-client": "^1.8.4",
@@ -1984,3 +1409,3 @@
@@ -1984,254 +1409,6 @@
"engines": {
- "node": ">= 20"
+ "node": ">= 14"
},
@@ -1990,250 +1415,2 @@
},
- },
- "optionalDependencies": {
- "keytar": "^7.7.0"
- }
- },
- "node_modules/@vscode/vsce-sign": {
- "version": "2.0.7",
- "resolved": "https://registry.npmjs.org/@vscode/vsce-sign/-/vsce-sign-2.0.7.tgz",
@@ -1175,7 +1176,8 @@ index 9faa5f8..1c8e52c 100644
- },
- "engines": {
- "node": "20 || >=22"
- },
+ "node": ">= 14"
},
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
@@ -1188,9 +1190,9 @@ index 9faa5f8..1c8e52c 100644
- "license": "MIT",
- "engines": {
- "node": ">=8"
- }
- },
"node_modules/@vscode/vsce/node_modules/jsonc-parser": {
+ "optionalDependencies": {
+ "keytar": "^7.7.0"
}
@@ -2242,9 +1419,11 @@
"integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
- "dev": true
@@ -1810,48 +1812,30 @@ index 9faa5f8..1c8e52c 100644
"dev": true,
+ "license": "MIT",
"optional": true
@@ -3777,35 +2714,14 @@
"version": "1.0.2",
- "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.2.tgz",
- "integrity": "sha512-ZQnSFO1la8P7auIOQECnm0sSuoMeaSq0EEdXMBFF2QJO4uNcwbyhSgG3MruWNbFTqCLmxVwGOl7LZ9kASvHdeQ==",
- "dev": true,
- "optional": true,
- "dependencies": {
- "define-properties": "^1.1.3"
- },
- "engines": {
- "node": ">= 0.4"
- },
- "funding": {
- "url": "https://github.com/sponsors/ljharb"
- }
- },
@@ -3791,23 +2728,2 @@
},
- "node_modules/globby": {
- "version": "14.1.0",
- "resolved": "https://registry.npmjs.org/globby/-/globby-14.1.0.tgz",
- "integrity": "sha512-0Ia46fDOaT7k4og1PDW4YbodWWr3scS2vAr2lTbsplOt2WkKp0vQbkI9wKis/T5LV/dqPjO3bpS/z6GTJB82LA==",
+ "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.2.tgz",
+ "integrity": "sha512-ZQnSFO1la8P7auIOQECnm0sSuoMeaSq0EEdXMBFF2QJO4uNcwbyhSgG3MruWNbFTqCLmxVwGOl7LZ9kASvHdeQ==",
"dev": true,
- "dev": true,
- "license": "MIT",
+ "optional": true,
"dependencies": {
- "dependencies": {
- "@sindresorhus/merge-streams": "^2.1.0",
- "fast-glob": "^3.3.3",
- "ignore": "^7.0.3",
- "path-type": "^6.0.0",
- "slash": "^5.1.0",
- "unicorn-magic": "^0.3.0"
+ "define-properties": "^1.1.3"
},
"engines": {
- },
- "engines": {
- "node": ">=18"
+ "node": ">= 0.4"
},
"funding": {
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
+ "url": "https://github.com/sponsors/ljharb"
}
- }
- },
"node_modules/gopd": {
@@ -3926,18 +2842,2 @@
},
- "node_modules/has-tostringtag": {
@@ -2202,15 +2186,8 @@ index 9faa5f8..1c8e52c 100644
"dev": true,
+ "license": "MIT",
"optional": true
@@ -4674,161 +3454,36 @@
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
- "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
- "dev": true,
- "license": "MIT"
- },
- "node_modules/mute-stream": {
- "version": "0.0.8",
- "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
@@ -4681,164 +3461,66 @@
"resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
- "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
- "dev": true
- },
@@ -2267,8 +2244,8 @@ index 9faa5f8..1c8e52c 100644
- "version": "4.8.4",
- "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.4.tgz",
- "integrity": "sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ==",
- "devOptional": true,
- "license": "MIT",
- "optional": true,
- "bin": {
- "node-gyp-build": "bin.js",
- "node-gyp-build-optional": "optional.js",
@@ -2316,61 +2293,63 @@ index 9faa5f8..1c8e52c 100644
- "optionalDependencies": {
- "graceful-fs": "^4.1.6"
- }
+ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+ "dev": true,
+ "license": "MIT"
+ "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
+ "dev": true
},
- "node_modules/node-sarif-builder/node_modules/universalify": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
- "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+ "node_modules/mute-stream": {
+ "version": "0.0.8",
+ "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
+ "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
"dev": true,
- "license": "MIT",
- "engines": {
- "node": ">= 10.0.0"
- }
+ "license": "ISC"
},
- "node_modules/normalize-package-data": {
- "version": "6.0.2",
- "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-6.0.2.tgz",
- "integrity": "sha512-V6gygoYb/5EmNI+MEGrWkC+e6+Rr7mTmfHrxDbLzxQogBkgzo76rkok0Am6thgSF7Mv2nLOajAJj5vDJZEFn7g==",
+ "node_modules/napi-build-utils": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-2.0.0.tgz",
+ "integrity": "sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA==",
"dev": true,
"license": "MIT",
- "engines": {
- "node": ">= 10.0.0"
- }
+ "optional": true
},
- "node_modules/normalize-package-data": {
- "version": "6.0.2",
- "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-6.0.2.tgz",
- "integrity": "sha512-V6gygoYb/5EmNI+MEGrWkC+e6+Rr7mTmfHrxDbLzxQogBkgzo76rkok0Am6thgSF7Mv2nLOajAJj5vDJZEFn7g==",
+ "node_modules/node-abi": {
+ "version": "3.30.0",
+ "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.30.0.tgz",
+ "integrity": "sha512-qWO5l3SCqbwQavymOmtTVuCWZE23++S+rxyoHjXqUmPyzRcaoI4lA2gO55/drddGnedAyjA7sk76SfQ5lfUMnw==",
"dev": true,
- "license": "BSD-2-Clause",
- "dependencies": {
+ "optional": true,
"dependencies": {
- "hosted-git-info": "^7.0.0",
- "semver": "^7.3.5",
- "validate-npm-package-license": "^3.0.4"
- },
- "engines": {
+ "semver": "^7.3.5"
},
"engines": {
- "node": "^16.14.0 || >=18.0.0"
- }
+ "license": "MIT",
+ "optional": true
+ "node": ">=10"
}
},
- "node_modules/normalize-package-data/node_modules/hosted-git-info": {
- "version": "7.0.2",
- "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.2.tgz",
- "integrity": "sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==",
+ "node_modules/node-abi": {
+ "version": "3.77.0",
+ "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.77.0.tgz",
+ "integrity": "sha512-DSmt0OEcLoK4i3NuscSbGjOf3bqiDEutejqENSplMSFA/gmB8mkED9G4pKWnPl7MDU4rSHebKPHeitpDfyH0cQ==",
+ "node_modules/node-abi/node_modules/semver": {
+ "version": "7.5.4",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+ "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
"dev": true,
- "license": "ISC",
+ "license": "MIT",
+ "optional": true,
"dependencies": {
- "lru-cache": "^10.0.1"
+ "semver": "^7.3.5"
+ "lru-cache": "^6.0.0"
+ },
+ "bin": {
+ "semver": "bin/semver.js"
},
"engines": {
- "node": "^16.14.0 || >=18.0.0"
@@ -2383,27 +2362,22 @@ index 9faa5f8..1c8e52c 100644
- "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
- "dev": true,
- "license": "ISC"
- },
- "node_modules/normalize-package-data/node_modules/semver": {
+ "node_modules/node-abi/node_modules/semver": {
"version": "7.7.2",
@@ -4838,2 +3493,3 @@
"license": "ISC",
+ "optional": true,
"bin": {
@@ -4845,2 +3501,28 @@
},
+ "node_modules/node-abort-controller": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.1.1.tgz",
+ "integrity": "sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==",
+ "dev": true
+ },
},
- "node_modules/normalize-package-data/node_modules/semver": {
- "version": "7.7.2",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
- "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+ "node_modules/node-addon-api": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-4.3.0.tgz",
+ "integrity": "sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==",
+ "dev": true,
"dev": true,
- "license": "ISC",
+ "license": "MIT",
+ "optional": true
+ },
@@ -2411,20 +2385,26 @@ index 9faa5f8..1c8e52c 100644
+ "version": "4.8.4",
+ "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.4.tgz",
+ "integrity": "sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ==",
+ "devOptional": true,
+ "license": "MIT",
+ "bin": {
+ "optional": true,
"bin": {
- "semver": "bin/semver.js"
- },
- "engines": {
- "node": ">=10"
+ "node-gyp-build": "bin.js",
+ "node-gyp-build-optional": "optional.js",
+ "node-gyp-build-test": "build-test.js"
+ }
+ },
"node_modules/normalize-path": {
}
@@ -4871,2 +3553,3 @@
"dev": true,
+ "license": "BSD-2-Clause",
"dependencies": {
@@ -4960,53 +3643,2 @@
@@ -4915,2 +3598,3 @@
"dev": true,
+ "license": "MIT",
"dependencies": {
@@ -4960,53 +3644,2 @@
},
- "node_modules/p-map": {
- "version": "7.0.3",
@@ -2478,10 +2458,6 @@ index 9faa5f8..1c8e52c 100644
- }
- },
"node_modules/parse-node-version": {
@@ -5025,2 +3657,3 @@
"dev": true,
+ "license": "MIT",
"dependencies": {
@@ -5034,2 +3667,3 @@
"dev": true,
+ "license": "ISC",
@@ -3432,13 +3408,17 @@ index 9faa5f8..1c8e52c 100644
- }
- },
"node_modules/universal-user-agent": {
@@ -6557,3 +4635,4 @@
@@ -6549,2 +4627,3 @@
"dev": true,
+ "license": "MIT",
"engines": {
@@ -6557,3 +4636,4 @@
"integrity": "sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==",
- "dev": true
+ "dev": true,
+ "license": "MIT"
},
@@ -6574,26 +4653,2 @@
@@ -6574,26 +4654,2 @@
},
- "node_modules/validate-npm-package-license": {
- "version": "3.0.4",
@@ -3465,14 +3445,10 @@ index 9faa5f8..1c8e52c 100644
- }
- },
"node_modules/vinyl": {
@@ -6718,2 +4773,3 @@
@@ -6664,2 +4720,3 @@
"dev": true,
+ "license": "MIT",
"dependencies": {
@@ -6733,2 +4789,3 @@
"dev": true,
+ "license": "MIT",
"engines": {
@@ -6737,2 +4794,25 @@
},
+ "node_modules/whatwg-encoding": {
@@ -3650,7 +3626,7 @@ index 9faa5f8..1c8e52c 100644
+ },
"node_modules/yocto-queue": {
diff --git a/build/package.json b/build/package.json
index 2ea3695..eeb0424 100644
index e28bd38..ae4a2c9 100644
--- a/build/package.json
+++ b/build/package.json
@@ -11,3 +11,2 @@