diff --git a/.chromium.metadata b/.chromium.metadata index 3334efe1..6ba0314e 100644 --- a/.chromium.metadata +++ b/.chromium.metadata @@ -7,4 +7,5 @@ dea187019741602d57aaf189a80abba261fbd2aa SOURCES/linux-x64-0.19.2.tgz a2a9663fa5c46439dafbc1b0f23825b2a8c68acf SOURCES/msspi-2e626e5a5605cc4c03fa4bfc0145e459864e897a.tar.xz 6fa9320397a6393a77152807c6de0306837dcc5f SOURCES/Chromium-Gost-39c440395462a753a3f064f7e28fdc2bc3173bf2.tar.xz 4543172087b8a3971b37ddaa4cf1fc91a575bfae SOURCES/Chromium-Gost-3224c62bcc360b80de98da20358cbbe16d773c10.tar.xz -f8e140b06b9255dc5b1e9bbfa80d299570b2fcc2 SOURCES/v0.69.4.tar.gz +b66519ed49abdd4712315ae3a4645830073c09cf SOURCES/bindgen-cli-aarch64.tar.xz +107a886d1095bb01268e6cd51f1878385e694229 SOURCES/bindgen-cli-x86_64.tar.xz diff --git a/.gitignore b/.gitignore index 61cc7649..91e6709e 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,5 @@ SOURCES/node-v20.6.1-linux-arm64.tar.xz SOURCES/chromium-browser-gost-icons.tar.xz SOURCES/msspi-2e626e5a5605cc4c03fa4bfc0145e459864e897a.tar.xz SOURCES/Chromium-Gost-3224c62bcc360b80de98da20358cbbe16d773c10.tar.xz +SOURCES/bindgen-cli-aarch64.tar.xz +SOURCES/bindgen-cli-x86_64.tar.xz diff --git a/SPECS/chromium.spec b/SPECS/chromium.spec index cfa1d23e..3ceb44ed 100644 --- a/SPECS/chromium.spec +++ b/SPECS/chromium.spec @@ -562,7 +562,8 @@ Source15: https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-%{esbuil %endif # bindgen for epel8 -Source16: https://github.com/rust-lang/rust-bindgen/archive/refs/tags/v0.69.4.tar.gz +Source16: https://than.fedorapeople.org/epel8/bindgen-cli-aarch64.tar.xz +Source17: https://than.fedorapeople.org/epel8/bindgen-cli-x86_64.tar.xz # esbuild binary from fedora %if 0%{?fedora} @@ -1367,6 +1368,20 @@ 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]\?=#!%{chromium_pybin}=' {} + +# workaround for missing bindgen on el8 +%if 0%{?rhel} == 8 +%ifarch aarch64 +tar -Jxf %{SOURCE16} +%endif +%ifarch x86_64 +tar -Jxf %{SOURCE17} +%endif +mkdir -p usr/%{_lib} +pushd usr/%{_lib} +ln -fs %{_libdir}/libclang* . +popd +%endif + # Add correct path for nodejs binary %if ! %{system_nodejs} pushd third_party/node/linux @@ -1428,18 +1443,6 @@ cp -a third_party/dav1d/version/version.h third_party/dav1d/libdav1d/include/dav %endif %build -# build bindgen on el8 -%if 0%{?rhel} == 8 -tar -zxf %{SOURCE16} -pushd rust-bindgen-0.69.4 -cargo --offline build -mkdir -p ..%{_bindir} ..%{_libdir} -cp target/debug/bindgen ..%{_bindir} -pushd ..%{_libdir} -ln -fs %{_libdir}/libclang* . -popd -popd -%endif # reduce warnings %if %{clang}