commit 682675b7f8625fb1f6cfd350ed168082fc2124ef Author: Tom Callaway <spot(a)fedoraproject.org&gt; Date: Wed Aug 9 14:48:34 2017 -0400 try to trick old gcc chromium-60.0.3112.90-init-list-hack.patch | 34 ++ chromium-60.0.3112.90-no-per-child.patch | 843 ----------------------------- chromium.spec | 5 +- 3 files changed, 36 insertions(+), 846 deletions(-) --- diff --git a/chromium-60.0.3112.90-init-list-hack.patch b/chromium-60.0.3112.90-init-list-hack.patch new file mode 100644 index 0000000..6cd91d6 --- /dev/null +++ b/chromium-60.0.3112.90-init-list-hack.patch @@ -0,0 +1,34 @@ +diff -up chromium-60.0.3112.90/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc.tryfix chromium-60.0.3112.90/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc +--- chromium-60.0.3112.90/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc.tryfix 2017-08-09 14:45:17.619172987 -0400 ++++ chromium-60.0.3112.90/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc 2017-08-09 14:46:07.375213058 -0400 +@@ -382,7 +382,7 @@ NGLogicalOffset NGBlockLayoutAlgorithm:: + + NGLogicalOffset child_bfc_offset = curr_bfc_offset_; + child_bfc_offset.inline_offset += +- {border_and_padding_.inline_start + curr_child_margins_.inline_start}; ++ {{border_and_padding_.inline_start + curr_child_margins_.inline_start}}; + + // Append the current margin strut with child's block start margin. + // Non empty border/padding, and new FC use cases are handled inside of the +@@ -396,8 +396,8 @@ NGLogicalOffset NGBlockLayoutAlgorithm:: + // Should collapse margins if our child is a legacy block. + if (IsLegacyBlock(*child)) { + curr_bfc_offset_ += +- {border_and_padding_.inline_start + curr_child_margins_.inline_start, +- curr_margin_strut_.Sum()}; ++ {{border_and_padding_.inline_start + curr_child_margins_.inline_start, ++ curr_margin_strut_.Sum()}}; + MaybeUpdateFragmentBfcOffset(ConstraintSpace(), curr_bfc_offset_, + &container_builder_); + PositionPendingFloats(curr_bfc_offset_.block_offset, &container_builder_, +@@ -526,8 +526,8 @@ NGLogicalOffset NGBlockLayoutAlgorithm:: + margin_strut.Append(curr_child_margins_.block_end); + + curr_bfc_offset_ += +- {border_and_padding_.inline_start + curr_child_margins_.inline_start, +- margin_strut.Sum()}; ++ {{border_and_padding_.inline_start + curr_child_margins_.inline_start, ++ margin_strut.Sum()}}; + AdjustToClearance(space.ClearanceOffset(), &curr_bfc_offset_); + PositionPendingFloatsFromOffset( + curr_bfc_offset_.block_offset, curr_bfc_offset_.block_offset, diff --git a/chromium.spec b/chromium.spec index 7cc501e..40b532b 100644 --- a/chromium.spec +++ b/chromium.spec @@ -198,8 +198,7 @@ Patch44: chromium-60.0.3112.78-gtk2fix.patch # Do not mangle zlib Patch45: chromium-60.0.3112.78-no-zlib-mangle.patch # Apply this change to work around EPEL7 compiler issues -# https://chromium.googlesource.com/chromium/src/+/639c840bf93e2934fe6b3f56... -Patch46: chromium-60.0.3112.90-no-per-child.patch +Patch46: chromium-60.0.3112.90-init-list-hack.patch ### Chromium Tests Patches ### @@ -629,7 +628,7 @@ udev. %patch44 -p1 -b .gtk2fix %patch45 -p1 -b .nozmangle %if 0%{?rhel} == 7 -%patch46 -p1 -b .noperchild +%patch46 -p1 -b .oldgcc %endif ### Chromium Tests Patches ###