Parker2991/vscodium
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: linux patches

Browse source
This commit is contained in:
Baptiste Augrain 2024-07-22 20:31:01 +02:00
parent beac8efa16
commit 6118ae5c2d
3 changed files with 37 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
build/update_patches.sh
View file

@ -12,69 +12,41 @@ while getopts ":i" opt; do
esac
done
check_file() {
if [[ -f "${1}" ]]; then
echo applying patch: "${1}"
if ! git apply --ignore-whitespace "${1}"; then
echo failed to apply patch "${1}"
git apply --reject "${1}"
git apply --reject "../patches/helper/settings.patch"
read -rp "Press any key when the conflict have been resolved..." -n1 -s
git restore .vscode/settings.json
git add .
git diff --staged -U1 > "${1}"
fi
git add .
git reset -q --hard HEAD
fi
}
cd vscode || { echo "'vscode' dir not found"; exit 1; }
git add .
git reset -q --hard HEAD
for FILE in ../patches/*.patch; do
if [[ -f "${FILE}" ]]; then
echo applying patch: "${FILE}"
if ! git apply --ignore-whitespace "${FILE}"; then
echo failed to apply patch "${FILE}"
git apply --reject "${FILE}"
git apply --reject "../patches/helper/settings.patch"
read -rp "Press any key when the conflict have been resolved..." -n1 -s
git restore .vscode/settings.json
git add .
git diff --staged -U1 > "${FILE}"
fi
git add .
git reset -q --hard HEAD
fi
check_file "${FILE}"
done
if [[ "${VSCODE_QUALITY}" == "insider" ]]; then
for FILE in ../patches/insider/*.patch; do
if [[ -f "${FILE}" ]]; then
echo applying patch: "${FILE}"
if ! git apply --ignore-whitespace "${FILE}"; then
echo failed to apply patch "${FILE}"
git apply --reject "${FILE}"
git apply --reject "../patches/helper/settings.patch"
read -rp "Press any key when the conflict have been resolved..." -n1 -s
git restore .vscode/settings.json
git add .
git diff --staged -U1 > "${FILE}"
fi
git add .
git reset -q --hard HEAD
fi
check_file "${FILE}"
done
fi
for FILE in ../patches/linux/*.patch; do
if [[ -f "${FILE}" ]]; then
echo applying patch: "${FILE}"
if ! git apply --ignore-whitespace "${FILE}"; then
echo failed to apply patch "${FILE}"
git apply --reject "${FILE}"
git apply --reject "../patches/helper/settings.patch"
read -rp "Press any key when the conflict have been resolved..." -n1 -s
git restore .vscode/settings.json
git add .
git diff --staged -U1 > "${FILE}"
fi
git add .
git reset -q --hard HEAD
fi
for FILE in ../patches/linux/*/*.patch; do
check_file "${FILE}"
done

10
patches/linux/client/node16.patch
View file

@ -1,5 +1,5 @@
diff --git a/build/package.json b/build/package.json
index 0bbeed3..012ead3 100644
index 1a73af9..da81494 100644
--- a/build/package.json
+++ b/build/package.json
@@ -5,5 +5,2 @@
@ -13,7 +13,7 @@ index 0bbeed3..012ead3 100644
+ "node-fetch": "^2.6.7",
"source-map": "0.6.1",
diff --git a/build/yarn.lock b/build/yarn.lock
index d99ceff..e7ae542 100644
index 9347576..eb4d17e 100644
--- a/build/yarn.lock
+++ b/build/yarn.lock
@@ -4,199 +4,2 @@
@ -215,12 +215,12 @@ index d99ceff..e7ae542 100644
- events "^3.0.0"
- tslib "^2.2.0"
-
"@electron/get@^2.0.0":
"@electron/asar@^3.2.7":
diff --git a/package.json b/package.json
index ae706de..b56b40d 100644
index a8bf6c6..658ab16 100644
--- a/package.json
+++ b/package.json
@@ -134,3 +134,3 @@
@@ -135,3 +135,3 @@
"@vscode/gulp-electron": "^1.36.0",
- "@vscode/l10n-dev": "0.0.35",
+ "@vscode/l10n-dev": "0.0.30",

16
patches/linux/reh/node16.patch
View file

@ -1,8 +1,8 @@
diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
index c2b81d0..2e94d99 100644
index 7d58861..87f2632 100644
--- a/build/gulpfile.reh.js
+++ b/build/gulpfile.reh.js
@@ -375,16 +375,2 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
@@ -389,16 +389,2 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
- if (platform === 'linux' && process.env['VSCODE_NODE_GLIBC'] === '-glibc-2.17') {
- result = es.merge(result,
@ -18,9 +18,9 @@ index c2b81d0..2e94d99 100644
- );
- }
-
return result.pipe(vfs.dest(destination));
result = inlineMeta(result, {
diff --git a/remote/package.json b/remote/package.json
index b84f513..42d8e41 100644
index 48b849c..2df37e4 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -31,3 +31,3 @@
@ -29,10 +29,10 @@ index b84f513..42d8e41 100644
+ "node-pty": "1.1.0-beta4",
"tas-client-umd": "0.2.0",
diff --git a/remote/yarn.lock b/remote/yarn.lock
index 4241bf0..5ce4431 100644
index 38f916a..d116ac9 100644
--- a/remote/yarn.lock
+++ b/remote/yarn.lock
@@ -412,2 +412,7 @@ ms@2.1.2:
@@ -439,2 +439,7 @@ ms@2.1.2:
+nan@^2.17.0:
+ version "2.18.0"
@ -40,12 +40,12 @@ index 4241bf0..5ce4431 100644
+ integrity sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==
+
napi-build-utils@^1.0.1:
@@ -429,3 +434,3 @@ node-abi@^3.3.0:
@@ -456,3 +461,3 @@ node-abi@^3.3.0:
-node-addon-api@7.1.0, node-addon-api@^7.1.0:
+node-addon-api@7.1.0:
version "7.1.0"
@@ -454,8 +459,8 @@ node-gyp-build@4.8.1, node-gyp-build@^4.3.0:
@@ -481,8 +486,8 @@ node-gyp-build@4.8.1, node-gyp-build@^4.3.0:
-node-pty@1.1.0-beta11:
- version "1.1.0-beta11"