From cd2eec9cbf752f2c45685d8d177d746f30b5027a Mon Sep 17 00:00:00 2001 From: Sergey Zhemoytel Date: Fri, 9 Jun 2023 08:13:30 +0000 Subject: [PATCH] %{msver}.%{subrel} --- .abf.yml | 5 +++-- vscodium.spec | 24 ++++++++++++++++++++++-- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/.abf.yml b/.abf.yml index 9f39943..2200da2 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,3 +1,4 @@ sources: - vscode-1.78.1.tar.gz: 229bda12b8a716bd6007bb3942a3fec0b2a2a977 - vscodium-1.78.1.23131.tar.gz: 9f803efb0fbdc4df2bc8a4225b1dcdba338c1176 + remote-dependencies.tar: 27bf01881fb712aa9b1b7ed80e028b6bb428ab2a + vscode-1.79.0.tar.gz: fde61e79f33ca62729429a36ac6af9ed62c5bea5 + vscodium-1.79.0.23159.tar.gz: 1de7697a652829bf7c8fa1e74019681b83281d84 diff --git a/vscodium.spec b/vscodium.spec index 653fdb8..c604bd3 100644 --- a/vscodium.spec +++ b/vscodium.spec @@ -1,8 +1,8 @@ %define _optdir /opt %define debug %nil %define debug_package %nil -%define msver 1.78.1 -%define subrel 23131 +%define msver 1.79.0 +%define subrel 23159 Name: vscodium Version: %{msver}.%{subrel} @@ -13,6 +13,7 @@ License: MIT URL: https://vscodium.com Source0: https://github.com/VSCodium/vscodium/archive/%{version}/%{name}-%{version}.tar.gz Source1: https://github.com/microsoft/vscode/archive/%{msver}/vscode-%{msver}.tar.gz +Source2: remote-dependencies.tar Source1000: %{name}.rpmlintrc ExclusiveArch: x86_64 BuildRequires: nodejs-bootstrap-bin >= 16 @@ -26,6 +27,8 @@ BuildRequires: git-core BuildRequires: openssl-devel BuildRequires: sqlite-tools BuildRequires: python38-devel +BuildRequires: clang +BuildRequires: llvm %description Visual Studio Code is a new choice of tool that @@ -38,6 +41,8 @@ tar -xf %{SOURCE1} mv vscode-%{msver} vscode %build +install -Dm0644 %{SOURCE2} remote-dependencies.tar + export PATH=$PATH:/opt/nodejs/16.*/bin export PYTHONPATH=%{python38_sitelib} export PYTHON3=/usr/libexec/python3.8 @@ -55,6 +60,21 @@ popd export MS_TAG=%{msver} MS_COMMIT="" RELEASE_VERSION=%{version} BUILD_SOURCEVERSION="" +#export CC=clang +#export CXX=clang++ + +#./build.sh + + + +#npm install tslib +#npm install postcss@^8.0.0 + +#npm rebuild @parcel/watcher + +#rm package-lock.json +npm update + ./build/build.sh %install