From 7eee9fa900b214747bdb497702c909b65c63943c Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Fri, 28 Aug 2020 22:03:06 -0400 Subject: [PATCH] 85, lets go --- .gitignore | 2 + chromium-84-ozone-include.patch | 24 --- chromium-85-DelayNode-cast.patch | 31 +++ chromium-85-FrameWidget-namespace.patch | 34 ++++ chromium-85-NearbyConnection-abstract.patch | 29 +++ ...rbyShareEncryptedMetadataKey-include.patch | 25 +++ chromium-85-oscillator_node-cast.patch | 34 ++++ chromium-85-ostream-operator.patch | 52 +++++ chromium-85-ozone-include.patch | 24 +++ chromium-85-sim_hash-include.patch | 25 +++ chromium-85.0.4183.83-gcc-not-auto.patch | 22 +++ chromium.spec | 181 ++++++++---------- sources | 4 +- 13 files changed, 364 insertions(+), 123 deletions(-) delete mode 100644 chromium-84-ozone-include.patch create mode 100644 chromium-85-DelayNode-cast.patch create mode 100644 chromium-85-FrameWidget-namespace.patch create mode 100644 chromium-85-NearbyConnection-abstract.patch create mode 100644 chromium-85-NearbyShareEncryptedMetadataKey-include.patch create mode 100644 chromium-85-oscillator_node-cast.patch create mode 100644 chromium-85-ostream-operator.patch create mode 100644 chromium-85-ozone-include.patch create mode 100644 chromium-85-sim_hash-include.patch create mode 100644 chromium-85.0.4183.83-gcc-not-auto.patch diff --git a/.gitignore b/.gitignore index 692d52e8..2e5133d2 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,5 @@ /node-v8.9.1-linux-x64.tar.gz /node-v10.15.3-linux-x64.tar.gz /xcb-proto-1.14.tar.xz +/NotoSansSymbols2-Regular.ttf +/NotoSansTibetan-Regular.ttf diff --git a/chromium-84-ozone-include.patch b/chromium-84-ozone-include.patch deleted file mode 100644 index a69ac6de..00000000 --- a/chromium-84-ozone-include.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 70ea8ba2c50be2a4bc476261e7640d824b938c99 Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann -Date: Sat, 13 Jun 2020 18:16:27 +0000 -Subject: [PATCH] IWYU: add missing include for memset - ---- - ui/events/ozone/evdev/event_device_info.cc | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/ui/events/ozone/evdev/event_device_info.cc b/ui/events/ozone/evdev/event_device_info.cc -index efbc258..0c5f0a3 100644 ---- a/ui/events/ozone/evdev/event_device_info.cc -+++ b/ui/events/ozone/evdev/event_device_info.cc -@@ -5,6 +5,7 @@ - #include "ui/events/ozone/evdev/event_device_info.h" - - #include -+#include - - #include "base/files/file_path.h" - #include "base/logging.h" --- -2.26.2 - diff --git a/chromium-85-DelayNode-cast.patch b/chromium-85-DelayNode-cast.patch new file mode 100644 index 00000000..72e33452 --- /dev/null +++ b/chromium-85-DelayNode-cast.patch @@ -0,0 +1,31 @@ +From 051a6f6f3fe71602d4c13aa8f3cda40cd3c7484d Mon Sep 17 00:00:00 2001 +From: Jose Dapena Paz +Date: Tue, 07 Jul 2020 16:10:14 +0000 +Subject: [PATCH] fixup: SIMD for main loop of a-rate DelayNode + +Similar to previous fix to oscillator node. In GCC, an implicit cast to +m128i of the result of mm_cmplt_ps is not valid. In this case, as the +next usage of the return value is already an m128, we just change the +type of the return value to m128 too. + +Bug: 819294 +Change-Id: I9ae9103a837920a5bfe432d7c81930bb4a5fce78 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2283211 +Reviewed-by: Raymond Toy +Commit-Queue: José Dapena Paz +Cr-Commit-Position: refs/heads/master@{#785770} +--- + +diff --git a/third_party/blink/renderer/platform/audio/audio_delay_dsp_kernel.cc b/third_party/blink/renderer/platform/audio/audio_delay_dsp_kernel.cc +index 6d26a4d..7b244a6 100644 +--- a/third_party/blink/renderer/platform/audio/audio_delay_dsp_kernel.cc ++++ b/third_party/blink/renderer/platform/audio/audio_delay_dsp_kernel.cc +@@ -142,7 +142,7 @@ + // Wrap the read position if it exceed the buffer length. + + // If buffer length < read_position, set cmp to 0xffffffff. Otherwise zero. +- __m128i cmp = _mm_cmplt_ps(v_buffer_length, v_position); ++ __m128 cmp = _mm_cmplt_ps(v_buffer_length, v_position); + + // Bitwise and buffer_length with cmp to get buffer_length or 0 depending on + // whether read_position >= buffer length or not. Then subtract from the diff --git a/chromium-85-FrameWidget-namespace.patch b/chromium-85-FrameWidget-namespace.patch new file mode 100644 index 00000000..81b0c764 --- /dev/null +++ b/chromium-85-FrameWidget-namespace.patch @@ -0,0 +1,34 @@ +From 9814c5890ecd3f1b044c234543010d8aa6f856b9 Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann +Date: Sun, 28 Jun 2020 11:14:10 +0000 +Subject: [PATCH] GCC: add explicit namespace for FrameWidget + +GCC is confused by multiple definitions in different namespaces +and fails like this: + +../../third_party/blink/renderer/platform/widget/widget_base_client.h:153:24: +error: declaration of 'virtual blink::FrameWidget* +blink::WidgetBaseClient::FrameWidget()' changes meaning of 'FrameWidget' +[-fpermissive] + 153 | virtual FrameWidget* FrameWidget() { return nullptr; } + | ^~~~~~~~~~~ +--- + third_party/blink/renderer/platform/widget/widget_base_client.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/third_party/blink/renderer/platform/widget/widget_base_client.h b/third_party/blink/renderer/platform/widget/widget_base_client.h +index b4ff5ed..606deab 100644 +--- a/third_party/blink/renderer/platform/widget/widget_base_client.h ++++ b/third_party/blink/renderer/platform/widget/widget_base_client.h +@@ -150,7 +150,7 @@ class WidgetBaseClient { + mojo::PendingRemote host) = 0; + + // The FrameWidget interface if this is a FrameWidget. +- virtual FrameWidget* FrameWidget() { return nullptr; } ++ virtual blink::FrameWidget* FrameWidget() { return nullptr; } + + // Send the composition change to the browser. + virtual void SendCompositionRangeChanged( +-- +2.26.2 + diff --git a/chromium-85-NearbyConnection-abstract.patch b/chromium-85-NearbyConnection-abstract.patch new file mode 100644 index 00000000..9cc3c85a --- /dev/null +++ b/chromium-85-NearbyConnection-abstract.patch @@ -0,0 +1,29 @@ +diff --git a/chrome/browser/nearby_sharing/nearby_connections_manager.h b/chrome/browser/nearby_sharing/nearby_connections_manager.h +index d6ac91e..eb1fda7 100644 +--- a/chrome/browser/nearby_sharing/nearby_connections_manager.h ++++ b/chrome/browser/nearby_sharing/nearby_connections_manager.h +@@ -7,6 +7,7 @@ + + #include + #include ++#include + #include + + #include "base/callback.h" +@@ -25,11 +26,13 @@ + + // A callback for handling incoming connections while advertising. + class IncomingConnectionListener { ++ public: + virtual ~IncomingConnectionListener() = default; + +- virtual void OnIncomingConnection(const std::string& endpoint_id, +- const std::vector& endpoint_info, +- NearbyConnection connection) = 0; ++ virtual void OnIncomingConnection( ++ const std::string& endpoint_id, ++ const std::vector& endpoint_info, ++ std::unique_ptr connection) = 0; + }; + + // A callback for handling discovered devices while discovering. diff --git a/chromium-85-NearbyShareEncryptedMetadataKey-include.patch b/chromium-85-NearbyShareEncryptedMetadataKey-include.patch new file mode 100644 index 00000000..d16aedde --- /dev/null +++ b/chromium-85-NearbyShareEncryptedMetadataKey-include.patch @@ -0,0 +1,25 @@ +From ad1493ec8f5287c5cd10dcb50b741359f7858349 Mon Sep 17 00:00:00 2001 +From: Jose Dapena Paz +Date: Tue, 07 Jul 2020 14:43:40 +0000 +Subject: [PATCH] IWYU: int8_t used in nearby share encrypted metadata key requires cstdint + +Bug: 819294 +Change-Id: I90f88cf35e85a8a0ab1811e5533347d329365b21 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2283508 +Reviewed-by: Alex Chau +Commit-Queue: José Dapena Paz +Cr-Commit-Position: refs/heads/master@{#785727} +--- + +diff --git a/chrome/browser/nearby_sharing/certificates/nearby_share_encrypted_metadata_key.h b/chrome/browser/nearby_sharing/certificates/nearby_share_encrypted_metadata_key.h +index 2893bde..8e1758f 100644 +--- a/chrome/browser/nearby_sharing/certificates/nearby_share_encrypted_metadata_key.h ++++ b/chrome/browser/nearby_sharing/certificates/nearby_share_encrypted_metadata_key.h +@@ -5,6 +5,7 @@ + #ifndef CHROME_BROWSER_NEARBY_SHARING_CERTIFICATES_NEARBY_SHARE_ENCRYPTED_METADATA_KEY_H_ + #define CHROME_BROWSER_NEARBY_SHARING_CERTIFICATES_NEARBY_SHARE_ENCRYPTED_METADATA_KEY_H_ + ++#include + #include + + // Holds the encrypted symmetric key--the key used to encrypt user/device diff --git a/chromium-85-oscillator_node-cast.patch b/chromium-85-oscillator_node-cast.patch new file mode 100644 index 00000000..2c6b68cd --- /dev/null +++ b/chromium-85-oscillator_node-cast.patch @@ -0,0 +1,34 @@ +From abd4ce23840614bb9e47fd0e674d1cbe74ec3fb6 Mon Sep 17 00:00:00 2001 +From: Jose Dapena Paz +Date: Tue, 16 Jun 2020 21:08:28 +0200 +Subject: [PATCH] fixup: do not return to 128 integer word from _mm_cmplt_ps in v_wrap_virtual_index. + +After the changes to convert to SIMD several operations in +WebAudio oscillator node, GCC refuses to compile a call to _mm_cmplt_ps +as it returns to an m128i (integer quad), though the declaration of +_mm_cmplt_ps expects to return to an m128 (float quad). + +To fix that, we reinterpret_cast<__m128i>. When we obtain 0xffffffff, +that is NaN, if we interpret it as an integer, it will convert it to +0x80000000, which is wrong. + +Verified with webaudio/Oscillator/* web tests. + +Bug: 819294 +Change-Id: Ia00a7695476e84996548b6c679ffeedead49213b +--- + +diff --git a/third_party/blink/renderer/modules/webaudio/oscillator_node.cc b/third_party/blink/renderer/modules/webaudio/oscillator_node.cc +index 0e38932..03ff1da 100644 +--- a/third_party/blink/renderer/modules/webaudio/oscillator_node.cc ++++ b/third_party/blink/renderer/modules/webaudio/oscillator_node.cc +@@ -377,7 +377,8 @@ + + // cmplt(a,b) returns 0xffffffff (-1) if a < b and 0 if not. So cmp is -1 or + // 0 depending on whether r < f, which is what we need to compute floor(r). +- const __m128i cmp = _mm_cmplt_ps(r, _mm_cvtepi32_ps(f)); ++ const __m128i cmp = ++ reinterpret_cast<__m128i>(_mm_cmplt_ps(r, _mm_cvtepi32_ps(f))); + + // This subtracts 1 if needed to get floor(r). + f = _mm_add_epi32(f, cmp); diff --git a/chromium-85-ostream-operator.patch b/chromium-85-ostream-operator.patch new file mode 100644 index 00000000..c64dc116 --- /dev/null +++ b/chromium-85-ostream-operator.patch @@ -0,0 +1,52 @@ +From 63ca21fddaf4f3b12baf320857407b884db2b570 Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann +Date: Thu, 02 Jul 2020 19:20:33 +0000 +Subject: [PATCH] GCC: fix operator<< for performance_manager::PageNode::OpenedType + +Move operator<< into namespace performance_manager. + +Bug: 819294 +Change-Id: I4e0e97f10dca0b2e56308e07a67cb00e2c2e8052 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2273191 +Reviewed-by: Chris Hamilton +Commit-Queue: Chris Hamilton +Cr-Commit-Position: refs/heads/master@{#784897} +--- + +diff --git a/components/performance_manager/graph/page_node.cc b/components/performance_manager/graph/page_node.cc +index 113fcf4..b1a4007 100644 +--- a/components/performance_manager/graph/page_node.cc ++++ b/components/performance_manager/graph/page_node.cc +@@ -32,11 +32,11 @@ + PageNode::ObserverDefaultImpl::ObserverDefaultImpl() = default; + PageNode::ObserverDefaultImpl::~ObserverDefaultImpl() = default; + +-} // namespace performance_manager +- + std::ostream& operator<<( + std::ostream& os, + performance_manager::PageNode::OpenedType opened_type) { + os << performance_manager::PageNode::ToString(opened_type); + return os; +-} +\ No newline at end of file ++} ++ ++} // namespace performance_manager +diff --git a/components/performance_manager/public/graph/page_node.h b/components/performance_manager/public/graph/page_node.h +index 422c043..79fec03 100644 +--- a/components/performance_manager/public/graph/page_node.h ++++ b/components/performance_manager/public/graph/page_node.h +@@ -265,10 +265,10 @@ + DISALLOW_COPY_AND_ASSIGN(ObserverDefaultImpl); + }; + +-} // namespace performance_manager +- + // std::ostream support for PageNode::OpenedType. + std::ostream& operator<<(std::ostream& os, + performance_manager::PageNode::OpenedType opened_type); + ++} // namespace performance_manager ++ + #endif // COMPONENTS_PERFORMANCE_MANAGER_PUBLIC_GRAPH_PAGE_NODE_H_ diff --git a/chromium-85-ozone-include.patch b/chromium-85-ozone-include.patch new file mode 100644 index 00000000..2441a2ac --- /dev/null +++ b/chromium-85-ozone-include.patch @@ -0,0 +1,24 @@ +From 9abbd7da1ddd8003106cc3420170561d475231a9 Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann +Date: Mon, 29 Jun 2020 13:01:27 +0000 +Subject: [PATCH] IWYU: add missing include for std::vector + +--- + ui/ozone/public/platform_screen.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/ui/ozone/public/platform_screen.h b/ui/ozone/public/platform_screen.h +index 9ce293c..ba20597 100644 +--- a/ui/ozone/public/platform_screen.h ++++ b/ui/ozone/public/platform_screen.h +@@ -7,6 +7,7 @@ + + #include + #include ++#include + + #include "base/component_export.h" + #include "base/macros.h" +-- +2.26.2 + diff --git a/chromium-85-sim_hash-include.patch b/chromium-85-sim_hash-include.patch new file mode 100644 index 00000000..7c272c8b --- /dev/null +++ b/chromium-85-sim_hash-include.patch @@ -0,0 +1,25 @@ +From c0934033a97b61f3177238ff9f842c5a0f5d8faa Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann +Date: Sun, 28 Jun 2020 18:48:11 +0000 +Subject: [PATCH] IWYU: add includes for uint64_t and std::string + +--- + components/federated_learning/sim_hash.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/components/federated_learning/sim_hash.h b/components/federated_learning/sim_hash.h +index 55030d9..a51dd64 100644 +--- a/components/federated_learning/sim_hash.h ++++ b/components/federated_learning/sim_hash.h +@@ -5,6 +5,8 @@ + #ifndef COMPONENTS_FEDERATED_LEARNING_SIM_HASH_H_ + #define COMPONENTS_FEDERATED_LEARNING_SIM_HASH_H_ + ++#include ++#include + #include + #include + +-- +2.26.2 + diff --git a/chromium-85.0.4183.83-gcc-not-auto.patch b/chromium-85.0.4183.83-gcc-not-auto.patch new file mode 100644 index 00000000..13c639ba --- /dev/null +++ b/chromium-85.0.4183.83-gcc-not-auto.patch @@ -0,0 +1,22 @@ +diff -up chromium-85.0.4183.83/base/test/test_timeouts.cc.gcc-not-auto chromium-85.0.4183.83/base/test/test_timeouts.cc +--- chromium-85.0.4183.83/base/test/test_timeouts.cc.gcc-not-auto 2020-08-28 09:05:05.125349246 -0400 ++++ chromium-85.0.4183.83/base/test/test_timeouts.cc 2020-08-28 09:05:43.498249998 -0400 +@@ -85,10 +85,14 @@ bool TestTimeouts::initialized_ = false; + + // The timeout values should increase in the order they appear in this block. + // static +-auto TestTimeouts::tiny_timeout_ = base::TimeDelta::FromMilliseconds(100); +-auto TestTimeouts::action_timeout_ = base::TimeDelta::FromSeconds(10); +-auto TestTimeouts::action_max_timeout_ = base::TimeDelta::FromSeconds(30); +-auto TestTimeouts::test_launcher_timeout_ = base::TimeDelta::FromSeconds(45); ++base::TimeDelta TestTimeouts::tiny_timeout_ = ++ base::TimeDelta::FromMilliseconds(100); ++base::TimeDelta TestTimeouts::action_timeout_ = ++ base::TimeDelta::FromSeconds(10); ++base::TimeDelta TestTimeouts::action_max_timeout_ = ++ base::TimeDelta::FromSeconds(30); ++base::TimeDelta TestTimeouts::test_launcher_timeout_ = ++ base::TimeDelta::FromSeconds(45); + + // static + void TestTimeouts::Initialize() { diff --git a/chromium.spec b/chromium.spec index 7bc02678..127428f4 100644 --- a/chromium.spec +++ b/chromium.spec @@ -165,14 +165,14 @@ BuildRequires: libicu-devel >= 5.4 %global chromoting_client_id %nil %endif -%global majorversion 84 +%global majorversion 85 %if %{freeworld} Name: chromium%{chromium_channel}%{nsuffix} %else Name: chromium%{chromium_channel} %endif -Version: %{majorversion}.0.4147.135 +Version: %{majorversion}.0.4183.83 Release: 1%{?dist} %if %{?freeworld} %if %{?shared} @@ -215,8 +215,6 @@ Patch10: chromium-79.0.3945.56-widevine-other-locations.patch Patch11: chromium-71.0.3578.98-py2-bootstrap.patch # Add "Fedora" to the user agent string Patch12: chromium-79.0.3945.56-fedora-user-agent.patch -# Find nss include files under nss3 -Patch13: chromium-84.0.4147.89-nss3.patch # rename function to avoid conflict with rawhide glibc "gettid()" Patch50: chromium-75.0.3770.80-grpc-gettid-fix.patch @@ -230,79 +228,59 @@ Patch53: chromium-77.0.3865.75-gcc-include-memory.patch Patch54: chromium-79-gcc-protobuf-alignas.patch # https://github.com/stha09/chromium-patches/blob/master/chromium-78-protobuf-RepeatedPtrField-export.patch Patch55: chromium-78-protobuf-RepeatedPtrField-export.patch -# https://github.com/stha09/chromium-patches/blob/master/chromium-84-base-has_bultin.patch -Patch56: chromium-84-base-has_bultin.patch -# /../../ui/base/cursor/ozone/bitmap_cursor_factory_ozone.cc:53:15: error: 'find_if' is not a member of 'std'; did you mean 'find'? -Patch57: chromium-79.0.3945.56-fix-find_if.patch # https://github.com/stha09/chromium-patches/blob/master/chromium-80-QuicStreamSendBuffer-deleted-move-constructor.patch -Patch58: chromium-80-QuicStreamSendBuffer-deleted-move-constructor.patch +Patch57: chromium-80-QuicStreamSendBuffer-deleted-move-constructor.patch # ../../third_party/perfetto/include/perfetto/base/task_runner.h:48:55: error: 'uint32_t' has not been declared -Patch59: chromium-80.0.3987.87-missing-cstdint-header.patch -# ../../third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h:34:3: error: 'size_t' does not name a type -Patch60: chromium-83.0.4103.61-missing-cstddef-header.patch +Patch58: chromium-80.0.3987.87-missing-cstdint-header.patch # Missing (thanks c++17) -Patch61: chromium-80.0.3987.106-missing-cstring-header.patch +Patch60: chromium-80.0.3987.106-missing-cstring-header.patch # prepare for using system ffmpeg (clean) # http://svnweb.mageia.org/packages/cauldron/chromium-browser-stable/current/SOURCES/chromium-53-ffmpeg-no-deprecation-errors.patch?view=markup -Patch62: chromium-53-ffmpeg-no-deprecation-errors.patch -# https://github.com/stha09/chromium-patches/blob/master/chromium-84-cross_variant_mojo_util-remove-noexcept.patch -Patch63: chromium-84-cross_variant_mojo_util-remove-noexcept.patch -# https://github.com/stha09/chromium-patches/blob/master/chromium-83-WebUI-fix-template-specialization.patch -Patch64: chromium-83-WebUI-fix-template-specialization.patch -# https://github.com/stha09/chromium-patches/blob/master/chromium-84-VectorBuffer-fix-template-specialization.patch -Patch65: chromium-84-VectorBuffer-fix-template-specialization.patch +Patch61: chromium-53-ffmpeg-no-deprecation-errors.patch # https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files/chromium-83-gcc-iterator.patch -Patch66: chromium-83-gcc-iterator.patch +Patch62: chromium-83-gcc-iterator.patch # https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files/chromium-83-gcc-compatibility.patch -Patch67: chromium-83-gcc-compatibility.patch +Patch63: chromium-83-gcc-compatibility.patch # Fix skia's handling of no_sanitize attributes to work with gcc -Patch68: chromium-skia-no_sanitize.patch +# https://github.com/stha09/chromium-patches/blob/master/chromium-skia-no_sanitize.patch +Patch64: chromium-skia-no_sanitize.patch # Work around aarch64 gcc bug (PR95726) -Patch69: chromium-83.0.4103.97-gcc10-aarch64-hack.patch -# https://github.com/stha09/chromium-patches/blob/master/chromium-84-AXObject-stl-iterator.patch -Patch70: chromium-84-AXObject-stl-iterator.patch +Patch65: chromium-83.0.4103.97-gcc10-aarch64-hack.patch # https://github.com/stha09/chromium-patches/blob/master/chromium-84-blink-disable-clang-format.patch -Patch71: chromium-84-blink-disable-clang-format.patch -# https://github.com/stha09/chromium-patches/blob/master/chromium-84-crashpad-include-cstring.patch -Patch72: chromium-84-crashpad-include-cstring.patch -# https://github.com/stha09/chromium-patches/blob/master/chromium-84-FilePath-add-noexcept.patch -Patch73: chromium-84-FilePath-add-noexcept.patch -# https://github.com/stha09/chromium-patches/blob/master/chromium-84-fix-decltype.patch -Patch74: chromium-84-fix-decltype.patch -# https://github.com/stha09/chromium-patches/blob/master/chromium-84-flat_map-flat_tree-add-noexcept.patch -Patch75: chromium-84-flat_map-flat_tree-add-noexcept.patch -# https://github.com/stha09/chromium-patches/blob/master/chromium-84-gcc-DCHECK_EQ-unique_ptr.patch -Patch76: chromium-84-gcc-DCHECK_EQ-unique_ptr.patch -# https://github.com/stha09/chromium-patches/blob/master/chromium-84-gcc-DOMRect-constexpr.patch -Patch77: chromium-84-gcc-DOMRect-constexpr.patch -# https://github.com/stha09/chromium-patches/blob/master/chromium-84-gcc-use-brace-initializer.patch -Patch78: chromium-84-gcc-use-brace-initializer.patch -# https://github.com/stha09/chromium-patches/blob/master/chromium-84-ListContainerHelper-include-cstring.patch -Patch79: chromium-84-ListContainerHelper-include-cstring.patch -# https://github.com/stha09/chromium-patches/blob/master/chromium-84-ozone-include.patch -Patch80: chromium-84-ozone-include.patch -# https://github.com/stha09/chromium-patches/blob/master/chromium-84-revert-manage-ManifestManagerHost-per-document.patch -Patch81: chromium-84-revert-manage-ManifestManagerHost-per-document.patch -# https://github.com/stha09/chromium-patches/blob/master/chromium-84-std-vector-const.patch -Patch82: chromium-84-std-vector-const.patch -# https://github.com/stha09/chromium-patches/blob/master/chromium-84-TraceInCollectionTrait-fix-template-specialization.patch -Patch83: chromium-84-TraceInCollectionTrait-fix-template-specialization.patch +Patch66: chromium-84-blink-disable-clang-format.patch +# https://github.com/stha09/chromium-patches/blob/master/chromium-85-ozone-include.patch +Patch67: chromium-85-ozone-include.patch # https://github.com/stha09/chromium-patches/blob/master/chromium-blink-gcc-diagnostic-pragma.patch -Patch84: chromium-blink-gcc-diagnostic-pragma.patch -# https://github.com/stha09/chromium-patches/blob/master/chromium-clang_lto_visibility_public.patch -Patch85: chromium-clang_lto_visibility_public.patch +Patch68: chromium-blink-gcc-diagnostic-pragma.patch # https://github.com/stha09/chromium-patches/blob/master/chromium-fix-char_traits.patch -Patch86: chromium-fix-char_traits.patch +Patch69: chromium-fix-char_traits.patch # https://github.com/stha09/chromium-patches/blob/master/chromium-quiche-invalid-offsetof.patch -Patch87: chromium-quiche-invalid-offsetof.patch +Patch70: chromium-quiche-invalid-offsetof.patch # Silence GCC warnings during gn compile -Patch88: chromium-84.0.4147.105-gn-gcc-cleanup.patch +Patch71: chromium-84.0.4147.105-gn-gcc-cleanup.patch # Fix missing cstring in remoting code -Patch89: chromium-84.0.4147.125-remoting-cstring.patch +Patch72: chromium-84.0.4147.125-remoting-cstring.patch # Apply fix_textrels hack for i686 (even without lld) -Patch90: chromium-84.0.4147.125-i686-fix_textrels.patch +Patch73: chromium-84.0.4147.125-i686-fix_textrels.patch # Work around binutils bug in aarch64 (F33+) -Patch91: chromium-84.0.4147.125-aarch64-clearkeycdm-binutils-workaround.patch +Patch74: chromium-84.0.4147.125-aarch64-clearkeycdm-binutils-workaround.patch +# https://github.com/stha09/chromium-patches/blob/master/chromium-85-FrameWidget-namespace.patch +Patch75: chromium-85-FrameWidget-namespace.patch +# https://github.com/stha09/chromium-patches/blob/master/chromium-85-NearbyConnection-abstract.patch +Patch76: chromium-85-NearbyConnection-abstract.patch +# https://github.com/stha09/chromium-patches/blob/master/chromium-85-oscillator_node-cast.patch +Patch77: chromium-85-oscillator_node-cast.patch +# https://github.com/stha09/chromium-patches/blob/master/chromium-85-ostream-operator.patch +Patch78: chromium-85-ostream-operator.patch +# https://github.com/stha09/chromium-patches/blob/master/chromium-85-sim_hash-include.patch +Patch79: chromium-85-sim_hash-include.patch +# https://github.com/stha09/chromium-patches/blob/master/chromium-85-DelayNode-cast.patch +Patch80: chromium-85-DelayNode-cast.patch +# https://github.com/stha09/chromium-patches/blob/master/chromium-85-NearbyShareEncryptedMetadataKey-include.patch +Patch81: chromium-85-NearbyShareEncryptedMetadataKey-include.patch +# https://chromium.googlesource.com/chromium/src/+/17edd5225a9e6a388a9560efe20362a1a0d86694 +Patch82: chromium-85.0.4183.83-gcc-not-auto.patch + # Use lstdc++ on EPEL7 only Patch101: chromium-75.0.3770.100-epel7-stdc++.patch @@ -574,6 +552,14 @@ BuildRequires: thai-scalable-garuda-fonts BuildRequires: lohit-devanagari-fonts BuildRequires: lohit-tamil-fonts BuildRequires: google-noto-sans-khmer-fonts +BuildRequires: google-noto-emoji-color-fonts +%if 0%{?fedora} >= 30 +BuildRequires: google-noto-sans-symbols2-fonts +BuildRequires: google-noto-sans-tibetan-fonts +%else +Source114: https://github.com/googlefonts/noto-fonts/blob/master/unhinted/NotoSansSymbols2/NotoSansSymbols2-Regular.ttf +Source115: https://github.com/googlefonts/noto-fonts/blob/master/hinted/NotoSansTibetan/NotoSansTibetan-Regular.ttf +%endif %endif # using the built from source version on aarch64 BuildRequires: ninja-build @@ -879,7 +865,6 @@ udev. %patch9 -p1 -b .gcc9 %patch10 -p1 -b .widevine-other-locations %patch11 -p1 -b .py2 -%patch13 -p1 -b .nss3 # Short term fixes (usually gcc and backports) %patch50 -p1 -b .gettid-fix @@ -888,42 +873,31 @@ udev. %patch53 -p1 -b .gcc-include-memory %patch54 -p1 -b .base-gcc-no-alignas %patch55 -p1 -b .protobuf-export -%patch56 -p1 -b .clang-supports-location-builtins -%patch57 -p1 -b .fix-find_if -%patch58 -p1 -b .gcc-quiche -%patch59 -p1 -b .missing-cstdint -%patch60 -p1 -b .missing-cstddef -%patch61 -p1 -b .missing-cstring -%patch62 -p1 -b .ffmpeg-deprecations -%patch63 -p1 -b .gcc-noexcept -%patch64 -p1 -b .gcc-template -%patch65 -p1 -b .gcc-template2 -%patch66 -p1 -b .gcc-iterator2 -%patch67 -p1 -b .gcc-compatibility -%patch68 -p1 -b .gcc-no_sanitize -%patch69 -p1 -b .gcc10-aarch64-hack -%patch70 -p1 -b .AXObject-stl-iterator -%patch71 -p1 -b .blink-disable-clang-format -%patch72 -p1 -b .crashpad-include-cstring -%patch73 -p1 -b .FilePath-add-noexcept -%patch74 -p1 -b .fix-decltype -%patch75 -p1 -b .flat_map-flat_tree-add-noexcept -%patch76 -p1 -b .gcc-DCHECK_EQ-unique-ptr -%patch77 -p1 -b .gcc-DOMRect-constexpr -%patch78 -p1 -b .gcc-use-brace-initializer -%patch79 -p1 -b .ListContainerHelper-include-cstring -%patch80 -p1 -b .ozone-include -%patch81 -p1 -b .revert-manage-ManifestManagerHost-per-document -%patch82 -p1 -b .std-vector-const -%patch83 -p1 -b .TraceInCollectionTrait-fix-template-specialization -%patch84 -p1 -b .blink-gcc-diagnostic-pragma -%patch85 -p1 -b .clang_lto_visibility_public -%patch86 -p1 -b .fix-char_traits -%patch87 -p1 -b .quiche-invalid-offset -%patch88 -p1 -b .gn-gcc-cleanup -%patch89 -p1 -b .remoting-cstring -%patch90 -p1 -b .i686-textrels -%patch91 -p1 -b .aarch64-clearkeycdm-binutils-workaround +%patch57 -p1 -b .gcc-quiche +%patch58 -p1 -b .missing-cstdint +%patch60 -p1 -b .missing-cstring +%patch61 -p1 -b .ffmpeg-deprecations +%patch62 -p1 -b .gcc-iterator2 +%patch63 -p1 -b .gcc-compatibility +%patch64 -p1 -b .gcc-no_sanitize +%patch65 -p1 -b .gcc10-aarch64-hack +%patch66 -p1 -b .blink-disable-clang-format +%patch67 -p1 -b .ozone-include +%patch68 -p1 -b .blink-gcc-diagnostic-pragma +%patch69 -p1 -b .fix-char_traits +%patch70 -p1 -b .quiche-invalid-offset +%patch71 -p1 -b .gn-gcc-cleanup +%patch72 -p1 -b .remoting-cstring +%patch73 -p1 -b .i686-textrels +%patch74 -p1 -b .aarch64-clearkeycdm-binutils-workaround +%patch75 -p1 -b .FrameWidget-namespace +%patch76 -p1 -b .NearbyConnection-abstract +%patch77 -p1 -b .oscillator_node-cast +%patch78 -p1 -b .ostream-operator +%patch79 -p1 -b .sim_hash-include +%patch80 -p1 -b .DelayNode-cast +%patch81 -p1 -b .NearbyShareEncryptedMetadataKey-include +%patch82 -p1 -b .gcc-not-auto # Fedora branded user agent %if 0%{?fedora} @@ -1035,6 +1009,12 @@ cp -a /usr/share/fonts/thai-scalable/Garuda.ttf . %endif cp -a /usr/share/fonts/lohit-devanagari/Lohit-Devanagari.ttf /usr/share/fonts/lohit-tamil/Lohit-Tamil.ttf . cp -a /usr/share/fonts/google-noto/NotoSansKhmer-Regular.ttf . +cp -a /usr/share/fonts/google-noto-emoji/NotoColorEmoji.ttf . +%if 0%{?fedora} >= 30 +cp -a /usr/share/fonts/google-noto/NotoSansSymbols2-Regular.ttf /usr/share/fonts/google-noto/NotoSansTibetan-Regular.ttf . +%else +cp -a %{SOURCE114} %{SOURCE115} . +%endif popd %endif @@ -1094,7 +1074,7 @@ export CHROMIUM_BROWSER_GN_DEFINES CHROMIUM_HEADLESS_GN_DEFINES="" CHROMIUM_HEADLESS_GN_DEFINES+=' use_ozone=true ozone_auto_platforms=false ozone_platform="headless" ozone_platform_headless=true' -CHROMIUM_HEADLESS_GN_DEFINES+=' headless_use_embedded_resources=true icu_use_data_file=false v8_use_external_startup_data=false' +CHROMIUM_HEADLESS_GN_DEFINES+=' headless_use_embedded_resources=false icu_use_data_file=false v8_use_external_startup_data=false' CHROMIUM_HEADLESS_GN_DEFINES+=' enable_nacl=false enable_print_preview=false enable_remoting=false use_alsa=false' CHROMIUM_HEADLESS_GN_DEFINES+=' use_cups=false use_dbus=false use_gio=false use_kerberos=false use_libpci=false' CHROMIUM_HEADLESS_GN_DEFINES+=' use_pulseaudio=false use_udev=false use_gtk=false use_glib=false' @@ -1259,6 +1239,7 @@ build/linux/unbundle/remove_bundled_libraries.py \ 'third_party/node' \ 'third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2' \ 'third_party/one_euro_filter' \ + 'third_party/opencv' \ %if %{freeworld} 'third_party/openh264' \ %endif @@ -1332,6 +1313,7 @@ build/linux/unbundle/remove_bundled_libraries.py \ 'third_party/widevine' \ 'third_party/woff2' \ 'third_party/wuffs' \ + 'third_party/xcbproto' \ 'third_party/xdg-utils' \ 'third_party/zlib' \ 'third_party/zlib/google' \ @@ -1927,6 +1909,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %changelog +* Wed Aug 26 2020 Tom Callaway - 85.0.4183.83-1 +- update to 85.0.4183.83 + * Thu Aug 20 2020 Tom Callaway - 84.0.4147.135-1 - update to 84.0.4147.135 - conditionalize build_clear_key_cdm diff --git a/sources b/sources index cf6329f9..e9e55ef4 100644 --- a/sources +++ b/sources @@ -18,4 +18,6 @@ SHA512 (Ahem.ttf) = aeb64b10ab9c87860714cb60b4900254b13dc52c51319256a1a3722c8820 SHA512 (node-v10.15.3-linux-x64.tar.gz) = 5eb544ef706562981340a82acc79e2162c6a3e4049b4a95f69ce353ee5b0f929c60b1fc457e8249b3fb0696f82fc28c5f543f5947db19fae4e9d5c21b906bb20 SHA512 (xcb-proto-1.14.tar.xz) = de66d568163b6da2be9d6c59984f3afa3acd119a781378638045fd68018665ef5c9af98f024e9962ba3eb7c7a4d85c27ba70ffafceb2324ccc6940f34de16690 SHA512 (depot_tools.git-master.tar.gz) = dc323888812b66cc92c53a24a8a58ccf9e2961be67aa21852bd091b8b49569071f06ae9104cb58950e6253ac3a29f0db0663e9f35ef2b1ea28696efb38b42708 -SHA512 (chromium-84.0.4147.135-clean.tar.xz) = a33c2717e3ef405ed2ba545d06137b7f88aa54872f3d846a7954562e7fe984132d6866bbdc72b2bff8b3d0fdbb124a395e429777af3b3e05210dcceb24e53c1f +SHA512 (chromium-85.0.4183.83-clean.tar.xz) = 8b5b150e1bc75986cf5c8d1db75e5e07e5cf3dd4961b74d9e83a6eba6a49da54af155d63e32ca59f3a94eab77224167219242f3d9d8fd6f71ef1af9a3b0a4925 +SHA512 (NotoSansSymbols2-Regular.ttf) = 2644b42c3fdccfe12395f9b61553aced169a0f1dc09f5a0fd7898e9d0a372ee4422b6b1cdab3c86ecc91db437e9ae8a951e64e85edc3ac9e9fca428852dbb2ad +SHA512 (NotoSansTibetan-Regular.ttf) = fb5a48fcaea80eebe7d692f6fcf00d59d47658a358d0ec8e046fc559873f88bd595b2da474d2826abd9e9305f3741c69058d867b1e6048f37fe7d71b5d3af36a