MSVSphere Packaging Team
1 month ago
parent
e1dce5d57c
commit
e81f8c406a
GPG Key ID:
B2B0B9F29E528FE8
@ -1,13 +1,24 @@
|
|||||||
Index: chromium-128.0.6613.113/base/compiler_specific.h
|
diff -up chromium-131.0.6778.69/base/compiler_specific.h.me chromium-131.0.6778.69/base/compiler_specific.h
|
||||||
===================================================================
|
--- chromium-131.0.6778.69/base/compiler_specific.h.me 2024-11-19 20:44:12.404060581 +0100
|
||||||
--- chromium-128.0.6613.113.orig/base/compiler_specific.h
|
+++ chromium-131.0.6778.69/base/compiler_specific.h 2024-11-19 20:44:54.434121935 +0100
|
||||||
+++ chromium-128.0.6613.113/base/compiler_specific.h
|
@@ -152,7 +152,7 @@
|
||||||
@@ -88,7 +88,7 @@
|
// MUSTTAIL return Func1(d + 1); // `Func1()` will be tail-called.
|
||||||
// Can be used only on return statements, even for functions returning void.
|
// }
|
||||||
// Caller and callee must have the same number of arguments and its types must
|
// ```
|
||||||
// be "similar".
|
-#if __has_cpp_attribute(clang::musttail)
|
||||||
-#if defined(__clang__) && HAS_ATTRIBUTE(musttail)
|
+#if __has_cpp_attribute(clang::musttail) && !defined(__powerpc64__)
|
||||||
+#if defined(__clang__) && HAS_ATTRIBUTE(musttail) && !defined(__powerpc64__)
|
|
||||||
#define MUSTTAIL [[clang::musttail]]
|
#define MUSTTAIL [[clang::musttail]]
|
||||||
#else
|
#else
|
||||||
#define MUSTTAIL
|
#define MUSTTAIL
|
||||||
|
diff -up chromium-131.0.6778.85/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h.me chromium-131.0.6778.85/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h
|
||||||
|
--- chromium-131.0.6778.85/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h.me 2024-11-20 18:50:28.690761262 +0100
|
||||||
|
+++ chromium-131.0.6778.85/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h 2024-11-20 18:54:49.374711202 +0100
|
||||||
|
@@ -138,7 +138,7 @@
|
||||||
|
// PA_MUSTTAIL return Func1(d + 1); // `Func1()` will be tail-called.
|
||||||
|
// }
|
||||||
|
// ```
|
||||||
|
-#if PA_HAS_CPP_ATTRIBUTE(clang::musttail)
|
||||||
|
+#if PA_HAS_CPP_ATTRIBUTE(clang::musttail) && !defined(__powerpc64__)
|
||||||
|
#define PA_MUSTTAIL [[clang::musttail]]
|
||||||
|
#else
|
||||||
|
#define PA_MUSTTAIL
|
||||||
|
|||||||
@ -0,0 +1,13 @@
|
|||||||
|
diff -up chromium-131.0.6778.69/build/linux/unbundle/freetype.gn.me chromium-131.0.6778.69/build/linux/unbundle/freetype.gn
|
||||||
|
--- chromium-131.0.6778.69/build/linux/unbundle/freetype.gn.me 2024-11-13 08:48:26.212329841 +0100
|
||||||
|
+++ chromium-131.0.6778.69/build/linux/unbundle/freetype.gn 2024-11-13 08:49:03.071985611 +0100
|
||||||
|
@@ -11,4 +11,9 @@ declare_args() {
|
||||||
|
# System FreeType configurations other than as described WILL INTRODUCE TEXT
|
||||||
|
# RENDERING AND SECURITY REGRESSIONS.
|
||||||
|
use_system_freetype = true
|
||||||
|
+
|
||||||
|
+ # Use FreeType for font rendering. If this is set to false, FreeType is
|
||||||
|
+ # replaced with the Rust-based Fontations set of libraries plus Skia
|
||||||
|
+ # path rendering.
|
||||||
|
+ enable_freetype = true
|
||||||
|
}
|
||||||
@ -1,15 +1,13 @@
|
|||||||
author: Andres Salomon <dilinger@debian.org>
|
diff -up chromium-131.0.6778.69/build/config/rust.gni.fix-rustc chromium-131.0.6778.69/build/config/rust.gni
|
||||||
description: allow ppc64le to build by using proper rustc target
|
--- chromium-131.0.6778.69/build/config/rust.gni.fix-rustc 2024-11-12 22:48:45.000000000 +0100
|
||||||
Index: chromium-128.0.6613.113/build/config/rust.gni
|
+++ chromium-131.0.6778.69/build/config/rust.gni 2024-11-19 23:01:25.484436409 +0100
|
||||||
===================================================================
|
@@ -200,6 +200,9 @@ if (is_linux || is_chromeos) {
|
||||||
--- chromium-128.0.6613.113.orig/build/config/rust.gni
|
|
||||||
+++ chromium-128.0.6613.113/build/config/rust.gni
|
|
||||||
@@ -186,6 +186,8 @@ rust_abi_target = ""
|
|
||||||
if (is_linux || is_chromeos) {
|
|
||||||
if (current_cpu == "arm64") {
|
if (current_cpu == "arm64") {
|
||||||
rust_abi_target = "aarch64-unknown-linux-gnu"
|
rust_abi_target = "aarch64-unknown-linux-gnu"
|
||||||
|
cargo_target_abi = ""
|
||||||
+ } else if (current_cpu == "ppc64") {
|
+ } else if (current_cpu == "ppc64") {
|
||||||
+ rust_abi_target = "powerpc64le-unknown-linux-gnu"
|
+ rust_abi_target = "powerpc64le-unknown-linux-gnu"
|
||||||
|
+ cargo_target_abi = ""
|
||||||
} else if (current_cpu == "x86") {
|
} else if (current_cpu == "x86") {
|
||||||
rust_abi_target = "i686-unknown-linux-gnu"
|
rust_abi_target = "i686-unknown-linux-gnu"
|
||||||
} else if (current_cpu == "x64") {
|
cargo_target_abi = ""
|
||||||
|
|||||||
@ -0,0 +1,61 @@
|
|||||||
|
#! /bin/bash
|
||||||
|
|
||||||
|
SRC_DIR=chromium-src
|
||||||
|
VERSION=$1
|
||||||
|
if [[ -z $VERSION ]]; then
|
||||||
|
echo "Version is missing"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
rm -rf $SRC_DIR && mkdir -p $SRC_DIR
|
||||||
|
pushd $SRC_DIR
|
||||||
|
cat >.gclient <<EOF
|
||||||
|
solutions = [
|
||||||
|
{
|
||||||
|
"name": "src",
|
||||||
|
"url": "https://chromium.googlesource.com/chromium/src.git",
|
||||||
|
"managed": False,
|
||||||
|
"custom_deps": {},
|
||||||
|
"custom_vars": {},
|
||||||
|
},
|
||||||
|
]
|
||||||
|
EOF
|
||||||
|
|
||||||
|
export PATH+=":$PWD/depot_tools"
|
||||||
|
export DEPOT_TOOLS_UPDATE=0
|
||||||
|
echo "Clone chromium-$VERSION..."
|
||||||
|
git clone -b $VERSION --depth=2 https://chromium.googlesource.com/chromium/src
|
||||||
|
echo "Clone depot_tools..."
|
||||||
|
git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools
|
||||||
|
gclient sync --no-history --nohooks
|
||||||
|
src/tools/update_pgo_profiles.py --target=linux update --gs-url-base=chromium-optimization-profiles/pgo_profiles
|
||||||
|
src/build/util/lastchange.py -o src/build/util/LASTCHANGE
|
||||||
|
src/build/util/lastchange.py -s src/third_party/dawn --revision src/gpu/webgpu/DAWN_VERSION
|
||||||
|
src/build/util/lastchange.py -m GPU_LISTS_VERSION --revision-id-only --header src/gpu/config/gpu_lists_version.h
|
||||||
|
src/build/util/lastchange.py -m SKIA_COMMIT_HASH -s src/third_party/skia --header src/skia/ext/skia_commit_hash.h
|
||||||
|
|
||||||
|
find src -type d -name ".git" | xargs rm -rf
|
||||||
|
find src/third_party/jdk/current -type f -delete
|
||||||
|
rm -rf src/build/linux/debian_bullseye_amd64-sysroot \
|
||||||
|
src/build/linux/debian_bullseye_i386-sysroot \
|
||||||
|
src/third_party/node/linux/node-linux-x64* \
|
||||||
|
src/third_party/rust-toolchain \
|
||||||
|
src/third_party/rust-src
|
||||||
|
|
||||||
|
# clean ffmpeg
|
||||||
|
echo "Cleaning ffmpeg from proprietary things..."
|
||||||
|
ln -s ../clean_ffmpeg.sh .
|
||||||
|
ln -s ../ffmpeg-clean.patch .
|
||||||
|
ln -s ../get_free_ffmpeg_source_files.py .
|
||||||
|
./clean_ffmpeg.sh src 1
|
||||||
|
|
||||||
|
# clean openh264
|
||||||
|
echo "Cleaning openh264 from proprietary things..."
|
||||||
|
find src/third_party/openh264/src -type f -not -name '*.h' -delete
|
||||||
|
mv src ../chromium-$VERSION
|
||||||
|
popd
|
||||||
|
|
||||||
|
echo "Compressing cleaned tree, please wait..."
|
||||||
|
tar -cf - chromium-$VERSION | xz -9 -T 0 -f > chromium-$VERSION-clean.tar.xz
|
||||||
|
echo "Finished!"
|
||||||
|
|
||||||
Loading…
Reference in new issue