diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..3d6f9cf4cb738a20b7cb546c1490faaa11c5bbab --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +node_modules-build-aarch64.tar.gz filter=lfs diff=lfs merge=lfs -text +node_modules-build-x86_64.tar.gz filter=lfs diff=lfs merge=lfs -text diff --git a/.lfsconfig b/.lfsconfig new file mode 100644 index 0000000000000000000000000000000000000000..dc0d802d27b1a9272722bf8d767855b5e725e99e --- /dev/null +++ b/.lfsconfig @@ -0,0 +1,2 @@ +[lfs] + url = https://artlfs.openeuler.openatom.cn/src-openeuler/vscode \ No newline at end of file diff --git a/checksum b/checksum deleted file mode 100644 index 3d4438dfadf6c6cfa0f9ecbdabc29c41b462de93..0000000000000000000000000000000000000000 --- a/checksum +++ /dev/null @@ -1 +0,0 @@ -ba33958f74272b94a085d9724d87d08ea317793e1408cf1c17907990b386d64a vscode-1.93.1.tar.gz diff --git a/checksum-aarch64 b/checksum-aarch64 deleted file mode 100644 index 12204ed87418ff7623d0d722bbca916300d2a7ac..0000000000000000000000000000000000000000 --- a/checksum-aarch64 +++ /dev/null @@ -1 +0,0 @@ -b988dc4f8094b8600a1184e070fa121a5c197ae56ec0c8eaaa1e5f55771eb6d1 node_modules-build-aarch64.tar.gz diff --git a/checksum-x86_64 b/checksum-x86_64 deleted file mode 100644 index d9f672ee21cc5dd1ab7523c37362982317050bc1..0000000000000000000000000000000000000000 --- a/checksum-x86_64 +++ /dev/null @@ -1 +0,0 @@ -4ed672d55bdfba759146fba1ff2a0306c7a1ec9c0c245270e260e3babb2d51fb node_modules-build-x86_64.tar.gz diff --git a/electron-v30.4.0-linux-arm64.zip b/electron-v30.4.0-linux-arm64.zip deleted file mode 100644 index 6b94c7bb6a300f407b7b06d6ed894c7490065ed5..0000000000000000000000000000000000000000 Binary files a/electron-v30.4.0-linux-arm64.zip and /dev/null differ diff --git a/electron-v30.4.0-linux-x64.zip b/electron-v30.4.0-linux-x64.zip deleted file mode 100644 index b514d201d0bd25e5200ce52901eb953f0645b714..0000000000000000000000000000000000000000 Binary files a/electron-v30.4.0-linux-x64.zip and /dev/null differ diff --git a/node_modules-build-aarch64.tar.gz b/node_modules-build-aarch64.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..62bae3e5ba373ba667cdc637e3249bfbc00f5726 --- /dev/null +++ b/node_modules-build-aarch64.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b988dc4f8094b8600a1184e070fa121a5c197ae56ec0c8eaaa1e5f55771eb6d1 +size 558855614 diff --git a/node_modules-build-aarch64aa b/node_modules-build-aarch64aa deleted file mode 100644 index 4d142cf5ab533becacd28ab3340a07753ce23e05..0000000000000000000000000000000000000000 Binary files a/node_modules-build-aarch64aa and /dev/null differ diff --git a/node_modules-build-aarch64ab b/node_modules-build-aarch64ab deleted file mode 100644 index 1e3c5f59942ca57cf4c7e182ebedeb94c1f46ee1..0000000000000000000000000000000000000000 Binary files a/node_modules-build-aarch64ab and /dev/null differ diff --git a/node_modules-build-x86_64.tar.gz b/node_modules-build-x86_64.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..daa00d6782df3a48633a0ea9a34e0f9a87a01fb0 --- /dev/null +++ b/node_modules-build-x86_64.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4ed672d55bdfba759146fba1ff2a0306c7a1ec9c0c245270e260e3babb2d51fb +size 562850378 diff --git a/node_modules-build-x86_64aa b/node_modules-build-x86_64aa deleted file mode 100644 index c350b6f22a50c6640e3b33f0bd5bcfc572cefa41..0000000000000000000000000000000000000000 Binary files a/node_modules-build-x86_64aa and /dev/null differ diff --git a/node_modules-build-x86_64ab b/node_modules-build-x86_64ab deleted file mode 100644 index a4df199d9f72d85524d4624480586b4aa4fd0f69..0000000000000000000000000000000000000000 Binary files a/node_modules-build-x86_64ab and /dev/null differ diff --git a/vscode-name.patch b/vscode-name.patch index f5232532a9ee44d8739725e938afb5830fe62d70..4faf04399ea0c25fc7f70e8d0ef1043ea813fc13 100644 --- a/vscode-name.patch +++ b/vscode-name.patch @@ -23,26 +23,23 @@ index 13fc4f4cabe..56c01a14595 100644 "distro": "2560b0e8d341a0b6734d28ef71b08e1920ff2501", "author": { diff --git a/product.json b/product.json -index 908be250245..95205f5673b 100644 +index 908be250245..686c17bb3f9 100644 --- a/product.json +++ b/product.json -@@ -1,8 +1,11 @@ +@@ -1,8 +1,8 @@ { - "nameShort": "Code - OSS", - "nameLong": "Code - OSS", - "applicationName": "code-oss", - "dataFolderName": ".vscode-oss", + "nameShort": "Code", -+ "nameLong": "Visual Studio Code", -+ "commit": "38c31bc77e0dd6ae88a4e9cc93428cc27a56ba40", -+ "date": "2024-09-11T17:20:05.685Z", -+ "version": "1.93.1", ++ "nameLong": "Code", + "applicationName": "code", + "dataFolderName": ".vscode", "win32MutexName": "vscodeoss", "licenseName": "MIT", "licenseUrl": "https://github.com/microsoft/vscode/blob/main/LICENSE.txt", -@@ -10,9 +13,9 @@ +@@ -10,9 +10,9 @@ "serverGreeting": [], "serverLicense": [], "serverLicensePrompt": "", @@ -55,7 +52,7 @@ index 908be250245..95205f5673b 100644 "win32DirName": "Microsoft Code OSS", "win32NameVersion": "Microsoft Code OSS", "win32RegValueName": "CodeOSS", -@@ -25,60 +28,15 @@ +@@ -25,60 +25,18 @@ "win32TunnelServiceMutex": "vscodeoss-tunnelservice", "win32TunnelMutex": "vscodeoss-tunnel", "darwinBundleIdentifier": "com.visualstudio.code.oss", @@ -120,5 +117,24 @@ index 908be250245..95205f5673b 100644 + "serviceUrl": "https://open-vsx.org/vscode/gallery", + "itemUrl": "https://open-vsx.org/vscode/item" + }, ++ "linkProtectionTrustedDomains": [ ++ "https://open-vsx.org" ++ ], + "builtInExtensions": [] } +diff --git a/resources/linux/code.appdata.xml b/resources/linux/code.appdata.xml +index ab9df8c25da..3ad4493e142 100644 +--- a/resources/linux/code.appdata.xml ++++ b/resources/linux/code.appdata.xml +@@ -5,9 +5,9 @@ + @@LICENSE@@ + @@NAME_LONG@@ + https://code.visualstudio.com +- Visual Studio Code. Code editing. Redefined. ++ Code. Code editing. Redefined. + +-

