[chromium-libs-media-freeworld: 20/259] i think this will build
commit 1144ae5d3cd031b0e14095ce787f1574109b33b2
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Tue Sep 19 10:07:30 2017 -0400
i think this will build
....0.3163.79-epel7-no-nullptr-assignment-on-StructPtr.patch | 12 ++++++++++++
chromium.spec | 6 +++---
2 files changed, 15 insertions(+), 3 deletions(-)
---
diff --git a/chromium-61.0.3163.79-epel7-no-nullptr-assignment-on-StructPtr.patch
b/chromium-61.0.3163.79-epel7-no-nullptr-assignment-on-StructPtr.patch
new file mode 100644
index 0000000..0ba375b
--- /dev/null
+++ b/chromium-61.0.3163.79-epel7-no-nullptr-assignment-on-StructPtr.patch
@@ -0,0 +1,12 @@
+diff -up
chromium-61.0.3163.79/third_party/WebKit/Source/platform/blob/BlobData.cpp.nonullptr
chromium-61.0.3163.79/third_party/WebKit/Source/platform/blob/BlobData.cpp
+---
chromium-61.0.3163.79/third_party/WebKit/Source/platform/blob/BlobData.cpp.nonullptr 2017-09-18
11:28:33.541339036 -0400
++++ chromium-61.0.3163.79/third_party/WebKit/Source/platform/blob/BlobData.cpp 2017-09-18
11:27:35.757799400 -0400
+@@ -287,7 +287,7 @@ BlobDataHandle::BlobDataHandle(std::uniq
+
+ size_t current_memory_population = 0;
+ Vector<DataElementPtr> elements;
+- const DataElementPtr null_element = nullptr;
++ const DataElementPtr null_element;
+ BlobBytesProvider* last_bytes_provider = nullptr;
+
+ // TODO(mek): When the mojo code path is the default BlobData should
diff --git a/chromium.spec b/chromium.spec
index 1f24993..3ab9372 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -219,8 +219,8 @@ Patch57: chromium-61.0.3163.79-aarch64-glibc-2.26.90.patch
# More gcc fixes for epel
Patch58: chromium-61.0.3163.79-dde535-gcc-fix.patch
Patch59: chromium-61.0.3163.79-gcc-nc.patch
-# This is really ugly.
-Patch60: chromium-61.0.3163.79-uglyhack.patch
+# Epel compiler really does not like assigning nullptr to a StructPtr
+Patch60: chromium-61.0.3163.79-epel7-no-nullptr-assignment-on-StructPtr.patch
### Chromium Tests Patches ###
Patch100: chromium-46.0.2490.86-use_system_opus.patch
@@ -663,7 +663,7 @@ udev.
%patch47 -p1 -b .c99
%patch58 -p1 -b .dde5e35
%patch59 -p1 -b .gcc-nc
-%patch60 -p1 -b .uglyhack
+%patch60 -p1 -b .nonullptr
%endif
%patch48 -p1 -b .camfix
%patch50 -p1 -b .pathfix