automatic import of vscodiumopeneuler24.03_LTS

4 files changed, 67 insertions, 48 deletions

diff --git a/.gitignore b/.gitignore
index 1492a5c..65515f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,9 @@
 /ms-vscode.js-debug.1.91.0.vsix
 /ms-vscode.vscode-js-profile-table.1.0.9.vsix
 /vendor.tar
+/1.92.2.24228.tar.gz
+/1.92.2.tar.gz
+/ms-vscode.js-debug-companion.1.1.3.vsix
+/ms-vscode.js-debug.1.92.0.vsix
+/node-v20.14.0-headers.tar.gz
+/node-v30.1.2-headers.tar.gz
diff --git a/ripgrep.patch b/ripgrep.patch
index 486d1fd..1f41366 100644
--- a/ripgrep.patch
+++ b/ripgrep.patch
@@ -52,18 +52,6 @@ index 68f6989f27a..1802c43acfb 100644
  import * as Parser from 'tree-sitter';
  const { typescript } = require('tree-sitter-typescript');
  const product = require('../../product.json');
-diff --git a/package.json b/package.json
-index 2103fe1fe1a..fcb42f433a0 100644
---- vscode/package.json
-+++ vscode/package.json
-@@ -74,7 +74,6 @@
-     "@vscode/iconv-lite-umd": "0.7.0",
-     "@vscode/policy-watcher": "^1.1.4",
-     "@vscode/proxy-agent": "^0.21.0",
--    "@vscode/ripgrep": "^1.15.9",
-     "@vscode/spdlog": "^0.15.0",
-     "@vscode/sqlite3": "5.1.6-vscode",
-     "@vscode/sudo-prompt": "9.3.1",
 diff --git a/src/vs/workbench/services/search/node/ripgrepFileSearch.ts b/src/vs/workbench/services/search/node/ripgrepFileSearch.ts
 index f833061c553..de0a5fa7df2 100644
 --- vscode/src/vs/workbench/services/search/node/ripgrepFileSearch.ts
@@ -90,23 +78,35 @@ index 4740a661119..8bcabe088e2 100644
  import { anchorGlob, createTextSearchResult, IOutputChannel, Maybe } from './ripgrepSearchUtils';
  import type { RipgrepTextSearchOptions } from 'vs/workbench/services/search/common/searchExtTypesInternal';
  
+diff --git a/package.json b/package.json
+index 9a2065fa14c..128f289dbe4 100644
+--- vscode/package.json
++++ vscode/package.json
+@@ -74,7 +74,6 @@
+     "@vscode/iconv-lite-umd": "0.7.0",
+     "@vscode/policy-watcher": "^1.1.4",
+     "@vscode/proxy-agent": "^0.22.0",
+-    "@vscode/ripgrep": "^1.15.9",
+     "@vscode/spdlog": "^0.15.0",
+     "@vscode/sqlite3": "5.1.6-vscode",
+     "@vscode/sudo-prompt": "9.3.1",
 diff --git a/remote/package.json b/remote/package.json
-index 5b0e80182ea..a88c2f5d41d 100644
+index 48b849c5928..b9616c172d0 100644
 --- vscode/remote/package.json
 +++ vscode/remote/package.json
 @@ -9,7 +9,6 @@
      "@vscode/deviceid": "^0.1.1",
      "@vscode/iconv-lite-umd": "0.7.0",
-     "@vscode/proxy-agent": "^0.21.0",
+     "@vscode/proxy-agent": "^0.22.0",
 -    "@vscode/ripgrep": "^1.15.9",
      "@vscode/spdlog": "^0.15.0",
      "@vscode/vscode-languagedetection": "1.0.21",
      "@vscode/windows-process-tree": "^0.6.0",
-diff --git a/yarn.lock b/yarn.lock
-index 71aef4295fa..7b74e981e61 100644
---- vscode/yarn.lock
-+++ vscode/yarn.lock
-@@ -1584,15 +1584,6 @@
+diff --git a/remote/yarn.lock b/remote/yarn.lock
+index 38f916a284e..b059a2031c9 100644
+--- vscode/remote/yarn.lock
++++ vscode/remote/yarn.lock
+@@ -80,15 +80,6 @@
    optionalDependencies:
      "@vscode/windows-ca-certs" "^0.3.1"
  
@@ -122,22 +122,14 @@ index 71aef4295fa..7b74e981e61 100644
  "@vscode/spdlog@^0.15.0":
    version "0.15.0"
    resolved "https://registry.yarnpkg.com/@vscode/spdlog/-/spdlog-0.15.0.tgz#37896541410ff036dc01c54e16bf131c522a057e"
