qtwebengine - fix build

5 files changed, 61 insertions, 1 deletions

diff --git a/qt5/qtwebengine/CONFLICTS b/qt5/qtwebengine/CONFLICTS
new file mode 100755
index 0000000000..7821c6b2a4
--- /dev/null
+++ b/qt5/qtwebengine/CONFLICTS
@@ -0,0 +1 @@
+conflicts qtwebengine y
diff --git a/qt5/qtwebengine/DEPENDS b/qt5/qtwebengine/DEPENDS
index 1d624d26d9..2411e1ed04 100755
--- a/qt5/qtwebengine/DEPENDS
+++ b/qt5/qtwebengine/DEPENDS
@@ -3,6 +3,7 @@ depends qtbase &&
 depends qtxmlpatterns &&
 depends qtdeclarative &&
 depends qtquickcontrols &&
+depends qtwebchannel  &&
 depends bison  &&
 depends perl   &&
 depends pkgconfig  &&
@@ -10,6 +11,7 @@ depends pkgconfig  &&
 depends python &&
 depends nss    &&
 depends freetype2 &&
+depends gperf  &&
 depends gyp    &&
 depends grit-i18n &&
 depends SSL &&
@@ -18,7 +20,6 @@ depends glib2  &&
 depends DEVICE-MANAGER &&
 depends dbus   &&
 depends yasm   &&
-depends ninja_build_system
 depends RUBY
 depends libxslt
 depends fontconfig
diff --git a/qt5/qtwebengine/HISTORY b/qt5/qtwebengine/HISTORY
index e53e01193f..a5869c811d 100644
--- a/qt5/qtwebengine/HISTORY
+++ b/qt5/qtwebengine/HISTORY
@@ -1,3 +1,8 @@
+2015-07-19 Treeve Jelbert <treeve@sourcemage.org>
+	* DEPENDS: add qtwebchannel, gperf; delete ninja
+	* PRE_BUILD, jpeg.diff: added
+	* CONFLICTS: added
+
 2015-07-02 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version 5.5.0
 
diff --git a/qt5/qtwebengine/PRE_BUILD b/qt5/qtwebengine/PRE_BUILD
new file mode 100755
index 0000000000..f4216ce456
--- /dev/null
+++ b/qt5/qtwebengine/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY/src/3rdparty/chromium/ui/gfx/codec &&
+patch  -p0 < $SPELL_DIRECTORY/jpeg.diff &&
+cd $SOURCE_DIRECTORY
diff --git a/qt5/qtwebengine/jpeg.diff b/qt5/qtwebengine/jpeg.diff
new file mode 100644
index 0000000000..9c3af2702c
--- /dev/null
+++ b/qt5/qtwebengine/jpeg.diff
@@ -0,0 +1,49 @@
+--- jpeg_codec.cc.orig	2015-05-17 13:37:27.000000000 +0200
++++ jpeg_codec.cc	2015-05-17 13:38:36.000000000 +0200
+@@ -120,7 +120,7 @@
+   // 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;
+-  return 1;
++  return TRUE;
+ }
+ 
+ // Cleans up the JpegEncoderState to prepare for returning in the final form.
+@@ -261,7 +261,7 @@
+   cinfo.data_precision = 8;
+ 
+   jpeg_set_defaults(&cinfo);
+-  jpeg_set_quality(&cinfo, quality, 1);  // quality here is 0-100
++  jpeg_set_quality(&cinfo, quality, TRUE);  // quality here is 0-100
+ 
+   // set up the destination manager
+   jpeg_destination_mgr destmgr;
+@@ -273,7 +273,7 @@
+   JpegEncoderState state(output);
+   cinfo.client_data = &state;
+ 
+-  jpeg_start_compress(&cinfo, 1);
++  jpeg_start_compress(&cinfo, TRUE);
+ 
+   // feed it the rows, doing necessary conversions for the color format
+ #ifdef JCS_EXTENSIONS
+@@ -359,7 +359,7 @@
+ //   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) {
+-  return false;
++  return FALSE;
+ }
+ 
+ // Skip data in the buffer. Since we have all the data at once, this operation
+@@ -487,8 +487,8 @@
+   cinfo.client_data = &state;
+ 
+   // fill the file metadata into our buffer
+-  if (jpeg_read_header(&cinfo, true) != JPEG_HEADER_OK)
+-    return false;
++  if (jpeg_read_header(&cinfo, TRUE) != JPEG_HEADER_OK)
++    return FALSE;
+ 
+   // we want to always get RGB data out
+   switch (cinfo.jpeg_color_space) {