From 241d311adf8652bc755f80bec9f14aeaa737eb83 Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Tue, 2 Mar 2021 19:33:25 +0100 Subject: [PATCH] Centos7 isn't supported by Electron 11 --- patches/fix-rpm-spec.patch | 16 ++++++++++++++++ patches/no-replace-product-json.patch | 8 -------- prepare_vscode.sh | 2 +- 3 files changed, 17 insertions(+), 9 deletions(-) create mode 100644 patches/fix-rpm-spec.patch delete mode 100644 patches/no-replace-product-json.patch diff --git a/patches/fix-rpm-spec.patch b/patches/fix-rpm-spec.patch new file mode 100644 index 0000000..27747ce --- /dev/null +++ b/patches/fix-rpm-spec.patch @@ -0,0 +1,16 @@ +--- vscode/resources/linux/rpm/code.spec.template 2021-03-02 19:26:53.000000000 +0100 ++++ vscode/resources/linux/rpm/code.spec.template.new 2021-03-02 19:28:12.000000000 +0100 +@@ -1,6 +1,6 @@ + Name: @@NAME@@ + Version: @@VERSION@@ +-Release: @@RELEASE@@.el7 ++Release: @@RELEASE@@.el8 + Summary: Code editing. Redefined. + Group: Development/Tools + Vendor: Microsoft Corporation +@@ -69,3 +69,5 @@ + /usr/share/pixmaps/@@ICON@@.png + /usr/share/bash-completion/completions/@@NAME@@ + /usr/share/zsh/site-functions/_@@NAME@@ ++ +++%config(noreplace) /usr/share/@@NAME@@/resources/app/product.json diff --git a/patches/no-replace-product-json.patch b/patches/no-replace-product-json.patch deleted file mode 100644 index 91bee64..0000000 --- a/patches/no-replace-product-json.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- vscode/resources/linux/rpm/code.spec.template 2020-11-15 15:28:20.179070106 +0800 -+++ vscode/resources/linux/rpm/code.spec.template.new 2020-11-15 15:25:39.269000000 +0800 -@@ -69,3 +69,5 @@ - /usr/share/pixmaps/@@ICON@@.png - /usr/share/bash-completion/completions/@@NAME@@ - /usr/share/zsh/site-functions/_@@NAME@@ -+ -+%config(noreplace) /usr/share/@@NAME@@/resources/app/product.json diff --git a/prepare_vscode.sh b/prepare_vscode.sh index 12fdb42..50f04fd 100755 --- a/prepare_vscode.sh +++ b/prepare_vscode.sh @@ -9,7 +9,7 @@ cd vscode || exit # apply patches patch -u src/vs/platform/update/electron-main/updateService.win32.ts -i ../patches/update-cache-path.patch -patch -u resources/linux/rpm/code.spec.template -i ../patches/no-replace-product-json.patch +patch -u resources/linux/rpm/code.spec.template -i ../patches/fix-rpm-spec.patch if [[ "$OS_NAME" == "osx" ]]; then CHILD_CONCURRENCY=1 yarn --frozen-lockfile --ignore-optional