try different cc/paint fix
This commit is contained in:
parent
bcf9692901
commit
92bd8d8d23
|
@ -1,12 +0,0 @@
|
||||||
diff -up chromium-61.0.3163.79/cc/paint/BUILD.gn.epel7 chromium-61.0.3163.79/cc/paint/BUILD.gn
|
|
||||||
--- chromium-61.0.3163.79/cc/paint/BUILD.gn.epel7 2017-09-13 13:21:07.743006338 -0400
|
|
||||||
+++ chromium-61.0.3163.79/cc/paint/BUILD.gn 2017-09-13 13:25:43.091933209 -0400
|
|
||||||
@@ -41,6 +41,8 @@ cc_component("paint") {
|
|
||||||
"solid_color_analyzer.h",
|
|
||||||
]
|
|
||||||
|
|
||||||
+ cflags = [ "-fpermissive" ]
|
|
||||||
+
|
|
||||||
defines = [ "CC_PAINT_IMPLEMENTATION=1" ]
|
|
||||||
|
|
||||||
# cc/paint is intended to be a separate component from cc that can be
|
|
|
@ -0,0 +1,12 @@
|
||||||
|
diff -up chromium-61.0.3163.79/cc/paint/paint_op_buffer.cc.kmaxskip chromium-61.0.3163.79/cc/paint/paint_op_buffer.cc
|
||||||
|
--- chromium-61.0.3163.79/cc/paint/paint_op_buffer.cc.kmaxskip 2017-09-14 09:28:18.594875170 -0400
|
||||||
|
+++ chromium-61.0.3163.79/cc/paint/paint_op_buffer.cc 2017-09-14 09:29:37.266072373 -0400
|
||||||
|
@@ -207,7 +207,7 @@ TYPES(M);
|
||||||
|
#undef TYPES
|
||||||
|
|
||||||
|
SkRect PaintOp::kUnsetRect = {SK_ScalarInfinity, 0, 0, 0};
|
||||||
|
-const size_t PaintOp::kMaxSkip;
|
||||||
|
+constexpr size_t PaintOp::kMaxSkip;
|
||||||
|
|
||||||
|
std::string PaintOpTypeToString(PaintOpType type) {
|
||||||
|
switch (type) {
|
|
@ -190,7 +190,7 @@ Patch43: chromium-60.0.3112.78-jpeg-nomangle.patch
|
||||||
# Do not mangle zlib
|
# Do not mangle zlib
|
||||||
Patch45: chromium-60.0.3112.78-no-zlib-mangle.patch
|
Patch45: chromium-60.0.3112.78-no-zlib-mangle.patch
|
||||||
# Apply these changes to work around EPEL7 compiler issues
|
# Apply these changes to work around EPEL7 compiler issues
|
||||||
Patch46: chromium-61.0.3163.79-cc-paint-fpermissive.patch
|
Patch46: chromium-61.0.3163.79-kmaxskip-constexpr.patch
|
||||||
Patch47: chromium-60.0.3112.90-vulkan-force-c99.patch
|
Patch47: chromium-60.0.3112.90-vulkan-force-c99.patch
|
||||||
# https://chromium.googlesource.com/chromium/src/+/9c77470ff34bac937ceb765a27cee1703f0f2426
|
# https://chromium.googlesource.com/chromium/src/+/9c77470ff34bac937ceb765a27cee1703f0f2426
|
||||||
Patch48: chromium-60.0.3112.101-camfix.patch
|
Patch48: chromium-60.0.3112.101-camfix.patch
|
||||||
|
@ -654,7 +654,7 @@ udev.
|
||||||
%patch43 -p1 -b .nomangle
|
%patch43 -p1 -b .nomangle
|
||||||
%patch45 -p1 -b .nozmangle
|
%patch45 -p1 -b .nozmangle
|
||||||
%if 0%{?rhel} == 7
|
%if 0%{?rhel} == 7
|
||||||
%patch46 -p1 -b .fpermissive
|
%patch46 -p1 -b .kmaxskip
|
||||||
%patch47 -p1 -b .c99
|
%patch47 -p1 -b .c99
|
||||||
%endif
|
%endif
|
||||||
%patch48 -p1 -b .camfix
|
%patch48 -p1 -b .camfix
|
||||||
|
|
Loading…
Reference in New Issue