[kodi/f25] Update to 17.4
by Michael Cronenworth
Summary of changes:
9ad1b88... Update to 17.4 (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 3 months
[kodi/f26] Update to 17.4
by Michael Cronenworth
Summary of changes:
9ad1b88... Update to 17.4 (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 3 months
[kodi] Update to 17.4
by Michael Cronenworth
commit 9ad1b884d26e740ac47fe31161c437a8d65bd778
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Wed Aug 23 15:55:44 2017 -0500
Update to 17.4
.gitignore | 2 +-
kodi-generate-tarball-xz.sh | 2 +-
kodi.spec | 9 +++++++--
sources | 2 +-
4 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0cacba6..018a5c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/kodi-17.3-patched.tar.xz
+/kodi-17.4-patched.tar.xz
diff --git a/kodi-generate-tarball-xz.sh b/kodi-generate-tarball-xz.sh
index 708b1cd..62c1dab 100755
--- a/kodi-generate-tarball-xz.sh
+++ b/kodi-generate-tarball-xz.sh
@@ -1,7 +1,7 @@
#!/bin/sh
MAJORVERSION=17
-MINORVERSION=3
+MINORVERSION=4
#GITCOMMIT=e988513175fccca83f8b688bb77b932f6a403b96
#GITSHORT=ge988513
CODENAME=Krypton
diff --git a/kodi.spec b/kodi.spec
index 95aa9b8..8f12c90 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -7,7 +7,7 @@
%global _with_dvd 0
Name: kodi
-Version: 17.3
+Version: 17.4
Release: 1%{?dist}
Summary: Media center
@@ -37,8 +37,10 @@ Source4: kodi-libdvdcss-master.tar.gz
# Set program version parameters
Patch1: kodi-16.0-versioning.patch
+%if 0%{?_with_dvd} == 0
# Drop DVD library support
Patch2: kodi-17a2-libdvd.patch
+%endif
# Optional deps (not in EPEL)
%if 0%{?fedora}
@@ -294,7 +296,7 @@ chmod +x bootstrap
%else
--disable-ssh \
%endif
-%if ! 0%{?_with_dvd}
+%if 0%{?_with_dvd} == 0
--disable-optical-drive \
%endif
--disable-optimizations --disable-debug \
@@ -422,6 +424,9 @@ fi
%changelog
+* Wed Aug 23 2017 Michael Cronenworth <mike(a)cchtml.com> - 17.4-1
+- Kodi 17.4 final
+
* Wed May 31 2017 Michael Cronenworth <mike(a)cchtml.com> - 17.3-1
- Kodi 17.3 final
diff --git a/sources b/sources
index 230b1b7..6cb55a3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2445a753e1f497be78bdbbc5eafaaaa3 kodi-17.3-patched.tar.xz
+436de137216e80e108d534791787cf76 kodi-17.4-patched.tar.xz
7 years, 3 months
[chromium-libs-media-freeworld: 8/8] Merge 'fedora/master' 5922b5c, 60.0.3112.101-1
by Miro Hrončok
commit 4495c9437a58f02d100ccbab642a4b075589a177
Merge: 487bae1 5922b5c
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Wed Aug 23 20:58:16 2017 +0200
Merge 'fedora/master' 5922b5c, 60.0.3112.101-1
.gitignore | 1 +
chromium-60.0.3112.101-camfix.patch | 25 +++++++++++++++++++++++++
chromium-60.0.3112.90-init-list-hack.patch | 27 +++++++++++++++++++++++++++
chromium-60.0.3112.90-vulkan-force-c99.patch | 11 +++++++++++
chromium-libs-media-freeworld.spec | 24 ++++++++++++++++++++++--
sources | 2 +-
6 files changed, 87 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index 8bad827,428fd64..c2a7b5e
--- a/.gitignore
+++ b/.gitignore
@@@ -20,15 -20,10 +20,16 @@@
/chromium-57.0.2987.133-clean.tar.xz
/chromium-58.0.3029.81-clean.tar.xz
/chromium-58.0.3029.110-clean.tar.xz
+/chromium-58.0.3029.110.tar.xz
/chromium-59.0.3071.86-clean.tar.xz
+/chromium-59.0.3071.86.tar.xz
/chromium-59.0.3071.104-clean.tar.xz
+/chromium-59.0.3071.104.tar.xz
/chromium-59.0.3071.109-clean.tar.xz
+/chromium-59.0.3071.109.tar.xz
/chromium-59.0.3071.115-clean.tar.xz
/chromium-59.0.3071.109-freetype.tar.bz2
+/chromium-59.0.3071.115.tar.xz
/chromium-60.0.3112.90-clean.tar.xz
-/chromium-60.0.3112.101-clean.tar.xz
+/chromium-60.0.3112.90.tar.xz
++/chromium-60.0.3112.101.tar.xz
diff --cc sources
index 13c5ce7,9309b9e..9816669
--- a/sources
+++ b/sources
@@@ -1,3 -1,3 +1,3 @@@
-SHA512 (depot_tools.git-master.tar.gz) = d3d6a1873b2b0296a8cd99e0d8d2e629a17b1808934b4972556168f8b4ccea60577ebaeab4445baf15afb1b04080808db59a832a5b61d247bd48da14fa6acf03
-SHA512 (policy_templates.zip) = 4d2a7162adb3ca224f3e1bf1d2936ae395603e8ffa3fda7753e666a16c42c7ba54c7acfcfdc742e22978ace37e471ed099d222063708d4d8a299da3daf135f15
-SHA512 (chromium-60.0.3112.101-clean.tar.xz) = 3ed13c6a32752294898fa72f2333f32fcf081eef7328307645dbc09baae95aca762d3083d2ae053fc903a0b4dc92e04da91a810d267aab21dea196362ed6abc6
+a6495be59bdbc20b2524d7c1356e82ac policy_templates.zip
+49a7f897775cce21d2b69968b8af1cea depot_tools.git-master.tar.gz
- 75f9199e5e0b31e9fbfbaf1f3071b411 chromium-60.0.3112.90.tar.xz
++9fe9af85faeaf617cb61997c431a02e2 chromium-60.0.3112.101.tar.xz
7 years, 3 months
[chromium-libs-media-freeworld: 7/8] update to 60.0.3112.101, apply upstream fix for cameras which report zero resolution formats (bz1465
by Miro Hrončok
commit 5922b5cfc93c9d5de2fe2258364697ea0cae6de5
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Wed Aug 16 17:20:49 2017 -0400
update to 60.0.3112.101, apply upstream fix for cameras which report zero resolution formats (bz1465357)
.gitignore | 1 +
chromium-60.0.3112.101-camfix.patch | 25 +++++++++++++++++++++++++
chromium.spec | 13 ++++++++++---
sources | 2 +-
4 files changed, 37 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 19bd92f..428fd64 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@
/chromium-59.0.3071.115-clean.tar.xz
/chromium-59.0.3071.109-freetype.tar.bz2
/chromium-60.0.3112.90-clean.tar.xz
+/chromium-60.0.3112.101-clean.tar.xz
diff --git a/chromium-60.0.3112.101-camfix.patch b/chromium-60.0.3112.101-camfix.patch
new file mode 100644
index 0000000..0dd59d4
--- /dev/null
+++ b/chromium-60.0.3112.101-camfix.patch
@@ -0,0 +1,25 @@
+diff -up chromium-60.0.3112.101/content/browser/renderer_host/media/media_devices_dispatcher_host.cc.camfix chromium-60.0.3112.101/content/browser/renderer_host/media/media_devices_dispatcher_host.cc
+--- chromium-60.0.3112.101/content/browser/renderer_host/media/media_devices_dispatcher_host.cc.camfix 2017-08-16 17:02:07.177832503 -0400
++++ chromium-60.0.3112.101/content/browser/renderer_host/media/media_devices_dispatcher_host.cc 2017-08-16 17:02:56.378883520 -0400
+@@ -6,6 +6,7 @@
+
+ #include <stddef.h>
+
++#include <algorithm>
+ #include <utility>
+ #include <vector>
+
+@@ -454,6 +455,13 @@ media::VideoCaptureFormats MediaDevicesD
+
+ media_stream_manager_->video_capture_manager()->GetDeviceSupportedFormats(
+ device_id, &formats);
++ // Remove formats that have zero resolution.
++ formats.erase(std::remove_if(formats.begin(), formats.end(),
++ [](const media::VideoCaptureFormat& format) {
++ return format.frame_size.GetArea() <= 0;
++ }),
++ formats.end());
++
+ return formats;
+ }
+
diff --git a/chromium.spec b/chromium.spec
index 8e2d7b0..c99bb84 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -115,8 +115,8 @@ Name: chromium%{chromium_channel}%{?freeworld:-freeworld}
%else
Name: chromium%{chromium_channel}
%endif
-Version: %{majorversion}.0.3112.90
-Release: 3%{?dist}
+Version: %{majorversion}.0.3112.101
+Release: 1%{?dist}
Summary: A WebKit (Blink) powered web browser
Url: http://www.chromium.org/Home
License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
@@ -200,7 +200,8 @@ Patch45: chromium-60.0.3112.78-no-zlib-mangle.patch
# Apply these changes to work around EPEL7 compiler issues
Patch46: chromium-60.0.3112.90-init-list-hack.patch
Patch47: chromium-60.0.3112.90-vulkan-force-c99.patch
-
+# https://chromium.googlesource.com/chromium/src/+/9c77470ff34bac937ceb765a...
+Patch48: chromium-60.0.3112.101-camfix.patch
### Chromium Tests Patches ###
Patch100: chromium-46.0.2490.86-use_system_opus.patch
@@ -632,6 +633,7 @@ udev.
%patch46 -p1 -b .oldgcc
%patch47 -p1 -b .c99
%endif
+%patch48 -p1 -b .camfix
### Chromium Tests Patches ###
%patch100 -p1 -b .use_system_opus
@@ -1839,6 +1841,11 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%changelog
+* Wed Aug 16 2017 Tom Callaway <spot(a)fedoraproject.org> 60.0.3112.101-1
+- update to 60.0.3112.101
+- apply upstream fix for cameras which report zero resolution formats
+ (bz1465357)
+
* Mon Aug 14 2017 Tom Callaway <spot(a)fedoraproject.org> 60.0.3112.90-3
- apply more workarounds to coax code to build with epel7 gcc
diff --git a/sources b/sources
index 24b41df..9309b9e 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
SHA512 (depot_tools.git-master.tar.gz) = d3d6a1873b2b0296a8cd99e0d8d2e629a17b1808934b4972556168f8b4ccea60577ebaeab4445baf15afb1b04080808db59a832a5b61d247bd48da14fa6acf03
-SHA512 (chromium-60.0.3112.90-clean.tar.xz) = 3b1579037b3debc0f714e5de3e02bd5fc1c8aa7482479ffc20b824653b11191ed558cef147633b30da16ffd8c26d5eacb95b93610041a44a6ea84606702f7ac1
SHA512 (policy_templates.zip) = 4d2a7162adb3ca224f3e1bf1d2936ae395603e8ffa3fda7753e666a16c42c7ba54c7acfcfdc742e22978ace37e471ed099d222063708d4d8a299da3daf135f15
+SHA512 (chromium-60.0.3112.101-clean.tar.xz) = 3ed13c6a32752294898fa72f2333f32fcf081eef7328307645dbc09baae95aca762d3083d2ae053fc903a0b4dc92e04da91a810d267aab21dea196362ed6abc6
7 years, 3 months
[chromium-libs-media-freeworld: 6/8] apply more workarounds to force code to compile with epel7 gcc
by Miro Hrončok
commit 26f11a9f0f82327066da16a2d3a6f15dc7fdaef9
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Mon Aug 14 11:20:03 2017 -0400
apply more workarounds to force code to compile with epel7 gcc
chromium-60.0.3112.90-vulkan-force-c99.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/chromium-60.0.3112.90-vulkan-force-c99.patch b/chromium-60.0.3112.90-vulkan-force-c99.patch
index a415962..881aa91 100644
--- a/chromium-60.0.3112.90-vulkan-force-c99.patch
+++ b/chromium-60.0.3112.90-vulkan-force-c99.patch
@@ -5,7 +5,7 @@ diff -up chromium-60.0.3112.90/third_party/angle/src/vulkan_support/BUILD.gn.c99
cflags += [ "-Wno-ignored-attributes" ]
}
if (is_linux) {
-+ cflags = [ "-std=c99" ]
++ cflags += [ "-std=c99" ]
defines += [
"SYSCONFDIR=\"/etc\"",
"FALLBACK_CONFIG_DIRS=\"/etc/xdg\"",
7 years, 3 months
[chromium-libs-media-freeworld: 5/8] apply more workarounds to force code to compile with epel7 gcc
by Miro Hrončok
commit efb66ad8f9d80f9ef434b4cf6675aab61d5e4beb
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Mon Aug 14 10:45:51 2017 -0400
apply more workarounds to force code to compile with epel7 gcc
chromium-60.0.3112.90-vulkan-force-c99.patch | 11 +++++++++++
chromium.spec | 9 +++++++--
2 files changed, 18 insertions(+), 2 deletions(-)
---
diff --git a/chromium-60.0.3112.90-vulkan-force-c99.patch b/chromium-60.0.3112.90-vulkan-force-c99.patch
new file mode 100644
index 0000000..a415962
--- /dev/null
+++ b/chromium-60.0.3112.90-vulkan-force-c99.patch
@@ -0,0 +1,11 @@
+diff -up chromium-60.0.3112.90/third_party/angle/src/vulkan_support/BUILD.gn.c99 chromium-60.0.3112.90/third_party/angle/src/vulkan_support/BUILD.gn
+--- chromium-60.0.3112.90/third_party/angle/src/vulkan_support/BUILD.gn.c99 2017-08-14 10:40:48.028799820 -0400
++++ chromium-60.0.3112.90/third_party/angle/src/vulkan_support/BUILD.gn 2017-08-14 10:41:43.054734910 -0400
+@@ -180,6 +180,7 @@ config("vulkan_internal_config") {
+ cflags += [ "-Wno-ignored-attributes" ]
+ }
+ if (is_linux) {
++ cflags = [ "-std=c99" ]
+ defines += [
+ "SYSCONFDIR=\"/etc\"",
+ "FALLBACK_CONFIG_DIRS=\"/etc/xdg\"",
diff --git a/chromium.spec b/chromium.spec
index 40b532b..8e2d7b0 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -116,7 +116,7 @@ Name: chromium%{chromium_channel}%{?freeworld:-freeworld}
Name: chromium%{chromium_channel}
%endif
Version: %{majorversion}.0.3112.90
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A WebKit (Blink) powered web browser
Url: http://www.chromium.org/Home
License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
@@ -197,8 +197,9 @@ Patch43: chromium-60.0.3112.78-jpeg-nomangle.patch
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
+# Apply these changes to work around EPEL7 compiler issues
Patch46: chromium-60.0.3112.90-init-list-hack.patch
+Patch47: chromium-60.0.3112.90-vulkan-force-c99.patch
### Chromium Tests Patches ###
@@ -629,6 +630,7 @@ udev.
%patch45 -p1 -b .nozmangle
%if 0%{?rhel} == 7
%patch46 -p1 -b .oldgcc
+%patch47 -p1 -b .c99
%endif
### Chromium Tests Patches ###
@@ -1837,6 +1839,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%changelog
+* Mon Aug 14 2017 Tom Callaway <spot(a)fedoraproject.org> 60.0.3112.90-3
+- apply more workarounds to coax code to build with epel7 gcc
+
* Wed Aug 9 2017 Tom Callaway <spot(a)fedoraproject.org> 60.0.3112.90-2
- apply post 60 code commit to get code building on epel7
7 years, 3 months
[chromium-libs-media-freeworld: 4/8] okay, do you like this?
by Miro Hrončok
commit 268e0a67112d2d7a6a64f140248bd450865fb5ae
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Fri Aug 11 12:00:53 2017 -0400
okay, do you like this?
chromium-60.0.3112.90-init-list-hack.patch | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/chromium-60.0.3112.90-init-list-hack.patch b/chromium-60.0.3112.90-init-list-hack.patch
index 1403335..d3d52fe 100644
--- a/chromium-60.0.3112.90-init-list-hack.patch
+++ b/chromium-60.0.3112.90-init-list-hack.patch
@@ -20,8 +20,8 @@ diff -up chromium-60.0.3112.90/third_party/WebKit/Source/core/layout/ng/ng_block
- curr_bfc_offset_ +=
- {border_and_padding_.inline_start + curr_child_margins_.inline_start,
- curr_margin_strut_.Sum()};
-+ LayoutUnit sum_inline_starts2 = {border_and_padding_.inline_start + curr_child_margins_.inline_start, curr_margin_strut_.Sum()};
-+ curr_bfc_offset_ += sum_inline_starts2;
++ LayoutUnit sum_inline_starts2 = {border_and_padding_.inline_start + curr_child_margins_.inline_start};
++ curr_bfc_offset_ += {sum_inline_starts2, curr_margin_strut_.Sum()};
MaybeUpdateFragmentBfcOffset(ConstraintSpace(), curr_bfc_offset_,
&container_builder_);
PositionPendingFloats(curr_bfc_offset_.block_offset, &container_builder_,
7 years, 3 months
[chromium-libs-media-freeworld: 3/8] try different hack
by Miro Hrončok
commit 97f98971c79e08594b438c3baa3229fbacdab2cf
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Fri Aug 11 10:26:58 2017 -0400
try different hack
chromium-60.0.3112.90-init-list-hack.patch | 31 ++++++++++++------------------
1 file changed, 12 insertions(+), 19 deletions(-)
---
diff --git a/chromium-60.0.3112.90-init-list-hack.patch b/chromium-60.0.3112.90-init-list-hack.patch
index 6cd91d6..1403335 100644
--- a/chromium-60.0.3112.90-init-list-hack.patch
+++ b/chromium-60.0.3112.90-init-list-hack.patch
@@ -1,34 +1,27 @@
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::
++++ chromium-60.0.3112.90/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc 2017-08-11 10:24:10.635245642 -0400
+@@ -381,8 +381,9 @@ NGLogicalOffset NGBlockLayoutAlgorithm::
+ }
NGLogicalOffset child_bfc_offset = curr_bfc_offset_;
- child_bfc_offset.inline_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}};
++ LayoutUnit sum_inline_starts = {border_and_padding_.inline_start + curr_child_margins_.inline_start};
++
++ child_bfc_offset.inline_offset += sum_inline_starts;
// 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::
+@@ -395,9 +396,8 @@ NGLogicalOffset NGBlockLayoutAlgorithm::
+
// Should collapse margins if our child is a legacy block.
if (IsLegacyBlock(*child)) {
- curr_bfc_offset_ +=
+- 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()}};
++ LayoutUnit sum_inline_starts2 = {border_and_padding_.inline_start + curr_child_margins_.inline_start, curr_margin_strut_.Sum()};
++ curr_bfc_offset_ += sum_inline_starts2;
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,
7 years, 3 months
[chromium-libs-media-freeworld: 2/8] try to trick old gcc
by Miro Hrončok
commit 682675b7f8625fb1f6cfd350ed168082fc2124ef
Author: Tom Callaway <spot(a)fedoraproject.org>
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 ###
7 years, 3 months