-@@ -1620,7 +1611,6 @@
-   resolved "https://registry.yarnpkg.com/@vscode/telemetry-extractor/-/telemetry-extractor-1.10.2.tgz#b1ec2296dac1923d400bf98b3242d9b7d792fe83"
-   integrity sha512-hn+KDSwIRj7LzDSFd9HALkc80UY1g16nQgWztHml+nxAZU3Hw/EoWEEDxOncvDYq9YcV+tX/cVHrVjbNL2Dg0g==
-   dependencies:
--    "@vscode/ripgrep" "^1.15.9"
-     command-line-args "^5.2.1"
-     ts-morph "^19.0.0"
- 
-diff --git a/remote/yarn.lock b/remote/yarn.lock
-index c8e84fc81e1..41219df5f33 100644
---- vscode/remote/yarn.lock
-+++ vscode/remote/yarn.lock
-@@ -80,15 +80,6 @@
+diff --git a/yarn.lock b/yarn.lock
+index 107fdd0e0ec..0a0b5e0edb5 100644
+--- vscode/yarn.lock
++++ vscode/yarn.lock
+@@ -1579,15 +1579,6 @@
    optionalDependencies:
      "@vscode/windows-ca-certs" "^0.3.1"
- 
+
 -"@vscode/ripgrep@^1.15.9":
 -  version "1.15.9"
 -  resolved "https://registry.yarnpkg.com/@vscode/ripgrep/-/ripgrep-1.15.9.tgz#92279f7f28e1e49ad9a89603e10b17a4c7f9f5f1"
@@ -150,3 +142,10 @@ index c8e84fc81e1..41219df5f33 100644
  "@vscode/spdlog@^0.15.0":
    version "0.15.0"
    resolved "https://registry.yarnpkg.com/@vscode/spdlog/-/spdlog-0.15.0.tgz#37896541410ff036dc01c54e16bf131c522a057e"
+@@ -1615,7 +1606,6 @@
+   resolved "https://registry.yarnpkg.com/@vscode/telemetry-extractor/-/telemetry-extractor-1.10.2.tgz#b1ec2296dac1923d400bf98b3242d9b7d792fe83"
+   integrity sha512-hn+KDSwIRj7LzDSFd9HALkc80UY1g16nQgWztHml+nxAZU3Hw/EoWEEDxOncvDYq9YcV+tX/cVHrVjbNL2Dg0g==
+   dependencies:
+-    "@vscode/ripgrep" "^1.15.9"
+     command-line-args "^5.2.1"
+     ts-morph "^19.0.0"
diff --git a/sources b/sources
index fdd38be..d2f4903 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,8 @@
-2137f14aa13c236274a22a59195d7045  1.91.1.24193.tar.gz
-91f4991ce2f25cb7c0f7ff96594ffae3  1.91.1.tar.gz
-fc7948ed0db659ff470c8bad56d1f383  ms-vscode.js-debug-companion.1.1.2.vsix
-07bc5ee6c37573883f2754929a6e23a8  ms-vscode.js-debug.1.91.0.vsix
+7daf926990d1c5781ddadd9ebba9526f  1.92.2.24228.tar.gz
+d47c35370d80d491e0ad6cdf822c6b6e  1.92.2.tar.gz
+5eb6e8246f753d477536130e46dee247  ms-vscode.js-debug-companion.1.1.3.vsix
+f6492b877270b659e9ff41ec71e70c8a  ms-vscode.js-debug.1.92.0.vsix
 881ce6fabad3eea0296c144eed369d3d  ms-vscode.vscode-js-profile-table.1.0.9.vsix
-826bd1515e378aa4da70044ee5e2e5ac  vendor.tar
+afb08a9aae0a8015a53f5e75890737a9  node-v20.14.0-headers.tar.gz
+4d6c059c44d11dee38121edb75538a6c  node-v30.1.2-headers.tar.gz
+02fc5f1cadea9f3640da935dd250fe29  vendor.tar
diff --git a/vscodium.spec b/vscodium.spec
index f128cf7..6e374c7 100644
--- a/vscodium.spec
+++ b/vscodium.spec
@@ -1,13 +1,15 @@
 %global debug_package %{nil}
 
-%define vscode_version 1.91.1
+%define vscode_version 1.92.2
 
-%define jsdebugcompanion_version 1.1.2
-%define jsdebug_version 1.91.0
+%define jsdebugcompanion_version 1.1.3
+%define jsdebug_version 1.92.0
 %define vscodejsprofiletable_version 1.0.9
