diff --git a/.gitignore b/.gitignore index 6a2d41a5..4f2e25c3 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,5 @@ /linux-arm64-0.19.2.tgz /linux-x64-0.19.2.tgz /v0.69.4.tar.gz +/bindgen-cli-aarch64.tar.xz +/bindgen-cli-x86_64.tar.xz diff --git a/chromium.spec b/chromium.spec index fb019c29..43df6131 100644 --- a/chromium.spec +++ b/chromium.spec @@ -513,7 +513,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} @@ -1213,6 +1214,20 @@ Qt6 UI for chromium. # 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 @@ -1274,18 +1289,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} diff --git a/sources b/sources index 60b93c8d..824d4710 100644 --- a/sources +++ b/sources @@ -3,4 +3,5 @@ SHA512 (node-v20.6.1-linux-x64.tar.xz) = 7e15c05041a9a50f0046266aadb2e092a5aefbe SHA512 (linux-arm64-0.19.2.tgz) = 8a0d8fec6786fffcd6954d00820037a55d61e60762c74300df0801f8db27057562c221a063bedfb8df56af9ba80abb366336987e881782c5996e6f871abd3dc6 SHA512 (linux-x64-0.19.2.tgz) = a31cc74c4bfa54f9b75d735a1cfc944d3b5efb7c06bfba9542da9a642ae0b2d235ea00ae84d3ad0572c406405110fe7b61377af0fd15803806ef78d20fc6f05d SHA512 (chromium-127.0.6533.72-clean.tar.xz) = 6faa0b0df800bafb31acb003d23f62e5eeea12c49ed3b9bf52c2e4f7ef3a7d7f6069f41026092bcb1e222dcbf4f0a3a0595e9be52502375f0b1094551cc7a98c -SHA512 (v0.69.4.tar.gz) = a493474c89255c801c6fd4eb44e6a94f4d23830dc13c0bbae08c46e5c364e0df176fc00174d6462b70239578d0821e9ff1aaf127d8c60688f38a50a62cf292f4 +SHA512 (bindgen-cli-aarch64.tar.xz) = 1a5ae4e8fdd31d80e8111c4d5f2115336684763ecd3a442ffecdbc2a37bab146f88bdee0bb1ea7a98e1049f81b12e64bd0ce5510529b30a74ce3306488ac129b +SHA512 (bindgen-cli-x86_64.tar.xz) = 7ccc9b43b32d3a064a75cfc150e060711356da8fe98e83d855bae017108ef8e9e172fbdd6e2579433c19cfb56ababa5b77a8db6fa57a5e657a3878778ca10a37