summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qtwebengine')
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-chromium-jpeg_codec.cc_Change-false-to-FALSE-and-1-to-TRUE.patch64
-rw-r--r--recipes-qt/qt5/qtwebengine/0002-media_capture_devices_dispatcher.h-Include-QCoreApplication-translate.patch26
-rw-r--r--recipes-qt/qt5/qtwebengine/0003-WebEngine-qquickwebengineview_p_p.h-add-inc-QColor.patch26
3 files changed, 116 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0001-chromium-jpeg_codec.cc_Change-false-to-FALSE-and-1-to-TRUE.patch b/recipes-qt/qt5/qtwebengine/0001-chromium-jpeg_codec.cc_Change-false-to-FALSE-and-1-to-TRUE.patch
new file mode 100644
index 00000000..3707cbeb
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/0001-chromium-jpeg_codec.cc_Change-false-to-FALSE-and-1-to-TRUE.patch
@@ -0,0 +1,64 @@
1From 54b183ada5b5ead1c4b6e6532e24d21f372d70d7 Mon Sep 17 00:00:00 2001
2From: Cleiton Bueno <cleitonrbueno@gmail.com>
3Date: Thu, 24 Dec 2015 12:46:58 -0200
4Subject: [PATCH] Change false to FALSE and 1 to TRUE, FIX qtwebengine compile
5
6Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com>
7---
8 src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc | 12 ++++++------
9 1 file changed, 6 insertions(+), 6 deletions(-)
10
11diff --git a/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc b/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc
12index 8a08fe0..32b2a05 100644
13--- a/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc
14+++ b/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc
15@@ -120,7 +120,7 @@ boolean EmptyOutputBuffer(jpeg_compress_struct* cinfo) {
16 // tell libjpeg where to write the next data
17 cinfo->dest->next_output_byte = &(*state->out)[state->image_buffer_used];
18 cinfo->dest->free_in_buffer = state->out->size() - state->image_buffer_used;
19- return 1;
20+ return TRUE;
21 }
22
23 // Cleans up the JpegEncoderState to prepare for returning in the final form.
24@@ -261,7 +261,7 @@ bool JPEGCodec::Encode(const unsigned char* input, ColorFormat format,
25 cinfo.data_precision = 8;
26
27 jpeg_set_defaults(&cinfo);
28- jpeg_set_quality(&cinfo, quality, 1); // quality here is 0-100
29+ jpeg_set_quality(&cinfo, quality, TRUE); // quality here is 0-100
30
31 // set up the destination manager
32 jpeg_destination_mgr destmgr;
33@@ -273,7 +273,7 @@ bool JPEGCodec::Encode(const unsigned char* input, ColorFormat format,
34 JpegEncoderState state(output);
35 cinfo.client_data = &state;
36
37- jpeg_start_compress(&cinfo, 1);
38+ jpeg_start_compress(&cinfo, TRUE);
39
40 // feed it the rows, doing necessary conversions for the color format
41 #ifdef JCS_EXTENSIONS
42@@ -359,7 +359,7 @@ void InitSource(j_decompress_ptr cinfo) {
43 // set to a positive value if TRUE is returned. A FALSE return should only
44 // be used when I/O suspension is desired."
45 boolean FillInputBuffer(j_decompress_ptr cinfo) {
46- return false;
47+ return FALSE;
48 }
49
50 // Skip data in the buffer. Since we have all the data at once, this operation
51@@ -487,8 +487,8 @@ bool JPEGCodec::Decode(const unsigned char* input, size_t input_size,
52 cinfo.client_data = &state;
53
54 // fill the file metadata into our buffer
55- if (jpeg_read_header(&cinfo, true) != JPEG_HEADER_OK)
56- return false;
57+ if (jpeg_read_header(&cinfo, TRUE) != JPEG_HEADER_OK)
58+ return FALSE;
59
60 // we want to always get RGB data out
61 switch (cinfo.jpeg_color_space) {
62--
631.8.1.2
64
diff --git a/recipes-qt/qt5/qtwebengine/0002-media_capture_devices_dispatcher.h-Include-QCoreApplication-translate.patch b/recipes-qt/qt5/qtwebengine/0002-media_capture_devices_dispatcher.h-Include-QCoreApplication-translate.patch
new file mode 100644
index 00000000..1b637cbf
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/0002-media_capture_devices_dispatcher.h-Include-QCoreApplication-translate.patch
@@ -0,0 +1,26 @@
1From 23e391f08f36d9ab9c0030ae52b3821ec9f3c3ed Mon Sep 17 00:00:00 2001
2From: Cleiton Bueno <cleitonrbueno@gmail.com>
3Date: Thu, 24 Dec 2015 15:59:51 -0200
4Subject: [PATCH] Include dependency to QCoreApplication::translate()
5
6Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com>
7---
8 src/core/media_capture_devices_dispatcher.h | 2 ++
9 1 file changed, 2 insertions(+)
10
11diff --git a/src/core/media_capture_devices_dispatcher.h b/src/core/media_capture_devices_dispatcher.h
12index 500fe76..eda2824 100644
13--- a/src/core/media_capture_devices_dispatcher.h
14+++ b/src/core/media_capture_devices_dispatcher.h
15@@ -43,6 +43,8 @@
16 #include <map>
17 #include <QtCore/qcompilerdetection.h>
18
19+#include <QCoreApplication>
20+
21 #include "web_contents_adapter_client.h"
22
23 #include "base/callback.h"
24--
251.8.1.2
26
diff --git a/recipes-qt/qt5/qtwebengine/0003-WebEngine-qquickwebengineview_p_p.h-add-inc-QColor.patch b/recipes-qt/qt5/qtwebengine/0003-WebEngine-qquickwebengineview_p_p.h-add-inc-QColor.patch
new file mode 100644
index 00000000..544db3ac
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/0003-WebEngine-qquickwebengineview_p_p.h-add-inc-QColor.patch
@@ -0,0 +1,26 @@
1From 741f83397be4157cd34386f619f6d74fca4da149 Mon Sep 17 00:00:00 2001
2From: Cleiton Bueno <cleitonrbueno@gmail.com>
3Date: Fri, 25 Dec 2015 18:16:05 -0200
4Subject: [PATCH] WebEngine qquickwebengineview_p_p.h add include QColor
5
6Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com>
7---
8 qquickwebengineview_p_p.h | 2 ++
9 1 file changed, 2 insertions(+)
10
11diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
12index c221085..d39aba7 100644
13--- a/src/webengine/api/qquickwebengineview_p_p.h
14+++ b/src/webengine/api/qquickwebengineview_p_p.h
15@@ -56,6 +56,8 @@
16 #include <QString>
17 #include <QtCore/qcompilerdetection.h>
18 #include <QtGui/qaccessibleobject.h>
19+#include <QColor>
20+
21
22 namespace QtWebEngineCore {
23 class WebContentsAdapter;
24--
251.8.1.2
26