diff --git a/fedora_patches/chromium-127-rust-clanglib.patch b/fedora_patches/chromium-127-rust-clanglib.patch index d4197016..64191483 100644 --- a/fedora_patches/chromium-127-rust-clanglib.patch +++ b/fedora_patches/chromium-127-rust-clanglib.patch @@ -1,35 +1,22 @@ -diff -up chromium-127.0.6533.72/build/rust/rust_bindgen.gni.me chromium-127.0.6533.72/build/rust/rust_bindgen.gni ---- chromium-127.0.6533.72/build/rust/rust_bindgen.gni.me 2024-07-25 16:11:18.754551595 +0200 -+++ chromium-127.0.6533.72/build/rust/rust_bindgen.gni 2024-07-25 16:11:33.997837660 +0200 -@@ -19,11 +19,11 @@ - - # On Windows, the libclang.dll is beside the bindgen.exe, otherwise it is in - # ../lib. --_libclang_path = rust_bindgen_root -+_libclang_path = clang_base_path - if (host_os == "win") { - _libclang_path += "/bin" - } else { -- _libclang_path += "/lib" -+ _libclang_path += "/lib64" - } - - # Template to build Rust/C bindings with bindgen. -diff -up chromium-121.0.6167.57/build/config/clang/BUILD.gn.rust-clang_lib chromium-121.0.6167.57/build/config/clang/BUILD.gn ---- chromium-121.0.6167.57/build/config/clang/BUILD.gn.rust-clang_lib 2024-01-10 16:43:01.000000000 +0100 -+++ chromium-121.0.6167.57/build/config/clang/BUILD.gn 2024-01-20 19:51:38.481992799 +0100 -@@ -112,6 +112,7 @@ template("clang_lib") { +diff --git a/build/config/clang/BUILD.gn b/build/config/clang/BUILD.gn +index 3b561e9b0c0a9..2bddbd82de21a 100644 +--- a/build/config/clang/BUILD.gn ++++ b/build/config/clang/BUILD.gn +@@ -166,8 +166,9 @@ template("clang_lib") { _prefix = "lib" _suffix = "" _ext = "a" + _libprefix = "" + +- _clang_lib_dir = "$clang_base_path/lib/clang/$clang_version/lib" ++ _clang_lib_dir = "$clang_base_path/lib${_libprefix}/clang/$clang_version/lib" if (is_win) { _dir = "windows" _prefix = "" -@@ -127,7 +128,33 @@ template("clang_lib") { +@@ -197,7 +198,33 @@ template("clang_lib") { + } else { + assert(false) # Unhandled cpu type } - } else if (is_apple) { - _dir = "darwin" - } else if (is_linux || is_chromeos) { + } else if (is_linux) { + if (current_cpu == "x64") { @@ -61,19 +48,29 @@ diff -up chromium-121.0.6167.57/build/config/clang/BUILD.gn.rust-clang_lib chrom if (current_cpu == "x64") { _dir = "x86_64-unknown-linux-gnu" } else if (current_cpu == "x86") { -@@ -166,7 +193,7 @@ template("clang_lib") { - assert(false) # Unhandled target platform - } +diff --git a/build/rust/rust_bindgen.gni b/build/rust/rust_bindgen.gni +index 5c809c6932c84..574d04c6b6c52 100644 +--- a/build/rust/rust_bindgen.gni ++++ b/build/rust/rust_bindgen.gni +@@ -19,11 +19,11 @@ if (host_os == "win") { -- _clang_lib_dir = "$clang_base_path/lib/clang/$clang_version/lib" -+ _clang_lib_dir = "$clang_base_path/lib${_libprefix}/clang/$clang_version/lib" - _lib_file = "${_prefix}clang_rt.${_libname}${_suffix}.${_ext}" - libs = [ "$_clang_lib_dir/$_dir/$_lib_file" ] - } -diff -up chromium-132.0.6834.57/build/rust/rust_bindgen_generator.gni.me chromium-132.0.6834.57/build/rust/rust_bindgen_generator.gni ---- chromium-132.0.6834.57/build/rust/rust_bindgen_generator.gni.me 2024-12-31 15:08:27.013151672 +0100 -+++ chromium-132.0.6834.57/build/rust/rust_bindgen_generator.gni 2024-12-31 15:08:49.538663024 +0100 -@@ -18,11 +18,11 @@ + # On Windows, the libclang.dll is beside the bindgen.exe, otherwise it is in + # ../lib. +-_libclang_path = rust_bindgen_root ++_libclang_path = clang_base_path + if (host_os == "win") { + _libclang_path += "/bin" + } else { +- _libclang_path += "/lib" ++ _libclang_path += "/lib64" + } + + # Template to build Rust/C bindings with bindgen. +diff --git a/build/rust/rust_bindgen_generator.gni b/build/rust/rust_bindgen_generator.gni +index c91916be93ba5..3377c0b5e0b56 100644 +--- a/build/rust/rust_bindgen_generator.gni ++++ b/build/rust/rust_bindgen_generator.gni +@@ -18,11 +18,11 @@ if (host_os == "win") { # On Windows, the libclang.dll is beside the bindgen.exe, otherwise it is in # ../lib. diff --git a/patches/use-adler-v1.patch b/patches/use-adler-v1.patch deleted file mode 100644 index f6d074dd..00000000 --- a/patches/use-adler-v1.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/build/rust/std/BUILD.gn b/build/rust/std/BUILD.gn -index 6b996aa1fe386..68b085be200fa 100644 ---- a/build/rust/std/BUILD.gn -+++ b/build/rust/std/BUILD.gn -@@ -89,7 +89,7 @@ if (toolchain_has_rust) { - # These are no longer present in the Windows toolchain. - stdlib_files += [ - "addr2line", -- "adler2", -+ "adler", - "gimli", - "libc", - "memchr",