diff options
| -rw-r--r-- | chromium/chromium/chromium-angle-string.patch | 31 | ||||
| -rw-r--r-- | chromium/chromium/chromium-base-time-constexpr.patch | 32 | ||||
| -rw-r--r-- | chromium/chromium/chromium-gcc10-r831923.patch | 46 | ||||
| -rw-r--r-- | chromium/chromium/chromium-gcc10-r838269.patch | 35 | ||||
| -rw-r--r-- | chromium/chromium/chromium-nearby-cstring.patch | 24 | ||||
| -rw-r--r-- | chromium/chromium/chromium-nearby-explicit.patch | 25 | ||||
| -rw-r--r-- | chromium/chromium/chromium-ui-memory-vector.patch | 27 | ||||
| -rw-r--r-- | chromium/chromium/chromium.spec | 29 |
8 files changed, 126 insertions, 123 deletions
diff --git a/chromium/chromium/chromium-angle-string.patch b/chromium/chromium/chromium-angle-string.patch deleted file mode 100644 index ff12a80..0000000 --- a/chromium/chromium/chromium-angle-string.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 2879a6ba43b65c33e3c02432b4ae7a7462d24096 Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann <stha09@googlemail.com> -Date: Fri, 28 Aug 2020 07:23:29 +0000 -Subject: [PATCH] GCC: fix ImageMemoryBarrierData initialization - -GCC can't convert constant string to char[40]. Use const char * instead. -Otherwise fails like this: - -src/libANGLE/renderer/vulkan/vk_helpers.cpp:121:1: error: could not convert -'...' from '<brace-enclosed initializer list>' to -'const angle::PackedEnumMap<rx::vk::ImageLayout, rx::vk::{anonymous}::ImageMemoryBarrierData>' ---- - third_party/angle/src/libANGLE/renderer/vulkan/vk_helpers.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/third_party/angle/src/libANGLE/renderer/vulkan/vk_helpers.cpp b/third_party/angle/src/libANGLE/renderer/vulkan/vk_helpers.cpp -index af957d7..7fe82ae 100644 ---- a/third_party/angle/src/libANGLE/renderer/vulkan/vk_helpers.cpp -+++ b/third_party/angle/src/libANGLE/renderer/vulkan/vk_helpers.cpp -@@ -73,7 +73,7 @@ enum BarrierType - - struct ImageMemoryBarrierData - { -- char name[40]; -+ const char *name; - - // The Vk layout corresponding to the ImageLayout key. - VkImageLayout layout; --- -2.26.2 - diff --git a/chromium/chromium/chromium-base-time-constexpr.patch b/chromium/chromium/chromium-base-time-constexpr.patch deleted file mode 100644 index b623223..0000000 --- a/chromium/chromium/chromium-base-time-constexpr.patch +++ /dev/null @@ -1,32 +0,0 @@ -From f64e2d2daa64749995253f8ad00679ce74abdc1b Mon Sep 17 00:00:00 2001 -From: Jose Dapena Paz <jdapena@igalia.com> -Date: Wed, 19 Aug 2020 11:02:00 +0200 -Subject: [PATCH] GCC: ConsumeDurationNumber cannot be a constexpr - -Declaring base::ConsumeDurationNumber as constexpr is not valid, as it -uses the BasicStringPiece::begin method, that is not constexpr. - -build error in GCC: -../../base/time/time.cc: In function ‘constexpr base::Optional<base::{anonymous}::ParsedDecimal> base::{anonymous}::ConsumeDurationNumber(base::StringPiece&)’: -../../base/time/time.cc:67:63: error: call to non-‘constexpr’ function ‘const value_type* base::BasicStringPiece<STRING_TYPE>::begin() const [with STRING_TYPE = std::__cxx11::basic_string<char>; base::BasicStringPiece<STRING_TYPE>::const_iterator = const char*; base::BasicStringPiece<STRING_TYPE>::value_type = char]’ - 67 | StringPiece::const_iterator orig_start = number_string.begin(); - | ~~~~~~~~~~~~~~~~~~~^~ - -Bug: 859294 -Change-Id: Id987d003f66052848d7083bb33abc3acfd109b73 ---- - -diff --git a/base/time/time.cc b/base/time/time.cc -index 1b1a830..7c47419 100644 ---- a/base/time/time.cc -+++ b/base/time/time.cc -@@ -61,8 +61,7 @@ - // - // Adapted from absl: - // https://cs.chromium.org/chromium/src/third_party/abseil-cpp/absl/time/duration.cc?l=807&rcl=2c22e9135f107a4319582ae52e2e3e6b201b6b7c --constexpr Optional<ParsedDecimal> ConsumeDurationNumber( -- StringPiece& number_string) { -+Optional<ParsedDecimal> ConsumeDurationNumber(StringPiece& number_string) { - ParsedDecimal res; - StringPiece::const_iterator orig_start = number_string.begin(); - // Parse contiguous digits. diff --git a/chromium/chromium/chromium-gcc10-r831923.patch b/chromium/chromium/chromium-gcc10-r831923.patch new file mode 100644 index 0000000..7f9a2c4 --- /dev/null +++ b/chromium/chromium/chromium-gcc10-r831923.patch @@ -0,0 +1,46 @@ +From d8f178c11d9008e528b1891371984e3ad209c776 Mon Sep 17 00:00:00 2001 +From: Jose Dapena Paz <jdapena@igalia.com> +Date: Mon, 30 Nov 2020 18:54:07 +0000 +Subject: [PATCH] GCC: move attribute to the start of function definition in + VAAPI wrapper. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fix compilation error: +../../base/compiler_specific.h:97:28: error: attributes are not allowed on a function-definition + 97 | #define WARN_UNUSED_RESULT __attribute__((warn_unused_result)) + | ^~~~~~~~~~~~~ +../../media/gpu/vaapi/vaapi_wrapper.h:322:36: note: in expansion of macro ‘WARN_UNUSED_RESULT’ + 322 | const T* data) WARN_UNUSED_RESULT { + | ^~~~~~~~~~~~~~~~~~ + +Bug: 819294 +Change-Id: I24e2e10a96182f8705fed96164550357acdb55a4 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2534931 +Commit-Queue: Miguel Casas <mcasas@chromium.org> +Reviewed-by: Hirokazu Honda <hiroh@chromium.org> +Reviewed-by: Miguel Casas <mcasas@chromium.org> +Cr-Commit-Position: refs/heads/master@{#831923} +--- + media/gpu/vaapi/vaapi_wrapper.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/media/gpu/vaapi/vaapi_wrapper.h b/media/gpu/vaapi/vaapi_wrapper.h +index 01ec58214f86..e2c95f1e2a6b 100644 +--- a/media/gpu/vaapi/vaapi_wrapper.h ++++ b/media/gpu/vaapi/vaapi_wrapper.h +@@ -345,8 +345,8 @@ class MEDIA_GPU_EXPORT VaapiWrapper + // Convenient templatized version of SubmitBuffer() where |size| is deduced to + // be the size of the type of |*data|. + template <typename T> +- bool SubmitBuffer(VABufferType va_buffer_type, +- const T* data) WARN_UNUSED_RESULT { ++ bool WARN_UNUSED_RESULT SubmitBuffer(VABufferType va_buffer_type, ++ const T* data) { + return SubmitBuffer(va_buffer_type, sizeof(T), data); + } + // Batch-version of SubmitBuffer(), where the lock for accessing libva is +-- +2.29.2 + diff --git a/chromium/chromium/chromium-gcc10-r838269.patch b/chromium/chromium/chromium-gcc10-r838269.patch new file mode 100644 index 0000000..4f2a387 --- /dev/null +++ b/chromium/chromium/chromium-gcc10-r838269.patch @@ -0,0 +1,35 @@ +From 09304ba4c3167b9977b412f8a3fc2e99c67fabd2 Mon Sep 17 00:00:00 2001 +From: Hans-Filip Elo <helo@vewd.com> +Date: Thu, 17 Dec 2020 22:34:21 +0000 +Subject: [PATCH] Build fix for libstdc++ + +When building against libstdc++, the macro DCHECK_NE does not seem to +handle implicit conversion between std::unique_ptr and nullptr. This +patch fixes one such build error in compositor_frame_reporter.cc. + +Bug: 957519 +Change-Id: If1801dba777a90089a4c0585cec7e62de8006fff +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2595279 +Reviewed-by: danakj <danakj@chromium.org> +Commit-Queue: Hans-Filip Elo <helo@vewd.com> +Cr-Commit-Position: refs/heads/master@{#838269} +--- + cc/metrics/compositor_frame_reporter.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cc/metrics/compositor_frame_reporter.cc b/cc/metrics/compositor_frame_reporter.cc +index 9392f0a44336..bab060123064 100644 +--- a/cc/metrics/compositor_frame_reporter.cc ++++ b/cc/metrics/compositor_frame_reporter.cc +@@ -767,7 +767,7 @@ void CompositorFrameReporter::ReportCompositorLatencyHistogram( + + void CompositorFrameReporter::ReportEventLatencyHistograms() const { + for (const auto& event_metrics : events_metrics_) { +- DCHECK_NE(event_metrics, nullptr); ++ DCHECK(event_metrics); + const std::string histogram_base_name = + GetEventLatencyHistogramBaseName(*event_metrics); + const int event_type_index = static_cast<int>(event_metrics->type()); +-- +2.29.2 + diff --git a/chromium/chromium/chromium-nearby-cstring.patch b/chromium/chromium/chromium-nearby-cstring.patch deleted file mode 100644 index d3f02c2..0000000 --- a/chromium/chromium/chromium-nearby-cstring.patch +++ /dev/null @@ -1,24 +0,0 @@ -From a5b2ee9dd7dfb186e26ec6c0c06c2ae1a9d27195 Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann <stha09@googlemail.com> -Date: Sat, 18 Jul 2020 14:15:50 +0000 -Subject: [PATCH] IWYU: memcpy is defined in cstring - ---- - third_party/nearby/src/cpp/platform_v2/base/byte_array.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/third_party/nearby/src/cpp/platform_v2/base/byte_array.h b/third_party/nearby/src/cpp/platform_v2/base/byte_array.h -index ee5d0eb..4b1d79b 100644 ---- a/third_party/nearby/src/cpp/platform_v2/base/byte_array.h -+++ b/third_party/nearby/src/cpp/platform_v2/base/byte_array.h -@@ -17,6 +17,7 @@ - - #include <array> - #include <cstdint> -+#include <cstring> - #include <string> - #include <type_traits> - #include <utility> --- -2.26.2 - diff --git a/chromium/chromium/chromium-nearby-explicit.patch b/chromium/chromium/chromium-nearby-explicit.patch deleted file mode 100644 index 84709cb..0000000 --- a/chromium/chromium/chromium-nearby-explicit.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 849e5c6b3a8746d9205102bd3df4e140cead405a Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann <stha09@googlemail.com> -Date: Sat, 18 Jul 2020 15:11:13 +0000 -Subject: [PATCH] GCC: remove explicit from AtomicReference constructor - ---- - .../nearby/src/cpp/platform_v2/public/atomic_reference.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/third_party/nearby/src/cpp/platform_v2/public/atomic_reference.h b/third_party/nearby/src/cpp/platform_v2/public/atomic_reference.h -index 5742724..bbb8c01 100644 ---- a/third_party/nearby/src/cpp/platform_v2/public/atomic_reference.h -+++ b/third_party/nearby/src/cpp/platform_v2/public/atomic_reference.h -@@ -37,7 +37,7 @@ class AtomicReference<T, std::enable_if_t<sizeof(T) <= sizeof(std::uint32_t) && - final { - public: - using Platform = api::ImplementationPlatform; -- explicit AtomicReference(T value) -+ AtomicReference(T value) - : impl_(Platform::CreateAtomicUint32(static_cast<std::uint32_t>(value))) { - } - ~AtomicReference() = default; --- -2.26.2 - diff --git a/chromium/chromium/chromium-ui-memory-vector.patch b/chromium/chromium/chromium-ui-memory-vector.patch new file mode 100644 index 0000000..0d7b0df --- /dev/null +++ b/chromium/chromium/chromium-ui-memory-vector.patch @@ -0,0 +1,27 @@ +From 6e402d97c2dec5726f37e95f97b7f7e12b1d3b1d Mon Sep 17 00:00:00 2001 +From: Jose Dapena Paz <jdapena@igalia.com> +Date: Wed, 11 Nov 2020 11:02:13 +0100 +Subject: [PATCH] IWYU: include headers for std::vector and std::unique_ptr in AXTreeFormatter + +Fix these build errors with libstdc++: +../../ui/accessibility/platform/inspect/tree_formatter.h:35:12: error: ‘std::vector’ has not been declared +../../ui/accessibility/platform/inspect/tree_formatter.h:61:16: error: ‘unique_ptr’ in namespace ‘std’ does not name a template type + +Bug: 957519 +Change-Id: I402ac0644255b3cd4932ff2fe72d999b125a7895 +--- + +diff --git a/ui/accessibility/platform/inspect/tree_formatter.h b/ui/accessibility/platform/inspect/tree_formatter.h +index 4a70a4d..bb23768 100644 +--- a/ui/accessibility/platform/inspect/tree_formatter.h ++++ b/ui/accessibility/platform/inspect/tree_formatter.h +@@ -5,6 +5,9 @@ + #ifndef UI_ACCESSIBILITY_PLATFORM_INSPECT_TREE_FORMATTER_H_ + #define UI_ACCESSIBILITY_PLATFORM_INSPECT_TREE_FORMATTER_H_ + ++#include <memory> ++#include <vector> ++ + #include "ui/accessibility/platform/inspect/inspect.h" + + #include "ui/gfx/native_widget_types.h" diff --git a/chromium/chromium/chromium.spec b/chromium/chromium/chromium.spec index 0e3a688..cc28790 100644 --- a/chromium/chromium/chromium.spec +++ b/chromium/chromium/chromium.spec @@ -51,7 +51,7 @@ %bcond_with fedora_compilation_flags Name: chromium -Version: 87.0.4280.141 +Version: 88.0.4324.96 Release: 100%{?dist} Summary: A WebKit (Blink) powered web browser @@ -107,17 +107,15 @@ Patch20: chromium-python2.patch Patch30: chromium-webrtc-cstring.patch # Pull patches from stha09 -# https://github.com/stha09/chromium-patches/commit/13641b34f86607a8 -# https://github.com/stha09/chromium-patches/commit/a50b8d53cd0fa79c # https://github.com/stha09/chromium-patches/commit/23bfdb7b34fb19bf -Patch40: chromium-nearby-cstring.patch -Patch41: chromium-nearby-explicit.patch -Patch42: chromium-angle-string.patch -Patch43: chromium-base-time-constexpr.patch -Patch44: chromium-openscreen-stdint.patch +# https://github.com/stha09/chromium-patches/commit/3495379e353f96ef +Patch40: chromium-openscreen-stdint.patch +Patch41: chromium-ui-memory-vector.patch # Pull upstream patches Patch50: chromium-quiche-gcc9.patch +Patch51: chromium-gcc10-r831923.patch +Patch52: chromium-gcc10-r838269.patch # I don't have time to test whether it work on other architectures ExclusiveArch: x86_64 @@ -138,11 +136,10 @@ BuildRequires: minizip-devel %endif BuildRequires: mesa-libGL-devel, mesa-libEGL-devel, mesa-libgbm-devel BuildRequires: pkgconfig(gtk+-2.0), pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(libexif), pkgconfig(nss) +BuildRequires: pkgconfig(libffi), pkgconfig(nss), pkgconfig(libexif) BuildRequires: pkgconfig(xtst), pkgconfig(xscrnsaver) BuildRequires: pkgconfig(dbus-1), pkgconfig(libudev) -BuildRequires: pkgconfig(gnome-keyring-1) -BuildRequires: pkgconfig(libffi) +BuildRequires: pkgconfig(libva), pkgconfig(gnome-keyring-1) BuildRequires: python2-setuptools # remove_bundled_libraries.py --do-remove BuildRequires: python2-rpm-macros @@ -302,6 +299,7 @@ find -type f -exec \ third_party/cros_system_api \ third_party/dav1d \ third_party/dawn \ + third_party/dawn/third_party/khronos \ third_party/depot_tools \ third_party/devscripts \ third_party/devtools-frontend \ @@ -324,6 +322,7 @@ find -type f -exec \ third_party/ffmpeg \ third_party/flatbuffers \ third_party/freetype \ + third_party/fusejs \ third_party/libgifcodec \ third_party/glslang \ third_party/google_input_tools \ @@ -361,6 +360,8 @@ find -type f -exec \ third_party/libvpx/source/libvpx/third_party/x86inc \ %endif third_party/libwebm \ + third_party/libx11 \ + third_party/libxcb-keysyms \ %if %{with system_libxml2} third_party/libxml/chromium \ %else @@ -425,6 +426,7 @@ find -type f -exec \ third_party/skia/third_party/vulkan \ third_party/smhasher \ third_party/speech-dispatcher \ + third_party/spirv-cross/spirv-cross \ third_party/spirv-headers \ third_party/SPIRV-Tools \ third_party/sqlite \ @@ -436,6 +438,7 @@ find -type f -exec \ third_party/swiftshader/third_party/subzero \ third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1 \ third_party/tcmalloc \ + third_party/tint \ third_party/ukey2 \ third_party/unrar \ third_party/usb_ids \ @@ -455,6 +458,7 @@ find -type f -exec \ third_party/widevine \ third_party/woff2 \ third_party/wuffs \ + third_party/x11proto \ third_party/xcbproto \ third_party/zxcvbn-cpp \ third_party/xdg-utils \ @@ -714,6 +718,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Tue Feb 2 2021 - Ting-Wei Lan <lantw44@gmail.com> - 88.0.4324.96-100 +- Update to 88.0.4324.96 + * Sun Jan 10 2021 - Ting-Wei Lan <lantw44@gmail.com> - 87.0.4280.141-100 - Update to 87.0.4280.141 |