Visual Studio Code is a new choice of tool that combines the simplicity of a code editor with what developers need for the core edit-build-debug cycle. See https://code.visualstudio.com/docs/setup/linux for installation instructions and FAQ.

++

Code is a new choice of tool that combines the simplicity of a code editor with what developers need for the core edit-build-debug cycle. See https://code.visualstudio.com/docs/setup/linux for installation instructions and FAQ.

+ + + diff --git a/vscode.spec b/vscode.spec index ea0405a0a56be85d728ff2e070c79be4eaf5c30b..0a01b0759d3f0258687d0ddb70f59474ccfbb344 100644 --- a/vscode.spec +++ b/vscode.spec @@ -2,7 +2,7 @@ Name: code Version: 1.93.1 -Release: 3 +Release: 4 License: MIT Group: Development/Tools Summary: Code editing. Redefined. @@ -12,6 +12,10 @@ AutoReq: 0 %global __provides_exclude_from ^%{_datadir}/%{name}/.*\\.so.*$ Source0: vscode-%{version}.tar.gz +Source1: ms-vscode.js-debug.1.93.0.vsix +Source2: ms-vscode.js-debug-companion.1.1.3.vsix +Source3: ms-vscode.vscode-js-profile-table.1.0.9.vsix + Patch1: vscode-name.patch @@ -41,26 +45,12 @@ BuildRequires: nodejs-devel BuildRequires: nodejs-yarn %description -Visual Studio Code, also commonly referred to as VS Code, is a source-code editor -made by Microsoft with the Electron Framework, for Windows, Linux and macOS. -Features include support for debugging, syntax highlighting, intelligent code completion, -snippets, code refactoring, and embedded Git. - -%prep -pushd %{_sourcedir} -cat node_modules-build-$(arch)a* > node_modules-build-$(arch).tar.gz -sha256sum -c checksum-$(arch) - -rm -rf ${HOME}/.cache/electron/edda2a221019110621f56af6c7a459e02ca6fa574ebe09e0e88459fec84f3238/ -mkdir -p ${HOME}/.cache/electron/edda2a221019110621f56af6c7a459e02ca6fa574ebe09e0e88459fec84f3238/ -if [ "$(arch)" == "x86_64" ]; then - cp electron-v30.4.0-linux-x64.zip ${HOME}/.cache/electron/edda2a221019110621f56af6c7a459e02ca6fa574ebe09e0e88459fec84f3238/ -else - cp electron-v30.4.0-linux-arm64.zip ${HOME}/.cache/electron/edda2a221019110621f56af6c7a459e02ca6fa574ebe09e0e88459fec84f3238/ -fi +Code is a new choice of tool that combines the simplicity of a code editor with +what developers need for the core edit-build-debug cycle. See +https://code.visualstudio.com/docs/setup/linux for installation instructions and FAQ. -popd +%prep %setup -q -n vscode-%{version} %autopatch -p1 -M 1 @@ -68,14 +58,16 @@ popd %build tar -xf %{_sourcedir}/node_modules-build-$(arch).tar.gz +export ELECTRON_MIRROR="https://mirrors.huaweicloud.com/electron/" +export BUILD_SOURCEVERSION=38c31bc77e0dd6ae88a4e9cc93428cc27a56ba40 -if [ "$(arch)" == "x86_64" ]; then - yarn run gulp vscode-linux-x64 - yarn run gulp vscode-linux-x64-prepare-rpm -else - yarn run gulp vscode-linux-arm64 - yarn run gulp vscode-linux-arm64-prepare-rpm -fi +%ifarch x86_64 +yarn run gulp vscode-linux-x64 +yarn run gulp vscode-linux-x64-prepare-rpm +%else +yarn run gulp vscode-linux-arm64 +yarn run gulp vscode-linux-arm64-prepare-rpm +%endif %install @@ -83,11 +75,11 @@ mkdir -p %{buildroot}%{_datadir} cp -arf .build/linux/rpm/$(arch)/rpmbuild/BUILD/usr/share/* %{buildroot}%{_datadir} pushd %{buildroot}%{_datadir}/code/resources/app/extensions -unzip %{_sourcedir}/ms-vscode.js-debug.1.93.0.vsix extension/* +unzip %{SOURCE1} extension/* mv extension ms-vscode.js-debug -unzip %{_sourcedir}/ms-vscode.js-debug-companion.1.1.3.vsix extension/* +unzip %{SOURCE2} extension/* mv extension ms-vscode.js-debug-companion -unzip %{_sourcedir}/ms-vscode.vscode-js-profile-table.1.0.9.vsix extension/* +unzip %{SOURCE3} extension/* mv extension ms-vscode.vscode-js-profile-table popd @@ -104,7 +96,7 @@ popd %post ln -s %{_datadir}/code/bin/code /usr/bin/code -update-desktop-database +update-desktop-database update-mime-database %{_datadir}/mime %postun @@ -113,6 +105,9 @@ update-desktop-database update-mime-database %{_datadir}/mime %changelog +* Tue Feb 18 2025 wangkui - 1.93.1-4 +- fix law issue + * Thu Dec 5 2024 wangkui - 1.93.1-3 - optimized space usage