From 9f1ccf6e17fbdbee3f36d803547a1e1ec893d058 Mon Sep 17 00:00:00 2001 From: tigro Date: Tue, 19 Sep 2023 16:43:18 +0300 Subject: [PATCH] Update to 117.0.5938.88 --- .chromium.metadata | 4 +- .gitignore | 4 +- SPECS/chromium.spec | 94 +++++++++++++++++++++++++++++---------------- 3 files changed, 67 insertions(+), 35 deletions(-) diff --git a/.chromium.metadata b/.chromium.metadata index 9eac5b65..00261959 100644 --- a/.chromium.metadata +++ b/.chromium.metadata @@ -1,3 +1,5 @@ -03c6701dcc4f2b8d90c4193716bb3e796c70ba3b SOURCES/chromium-117.0.5938.62.tar.xz +0fd76c55af67029bcf78087de9e05aedb4ba2877 SOURCES/chromium-117.0.5938.88.tar.xz +dea187019741602d57aaf189a80abba261fbd2aa SOURCES/linux-x64-0.19.2.tgz +7e5d2c7864c5c83ec789b59c77cd9c20d2594916 SOURCES/linux-arm64-0.19.2.tgz 769196d081c6a0ad37f1c63dec56febfff3370de SOURCES/node-v20.6.1-linux-x64.tar.xz 3e94bb4f999c636293bc745b02d98e7925da5616 SOURCES/node-v20.6.1-linux-arm64.tar.xz diff --git a/.gitignore b/.gitignore index c2abf377..453db803 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ -SOURCES/chromium-117.0.5938.62.tar.xz +SOURCES/chromium-117.0.5938.88.tar.xz +SOURCES/linux-x64-0.19.2.tgz +SOURCES/linux-arm64-0.19.2.tgz SOURCES/node-v20.6.1-linux-x64.tar.xz SOURCES/node-v20.6.1-linux-arm64.tar.xz diff --git a/SPECS/chromium.spec b/SPECS/chromium.spec index de62a3c2..a1decbec 100644 --- a/SPECS/chromium.spec +++ b/SPECS/chromium.spec @@ -43,6 +43,9 @@ # set nodejs_version %global nodejs_version v20.6.1 +# set esbuild_version +%global esbuild_version 0.19.2 + # set version for devtoolset and gcc-toolset %global dts_version 12 @@ -235,7 +238,7 @@ %endif Name: chromium%{chromium_channel} -Version: 117.0.5938.62 +Version: 117.0.5938.88 Release: 1%{?dist}.inferit Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use Url: http://www.chromium.org/Home @@ -347,32 +350,30 @@ Patch302: chromium-117-workaround_clang_bug-structured_binding.patch # missing typename Patch303: chromium-117-typename.patch -# missing include header files -Patch304: chromium-117-missing-header-files.patch - # compiler error with c++20 -Patch306: chromium-117-emplace_back_on_vector-c++20.patch +Patch304: chromium-117-emplace_back_on_vector-c++20.patch + +# error: invalid operands to binary expression +Patch305: chromium-117-string-convert.patch # disable memory tagging for epel8 on aarch64 due to new feature IFUNC-Resolver not supported -# in old glibc < 2.30 -# error: fatal error: 'sys/ifunc.h' file not found -Patch307: chromium-116-arm64-memory_tagging.patch +# in old glibc < 2.30, error: fatal error: 'sys/ifunc.h' file not found +Patch306: chromium-116-arm64-memory_tagging.patch -# error: use of undeclared identifier 'kV4L2FlatStatelessVideoDecoder' -# error: invalid operands to binary expression -Patch308: chromium-117-string-convert.patch +# missing include header files +Patch310: chromium-117-missing-header-files.patch # clang warnings Patch311: chromium-115-clang-warnings.patch -# imp module is removed in python-3.12 +# imp module is removed in python-3.12 in fedora 39 and newer Patch312: chromium-117-python-3.12-deprecated.patch # Tweak about:gpu, Add dark mode support -Patch351: chromium-116-tweak_about_gpu.patch +Patch350: chromium-116-tweak_about_gpu.patch # build error -Patch352: chromium-117-mnemonic-error.patch +Patch351: chromium-117-mnemonic-error.patch # Yandex Search by default Patch500: 0001-Yandex-as-default-search-engine.patch @@ -398,13 +399,24 @@ Source7: get_free_ffmpeg_source_files.py Source8: get_linux_tests_names.py # GNOME stuff Source9: chromium-browser.xml -Source11: chrome-remote-desktop@.service -Source13: master_preferences +Source10: chrome-remote-desktop@.service +Source11: master_preferences # RHEL 8 needs newer nodejs %if 0%{?rhel} == 8 -Source19: https://nodejs.org/dist/latest-v20.x/node-%{nodejs_version}-linux-x64.tar.xz -Source21: https://nodejs.org/dist/latest-v20.x/node-%{nodejs_version}-linux-arm64.tar.xz +Source12: https://nodejs.org/dist/latest-v20.x/node-%{nodejs_version}-linux-x64.tar.xz +Source13: https://nodejs.org/dist/latest-v20.x/node-%{nodejs_version}-linux-arm64.tar.xz +%endif + +# esbuild binary +%if 0%{?rhel} +Source14: https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-%{esbuild_version}.tgz +Source15: https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-%{esbuild_version}.tgz +%endif + +# esbuild binary from fedora +%if 0%{?fedora} +BuildRequires: golang-github-evanw-esbuild %endif # Yandex logo @@ -962,31 +974,31 @@ udev. %patch -P130 -p1 -b .revert-av1enc %endif -%patch -P300 -p1 -b .no_matching_constructor %if %{clang} %if 0%{?rhel} || 0%{?fedora} < 38 +%patch -P300 -p1 -b .no_matching_constructor %patch -P301 -p1 -b .workaround_clang-SkColor4f %patch -P302 -p1 -b .workaround_clang_bug-structured_binding +%patch -P303 -p1 -b .typename +%patch -P304 -p1 -b .emplace_back_on_vector-c++20 +%patch -P305 -p1 -b .string-convert %endif %endif -%patch -P303 -p1 -b .typename -%patch -P304 -p1 -b .missing-header-files -%patch -P306 -p1 -b .emplace_back_on_vector-c++20 - %ifarch aarch64 %if 0%{?rhel} <= 8 -%patch -P307 -p1 -b .memory_tagging +%patch -P306 -p1 -b .memory_tagging %endif %endif -%patch -P308 -p1 -b .string-convert +%patch -P310 -p1 -b .missing-header-files %patch -P311 -p1 -b .clang-warnings +%if 0%{?rhel} > 9 || 0%{?fedora} > 38 %patch -P312 -p1 -b .python-3.12-deprecated +%endif -%patch -P351 -p1 -b .tweak_about_gpu - -%patch -P352 -p1 -b .mnemonic-error +%patch -P350 -p1 -b .tweak_about_gpu +%patch -P351 -p1 -b .mnemonic-error %patch -P500 -p1 -b .Yandex-as-default-search-engine %patch -P501 -p1 -b .Added-Russian-description-and-summary-for-gnome-soft @@ -1006,15 +1018,15 @@ install -m0644 %{SOURCE50} ./chrome/browser/resources/new_tab_page/icons/google_ # See `man find` for how the `-exec command {} +` syntax works find -type f \( -iname "*.py" \) -exec sed -i '1s=^#! */usr/bin/\(python\|env python\)[23]\?=#!%{__python3}=' {} + - +# install nodejs %if 0%{?rhel} == 8 pushd third_party/node/linux %ifarch x86_64 - tar xf %{SOURCE19} + tar xf %{SOURCE12} mv node-%{nodejs_version}-linux-x64 node-linux-x64 %endif %ifarch aarch64 - tar xf %{SOURCE21} + tar xf %{SOURCE13} mv node-%{nodejs_version}-linux-arm64 node-linux-arm64 # This is weird, but whatever ln -s node-linux-arm64 node-linux-x64 @@ -1025,6 +1037,19 @@ popd ln -s %{_bindir}/node third_party/node/linux/node-linux-x64/bin/node %endif +# Get rid of the bundled esbuild +%if 0%{?fedora} + ln -sf %{_bindir}/esbuild third_party/devtools-frontend/src/third_party/esbuild/esbuild +%else + %ifarch x86_64 + tar -zxf %{SOURCE14} --directory %{_tmppath} + %endif + %ifarch aarch64 + tar -zxf %{SOURCE15} --directory %{_tmppath} + %endif + mv %{_tmppath}/package/bin/esbuild third_party/devtools-frontend/src/third_party/esbuild/esbuild +%endif + # 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 @@ -1461,7 +1486,7 @@ popd cp -a remoting/host/installer/linux/is-remoting-session %{buildroot}%{crd_path}/ mkdir -p %{buildroot}%{_unitdir} - cp -a %{SOURCE11} %{buildroot}%{_unitdir}/ + cp -a %{SOURCE10} %{buildroot}%{_unitdir}/ sed -i 's|@@CRD_PATH@@|%{crd_path}|g' %{buildroot}%{_unitdir}/chrome-remote-desktop@.service %endif @@ -1492,7 +1517,7 @@ mkdir -p %{buildroot}%{_datadir}/icons/hicolor/24x24/apps cp -a chrome/app/theme/chromium/product_logo_24.png %{buildroot}%{_datadir}/icons/hicolor/24x24/apps/%{chromium_browser_channel}.png # Install the master_preferences file -install -m 0644 %{SOURCE13} %{buildroot}%{_sysconfdir}/%{name}/ +install -m 0644 %{SOURCE11} %{buildroot}%{_sysconfdir}/%{name}/ mkdir -p %{buildroot}%{_datadir}/applications/ desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE4} @@ -1679,6 +1704,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %{chromium_path}/chromedriver %changelog +* Tue Sep 19 2023 Arkady L. Shane - 117.0.5938.88-1.inferit +- Update to 117.0.5938.88 + * Fri Sep 15 2023 Arkady L. Shane - 117.0.5938.62-1.inferit - Update to 117.0.5938.62