diff options
author | Ting-Wei Lan <lantw44@gmail.com> | 2023-04-08 23:09:00 +0800 |
---|---|---|
committer | Ting-Wei Lan <lantw44@gmail.com> | 2023-04-08 23:09:00 +0800 |
commit | 4377a90e603cc6dbdf902095f4a9e0bbe3c474cf (patch) | |
tree | b09c13e47e6fcc1adc2cf8521b6b475a06bbd8fa /chromium | |
parent | 3eb8a49f8596a5c8ae51d54f18ca7aa786e9a795 (diff) | |
download | copr-rpm-spec-4377a90e603cc6dbdf902095f4a9e0bbe3c474cf.tar copr-rpm-spec-4377a90e603cc6dbdf902095f4a9e0bbe3c474cf.tar.gz copr-rpm-spec-4377a90e603cc6dbdf902095f4a9e0bbe3c474cf.tar.bz2 copr-rpm-spec-4377a90e603cc6dbdf902095f4a9e0bbe3c474cf.tar.lz copr-rpm-spec-4377a90e603cc6dbdf902095f4a9e0bbe3c474cf.tar.xz copr-rpm-spec-4377a90e603cc6dbdf902095f4a9e0bbe3c474cf.tar.zst copr-rpm-spec-4377a90e603cc6dbdf902095f4a9e0bbe3c474cf.zip |
chromium: Chromium 111.0.5563.146 -> 112.0.5615.49
Diffstat (limited to 'chromium')
-rw-r--r-- | chromium/chromium/chromium-gcc-12-r1105184.patch | 41 | ||||
-rw-r--r-- | chromium/chromium/chromium-gcc-12-r1111077.patch | 73 | ||||
-rw-r--r-- | chromium/chromium/chromium-gcc-12-r1113983.patch | 69 | ||||
-rw-r--r-- | chromium/chromium/chromium-gcc-13-r1126024.patch | 34 | ||||
-rw-r--r-- | chromium/chromium/chromium.spec | 13 |
5 files changed, 185 insertions, 45 deletions
diff --git a/chromium/chromium/chromium-gcc-12-r1105184.patch b/chromium/chromium/chromium-gcc-12-r1105184.patch deleted file mode 100644 index 37f59f1..0000000 --- a/chromium/chromium/chromium-gcc-12-r1105184.patch +++ /dev/null @@ -1,41 +0,0 @@ -From eeb0b18565e6e644524fedb511a1658b502836cf Mon Sep 17 00:00:00 2001 -From: Jose Dapena Paz <jdapena@igalia.com> -Date: Tue, 14 Feb 2023 19:09:47 +0000 -Subject: [PATCH] IWYU: missing PlatformKeyboardHook include in - ozone_platform.cc -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -libstdc++ implementation of std::unique_ptr requires full declaration -of the contained type for converting from nullptr. Add the required -include in OzonePlatform for PlatformKeyboardHook. - -This fixes this build error with GCC and libstdc++: - /usr/include/c++/12/bits/unique_ptr.h:93:23: error: invalid application of ‘sizeof’ to incomplete type ‘ui::PlatformKeyboardHook’ - -Bug: 957519 -Change-Id: I20429925dd00108cf684548b0260ebb053a8ada2 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4239869 -Reviewed-by: Robert Kroeger <rjkroege@chromium.org> -Commit-Queue: José Dapena Paz <jdapena@igalia.com> -Cr-Commit-Position: refs/heads/main@{#1105184} ---- - ui/ozone/public/ozone_platform.cc | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/ui/ozone/public/ozone_platform.cc b/ui/ozone/public/ozone_platform.cc -index 81f80704c5189..6c4ce213d0986 100644 ---- a/ui/ozone/public/ozone_platform.cc -+++ b/ui/ozone/public/ozone_platform.cc -@@ -15,6 +15,7 @@ - #include "ui/ozone/platform_object.h" - #include "ui/ozone/platform_selection.h" - #include "ui/ozone/public/platform_global_shortcut_listener.h" -+#include "ui/ozone/public/platform_keyboard_hook.h" - #include "ui/ozone/public/platform_menu_utils.h" - #include "ui/ozone/public/platform_screen.h" - #include "ui/ozone/public/platform_user_input_monitor.h" --- -2.39.2 - diff --git a/chromium/chromium/chromium-gcc-12-r1111077.patch b/chromium/chromium/chromium-gcc-12-r1111077.patch new file mode 100644 index 0000000..ebd9c1b --- /dev/null +++ b/chromium/chromium/chromium-gcc-12-r1111077.patch @@ -0,0 +1,73 @@ +From f2ea90d9cf667612b2913a6f30636a4773bad026 Mon Sep 17 00:00:00 2001 +From: Jose Dapena Paz <jdapena@igalia.com> +Date: Tue, 28 Feb 2023 18:38:25 +0000 +Subject: [PATCH] IWYU: include blink::URLLoader for unique_ptr usage in + WebLocalFrameClient +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Recent refactor broke again libstdc++ build by not including URLLoader +header. But the reason for that change was removing in public code +includes of non public code, as URLLoader. + +To fix the problem, move the implementation exposing the problem +to the .cc file. + +Fixes build error with libstdc++: + /usr/include/c++/12/bits/unique_ptr.h: In instantiation of ‘void std::default_delete<_Tp>::operator()(_Tp*) const [with _Tp = blink::URLLoader]’: + /usr/include/c++/12/bits/unique_ptr.h:396:17: required from ‘std::unique_ptr<_Tp, _Dp>::~unique_ptr() [with _Tp = blink::URLLoader; _Dp = std::default_delete<blink::URLLoader>]’ + ../../third_party/blink/public/web/web_local_frame_client.h:678:12: required from here + /usr/include/c++/12/bits/unique_ptr.h:93:23: error: invalid application of ‘sizeof’ to incomplete type ‘blink::URLLoader’ + +Bug: 957519 +Change-Id: I0db2f86603fba4fe8f10d6c4370ad1ff4c9ca70b +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4276241 +Reviewed-by: Daniel Cheng <dcheng@chromium.org> +Commit-Queue: José Dapena Paz <jdapena@igalia.com> +Cr-Commit-Position: refs/heads/main@{#1111077} +--- + third_party/blink/public/web/web_local_frame_client.h | 4 +--- + .../blink/renderer/core/frame/web_local_frame_client.cc | 6 ++++++ + 2 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/third_party/blink/public/web/web_local_frame_client.h b/third_party/blink/public/web/web_local_frame_client.h +index d6bb89671f9d7..246d2ff90ea00 100644 +--- a/third_party/blink/public/web/web_local_frame_client.h ++++ b/third_party/blink/public/web/web_local_frame_client.h +@@ -674,9 +674,7 @@ class BLINK_EXPORT WebLocalFrameClient { + return nullptr; + } + +- virtual std::unique_ptr<URLLoader> CreateURLLoaderForTesting() { +- return nullptr; +- } ++ virtual std::unique_ptr<URLLoader> CreateURLLoaderForTesting(); + + virtual void OnStopLoading() {} + +diff --git a/third_party/blink/renderer/core/frame/web_local_frame_client.cc b/third_party/blink/renderer/core/frame/web_local_frame_client.cc +index a3617af5117d2..3adcd7cdd9c4e 100644 +--- a/third_party/blink/renderer/core/frame/web_local_frame_client.cc ++++ b/third_party/blink/renderer/core/frame/web_local_frame_client.cc +@@ -7,6 +7,7 @@ + #include "mojo/public/cpp/bindings/pending_remote.h" + #include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h" + #include "third_party/blink/public/common/browser_interface_broker_proxy.h" ++#include "third_party/blink/renderer/platform/loader/fetch/url_loader/url_loader.h" + + namespace blink { + +@@ -25,4 +26,9 @@ WebLocalFrameClient::GetRemoteNavigationAssociatedInterfaces() { + // have this implementation in the base class. + return AssociatedInterfaceProvider::GetEmptyAssociatedInterfaceProvider(); + } ++ ++std::unique_ptr<URLLoader> WebLocalFrameClient::CreateURLLoaderForTesting() { ++ return nullptr; ++} ++ + } // namespace blink +-- +2.39.2 + diff --git a/chromium/chromium/chromium-gcc-12-r1113983.patch b/chromium/chromium/chromium-gcc-12-r1113983.patch new file mode 100644 index 0000000..60c36e9 --- /dev/null +++ b/chromium/chromium/chromium-gcc-12-r1113983.patch @@ -0,0 +1,69 @@ +From aaeaf2a563682f2f63196f924a842dcca42be8ef Mon Sep 17 00:00:00 2001 +From: Jose Dapena Paz <jdapena@igalia.com> +Date: Tue, 7 Mar 2023 16:54:09 +0000 +Subject: [PATCH] IWYU: libstdc++ unique_ptr cast from nullptr requires + declaration of type +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +fallback_linux_ui.cc returns a nullptr as a result of several +calls returning a std::unique_ptr of a type that has not been declared +and that's not allowed in libstdc++ implementation. + +Fix build errors: + /usr/include/c++/12/bits/unique_ptr.h: In instantiation of ‘void std::default_delete<_Tp>::operator()(_Tp*) const [with _Tp = ui::LinuxInputMethodContext]’: + /usr/include/c++/12/bits/unique_ptr.h:396:17: required from ‘std::unique_ptr<_Tp, _Dp>::~unique_ptr() [with _Tp = ui::LinuxInputMethodContext; _Dp = std::default_delete<ui::LinuxInputMethodContext>]’ + ../../ui/linux/fallback_linux_ui.cc:35:10: required from here + /usr/include/c++/12/bits/unique_ptr.h:93:23: error: invalid application of ‘sizeof’ to incomplete type ‘ui::LinuxInputMethodContext’ + 93 | static_assert(sizeof(_Tp)>0, + | ^~~~~~~~~~~ + /usr/include/c++/12/bits/unique_ptr.h: In instantiation of ‘void std::default_delete<_Tp>::operator()(_Tp*) const [with _Tp = ui::NavButtonProvider]’: + /usr/include/c++/12/bits/unique_ptr.h:396:17: required from ‘std::unique_ptr<_Tp, _Dp>::~unique_ptr() [with _Tp = ui::NavButtonProvider; _Dp = std::default_delete<ui::NavButtonProvider>]’ + ../../ui/linux/fallback_linux_ui.cc:133:10: required from here + /usr/include/c++/12/bits/unique_ptr.h:93:23: error: invalid application of ‘sizeof’ to incomplete type ‘ui::NavButtonProvider’ + +Bug: 957519 +Change-Id: I5e7f096003d8f5de8f5be36137ac4427799bf7a5 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4310671 +Reviewed-by: Thomas Anderson <thomasanderson@chromium.org> +Commit-Queue: Thomas Anderson <thomasanderson@chromium.org> +Cr-Commit-Position: refs/heads/main@{#1113983} +--- + ui/linux/BUILD.gn | 1 + + ui/linux/fallback_linux_ui.cc | 2 ++ + 2 files changed, 3 insertions(+) + +diff --git a/ui/linux/BUILD.gn b/ui/linux/BUILD.gn +index eb72461b549c4..8662261518293 100644 +--- a/ui/linux/BUILD.gn ++++ b/ui/linux/BUILD.gn +@@ -52,6 +52,7 @@ component("linux_ui_factory") { + deps = [ + "//base", + "//ui/base:buildflags", ++ "//ui/base/ime/linux:linux", + "//ui/events:dom_keyboard_layout", + "//ui/gfx", + "//ui/native_theme", +diff --git a/ui/linux/fallback_linux_ui.cc b/ui/linux/fallback_linux_ui.cc +index ee3e7b96eba0a..5f5abeeb78372 100644 +--- a/ui/linux/fallback_linux_ui.cc ++++ b/ui/linux/fallback_linux_ui.cc +@@ -5,11 +5,13 @@ + #include "ui/linux/fallback_linux_ui.h" + + #include "base/time/time.h" ++#include "ui/base/ime/linux/linux_input_method_context.h" + #include "ui/events/keycodes/dom/dom_keyboard_layout_map.h" + #include "ui/gfx/color_palette.h" + #include "ui/gfx/geometry/size.h" + #include "ui/gfx/image/image.h" + #include "ui/gfx/platform_font.h" ++#include "ui/linux/nav_button_provider.h" + #include "ui/native_theme/native_theme.h" + #include "ui/shell_dialogs/select_file_policy.h" + #include "ui/views/controls/textfield/textfield.h" +-- +2.39.2 + diff --git a/chromium/chromium/chromium-gcc-13-r1126024.patch b/chromium/chromium/chromium-gcc-13-r1126024.patch new file mode 100644 index 0000000..df71109 --- /dev/null +++ b/chromium/chromium/chromium-gcc-13-r1126024.patch @@ -0,0 +1,34 @@ +From b969f3cc2482f118819919900d0d42fe81c947e2 Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann <stha09@googlemail.com> +Date: Tue, 4 Apr 2023 16:10:52 +0000 +Subject: [PATCH] GCC: fix copy-list-initialization in net::HostCache + +absl::optional has an explicit constructor and therefore all +constructors are considered on copy-list-initialization (CWG1228). + +Bug: 819294 +Change-Id: Ifce659f6a3ed072e0336b5655f2237c0613bddbe +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4395935 +Reviewed-by: Adam Langley <agl@chromium.org> +Commit-Queue: Stephan Hartmann <stha09@googlemail.com> +Cr-Commit-Position: refs/heads/main@{#1126024} +--- + net/dns/host_cache.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/net/dns/host_cache.cc b/net/dns/host_cache.cc +index 94d2a9ed203c8..bbdae25656042 100644 +--- a/net/dns/host_cache.cc ++++ b/net/dns/host_cache.cc +@@ -389,7 +389,7 @@ HostCache::Entry::Entry( + + // Even if otherwise empty, having the metadata result object signifies + // receiving a compatible HTTPS record. +- https_record_compatibility_ = {true}; ++ https_record_compatibility_ = std::vector<bool>{true}; + + if (endpoint_metadatas_.value().empty()) + error_ = ERR_NAME_NOT_RESOLVED; +-- +2.39.2 + diff --git a/chromium/chromium/chromium.spec b/chromium/chromium/chromium.spec index 1651904..95f0889 100644 --- a/chromium/chromium/chromium.spec +++ b/chromium/chromium/chromium.spec @@ -70,7 +70,7 @@ %bcond_with fedora_compilation_flags Name: chromium -Version: 111.0.5563.146 +Version: 112.0.5615.49 Release: 100%{?dist} Summary: A WebKit (Blink) powered web browser @@ -124,9 +124,11 @@ Patch3: chromium-media-mojo-services-opus.patch Patch4: chromium-v8-WasmArray-incomplete-type.patch # Pull upstream patches -Patch10: chromium-gcc-12-r1105184.patch -Patch11: chromium-vulkan_memory_allocator-gcc-13.patch -Patch12: chromium-webrtc-gcc-13.patch +Patch10: chromium-gcc-12-r1111077.patch +Patch11: chromium-gcc-12-r1113983.patch +Patch12: chromium-gcc-13-r1126024.patch +Patch13: chromium-vulkan_memory_allocator-gcc-13.patch +Patch14: chromium-webrtc-gcc-13.patch # Fix missing includes Patch20: chromium-autofill-cstdint.patch @@ -799,6 +801,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Sat Apr 08 2023 - Ting-Wei Lan <lantw44@gmail.com> - 112.0.5615.49-100 +- Update to 112.0.5615.49 + * Fri Mar 31 2023 - Ting-Wei Lan <lantw44@gmail.com> - 111.0.5563.146-100 - Update to 111.0.5563.146 |