Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=f9ce0df24118abe14274f4ef5015924b39323021
commit f9ce0df24118abe14274f4ef5015924b39323021 Author: Marius Cirsta <[email protected]> Date: Mon Jan 11 04:36:58 2016 +0200 qt5-webengine-5.5.1-5-x86_64 * fix deps * rebuild with tc * add patch to fix build diff --git a/source/xlib-extra/qt5-webengine/FrugalBuild b/source/xlib-extra/qt5-webengine/FrugalBuild index 5aaaa8e..1e8a85a 100644 --- a/source/xlib-extra/qt5-webengine/FrugalBuild +++ b/source/xlib-extra/qt5-webengine/FrugalBuild @@ -2,13 +2,21 @@ # Maintainer: Marius Cirsta <[email protected]> pkgname=qt5-webengine -pkgrel=4 -depends=('qt5-declarative' 'qt5-webchannel' 'libxcomposite' 'libxrandr' 'nss') -makedepends=('git' 're2c' 'inputproto' 'randrproto' 'renderproto') +pkgrel=5 +depends=('qt5-declarative' 'qt5-webchannel' 'libxcomposite' 'libxrandr' 'nss' 'libxtst') +makedepends=('git' 're2c' 'x11-protos') Finclude qt5 +source=(${source[@]} libjpeg.patch) replaces=('libqt5webengine') conflicts=("${replaces[@]}") provides=("${replaces[@]}") -sha1sums=('2b87a0eca28150106dfe0a8639ea3520a19bd0c9') +sha1sums=('2b87a0eca28150106dfe0a8639ea3520a19bd0c9' \ + 'fc40f2d0b97dfec78b3ca4a125dee8edbbd4da0a') + +build() +{ + Fpatchall + build_qt5 +} # optimization OK diff --git a/source/xlib-extra/qt5-webengine/libjpeg.patch b/source/xlib-extra/qt5-webengine/libjpeg.patch new file mode 100644 index 0000000..79c2f41 --- /dev/null +++ b/source/xlib-extra/qt5-webengine/libjpeg.patch @@ -0,0 +1,47 @@ +--- orig/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc 2015-10-13 07:36:34.000000000 +0300 ++++ patched//src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc 2016-01-11 03:27:46.957114711 +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,7 +487,7 @@ + cinfo.client_data = &state; + + // fill the file metadata into our buffer +- if (jpeg_read_header(&cinfo, true) != JPEG_HEADER_OK) ++ if (jpeg_read_header(&cinfo, TRUE) != JPEG_HEADER_OK) + return false; + + // we want to always get RGB data out _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
