cef3, chromium: fix build with gcc-5.3
PATCH 1/2 cef3, chromium: fix build with gcc-5.3
Signed-off-by Martin Jansa <[email protected]>
--- ...0001-bignum.cc-disable-warning-from-gcc-5.patch | 39 +++++++++++++++++----- ...-image_util.cc-disable-warning-from-gcc-5.patch | 17 +++++----- .../cef3/0003-disable-uninitialized-warning.patch | 24 +++++++++++++ recipes-browser/chromium/cef3_280796.bb | 1 + .../0003-disable-uninitialized-warning.patch | 19 +++++++++++ recipes-browser/chromium/chromium_40.0.2214.91.bb | 1 + 6 files changed, 83 insertions(+), 18 deletions(-) create mode 100644 recipes-browser/chromium/cef3/0003-disable-uninitialized-warning.patch create mode 100644 recipes-browser/chromium/chromium/chromium-40/0003-disable-uninitialized-warning.patch
recipes-browser/chromium/cef3/0001-bignum.cc-disable-warning-from-gcc-5.patch +30 -9
@@ -23,17 +23,38 @@ diff --git a/third_party/WebKit/Source/wtf/dtoa/bignum.cc b/third_party/WebKit/S index a000b46..6c6d336 100644 --- a/third_party/WebKit/Source/wtf/dtoa/bignum.cc +++ b/third_party/WebKit/Source/wtf/dtoa/bignum.cc -@@ -109,7 +109,10 @@ namespace double_conversion { - int length = value.length(); - int pos = 0; - // Let's just say that each digit needs 4 bits. +@@ -102,7 +102,10 @@ + } + + +#pragma GCC diagnostic push +#pragma GCC diagnostic warning "-Wstrict-overflow" - while (length >= kMaxUint64DecimalDigits) { + void Bignum::AssignDecimalString(Vector<const char> value) { +#pragma GCC diagnostic pop - uint64_t digits = ReadUInt64(value, pos, kMaxUint64DecimalDigits); - pos += kMaxUint64DecimalDigits; - length -= kMaxUint64DecimalDigits; + // 2^64 = 18446744073709551616 > 10^19 + const int kMaxUint64DecimalDigits = 19; + Zero(); +@@ -699,7 +699,10 @@ + } + + ++#pragma GCC diagnostic push ++#pragma GCC diagnostic warning "-Wstrict-overflow" + void Bignum::Align(const Bignum& other) { ++#pragma GCC diagnostic pop + if (exponent_ > other.exponent_) { + // If "X" represents a "hidden" digit (by the exponent) then we are in the + // following case (a == this, b == other): +@@ -715,7 +715,10 @@ + for (int i = used_digits_ - 1; i >= 0; --i) { + bigits_[i + zero_digits] = bigits_[i]; + } ++#pragma GCC diagnostic push ++#pragma GCC diagnostic warning "-Wstrict-overflow" + for (int i = 0; i < zero_digits; ++i) { ++#pragma GCC diagnostic pop + bigits_[i] = 0; + } + used_digits_ += zero_digits; -- 1.8.4.5 -
recipes-browser/chromium/cef3/0002-image_util.cc-disable-warning-from-gcc-5.patch +8 -9
@@ -24,17 +24,16 @@ diff --git a/ui/gfx/image/image_util.cc b/ui/gfx/image/image_util.cc index 89a3f8c..d595da3 100644 --- a/ui/gfx/image/image_util.cc +++ b/ui/gfx/image/image_util.cc -@@ -68,7 +68,10 @@ bool VisibleMargins(const ImageSkia& image, int* leading, int* trailing) { - int inner_min = bitmap.width(); - for (int x = 0; x < bitmap.width(); ++x) { - for (int y = 0; y < bitmap.height(); ++y) { +@@ -47,7 +47,10 @@ + } + #endif // !defined(OS_IOS) + +#pragma GCC diagnostic push +#pragma GCC diagnostic warning "-Wstrict-overflow" - if (SkColorGetA(bitmap.getColor(x, y)) > kMinimumVisibleOpacity) { + bool VisibleMargins(const ImageSkia& image, int* leading, int* trailing) { +#pragma GCC diagnostic pop - inner_min = x; - break; - } + *leading = 0; + *trailing = std::max(1, image.width()) - 1; + if (!image.HasRepresentation(1.0)) -- 1.8.4.5 -
recipes-browser/chromium/cef3/0003-disable-uninitialized-warning.patch new file +24 -0
@@ -0,0 +1,24 @@ +../../third_party/WebKit/Source/core/inspector/InspectorTimelineAgent.cpp: In static member function 'static void WTF::HashTableBucketInitializer<false>::initialize(Value&) [with Traits = WTF::HashMapValueTraits<WTF::HashTraits<int>, WTF::HashTraits<blink::TimelineThreadState> >; Value = WTF::KeyValuePair<int, blink::TimelineThreadState>]': +../../third_party/WebKit/Source/core/inspector/InspectorTimelineAgent.cpp:234:8: error: '<anonymous>.blink::TimelineThreadState::inKnownLayerTask' is used uninitialized in this function [-Werror=uninitialized] + struct TimelineThreadState { + ^ + +--- a/third_party/WebKit/Source/core/inspector/InspectorTimelineAgent.cpp 2016-03-10 09:53:53.595413000 -1000 ++++ b/third_party/WebKit/Source/core/inspector/InspectorTimelineAgent.cpp 2016-03-10 09:55:40.131413000 -1000 +@@ -195,6 +195,8 @@ + Vector<Entry> m_stack; + }; + ++#pragma GCC diagnostic push ++#pragma GCC diagnostic warning "-Wuninitialized" + struct TimelineThreadState { + TimelineThreadState() { } + +@@ -209,6 +211,7 @@ + bool inKnownLayerTask; + unsigned long long decodedPixelRefId; + }; ++#pragma GCC diagnostic push + + struct TimelineImageInfo { + int backendNodeId;
recipes-browser/chromium/cef3_280796.bb +1 -0
@@ -17,6 +17,7 @@ SRC_URI = "http://people.linaro.org/~zoltan.kuscsik/chromium-browser/chromium_re file://cef-simple \ file://0001-bignum.cc-disable-warning-from-gcc-5.patch \ file://0002-image_util.cc-disable-warning-from-gcc-5.patch \ + file://0003-disable-uninitialized-warning.patch \ file://0003-gtest-typed-test.h-disable-warning-unused-definition.patch \ file://0004-SaturatedArithmetic.h-put-parentheses-to-silence-war.patch \ "
recipes-browser/chromium/chromium/chromium-40/0003-disable-uninitialized-warning.patch new file +19 -0
@@ -0,0 +1,19 @@ +../../third_party/WebKit/Source/core/inspector/InspectorTimelineAgent.cpp: In static member function 'static void WTF::HashTableBucketInitializer<false>::initialize(Value&) [with Traits = WTF::HashMapValueTraits<WTF::HashTraits<int>, WTF::HashTraits<blink::TimelineThreadState> >; Value = WTF::KeyValuePair<int, blink::TimelineThreadState>]': +../../third_party/WebKit/Source/core/inspector/InspectorTimelineAgent.cpp:234:8: error: '<anonymous>.blink::TimelineThreadState::inKnownLayerTask' is used uninitialized in this function [-Werror=uninitialized] + struct TimelineThreadState { + ^ + +--- a/third_party/WebKit/Source/core/inspector/InspectorTimelineAgent.cpp 2016-03-10 08:14:18.771413000 -1000 ++++ b/third_party/WebKit/Source/core/inspector/InspectorTimelineAgent.cpp 2016-03-10 08:15:58.179413000 -1000 +@@ -231,7 +231,11 @@ + Vector<Entry> m_stack; + }; + ++#pragma GCC diagnostic push ++#pragma GCC diagnostic warning "-Wuninitialized" + struct TimelineThreadState { ++#pragma GCC diagnostic pop ++ + ALLOW_ONLY_INLINE_ALLOCATION(); + public: + TimelineThreadState() { }
recipes-browser/chromium/chromium_40.0.2214.91.bb +1 -0
@@ -31,6 +31,7 @@ SRC_URI = "\ file://chromium-40/add_missing_stat_h_include.patch \ file://chromium-40/0001-bignum.cc-disable-warning-from-gcc-5.patch \ file://chromium-40/0002-image_util.cc-disable-warning-from-gcc-5.patch \ + file://chromium-40/0003-disable-uninitialized-warning.patch \ file://chromium-40/0004-Remove-hard-coded-values-for-CC-and-CXX.patch \ "
Signature · 1 line
2.7.3
PATCH 2/2 cef3: comment out gtests completely
* the old fix wasn't enough and it was still failing with warnings about unused variables in gtests
Signed-off-by Martin Jansa <[email protected]>
--- ...-test.h-disable-warning-unused-definition.patch | 72 +++++++++++++++++++++- 1 file changed, 70 insertions(+), 2 deletions(-)
recipes-browser/chromium/cef3/0003-gtest-typed-test.h-disable-warning-unused-definition.patch +70 -2
@@ -38,6 +38,74 @@ index fe1e83b..5053bbe 100644 +#pragma GCC diagnostic pop + #endif // GTEST_INCLUDE_GTEST_GTEST_TYPED_TEST_H_ --- -1.8.4.5 +diff -uNr a/base/test/sequenced_task_runner_test_template.h b/base/test/sequenced_task_runner_test_template.h +--- a/base/test/sequenced_task_runner_test_template.h 2014-10-28 02:07:09.000000000 -1000 ++++ b/base/test/sequenced_task_runner_test_template.h 2016-03-10 09:38:16.987413000 -1000 +@@ -23,6 +23,9 @@ + #include "base/time/time.h" + #include "testing/gtest/include/gtest/gtest.h" + ++#pragma GCC diagnostic push ++#pragma GCC diagnostic warning "-Wunused" ++ + namespace base { + + namespace internal { +@@ -326,6 +329,7 @@ + // whether the implementation supports nested tasks. + // + ++/* + REGISTER_TYPED_TEST_CASE_P(SequencedTaskRunnerTest, + SequentialNonNestable, + SequentialNestable, +@@ -335,6 +339,8 @@ + DelayedTasksSameDelay, + DelayedTaskAfterLongTask, + DelayedTaskAfterManyLongTasks); ++*/ ++#pragma GCC diagnostic pop + + } // namespace base + +diff -uNr a/base/test/task_runner_test_template.h b/base/test/task_runner_test_template.h +--- a/base/test/task_runner_test_template.h 2014-10-28 02:07:09.000000000 -1000 ++++ b/base/test/task_runner_test_template.h 2016-03-10 09:39:02.051413000 -1000 +@@ -207,8 +207,10 @@ + this->task_tracker_->GetTaskRunCounts()); + } + ++/* + REGISTER_TYPED_TEST_CASE_P( + TaskRunnerTest, Basic, Delayed, RunsTasksOnCurrentThread); ++*/ + + } // namespace base + +diff -uNr a/testing/gtest/include/gtest/gtest-typed-test.h b/testing/gtest/include/gtest/gtest-typed-test.h +--- a/testing/gtest/include/gtest/gtest-typed-test.h 2016-03-10 10:25:47.371413000 -1000 ++++ b/testing/gtest/include/gtest/gtest-typed-test.h 2016-03-10 09:35:25.811413000 -1000 +@@ -34,6 +34,7 @@ + + #pragma GCC diagnostic push + #pragma GCC diagnostic warning "-Wunused" ++#pragma GCC diagnostic warning "-Wunused-variable" + + // This header implements typed tests and type-parameterized tests. + +diff -uNr a/testing/gtest/include/gtest/gtest.h b/testing/gtest/include/gtest/gtest.h +--- a/testing/gtest/include/gtest/gtest.h 2014-10-27 23:19:20.000000000 -1000 ++++ b/testing/gtest/include/gtest/gtest.h 2016-03-10 09:36:13.607413000 -1000 +@@ -63,7 +63,11 @@ + #include "gtest/gtest-printers.h" + #include "gtest/gtest_prod.h" + #include "gtest/gtest-test-part.h" ++#pragma GCC diagnostic push ++#pragma GCC diagnostic warning "-Wunused" ++#pragma GCC diagnostic warning "-Wunused-variable" + #include "gtest/gtest-typed-test.h" ++#pragma GCC diagnostic pop + + // Depending on the platform, different string classes are available. + // On Linux, in addition to ::std::string, Google also makes use of
Signature · 1 line
2.7.3