From 20b7e208d5821e6b989a232b66505a5f44a82abf Mon Sep 17 00:00:00 2001 From: Chris Xiong Date: Sun, 13 Mar 2022 03:38:41 -0400 Subject: chromium 101.0.4929.5 with sync'ed changes from official repo. --- .../files/chromium-101-libxml-unbundle.patch | 10 ++++ .../files/chromium-97-arm-tflite-cast.patch | 26 ++++++++++ .../chromium/files/chromium-98-gtk4-build.patch | 56 ++++++++++++++++++++++ .../chromium/files/chromium-cross-compile.patch | 12 +++++ 4 files changed, 104 insertions(+) create mode 100644 www-client/chromium/files/chromium-101-libxml-unbundle.patch create mode 100644 www-client/chromium/files/chromium-97-arm-tflite-cast.patch create mode 100644 www-client/chromium/files/chromium-98-gtk4-build.patch create mode 100644 www-client/chromium/files/chromium-cross-compile.patch (limited to 'www-client/chromium/files') diff --git a/www-client/chromium/files/chromium-101-libxml-unbundle.patch b/www-client/chromium/files/chromium-101-libxml-unbundle.patch new file mode 100644 index 0000000..5699bc8 --- /dev/null +++ b/www-client/chromium/files/chromium-101-libxml-unbundle.patch @@ -0,0 +1,10 @@ +--- a/build/linux/unbundle/libxml.gn ++++ b/build/linux/unbundle/libxml.gn +@@ -19,6 +19,7 @@ static_library("libxml_utils") { + ":xml_reader", + ":xml_writer", + "//base/test:test_support", ++ "//services/data_decoder:lib", + "//services/data_decoder:xml_parser_fuzzer_deps", + ] + sources = [ diff --git a/www-client/chromium/files/chromium-97-arm-tflite-cast.patch b/www-client/chromium/files/chromium-97-arm-tflite-cast.patch new file mode 100644 index 0000000..843a384 --- /dev/null +++ b/www-client/chromium/files/chromium-97-arm-tflite-cast.patch @@ -0,0 +1,26 @@ +vreinterpret_s32_s8() casts int8x8_t to int32x2_t. However, third argument +of vdotq_lane_s32() is of type int8x8_t. + +--- a/third_party/tflite/src/tensorflow/lite/kernels/internal/optimized/depthwiseconv_3x3_filter_common.h ++++ b/third_party/tflite/src/tensorflow/lite/kernels/internal/optimized/depthwiseconv_3x3_filter_common.h +@@ -129,16 +129,14 @@ inline int32x4_t vdotq_four_lane_s32(int32x4_t acc, int8x16_t lhs, + int8x16_t rhs, const int lane) { + switch (lane) { + case 0: +- return vdotq_lane_s32(acc, lhs, vreinterpret_s32_s8(vget_low_s8(rhs)), 0); ++ return vdotq_lane_s32(acc, lhs, vget_low_s8(rhs), 0); + case 1: +- return vdotq_lane_s32(acc, lhs, vreinterpret_s32_s8(vget_low_s8(rhs)), 1); ++ return vdotq_lane_s32(acc, lhs, vget_low_s8(rhs), 1); + case 2: +- return vdotq_lane_s32(acc, lhs, vreinterpret_s32_s8(vget_high_s8(rhs)), +- 0); ++ return vdotq_lane_s32(acc, lhs, vget_high_s8(rhs), 0); + case 3: + default: +- return vdotq_lane_s32(acc, lhs, vreinterpret_s32_s8(vget_high_s8(rhs)), +- 1); ++ return vdotq_lane_s32(acc, lhs, vget_high_s8(rhs), 1); + } + } + diff --git a/www-client/chromium/files/chromium-98-gtk4-build.patch b/www-client/chromium/files/chromium-98-gtk4-build.patch new file mode 100644 index 0000000..94d2f1f --- /dev/null +++ b/www-client/chromium/files/chromium-98-gtk4-build.patch @@ -0,0 +1,56 @@ +--- a/ui/gtk/gsk.sigs ++++ b/ui/gtk/gsk.sigs +@@ -1,16 +1,16 @@ +-GskRenderNodeType gsk_render_node_get_node_type(GskRenderNode* node); ++GskRenderNodeType gsk_render_node_get_node_type(const GskRenderNode* node); + void gsk_render_node_unref(GskRenderNode* node); +-GskRenderNode* gsk_transform_node_get_child(GskRenderNode* node); +-GskRenderNode* gsk_opacity_node_get_child(GskRenderNode* node); +-GskRenderNode* gsk_color_matrix_node_get_child(GskRenderNode* node); +-GskRenderNode* gsk_repeat_node_get_child(GskRenderNode* node); +-GskRenderNode* gsk_clip_node_get_child(GskRenderNode* node); +-GskRenderNode* gsk_rounded_clip_node_get_child(GskRenderNode* node); +-GskRenderNode* gsk_shadow_node_get_child(GskRenderNode* node); +-GskRenderNode* gsk_blur_node_get_child(GskRenderNode* node); +-GskRenderNode* gsk_debug_node_get_child(GskRenderNode* node); +-GskRenderNode* gsk_container_node_get_child(GskRenderNode* node, guint idx); +-GskRenderNode* gsk_gl_shader_node_get_child(GskRenderNode* node, guint idx); +-guint gsk_container_node_get_n_children(GskRenderNode* node); +-guint gsk_gl_shader_node_get_n_children(GskRenderNode* node); +-GdkTexture* gsk_texture_node_get_texture(GskRenderNode* node); ++GskRenderNode* gsk_transform_node_get_child(const GskRenderNode* node); ++GskRenderNode* gsk_opacity_node_get_child(const GskRenderNode* node); ++GskRenderNode* gsk_color_matrix_node_get_child(const GskRenderNode* node); ++GskRenderNode* gsk_repeat_node_get_child(const GskRenderNode* node); ++GskRenderNode* gsk_clip_node_get_child(const GskRenderNode* node); ++GskRenderNode* gsk_rounded_clip_node_get_child(const GskRenderNode* node); ++GskRenderNode* gsk_shadow_node_get_child(const GskRenderNode* node); ++GskRenderNode* gsk_blur_node_get_child(const GskRenderNode* node); ++GskRenderNode* gsk_debug_node_get_child(const GskRenderNode* node); ++GskRenderNode* gsk_container_node_get_child(const GskRenderNode* node, guint idx); ++GskRenderNode* gsk_gl_shader_node_get_child(const GskRenderNode* node, guint idx); ++guint gsk_container_node_get_n_children(const GskRenderNode* node); ++guint gsk_gl_shader_node_get_n_children(const GskRenderNode* node); ++GdkTexture* gsk_texture_node_get_texture(const GskRenderNode* node); +--- a/ui/gtk/gtk_util.cc ++++ b/ui/gtk/gtk_util.cc +@@ -705,7 +705,7 @@ + DCHECK(GtkCheckVersion(4)); + struct { + GskRenderNodeType node_type; +- GskRenderNode* (*get_child)(GskRenderNode*); ++ GskRenderNode* (*get_child)(const GskRenderNode*); + } constexpr simple_getters[] = { + {GSK_TRANSFORM_NODE, gsk_transform_node_get_child}, + {GSK_OPACITY_NODE, gsk_opacity_node_get_child}, +@@ -719,8 +719,8 @@ + }; + struct { + GskRenderNodeType node_type; +- guint (*get_n_children)(GskRenderNode*); +- GskRenderNode* (*get_child)(GskRenderNode*, guint); ++ guint (*get_n_children)(const GskRenderNode*); ++ GskRenderNode* (*get_child)(const GskRenderNode*, guint); + } constexpr container_getters[] = { + {GSK_CONTAINER_NODE, gsk_container_node_get_n_children, + gsk_container_node_get_child}, diff --git a/www-client/chromium/files/chromium-cross-compile.patch b/www-client/chromium/files/chromium-cross-compile.patch new file mode 100644 index 0000000..430ceb7 --- /dev/null +++ b/www-client/chromium/files/chromium-cross-compile.patch @@ -0,0 +1,12 @@ +--- a/build/toolchain/linux/unbundle/BUILD.gn ++++ b/build/toolchain/linux/unbundle/BUILD.gn +@@ -35,7 +35,7 @@ gcc_toolchain("host") { + extra_ldflags = getenv("BUILD_LDFLAGS") + + toolchain_args = { +- current_cpu = current_cpu +- current_os = current_os ++ current_cpu = host_cpu ++ current_os = host_os + } + } -- cgit v1.2.3