okay, lets try the old node hack on rhel 8 too

This commit is contained in:
Tom spot Callaway 2021-09-04 22:22:06 -04:00
parent 8ba922708a
commit 367d6daf85
3 changed files with 18 additions and 6 deletions

2
.gitignore vendored
View File

@ -24,3 +24,5 @@
/xcb-proto-1.14.tar.xz
/NotoSansSymbols2-Regular.ttf
/NotoSansTibetan-Regular.ttf
/node-v12.22.6-linux-arm64.tar.xz
/node-v12.22.6-linux-x64.tar.xz

View File

@ -425,7 +425,8 @@ Source17: GardinerModBug.ttf
Source18: GardinerModCat.ttf
# RHEL 7 needs newer nodejs
%if 0%{?rhel} == 7
Source19: https://nodejs.org/dist/v10.15.3/node-v10.15.3-linux-x64.tar.gz
Source19: https://nodejs.org/dist/latest-v12.x/node-v12.22.6-linux-x64.tar.xz
Source21: https://nodejs.org/dist/latest-v12.x/node-v12.22.6-linux-arm64.tar.xz
%endif
# Bring xcb-proto with us (might need more than python on EPEL?)
Source20: https://www.x.org/releases/individual/proto/xcb-proto-1.14.tar.xz
@ -479,8 +480,8 @@ BuildRequires: minizip-compat-devel
# BuildRequires: minizip-devel
%endif
%endif
# RHEL 7's nodejs is too old
%if 0%{?rhel} == 7
# RHEL 7|8's nodejs is too old
%if 0%{?rhel} <= 8
# Use bundled.
%else
BuildRequires: nodejs
@ -1228,10 +1229,18 @@ CHROMIUM_HEADLESS_GN_DEFINES+=' use_cups=false use_dbus=false use_gio=false use_
CHROMIUM_HEADLESS_GN_DEFINES+=' use_pulseaudio=false use_udev=false use_gtk=false use_glib=false use_x11=false'
export CHROMIUM_HEADLESS_GN_DEFINES
%if 0%{?rhel} == 7
%if 0%{?rhel} <= 8
pushd third_party/node/linux
%ifarch x86_64
tar xf %{SOURCE19}
mv node-v10.15.3-linux-x64 node-linux-x64
mv node-v12.22.6-linux-x64 node-linux-x64
%endif
%ifarch aarch64
tar xf %{SOURCE21}
mv node-v12.22.6-linux-arm64 node-linux-arm64
# This is weird, but whatever
ln -s node-linux-arm64 node-linux-x64
%endif
popd
%else
mkdir -p third_party/node/linux/node-linux-x64/bin

View File

@ -15,9 +15,10 @@ SHA512 (Tinos-Bold.ttf) = 54aeca804c06a4d5c57ade596e73df91a6a1c4401c4aadba55d987
SHA512 (Tinos-Italic.ttf) = d4f4f096110ef98a781a2a0e0d319317e5f84e650fe6f4d4f6b0e22a16414278217f37497b904a18540273c0e2d79d4f1faabde3b0eb5446283b318c73bafb38
SHA512 (Tinos-Regular.ttf) = 58085c5dac6d067d60ba2ab3220c4a0cc1efcf279cadfcfb8746a5e5fa1a6f6daa62750dc2051b3b2d8a51b4d2e9bb0f66594caf2253c0870ed9c7286fa45e8f
SHA512 (Ahem.ttf) = aeb64b10ab9c87860714cb60b4900254b13dc52c51319256a1a3722c882026ab7c616bf628fbc2fe14e38a6003f3a481af60b52a7ed62071d28ddaf428e4e3fd
SHA512 (node-v10.15.3-linux-x64.tar.gz) = 5eb544ef706562981340a82acc79e2162c6a3e4049b4a95f69ce353ee5b0f929c60b1fc457e8249b3fb0696f82fc28c5f543f5947db19fae4e9d5c21b906bb20
SHA512 (xcb-proto-1.14.tar.xz) = de66d568163b6da2be9d6c59984f3afa3acd119a781378638045fd68018665ef5c9af98f024e9962ba3eb7c7a4d85c27ba70ffafceb2324ccc6940f34de16690
SHA512 (depot_tools.git-master.tar.gz) = dc323888812b66cc92c53a24a8a58ccf9e2961be67aa21852bd091b8b49569071f06ae9104cb58950e6253ac3a29f0db0663e9f35ef2b1ea28696efb38b42708
SHA512 (NotoSansSymbols2-Regular.ttf) = 2644b42c3fdccfe12395f9b61553aced169a0f1dc09f5a0fd7898e9d0a372ee4422b6b1cdab3c86ecc91db437e9ae8a951e64e85edc3ac9e9fca428852dbb2ad
SHA512 (NotoSansTibetan-Regular.ttf) = fb5a48fcaea80eebe7d692f6fcf00d59d47658a358d0ec8e046fc559873f88bd595b2da474d2826abd9e9305f3741c69058d867b1e6048f37fe7d71b5d3af36a
SHA512 (chromium-93.0.4577.63-clean.tar.xz) = a8d6ad79a52e2df7a12c5922df41855a70f6dddcb76ec5e25177d9b0d565634074de1d86fbc1f894be259f37736d44ee231567596d7a37de96de11a010f2c5d9
SHA512 (node-v12.22.6-linux-arm64.tar.xz) = 87ce5eb954deb1d0debe6fa02b28a3cc675e12fca1e51d44b123ab294aa39ce0c6b8ac9eae1e7a6e32673ea2c2d480651d9ba7eea73012f0529503eebe9eb34d
SHA512 (node-v12.22.6-linux-x64.tar.xz) = e1b55c32343cb2ccc40d888c705414bebf9c46b02083d13731df79b1e79521b7277761f6bcca041e40e3a2e47c67bb8e7848aa2b919a9de5c2ebf62c4a9c7176