+%define nodeheaders_version 20.14.0
+%define electronnodeheaders_version 30.1.2
 
 Name:		vscodium
-Version:	%{vscode_version}.24193
+Version:	%{vscode_version}.24228
 Release:	1
 Summary:	Free/Libre Open Source Software Binaries of VS Code
 
@@ -20,7 +22,9 @@ Source1:	https://github.com/microsoft/vscode/archive/refs/tags/%{vscode_version}
 Source2:	https://github.com/microsoft/vscode-js-debug-companion/releases/download/v%{jsdebugcompanion_version}/ms-vscode.js-debug-companion.%{jsdebugcompanion_version}.vsix
 Source3:	https://github.com/microsoft/vscode-js-debug/releases/download/v%{jsdebug_version}/ms-vscode.js-debug.%{jsdebug_version}.vsix
 Source4:	https://github.com/microsoft/vscode-js-profile-visualizer/releases/download/v%{vscodejsprofiletable_version}/ms-vscode.vscode-js-profile-table.%{vscodejsprofiletable_version}.vsix
-Source5:	vendor.tar
+Source5:	https://nodejs.org/dist/v%{nodeheaders_version}/node-v%{nodeheaders_version}-headers.tar.gz
+Source6:	https://electronjs.org/headers/v%{electronnodeheaders_version}/node-v%{electronnodeheaders_version}-headers.tar.gz
+Source7:	vendor.tar
 
 Patch0:		no-exec-git.patch
 Patch1:		use-local-vsix.patch
@@ -28,7 +32,7 @@ Patch2:		yarn-offline.patch
 Patch3:		ripgrep.patch
 
 Requires:	glibc nodejs fontconfig libXtst cairo alsa-lib nss libnotify libxcb libxkbfile libsecret
-BuildRequires:	gcc g++ make pkg-config libxcb-devel libxkbfile-devel krb5-devel libsecret-devel nodejs-yarn git python3 jq nodejs-devel
+BuildRequires:	gcc g++ make pkg-config libxcb-devel libxkbfile-devel krb5-devel libsecret-devel npm nodejs-yarn git python3 jq nodejs-devel
 
 %description
 VSCodium is a community-driven, freely-licensed binary distribution of Microsoft’s editor VS Code.
@@ -49,9 +53,18 @@ cp %{SOURCE4} %{_builddir}/%{name}-%{version}
 %patch 2
 %patch 3
 
-mkdir -p %{_builddir}/%{name}-%{version}/vendor
-tar -xvf %{SOURCE5} -C %{_builddir}/%{name}-%{version}/vendor
+mkdir -p ~/.cache/node-gyp/%{nodeheaders_version}
+tar -xvf %{SOURCE5} -C ~/.cache/node-gyp/%{nodeheaders_version}
+mv ~/.cache/node-gyp/%{nodeheaders_version}/node-v%{nodeheaders_version}/* ~/.cache/node-gyp/%{nodeheaders_version}
+echo 11 > ~/.cache/node-gyp/%{nodeheaders_version}/installVersion
+
+mkdir -p ~/.cache/node-gyp/%{electronnodeheaders_version}
+tar -xvf %{SOURCE6} -C ~/.cache/node-gyp/%{electronnodeheaders_version}
+mv ~/.cache/node-gyp/%{electronnodeheaders_version}/node_headers/* ~/.cache/node-gyp/%{electronnodeheaders_version}
+echo 11 > ~/.cache/node-gyp/%{electronnodeheaders_version}/installVersion
 
+mkdir -p %{_builddir}/%{name}-%{version}/vendor
+tar -xvf %{SOURCE7} -C %{_builddir}/%{name}-%{version}/vendor
 yarn config set yarn-offline-mirror %{_builddir}/%{name}-%{version}/vendor
 echo "yarn-offline-mirror %{_builddir}/%{name}-%{version}/vendor" >> %{_builddir}/%{name}-%{version}/vscode/.yarnrc
 
@@ -71,6 +84,7 @@ export SHOULD_BUILD_REH="no"
 export OS_NAME="linux"
 
 export ELECTRON_MIRROR="https://mirrors.huaweicloud.com/electron/"
+export NODE_OPTIONS="--max-old-space-size=8192"
 
 UNAME_ARCH=$( uname -m )
 
@@ -84,8 +98,6 @@ else
 	export VSCODE_ARCH="x64"
 fi
 
-export NODE_OPTIONS="--max-old-space-size=8192"
-
 ./build.sh