[rpms/chromium] epel9-next: use system nodejs

[rpms/chromium] epel9-next: use system nodejs

[Than Ngo]

A new commit has been pushed.

Repo   : rpms/chromium
Branch : epel9-next
Commit : 90f438194a7175697f31f91bc8da5990b55dfb7e
Author : Than Ngo <than@redhat.com>
Date   : 2023-01-25T18:29:35+01:00
Stats  : +5/-72 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/chromium/c/90f438194a7175697f31f91bc8da5990b55dfb7e?branch=epel9-next

Log:
use system nodejs

---
diff --git a/chromium-93.0.4577.63-py3-bootstrap.patch b/chromium-93.0.4577.63-py3-bootstrap.patch
deleted file mode 100644
index 899495f..0000000
--- a/chromium-93.0.4577.63-py3-bootstrap.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up chromium-93.0.4577.63/tools/gn/bootstrap/bootstrap.py.py3 chromium-93.0.4577.63/tools/gn/bootstrap/bootstrap.py
---- chromium-93.0.4577.63/tools/gn/bootstrap/bootstrap.py.py3	2021-08-31 21:40:34.000000000 -0400
-+++ chromium-93.0.4577.63/tools/gn/bootstrap/bootstrap.py	2021-09-02 08:26:04.415846917 -0400
-@@ -130,7 +130,7 @@ def main(argv):
-     if not options.debug:
-       gn_gen_args += ' is_debug=false'
-     subprocess.check_call([
--        gn_path, 'gen', out_dir,
-+        gn_path, 'gen', out_dir, ' --script-executable=/usr/bin/python3',
-         '--args=%s' % gn_gen_args, "--root=" + SRC_ROOT
-     ])
- 

diff --git a/chromium.spec b/chromium.spec
index 1c6c843..10d318e 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -29,13 +29,6 @@
 # official builds have less debugging and go faster... but we have to shut some things off.
 %global official_build 1
 
-# enable|disble bootstrap for gn
-%if 0%{?rhel} >= 8 || 0%{?fedora}
-%global bootstrap 0
-%else
-%global bootstrap 1
-%endif
-
 # Fancy build status, so we at least know, where we are..
 # %1 where
 # %2 what
@@ -49,9 +42,6 @@
 # enable|disable chrome-remote-desktop build
 %global build_remoting 0
 
-# set nodejs_version
-%global nodejs_version v16.17.0
-
 # set version for devtoolset and gcc-toolset
 %global dts_version 12
 
@@ -265,9 +255,6 @@ Patch8: chromium-108-widevine-other-locations.patch
 # Do not download proprietary widevine module in the background (thanks Debian)
 Patch9: chromium-99.0.4844.51-widevine-no-download.patch
 
-# Tell bootstrap.py to always use the version of Python we specify
-Patch11: chromium-93.0.4577.63-py3-bootstrap.patch
-
 # Add "Fedora" to the user agent string
 Patch12: chromium-101.0.4951.41-fedora-user-agent.patch
 
@@ -402,12 +389,6 @@ Source9: chromium-browser.xml
 Source11: chrome-remote-desktop@.service
 Source13: master_preferences
 
-# RHEL 8 needs newer nodejs
-%if 0%{?rhel} == 8
-Source19: https://nodejs.org/dist/latest-v16.x/node-%{nodejs_version}-linux-x64.tar.xz
-Source21: https://nodejs.org/dist/latest-v16.x/node-%{nodejs_version}-linux-arm64.tar.xz
-%endif
-
 # Unpackaged fonts
 Source14: https://fontlibrary.org/assets/downloads/gelasio/4d610887ff4d445cbc639aae7828d139/gelasio.zip
 Source15: http://download.savannah.nongnu.org/releases/freebangfont/MuktiNarrow-0.94.tar.bz2
@@ -509,17 +490,8 @@ BuildRequires:	minizip-compat-devel
 %endif
 %endif
 
