qtwebengine: fix build with gcc7
PATCH 1/1 qtwebengine: fix build with gcc7
Signed-off-by Martin Jansa <[email protected]>
--- ...se.gypi-include-atomicops_internals_x86_g.patch | 21 ++-- ...ange-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch | 25 ++-- .../0003-chromium-v8-fix-build-with-gcc7.patch | 134 +++++++++++++++++++++ .../0004-chromium-WebKit-fix-build-with-gcc7.patch | 44 +++++++ recipes-qt/qt5/qtwebengine_git.bb | 6 +- 5 files changed, 208 insertions(+), 22 deletions(-) create mode 100644 recipes-qt/qt5/qtwebengine/0003-chromium-v8-fix-build-with-gcc7.patch create mode 100644 recipes-qt/qt5/qtwebengine/0004-chromium-WebKit-fix-build-with-gcc7.patch
recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch +12 -9
@@ -1,19 +1,19 @@ -From db56cd0fd185a9f3858f5aa6e95b24e63dee119f Mon Sep 17 00:00:00 2001 +From 83eee1ff5f9259595b8630e464fa869c6fde8f3c Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Fri, 3 Oct 2014 03:52:11 +0200 -Subject: [PATCH] <chromium> base.gypi: include atomicops_internals_x86_gcc.cc - when building for x64 arch +Subject: [PATCH 1/4] <chromium> base.gypi: include + atomicops_internals_x86_gcc.cc when building for x64 arch Signed-off-by: Martin Jansa <[email protected]> --- - src/3rdparty/chromium/base/base.gypi | 2 +- + chromium/base/base.gypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/3rdparty/chromium/base/base.gypi b/src/3rdparty/chromium/base/base.gypi -index 63c3f76..331c975 100644 ---- a/src/3rdparty/chromium/base/base.gypi -+++ b/src/3rdparty/chromium/base/base.gypi -@@ -801,7 +801,7 @@ +diff --git a/chromium/base/base.gypi b/chromium/base/base.gypi +index a4da596070..13173d621e 100644 +--- a/chromium/base/base.gypi ++++ b/chromium/base/base.gypi +@@ -845,7 +845,7 @@ ['include', '^nix/'], ], }],
@@ -22,3 +22,6 @@ index 63c3f76..331c975 100644 'sources/': [ ['include', 'atomicops_internals_x86_gcc.cc'], ], +-- +2.13.2 +
recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch +14 -11
@@ -1,7 +1,7 @@ -From de6311b4d556abbe131462a3cd962ae87da59522 Mon Sep 17 00:00:00 2001 +From 4aa614106c03793709e5dbd69f45df8a5e5c9fe4 Mon Sep 17 00:00:00 2001 From: Cleiton Bueno <[email protected]> Date: Thu, 24 Dec 2015 12:46:58 -0200 -Subject: [PATCH] chromium: Change false to FALSE and 1 to TRUE, FIX +Subject: [PATCH 2/4] chromium: Change false to FALSE and 1 to TRUE, FIX qtwebengine compile Signed-off-by: Cleiton Bueno <[email protected]>
@@ -10,11 +10,11 @@ Signed-off-by: Martin Jansa <[email protected]> chromium/ui/gfx/codec/jpeg_codec.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -diff --git a/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc b/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc -index 8a08fe0..32b2a05 100644 ---- a/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc -+++ b/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc -@@ -120,7 +120,7 @@ boolean EmptyOutputBuffer(jpeg_compress_struct* cinfo) { +diff --git a/chromium/ui/gfx/codec/jpeg_codec.cc b/chromium/ui/gfx/codec/jpeg_codec.cc +index 6d926378be..738d3fdedf 100644 +--- a/chromium/ui/gfx/codec/jpeg_codec.cc ++++ b/chromium/ui/gfx/codec/jpeg_codec.cc +@@ -121,7 +121,7 @@ boolean EmptyOutputBuffer(jpeg_compress_struct* cinfo) { // tell libjpeg where to write the next data cinfo->dest->next_output_byte = &(*state->out)[state->image_buffer_used]; cinfo->dest->free_in_buffer = state->out->size() - state->image_buffer_used;
@@ -23,7 +23,7 @@ index 8a08fe0..32b2a05 100644 } // Cleans up the JpegEncoderState to prepare for returning in the final form. -@@ -261,7 +261,7 @@ bool JPEGCodec::Encode(const unsigned char* input, ColorFormat format, +@@ -262,7 +262,7 @@ bool JPEGCodec::Encode(const unsigned char* input, ColorFormat format, cinfo.data_precision = 8; jpeg_set_defaults(&cinfo);
@@ -32,7 +32,7 @@ index 8a08fe0..32b2a05 100644 // set up the destination manager jpeg_destination_mgr destmgr; -@@ -273,7 +273,7 @@ bool JPEGCodec::Encode(const unsigned char* input, ColorFormat format, +@@ -274,7 +274,7 @@ bool JPEGCodec::Encode(const unsigned char* input, ColorFormat format, JpegEncoderState state(output); cinfo.client_data = &state;
@@ -41,7 +41,7 @@ index 8a08fe0..32b2a05 100644 // feed it the rows, doing necessary conversions for the color format #ifdef JCS_EXTENSIONS -@@ -359,7 +359,7 @@ void InitSource(j_decompress_ptr cinfo) { +@@ -360,7 +360,7 @@ void InitSource(j_decompress_ptr cinfo) { // set to a positive value if TRUE is returned. A FALSE return should only // be used when I/O suspension is desired." boolean FillInputBuffer(j_decompress_ptr cinfo) {
@@ -50,7 +50,7 @@ index 8a08fe0..32b2a05 100644 } // Skip data in the buffer. Since we have all the data at once, this operation -@@ -487,8 +487,8 @@ bool JPEGCodec::Decode(const unsigned char* input, size_t input_size, +@@ -488,8 +488,8 @@ bool JPEGCodec::Decode(const unsigned char* input, size_t input_size, cinfo.client_data = &state; // fill the file metadata into our buffer
@@ -61,3 +61,6 @@ index 8a08fe0..32b2a05 100644 // we want to always get RGB data out switch (cinfo.jpeg_color_space) { +-- +2.13.2 +
recipes-qt/qt5/qtwebengine/0003-chromium-v8-fix-build-with-gcc7.patch new file +134 -0
134 lines not on this page · raw message
recipes-qt/qt5/qtwebengine/0004-chromium-WebKit-fix-build-with-gcc7.patch new file +44 -0
44 lines not on this page · raw message
recipes-qt/qt5/qtwebengine_git.bb +4 -2
@@ -114,8 +114,10 @@ SRC_URI += " \ file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \ file://0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \ file://0005-Include-dependency-to-QCoreApplication-translate.patch \ - file://0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch \ - file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ + file://0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch;patchdir=src/3rdparty \ + file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch;patchdir=src/3rdparty \ + file://0003-chromium-v8-fix-build-with-gcc7.patch;patchdir=src/3rdparty \ + file://0004-chromium-WebKit-fix-build-with-gcc7.patch;patchdir=src/3rdparty \ " SRCREV_qtwebengine = "d740d6a7dbfec387752c7bc8a8b06db0e757c9dc"
Signature · 1 line
2.13.2