Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package chromium for openSUSE:Factory
checked in at 2023-10-08 12:19:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/chromium (Old)
and /work/SRC/openSUSE:Factory/.chromium.new.28202 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "chromium"
Sun Oct 8 12:19:17 2023 rev:402 rq:1116230 version:118.0.5993.54
Changes:
--------
--- /work/SRC/openSUSE:Factory/chromium/chromium.changes 2023-10-04
22:33:58.681120257 +0200
+++ /work/SRC/openSUSE:Factory/.chromium.new.28202/chromium.changes
2023-10-08 12:23:54.426215433 +0200
@@ -1,0 +2,7 @@
+Sat Oct 7 15:32:52 UTC 2023 - Andreas Stieger <andreas.stie...@gmx.de>
+
+- Chromium 118.0.5993.54
+- add patches:
+ * chromium-118-includes.patch
+
+-------------------------------------------------------------------
Old:
----
chromium-117.0.5938.149.tar.xz
New:
----
chromium-118-includes.patch
chromium-118.0.5993.54.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ chromium.spec ++++++
--- /var/tmp/diff_new_pack.JkVBRl/_old 2023-10-08 12:24:13.014884117 +0200
+++ /var/tmp/diff_new_pack.JkVBRl/_new 2023-10-08 12:24:13.014884117 +0200
@@ -36,14 +36,12 @@
%endif
%if 0%{?suse_version} >= 1599
%bcond_without system_harfbuzz
-%bcond_without system_freetype
%bcond_without arm_bti
%bcond_without system_icu
%bcond_without ffmpeg_51
%bcond_without qt6
%else
%bcond_with system_harfbuzz
-%bcond_with system_freetype
%bcond_with arm_bti
%bcond_with system_icu
%bcond_with ffmpeg_51
@@ -68,6 +66,7 @@
%bcond_without lto
%bcond_without pipewire
%bcond_without system_ffmpeg
+%bcond_with system_freetype
%bcond_without system_zlib
%bcond_with system_vpx
# FFmpeg version
@@ -85,7 +84,7 @@
%define n_suffix %{nil}
%endif
Name: chromium%{n_suffix}
-Version: 117.0.5938.149
+Version: 118.0.5993.54
Release: 0
Summary: Google's open source browser project
License: BSD-3-Clause AND LGPL-2.1-or-later
@@ -143,6 +142,7 @@
Patch239: chromium-117-includes.patch
Patch240: chromium-117-string-convert.patch
Patch241: chromium-117-lp155-typename.patch
+Patch242: chromium-118-includes.patch
BuildRequires: (python3 >= 3.7 or python3-dataclasses)
BuildRequires: (python3-importlib-metadata if python3-base < 3.8)
BuildRequires: SDL-devel
++++++ chromium-110-compiler.patch ++++++
--- /var/tmp/diff_new_pack.JkVBRl/_old 2023-10-08 12:24:13.090886851 +0200
+++ /var/tmp/diff_new_pack.JkVBRl/_new 2023-10-08 12:24:13.094886995 +0200
@@ -7,11 +7,11 @@
build/config/compiler/BUILD.gn | 134 +++++----------------------------
1 file changed, 17 insertions(+), 117 deletions(-)
-Index: chromium-115.0.5790.32/build/config/compiler/BUILD.gn
+Index: chromium-118.0.5993.18/build/config/compiler/BUILD.gn
===================================================================
---- chromium-115.0.5790.32.orig/build/config/compiler/BUILD.gn
-+++ chromium-115.0.5790.32/build/config/compiler/BUILD.gn
-@@ -302,9 +302,7 @@ config("compiler") {
+--- chromium-118.0.5993.18.orig/build/config/compiler/BUILD.gn
++++ chromium-118.0.5993.18/build/config/compiler/BUILD.gn
+@@ -310,9 +310,7 @@ config("compiler") {
configs += [
# See the definitions below.
@@ -21,7 +21,7 @@
":compiler_codegen",
":compiler_deterministic",
]
-@@ -570,37 +568,6 @@ config("compiler") {
+@@ -580,37 +578,6 @@ config("compiler") {
ldflags += [ "-Wl,-z,keep-text-section-prefix" ]
}
@@ -59,7 +59,7 @@
# C11/C++11 compiler flags setup.
# ---------------------------
if (is_linux || is_chromeos || is_android || (is_nacl && is_clang) ||
-@@ -1436,46 +1403,6 @@ config("compiler_deterministic") {
+@@ -1453,46 +1420,6 @@ config("compiler_deterministic") {
}
}
@@ -106,7 +106,7 @@
# Tells the compiler not to use absolute paths when passing the default
# paths to the tools it invokes. We don't want this because we don't
# really need it and it can mess up the goma cache entries.
-@@ -1494,27 +1421,6 @@ config("compiler_deterministic") {
+@@ -1511,27 +1438,6 @@ config("compiler_deterministic") {
}
}
@@ -134,7 +134,7 @@
config("rustc_revision") {
if (rustc_revision != "") {
# Similar to the above config, this is here so that all files get
recompiled
-@@ -1804,7 +1710,7 @@ config("chromium_code") {
+@@ -1864,7 +1770,7 @@ config("chromium_code") {
defines = [ "_HAS_NODISCARD" ]
}
} else {
@@ -143,7 +143,7 @@
if (treat_warnings_as_errors) {
cflags += [ "-Werror" ]
-@@ -1813,10 +1719,6 @@ config("chromium_code") {
+@@ -1873,10 +1779,6 @@ config("chromium_code") {
# well.
ldflags = [ "-Werror" ]
}
@@ -154,7 +154,7 @@
if (treat_warnings_as_errors) {
# Turn rustc warnings into the "deny" lint level, which produce compiler
-@@ -1834,16 +1736,6 @@ config("chromium_code") {
+@@ -1894,23 +1796,6 @@ config("chromium_code") {
"__STDC_FORMAT_MACROS",
]
@@ -165,13 +165,20 @@
- # Non-chromium code is not guaranteed to compile cleanly with
- # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are
- # disabled, so only do that for Release build.
-- defines += [ "_FORTIFY_SOURCE=2" ]
+- fortify_level = "2"
+-
+- # ChromeOS supports a high-quality _FORTIFY_SOURCE=3 implementation
+- # with a few custom glibc patches. Use that if it's available.
+- if (is_chromeos_ash) {
+- fortify_level = "3"
+- }
+- defines += [ "_FORTIFY_SOURCE=" + fortify_level ]
- }
-
if (is_apple) {
cflags_objc = [ "-Wimplicit-retain-self" ]
cflags_objcc = [ "-Wimplicit-retain-self" ]
-@@ -2212,7 +2104,8 @@ config("default_stack_frames") {
+@@ -2277,7 +2162,8 @@ config("default_stack_frames") {
}
# Default "optimization on" config.
@@ -181,7 +188,7 @@
if (is_win) {
if (chrome_pgo_phase != 2) {
# Favor size over speed, /O1 must be before the common flags.
-@@ -2271,7 +2164,8 @@ config("optimize") {
+@@ -2336,7 +2222,8 @@ config("optimize") {
}
# Turn off optimizations.
@@ -191,7 +198,7 @@
if (is_win) {
cflags = [
"/Od", # Disable optimization.
-@@ -2311,7 +2205,8 @@ config("no_optimize") {
+@@ -2376,7 +2263,8 @@ config("no_optimize") {
# Turns up the optimization level. On Windows, this implies whole program
# optimization and link-time code generation which is very expensive and
should
# be used sparingly.
@@ -201,7 +208,7 @@
if (is_nacl && is_nacl_irt) {
# The NaCl IRT is a special case and always wants its own config.
# Various components do:
-@@ -2344,7 +2239,8 @@ config("optimize_max") {
+@@ -2409,7 +2297,8 @@ config("optimize_max") {
#
# TODO(crbug.com/621335) - rework how all of these configs are related
# so that we don't need this disclaimer.
@@ -211,7 +218,7 @@
if (is_nacl && is_nacl_irt) {
# The NaCl IRT is a special case and always wants its own config.
# Various components do:
-@@ -2370,7 +2266,8 @@ config("optimize_speed") {
+@@ -2435,7 +2324,8 @@ config("optimize_speed") {
}
}
@@ -221,7 +228,7 @@
cflags = [ "-O1" ] + common_optimize_on_cflags
rustflags = [ "-Copt-level=1" ]
ldflags = common_optimize_on_ldflags
-@@ -2495,7 +2392,8 @@ config("win_pdbaltpath") {
+@@ -2568,7 +2458,8 @@ config("win_pdbaltpath") {
}
# Full symbols.
@@ -231,7 +238,7 @@
rustflags = []
if (is_win) {
if (is_clang) {
-@@ -2638,7 +2536,8 @@ config("symbols") {
+@@ -2717,7 +2608,8 @@ config("symbols") {
# Minimal symbols.
# This config guarantees to hold symbol for stack trace which are shown to
user
# when crash happens in unittests running on buildbot.
@@ -241,7 +248,7 @@
rustflags = []
if (is_win) {
# Functions, files, and line tables only.
-@@ -2723,7 +2622,8 @@ config("minimal_symbols") {
+@@ -2802,7 +2694,8 @@ config("minimal_symbols") {
# This configuration contains function names only. That is, the compiler is
# told to not generate debug information and the linker then just puts
function
# names in the final debug information.
++++++ chromium-117-includes.patch ++++++
--- /var/tmp/diff_new_pack.JkVBRl/_old 2023-10-08 12:24:13.142888721 +0200
+++ /var/tmp/diff_new_pack.JkVBRl/_new 2023-10-08 12:24:13.146888865 +0200
@@ -27,10 +27,10 @@
[ 863s] std::abs
[ 863s] 3 warnings and 2 errors generated.
-Index:
chromium-117.0.5938.22/third_party/material_color_utilities/src/cpp/palettes/tones.cc
+Index:
chromium-118.0.5993.18/third_party/material_color_utilities/src/cpp/palettes/tones.cc
===================================================================
----
chromium-117.0.5938.22.orig/third_party/material_color_utilities/src/cpp/palettes/tones.cc
-+++
chromium-117.0.5938.22/third_party/material_color_utilities/src/cpp/palettes/tones.cc
+---
chromium-118.0.5993.18.orig/third_party/material_color_utilities/src/cpp/palettes/tones.cc
++++
chromium-118.0.5993.18/third_party/material_color_utilities/src/cpp/palettes/tones.cc
@@ -18,6 +18,7 @@
#include "cpp/cam/cam.h"
@@ -39,18 +39,12 @@
namespace material_color_utilities {
-[ 3262s] In file included from ../third_party/ipcz/src/ipcz/route_edge.cc:5:
-[ 3262s] In file included from ../third_party/ipcz/src/ipcz/route_edge.h:8:
-[ 3262s] ../third_party/ipcz/src/ipcz/router_link.h:73:34: error: no template
named 'unique_ptr' in namespace 'std'
-[ 3262s] std::unique_ptr<Parcel> parcel) = 0;
-[ 3262s] ~~~~~^
-[ 3262s] 1 error generated.
-Index: chromium-117.0.5938.22/third_party/ipcz/src/ipcz/router_link.h
+Index: chromium-118.0.5993.18/third_party/ipcz/src/ipcz/router_link.h
===================================================================
---- chromium-117.0.5938.22.orig/third_party/ipcz/src/ipcz/router_link.h
-+++ chromium-117.0.5938.22/third_party/ipcz/src/ipcz/router_link.h
-@@ -9,6 +9,7 @@
- #include <functional>
+--- chromium-118.0.5993.18.orig/third_party/ipcz/src/ipcz/router_link.h
++++ chromium-118.0.5993.18/third_party/ipcz/src/ipcz/router_link.h
+@@ -10,6 +10,7 @@
+ #include <memory>
#include <string>
#include <utility>
+#include <memory>
++++++ chromium-117-workaround_clang_bug-structured_binding.patch ++++++
--- /var/tmp/diff_new_pack.JkVBRl/_old 2023-10-08 12:24:13.174889873 +0200
+++ /var/tmp/diff_new_pack.JkVBRl/_new 2023-10-08 12:24:13.178890017 +0200
@@ -1,6 +1,7 @@
-diff -up
chromium-115.0.5790.24/media/base/cdm_promise_adapter.cc.workaround_clang_bug-structured_binding
chromium-115.0.5790.24/media/base/cdm_promise_adapter.cc
----
chromium-115.0.5790.24/media/base/cdm_promise_adapter.cc.workaround_clang_bug-structured_binding
2023-06-07 21:48:37.000000000 +0200
-+++ chromium-115.0.5790.24/media/base/cdm_promise_adapter.cc 2023-06-17
16:53:20.216628557 +0200
+Index: chromium-118.0.5993.18/media/base/cdm_promise_adapter.cc
+===================================================================
+--- chromium-118.0.5993.18.orig/media/base/cdm_promise_adapter.cc
++++ chromium-118.0.5993.18/media/base/cdm_promise_adapter.cc
@@ -94,7 +94,9 @@ void CdmPromiseAdapter::RejectPromise(ui
void CdmPromiseAdapter::Clear(ClearReason reason) {
// Reject all outstanding promises.
@@ -12,10 +13,11 @@
TRACE_EVENT_NESTABLE_ASYNC_END1(
"media", "CdmPromise", TRACE_ID_WITH_SCOPE("CdmPromise", promise_id),
"status", "cleared");
-diff -up
chromium-115.0.5790.24/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.workaround_clang_bug-structured_binding
chromium-115.0.5790.24/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
----
chromium-115.0.5790.24/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.workaround_clang_bug-structured_binding
2023-06-07 21:48:41.000000000 +0200
-+++
chromium-115.0.5790.24/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
2023-06-17 18:47:06.001403966 +0200
-@@ -655,8 +658,10 @@ NGGridSizingTree NGGridLayoutAlgorithm::
+Index:
chromium-118.0.5993.18/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
+===================================================================
+---
chromium-118.0.5993.18.orig/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
++++
chromium-118.0.5993.18/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
+@@ -633,8 +633,10 @@ NGGridSizingTree NGGridLayoutAlgorithm::
NGGridSizingTree sizing_tree;
if (const auto* layout_subtree = ConstraintSpace().GridLayoutSubtree()) {
@@ -28,7 +30,7 @@
const auto& node = Node();
grid_items =
-@@ -1798,8 +1803,10 @@ void NGGridLayoutAlgorithm::CompleteTrac
+@@ -1837,8 +1839,10 @@ void NGGridLayoutAlgorithm::CompleteTrac
bool* opt_needs_additional_pass) const {
DCHECK(sizing_subtree);
@@ -41,7 +43,7 @@
const bool is_for_columns = track_direction == kForColumns;
const bool has_non_definite_track =
-@@ -1924,8 +1931,10 @@ template <typename CallbackFunc>
+@@ -1984,8 +1988,10 @@ template <typename CallbackFunc>
void NGGridLayoutAlgorithm::ForEachSubgrid(
const NGGridSizingSubtree& sizing_subtree,
const CallbackFunc& callback_func) const {
@@ -54,23 +56,7 @@
// If we know this subtree doesn't have nested subgrids we can exit early
// instead of iterating over every grid item looking for them.
-diff -up
chromium-115.0.5790.32/content/browser/service_worker/service_worker_context_wrapper.cc.me
chromium-115.0.5790.32/content/browser/service_worker/service_worker_context_wrapper.cc
----
chromium-115.0.5790.32/content/browser/service_worker/service_worker_context_wrapper.cc.me
2023-06-19 08:04:02.287072722 +0200
-+++
chromium-115.0.5790.32/content/browser/service_worker/service_worker_context_wrapper.cc
2023-06-19 08:18:24.576814950 +0200
-@@ -1393,7 +1393,8 @@ void ServiceWorkerContextWrapper::MaybeP
- return;
- }
-
-- auto [document_url, key, callback] = std::move(*request);
-+ auto [d_u, key, callback] = std::move(*request);
-+ auto document_url = d_u;
-
- DCHECK(document_url.is_valid());
- TRACE_EVENT1("ServiceWorker",
-diff -up
chromium-117.0.5938.62/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.me
chromium-117.0.5938.62/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
----
chromium-117.0.5938.62/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.me
2023-09-15 13:03:00.787257048 +0200
-+++
chromium-117.0.5938.62/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
2023-09-15 13:15:05.502706522 +0200
-@@ -3437,7 +3437,10 @@ void NGGridLayoutAlgorithm::PlaceGridIte
+@@ -3452,7 +3458,10 @@ void NGGridLayoutAlgorithm::PlaceGridIte
DCHECK(out_row_break_between);
const auto& container_space = ConstraintSpace();
@@ -82,7 +68,7 @@
const auto* cached_layout_subtree = container_space.GridLayoutSubtree();
const auto container_writing_direction =
-@@ -3601,7 +3604,10 @@ void NGGridLayoutAlgorithm::PlaceGridIte
+@@ -3616,7 +3625,10 @@ void NGGridLayoutAlgorithm::PlaceGridIte
// TODO(ikilpatrick): Update |SetHasSeenAllChildren| and early exit if true.
const auto& constraint_space = ConstraintSpace();
@@ -94,17 +80,18 @@
const auto* cached_layout_subtree = constraint_space.GridLayoutSubtree();
const auto container_writing_direction =
-diff -up
chromium-117.0.5938.62/chrome/browser/ui/autofill/chrome_autofill_client.cc.me
chromium-117.0.5938.62/chrome/browser/ui/autofill/chrome_autofill_client.cc
----
chromium-117.0.5938.62/chrome/browser/ui/autofill/chrome_autofill_client.cc.me
2023-09-15 18:24:18.984133783 +0200
-+++
chromium-117.0.5938.62/chrome/browser/ui/autofill/chrome_autofill_client.cc
2023-09-15 18:28:50.420833595 +0200
-@@ -1100,7 +1100,8 @@ void ChromeAutofillClient::PropagateAuto
- &renderer_form);
- }
-
-- for (const auto& [frame_token, frame_forms] : renderer_forms_by_frame) {
-+ for (const auto& [f_t, frame_forms] : renderer_forms_by_frame) {
-+ auto& frame_token = f_t;
- // Attempt to find the RFH with this `frame_token`.
- content::RenderFrameHost* rfh = nullptr;
- GetWebContents().ForEachRenderFrameHost(
+Index:
chromium-118.0.5993.18/content/browser/service_worker/service_worker_context_wrapper.cc
+===================================================================
+---
chromium-118.0.5993.18.orig/content/browser/service_worker/service_worker_context_wrapper.cc
++++
chromium-118.0.5993.18/content/browser/service_worker/service_worker_context_wrapper.cc
+@@ -1409,7 +1409,8 @@ void ServiceWorkerContextWrapper::MaybeP
+ return;
+ }
+
+- auto [document_url, key, callback] = std::move(*request);
++ auto [d_u, key, callback] = std::move(*request);
++ auto document_url = d_u;
+
+ DCHECK(document_url.is_valid());
+ TRACE_EVENT1("ServiceWorker",
++++++ chromium-118-includes.patch ++++++
Index:
chromium-118.0.5993.18/services/device/public/cpp/generic_sensor/sensor_reading.h
===================================================================
---
chromium-118.0.5993.18.orig/services/device/public/cpp/generic_sensor/sensor_reading.h
+++
chromium-118.0.5993.18/services/device/public/cpp/generic_sensor/sensor_reading.h
@@ -6,6 +6,8 @@
#define SERVICES_DEVICE_PUBLIC_CPP_GENERIC_SENSOR_SENSOR_READING_H_
#include <type_traits>
+#include <stdint.h>
+#include <cstddef>
namespace device {
Index: chromium-118.0.5993.18/components/gwp_asan/client/lightweight_detector.h
===================================================================
---
chromium-118.0.5993.18.orig/components/gwp_asan/client/lightweight_detector.h
+++ chromium-118.0.5993.18/components/gwp_asan/client/lightweight_detector.h
@@ -5,6 +5,8 @@
#ifndef COMPONENTS_GWP_ASAN_CLIENT_LIGHTWEIGHT_DETECTOR_H_
#define COMPONENTS_GWP_ASAN_CLIENT_LIGHTWEIGHT_DETECTOR_H_
+#include <atomic>
+
#include "base/gtest_prod_util.h"
#include "components/gwp_asan/client/export.h"
#include "components/gwp_asan/common/lightweight_detector_state.h"
++++++ chromium-117.0.5938.149.tar.xz -> chromium-118.0.5993.54.tar.xz ++++++
/work/SRC/openSUSE:Factory/chromium/chromium-117.0.5938.149.tar.xz
/work/SRC/openSUSE:Factory/.chromium.new.28202/chromium-118.0.5993.54.tar.xz
differ: char 15, line 1
++++++ chromium-93-ffmpeg-4.4.patch ++++++
--- /var/tmp/diff_new_pack.JkVBRl/_old 2023-10-08 12:24:13.222891600 +0200
+++ /var/tmp/diff_new_pack.JkVBRl/_new 2023-10-08 12:24:13.226891743 +0200
@@ -21,10 +21,11 @@
media/filters/ffmpeg_demuxer.cc | 16 ++++++++++++++++
2 files changed, 20 insertions(+)
-diff --git a/media/filters/audio_decoder_unittest.cc
b/media/filters/audio_decoder_unittest.cc
---- a/media/filters/audio_decoder_unittest.cc
-+++ b/media/filters/audio_decoder_unittest.cc
-@@ -109,7 +109,11 @@ void SetDiscardPadding(AVPacket* packet,
+Index: chromium-118.0.5993.18/media/filters/audio_decoder_unittest.cc
+===================================================================
+--- chromium-118.0.5993.18.orig/media/filters/audio_decoder_unittest.cc
++++ chromium-118.0.5993.18/media/filters/audio_decoder_unittest.cc
+@@ -108,7 +108,11 @@ void SetDiscardPadding(AVPacket* packet,
}
// If the timestamp is positive, try to use FFmpeg's discard data.
@@ -36,32 +37,13 @@
const uint32_t* skip_samples_ptr =
reinterpret_cast<const uint32_t*>(av_packet_get_side_data(
packet, AV_PKT_DATA_SKIP_SAMPLES, &skip_samples_size));
-diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
---- a/media/filters/ffmpeg_demuxer.cc
-+++ b/media/filters/ffmpeg_demuxer.cc
-@@ -427,11 +427,19 @@ void FFmpegDemuxerStream::EnqueuePacket(
- scoped_refptr<DecoderBuffer> buffer;
-
- if (type() == DemuxerStream::TEXT) {
-+#if LIBAVUTIL_VERSION_MAJOR < 57
-+ int id_size = 0;
-+#else
- size_t id_size = 0;
-+#endif
- uint8_t* id_data = av_packet_get_side_data(
- packet.get(), AV_PKT_DATA_WEBVTT_IDENTIFIER, &id_size);
-
-+#if LIBAVUTIL_VERSION_MAJOR < 57
-+ int settings_size = 0;
-+#else
- size_t settings_size = 0;
-+#endif
- uint8_t* settings_data = av_packet_get_side_data(
- packet.get(), AV_PKT_DATA_WEBVTT_SETTINGS, &settings_size);
-
-@@ -443,7 +451,11 @@ void FFmpegDemuxerStream::EnqueuePacket(
- buffer = DecoderBuffer::CopyFrom(packet->data, packet->size,
- side_data.data(), side_data.size());
+Index: chromium-118.0.5993.18/media/filters/ffmpeg_demuxer.cc
+===================================================================
+--- chromium-118.0.5993.18.orig/media/filters/ffmpeg_demuxer.cc
++++ chromium-118.0.5993.18/media/filters/ffmpeg_demuxer.cc
+@@ -398,7 +398,11 @@ void FFmpegDemuxerStream::EnqueuePacket(
+ // TODO(crbug.com/1471504): This is now broken without side data; remove.
+ buffer = DecoderBuffer::CopyFrom(packet->data, packet->size);
} else {
+#if LIBAVUTIL_VERSION_MAJOR < 57
+ int side_data_size = 0;
@@ -71,7 +53,7 @@
uint8_t* side_data = av_packet_get_side_data(
packet.get(), AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL, &side_data_size);
-@@ -504,7 +516,11 @@ void FFmpegDemuxerStream::EnqueuePacket(
+@@ -461,7 +465,11 @@ void FFmpegDemuxerStream::EnqueuePacket(
packet->size - data_offset);
}
++++++ chromium-norar.patch ++++++
--- /var/tmp/diff_new_pack.JkVBRl/_old 2023-10-08 12:24:13.266893182 +0200
+++ /var/tmp/diff_new_pack.JkVBRl/_new 2023-10-08 12:24:13.270893326 +0200
@@ -1,7 +1,7 @@
-Index:
chromium-117.0.5938.22/chrome/browser/safe_browsing/download_protection/file_analyzer.cc
+Index:
chromium-118.0.5993.18/chrome/browser/safe_browsing/download_protection/file_analyzer.cc
===================================================================
----
chromium-117.0.5938.22.orig/chrome/browser/safe_browsing/download_protection/file_analyzer.cc
-+++
chromium-117.0.5938.22/chrome/browser/safe_browsing/download_protection/file_analyzer.cc
+---
chromium-118.0.5993.18.orig/chrome/browser/safe_browsing/download_protection/file_analyzer.cc
++++
chromium-118.0.5993.18/chrome/browser/safe_browsing/download_protection/file_analyzer.cc
@@ -77,8 +77,6 @@ void FileAnalyzer::Start(const base::Fil
if (inspection_type == DownloadFileType::ZIP) {
@@ -11,10 +11,10 @@
#if BUILDFLAG(IS_MAC)
} else if (inspection_type == DownloadFileType::DMG) {
StartExtractDmgFeatures();
-Index: chromium-117.0.5938.22/chrome/utility/safe_browsing/archive_analyzer.cc
+Index: chromium-118.0.5993.18/chrome/utility/safe_browsing/archive_analyzer.cc
===================================================================
----
chromium-117.0.5938.22.orig/chrome/utility/safe_browsing/archive_analyzer.cc
-+++ chromium-117.0.5938.22/chrome/utility/safe_browsing/archive_analyzer.cc
+---
chromium-118.0.5993.18.orig/chrome/utility/safe_browsing/archive_analyzer.cc
++++ chromium-118.0.5993.18/chrome/utility/safe_browsing/archive_analyzer.cc
@@ -8,7 +8,6 @@
#include "build/build_config.h"
#include "build/buildflag.h"
@@ -34,10 +34,10 @@
return std::make_unique<ZipAnalyzer>();
} else if (file_type == DownloadFileType::SEVEN_ZIP) {
return std::make_unique<SevenZipAnalyzer>();
-Index: chromium-117.0.5938.22/chrome/common/safe_browsing/BUILD.gn
+Index: chromium-118.0.5993.18/chrome/common/safe_browsing/BUILD.gn
===================================================================
---- chromium-117.0.5938.22.orig/chrome/common/safe_browsing/BUILD.gn
-+++ chromium-117.0.5938.22/chrome/common/safe_browsing/BUILD.gn
+--- chromium-118.0.5993.18.orig/chrome/common/safe_browsing/BUILD.gn
++++ chromium-118.0.5993.18/chrome/common/safe_browsing/BUILD.gn
@@ -137,7 +137,6 @@ source_set("safe_browsing") {
"//components/safe_browsing/content/common:file_type_policies",
"//components/safe_browsing/core/common",
@@ -46,20 +46,20 @@
]
public_deps = [
-Index:
chromium-117.0.5938.22/chrome/services/file_util/safe_archive_analyzer.cc
+Index:
chromium-118.0.5993.18/chrome/services/file_util/safe_archive_analyzer.cc
===================================================================
----
chromium-117.0.5938.22.orig/chrome/services/file_util/safe_archive_analyzer.cc
-+++ chromium-117.0.5938.22/chrome/services/file_util/safe_archive_analyzer.cc
-@@ -73,6 +73,7 @@ void SafeArchiveAnalyzer::AnalyzeRarFile
- base::File rar_file,
+---
chromium-118.0.5993.18.orig/chrome/services/file_util/safe_archive_analyzer.cc
++++ chromium-118.0.5993.18/chrome/services/file_util/safe_archive_analyzer.cc
+@@ -74,6 +74,7 @@ void SafeArchiveAnalyzer::AnalyzeRarFile
+ const absl::optional<std::string>& password,
mojo::PendingRemote<chrome::mojom::TemporaryFileGetter> temp_file_getter,
AnalyzeRarFileCallback callback) {
+#if 0
DCHECK(rar_file.IsValid());
temp_file_getter_.Bind(std::move(temp_file_getter));
callback_ = std::move(callback);
-@@ -91,6 +92,9 @@ void SafeArchiveAnalyzer::AnalyzeRarFile
- /*password=*/absl::nullopt,
+@@ -90,6 +91,9 @@ void SafeArchiveAnalyzer::AnalyzeRarFile
+ /*password=*/password,
std::move(analysis_finished_callback),
std::move(temp_file_getter_callback), &results_);
+#else
@@ -68,10 +68,10 @@
}
void SafeArchiveAnalyzer::AnalyzeSevenZipFile(
-Index: chromium-117.0.5938.22/chrome/services/file_util/safe_archive_analyzer.h
+Index: chromium-118.0.5993.18/chrome/services/file_util/safe_archive_analyzer.h
===================================================================
----
chromium-117.0.5938.22.orig/chrome/services/file_util/safe_archive_analyzer.h
-+++ chromium-117.0.5938.22/chrome/services/file_util/safe_archive_analyzer.h
+---
chromium-118.0.5993.18.orig/chrome/services/file_util/safe_archive_analyzer.h
++++ chromium-118.0.5993.18/chrome/services/file_util/safe_archive_analyzer.h
@@ -7,7 +7,6 @@
#include "chrome/common/safe_browsing/archive_analyzer_results.h"
@@ -80,7 +80,7 @@
#include "chrome/utility/safe_browsing/seven_zip_analyzer.h"
#include "chrome/utility/safe_browsing/zip_analyzer.h"
#include "mojo/public/cpp/bindings/remote.h"
-@@ -65,7 +64,6 @@ class SafeArchiveAnalyzer : public chrom
+@@ -66,7 +65,6 @@ class SafeArchiveAnalyzer : public chrom
void Timeout();
safe_browsing::ZipAnalyzer zip_analyzer_;
@@ -88,10 +88,10 @@
safe_browsing::SevenZipAnalyzer seven_zip_analyzer_;
#if BUILDFLAG(IS_MAC)
safe_browsing::dmg::DMGAnalyzer dmg_analyzer_;
-Index: chromium-117.0.5938.22/chrome/utility/safe_browsing/BUILD.gn
+Index: chromium-118.0.5993.18/chrome/utility/safe_browsing/BUILD.gn
===================================================================
---- chromium-117.0.5938.22.orig/chrome/utility/safe_browsing/BUILD.gn
-+++ chromium-117.0.5938.22/chrome/utility/safe_browsing/BUILD.gn
+--- chromium-118.0.5993.18.orig/chrome/utility/safe_browsing/BUILD.gn
++++ chromium-118.0.5993.18/chrome/utility/safe_browsing/BUILD.gn
@@ -31,8 +31,6 @@ source_set("safe_browsing") {
sources = [
"archive_analyzer.cc",