-# RHEL 8 needs newer nodejs
-%if 0%{?rhel} == 8
-# nothing
-%else
 BuildRequires: nodejs
-%endif
-
-# use system gn on fedora and rhel >=8, el7 needs bundle gn
-%if ! %{bootstrap}
 BuildRequires: gn
-%endif
 
 BuildRequires:	nss-devel >= 3.26
 BuildRequires:	pciutils-devel
@@ -533,11 +505,6 @@ BuildRequires:	pkgconfig(libpipewire-0.3)
 # for /usr/bin/appstream-util
 BuildRequires: libappstream-glib
 
-%if %{bootstrap}
-# gn needs these
-BuildRequires: libstdc++-static
-%endif
-
 # Fedora tries to use system libs whenever it can.
 BuildRequires:	bzip2-devel
 BuildRequires:	dbus-glib-devel
@@ -954,7 +921,6 @@ udev.
 %patch7 -p1 -b .widevine-hack
 %patch8 -p1 -b .widevine-other-locations
 %patch9 -p1 -b .widevine-no-download
-%patch11 -p1 -b .py3
 
 # Short term fixes (usually gcc and backports)
 %patch51 -p1 -b .gcc-remoting-constexpr
@@ -1117,23 +1083,8 @@ cp -a %{SOURCE114} .
 cp -a %{SOURCE115} .
 popd
 
-%if 0%{?rhel} == 8
-  pushd third_party/node/linux
-%ifarch x86_64
-  tar xf %{SOURCE19}
-  mv node-%{nodejs_version}-linux-x64 node-linux-x64
-%endif
-%ifarch aarch64
-  tar xf %{SOURCE21}
-  mv node-%{nodejs_version}-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
-  ln -s %{_bindir}/node third_party/node/linux/node-linux-x64/bin/node
-%endif
+mkdir -p third_party/node/linux/node-linux-x64/bin
+ln -s %{_bindir}/node third_party/node/linux/node-linux-x64/bin/node
 
 # Get rid of the pre-built eu-strip binary, it is x86_64 and of mysterious origin
 rm -rf buildtools/third_party/eu-strip/bin/eu-strip
@@ -1387,20 +1338,14 @@ if python3 -c 'import google ; print google.__path__' 2> /dev/null ; then \
     exit 1 ; \
 fi
 
-%if %{bootstrap}
-tools/gn/bootstrap/bootstrap.py --gn-gen-args="$CHROMIUM_CORE_GN_DEFINES $CHROMIUM_BROWSER_GN_DEFINES"
-%else
-mkdir -p %{builddir} && cp -a %{_bindir}/gn %{builddir}/
-%endif
-
-%{builddir}/gn --script-executable=%{chromium_pybin} gen --args="$CHROMIUM_CORE_GN_DEFINES $CHROMIUM_BROWSER_GN_DEFINES" %{builddir}
+gn --script-executable=%{chromium_pybin} gen --args="$CHROMIUM_CORE_GN_DEFINES $CHROMIUM_BROWSER_GN_DEFINES" %{builddir}
 
 %if %{build_headless}
-%{builddir}/gn --script-executable=%{chromium_pybin} gen --args="$CHROMIUM_CORE_GN_DEFINES $CHROMIUM_HEADLESS_GN_DEFINES" %{headlessbuilddir}
+gn --script-executable=%{chromium_pybin} gen --args="$CHROMIUM_CORE_GN_DEFINES $CHROMIUM_HEADLESS_GN_DEFINES" %{headlessbuilddir}
 %endif
 
 %if %{build_remoting}
-%{builddir}/gn --script-executable=%{chromium_pybin} gen --args="$CHROMIUM_CORE_GN_DEFINES $CHROMIUM_BROWSER_GN_DEFINES" %{remotingbuilddir}
+gn --script-executable=%{chromium_pybin} gen --args="$CHROMIUM_CORE_GN_DEFINES $CHROMIUM_BROWSER_GN_DEFINES" %{remotingbuilddir}
 %endif
 
 %if %{build_headless}