From f78108598211053d41752a83e0345441bb9014ae Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 11 Feb 2018 16:09:52 +0000 Subject: gentoo resync : 11.02.2018 --- dev-qt/qtwebengine/Manifest | 6 +- .../files/qtwebengine-5.9.4-jpeg-9-1.patch | 70 ++++++++++++ .../files/qtwebengine-5.9.4-jpeg-9-2.patch | 46 ++++++++ dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild | 122 --------------------- dev-qt/qtwebengine/qtwebengine-5.9.4.ebuild | 7 +- 5 files changed, 125 insertions(+), 126 deletions(-) create mode 100644 dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-1.patch create mode 100644 dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-2.patch delete mode 100644 dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild (limited to 'dev-qt/qtwebengine') diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index 772db31a843e..cd0a391bdb95 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -5,11 +5,11 @@ AUX qtwebengine-5.7.1-fix-audio-detection.patch 802 BLAKE2B 0567ca41667c62c794c9 AUX qtwebengine-5.7.1-gcc-7.patch 5612 BLAKE2B 2ee8a7411dcdd397e9dfd17af0b0081fd16b16da4598ba976e94b3b14d4e1a3fbfc7abed83204e472d5f9a8aea60bc402ca98c3d355f653117556a6047a1393f SHA512 a2824a8ea4b2499fb6f5b583349c3b3428a3a99e5f534d624e00c7820f7a70c824ffc90fc9abd0f981fd707e5361b1d466de1094f65d5c1c8d62db9dc118be0a AUX qtwebengine-5.9.3-icu-60.1.patch 664 BLAKE2B eb36ee21a907677d6599dfd7fa3960619492ca0616cace73e475ceba64b1f43631d6f81b303801d934dc6e4a71bf7dc4c4b43fc73d3d048ca51bd7ceea13bc68 SHA512 9652916b675ae2d94f761ebd1e13effbb7545d14bda130a61122d082ea7e826da1be1d22d9063f5e3a4a3b2bb3bc51edb7a98a51869ec8bb9db9089e4c31dd5b AUX qtwebengine-5.9.3-paxmark-mksnapshot.patch 997 BLAKE2B e6fd8d6830ee2ca7b4e9c5586e52ce0ce577ddf6839d1de33a125606bc94bd483e4bef3008196f60e6c622074d23166a01b560dacfc5cec86e82dd360376627d SHA512 4a93fa1bdc7c4bbf22c68af4eff9473c4c9e39bc9cdc725441d5bdaec0521fd54db2b25f6900d4dc5d41a8cbeb04d5b420a85f334e3c18348d2e9dd1d9700dc3 +AUX qtwebengine-5.9.4-jpeg-9-1.patch 2782 BLAKE2B eb52d5ab51ca47603f3cdf684e0d34bdb0e6441aed99603608866d41fbfaeb812129199d28f7d01763bd9a86cf0a4e9b46199ab1b227d5e0a3add1ad7bc43329 SHA512 85f305333741e88461c792e5ab1e65f3efaa762d60c52f6afd56c6344375e3467b3268c478d51de0340d99ad2ce3ea2aa5fad83364dfeed2d665244dc84c36ab +AUX qtwebengine-5.9.4-jpeg-9-2.patch 1295 BLAKE2B 93fdcc0a69fa39c85583dcacd3052b87897e4b8df045b81090524e84a90e259d7824521e71639eec5ef8cfd86c5823302846bd1a05dff3fb39d5b988544bf46b SHA512 57551a4859791431d921fc0f514332d408f43c05ead7919468727069e01b9cf3cfe70f5ca014af57b8842f8ba745d1abe5838fa271d354b775a520ef296bd6a5 AUX qtwebengine-paxmark-mksnapshot.patch 1478 BLAKE2B 99f99e8264c0bd534e5efe0dce1d2bd58662f83e35f3426cf3daba0ea49d28689723c59c14ed2d357102d8eefbc4c7afcce298efa516f82710bcabe930a6e566 SHA512 3ad5312be5d0a1e08df9d5f25256678c12373d64a99f0d7fb0f96b711f719775328feb554144ac5cde22f8226a7b8d62bd07287270da613db09a1ed3c3303019 DIST qtwebengine-opensource-src-5.7.1.tar.xz 163782564 BLAKE2B 624df9c61b887ed393d8021db4e7bd058544abab3a13341fd0bb76fa3c00cf2692c4e08c2058e1576dfe5c62f9e9bc9ac8a1b5a4a640a204e74ba88516fb4ffd SHA512 4f53e51141d8e3479d22062a80af0359d3d7ab6bc0d2d6530c6af2d3e5b625f7192cda2a9eb85c657864ec3b30bdc797d3bff57db4c71211e71bb4ee5ac9c71a -DIST qtwebengine-opensource-src-5.9.3.tar.xz 217344496 BLAKE2B 51701dfa8a804ad7723d296fb8ba11df821041c60e4c96459b7851b3ba1ca683e83207c3020a5a54e401779186daf46049a1167649b930cc04151b6d0474aaeb SHA512 0db532b4d54540da1ca63de1cc4d561d72f052211535f75f60b99c1858ec0819ab0f831a3326d58da6350066748634000fe7ad0719ca545e12f3ed249a6eb90a DIST qtwebengine-opensource-src-5.9.4.tar.xz 217337248 BLAKE2B 8a8c55dc08b06b07822fd53c780c1b7898516c8a7d021711f4ad5409630a131a90b1916c21d4e83e43dac773c4c73b4a1045baf96ed3c1d39f2d3d4c35c4a8c0 SHA512 c576e81cd9d202a4614c3eedd008bc41bd6212cd4d06e639469b843726be427f9e7a9551b3e604cbfee90f8dde22afb5bcd4905818ca65234e198078971d6ac9 EBUILD qtwebengine-5.7.1-r2.ebuild 3109 BLAKE2B 5ecfaf15205fb4d3ea2a2a688c1fedf312efcfb44140de281738ae45f16ec38f4a81bf37fd963c6847c94d64b7b013580056feea224d40cfe56dc1a10ca3cf0c SHA512 618c00c7d5edc4d9fcae5b25e61f957ada6555afe53a2e52164eb7cf22c05a6a015041b2ead744624fd8eeb9c35edbd951786337cb2d3ebd4a1747af339bd730 -EBUILD qtwebengine-5.9.3.ebuild 3103 BLAKE2B 3d4c326b27f54799faa38ea36bc5147e1299483be0bed1214758cfbb0f7952b46cfc83b10b780edc834cc2d82ff5568bf1b7265f69e875b2b9be09b168897630 SHA512 ef109193825017c7c2e762c1e046b3667397aa56f3a87490b19f261b04651a68191f79e43c277eb0ee91fb837532167ee7bdc2a1580ac90af7889ae7a4999545 -EBUILD qtwebengine-5.9.4.ebuild 3110 BLAKE2B 9bfb19630207aabb381557a6ff7d5ff3a3396dcee19411606f7392067408473dff0d014fbcb75639b2efbd35503bb3c5fbb91a5c8cfc10e8f95ced63e251fd59 SHA512 4a9f787397dd4ffa2081724125c77a437fa077a7c060a6998d1d2d08eccd2ba491c0aac3ee31b41421b35a9bd8b6666dfa06cc460af39ed0c87ae8535413038d +EBUILD qtwebengine-5.9.4.ebuild 3225 BLAKE2B 830c8ef36096ea0ba82d5e880907bdfd7ca7c7e5458484b69e7f1009a2b89327aa7defedd15e2e1792b5779f38d22ef249bfb9bbe31ecf5db8ea6e942306efbe SHA512 57bb75821490db5da70dda740a691a0048fbbad6868ba11eb666c4c16e216dab55fe0b975242fb8c221f1a00522f3ef710d514eb5827ad27369316092ca71aec MISC metadata.xml 948 BLAKE2B c3f99b9a59aeb8ad3754b0caafdd7132ee60142f41d992b0fecdb3ed0f396ec7903fb68bc2e734e127f4f722c4f0c6c8398f94685925296037684912ace05764 SHA512 999c61f79a077d37981fbac6420c6255ec6fea2397372182700d6c709fbd5029289173aaa910916ab9096109070afc47ad11f411cfd8d5bcaafb6c9bd6309a85 diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-1.patch b/dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-1.patch new file mode 100644 index 000000000000..8b739680f685 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-1.patch @@ -0,0 +1,70 @@ +From 560a4a616f2a1307385e5e7a7d2e99b0b41775c8 Mon Sep 17 00:00:00 2001 +From: Viktor Engelmann +Date: Fri, 18 Aug 2017 14:50:20 +0200 +Subject: [PATCH] Fix improper boolean values + +jpeg_codec.cc contained some implicit conversions to boolean, which +is apparently problematic for some versions of libjpeg. Patch +taken from https://bugs.chromium.org/p/chromium/issues/detail?id=686191 +but not backported, since it has not been accepted into chromium yet. + +Task-Number: QTBUG-58482 + +Change-Id: I2c5d5894493d6a7d0698a4e5a7191288a2fdfeb4 +Reviewed-by: Allan Sandfeld Jensen +--- + src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc b/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc +index 6d92637..85c7bec 100644 +--- a/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc ++++ b/src/3rdparty/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; +- return 1; ++ return TRUE; + } + + // Cleans up the JpegEncoderState to prepare for returning in the final form. +@@ -262,7 +262,7 @@ bool JPEGCodec::Encode(const unsigned char* input, ColorFormat format, + 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; +@@ -274,7 +274,7 @@ bool JPEGCodec::Encode(const unsigned char* input, ColorFormat format, + 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 +@@ -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) { +- return false; ++ return FALSE; + } + + // Skip data in the buffer. Since we have all the data at once, this operation +@@ -488,7 +488,7 @@ bool JPEGCodec::Decode(const unsigned char* input, size_t input_size, + 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 +-- +2.7.4 + diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-2.patch b/dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-2.patch new file mode 100644 index 000000000000..ef5f44efcf23 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-2.patch @@ -0,0 +1,46 @@ +Fix build with jpeg-9. Bug #646456 + +--- a/src/3rdparty/chromium/third_party/pdfium/core/fxcodec/codec/fx_codec_jpeg.cpp 2018-01-15 12:39:43.000000000 +0100 ++++ b/src/3rdparty/chromium/third_party/pdfium/core/fxcodec/codec/fx_codec_jpeg.cpp 2018-02-06 20:55:37.455912163 +0100 +@@ -57,12 +57,12 @@ + }; + extern "C" { + static boolean _src_fill_buffer(j_decompress_ptr cinfo) { +- return 0; ++ return FALSE; + } + }; + extern "C" { + static boolean _src_resync(j_decompress_ptr cinfo, int desired) { +- return 0; ++ return FALSE; + } + }; + extern "C" { +@@ -126,7 +126,7 @@ + jpeg_destroy_decompress(&cinfo); + return false; + } +- int ret = jpeg_read_header(&cinfo, true); ++ int ret = jpeg_read_header(&cinfo, TRUE); + if (ret != JPEG_HEADER_OK) { + jpeg_destroy_decompress(&cinfo); + return false; +@@ -210,7 +210,7 @@ + } + cinfo.image_width = m_OrigWidth; + cinfo.image_height = m_OrigHeight; +- int ret = jpeg_read_header(&cinfo, true); ++ int ret = jpeg_read_header(&cinfo, TRUE); + if (ret != JPEG_HEADER_OK) + return false; + +@@ -433,7 +433,7 @@ + if (setjmp(ctx->m_JumpMark) == -1) + return 1; + +- int ret = jpeg_read_header(&ctx->m_Info, true); ++ int ret = jpeg_read_header(&ctx->m_Info, TRUE); + if (ret == JPEG_SUSPENDED) + return 2; + if (ret != JPEG_HEADER_OK) diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild deleted file mode 100644 index e8a3d5f814e8..000000000000 --- a/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) -inherit multiprocessing pax-utils python-any-r1 qt5-build - -DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~x86" -fi - -IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets" - -RDEPEND=" - app-arch/snappy:= - dev-libs/glib:2 - dev-libs/nspr - dev-libs/nss - ~dev-qt/qtcore-${PV} - ~dev-qt/qtdeclarative-${PV} - ~dev-qt/qtgui-${PV} - ~dev-qt/qtnetwork-${PV} - ~dev-qt/qtprintsupport-${PV} - ~dev-qt/qtwebchannel-${PV}[qml] - dev-libs/expat - dev-libs/libevent:= - dev-libs/libxml2[icu] - dev-libs/libxslt - dev-libs/protobuf:= - dev-libs/re2:= - media-libs/fontconfig - media-libs/freetype - media-libs/harfbuzz:= - media-libs/libpng:0= - >=media-libs/libvpx-1.5:=[svc] - media-libs/libwebp:= - media-libs/mesa - media-libs/opus - net-libs/libsrtp:0= - sys-apps/dbus - sys-apps/pciutils - sys-libs/libcap - sys-libs/zlib[minizip] - virtual/jpeg:0 - virtual/libudev - x11-libs/libdrm - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXScrnSaver - x11-libs/libXtst - alsa? ( media-libs/alsa-lib ) - geolocation? ( ~dev-qt/qtpositioning-${PV} ) - pulseaudio? ( media-sound/pulseaudio:= ) - system-ffmpeg? ( media-video/ffmpeg:0= ) - system-icu? ( dev-libs/icu:= ) - widgets? ( - ~dev-qt/qtdeclarative-${PV}[widgets] - ~dev-qt/qtwidgets-${PV} - ) -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - >=app-arch/gzip-1.7 - dev-util/gperf - dev-util/ninja - dev-util/re2c - sys-devel/bison - pax_kernel? ( sys-apps/elfix ) -" - -PATCHES=( "${FILESDIR}/${P}-icu-60.1.patch" ) - -src_prepare() { - use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" ) - - # bug 620444 - ensure local headers are used - find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die - - qt_use_disable_config alsa alsa src/core/config/linux.pri - qt_use_disable_config pulseaudio pulseaudio src/core/config/linux.pri - - qt_use_disable_mod geolocation positioning \ - mkspecs/features/configure.prf \ - src/core/core_chromium.pri \ - src/core/core_common.pri - - qt_use_disable_mod widgets widgets src/src.pro - - qt5-build_src_prepare -} - -src_configure() { - export NINJA_PATH=/usr/bin/ninja - export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}" - - local myqmakeargs=( - $(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs') - $(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '') - $(usex system-icu 'WEBENGINE_CONFIG+=use_system_icu' '') - ) - qt5-build_src_configure -} - -src_install() { - qt5-build_src_install - - # bug 601472 - if [[ ! -f ${D%/}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then - die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/" - fi - - pax-mark m "${D%/}${QT5_LIBEXECDIR}"/QtWebEngineProcess -} diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.4.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.4.ebuild index e36ea1ca7b3b..6545b759d29d 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.9.4.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.9.4.ebuild @@ -77,7 +77,12 @@ DEPEND="${RDEPEND} pax_kernel? ( sys-apps/elfix ) " -PATCHES=( "${FILESDIR}/${PN}-5.9.3-icu-60.1.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-5.9.3-icu-60.1.patch" + "${FILESDIR}/${P}-jpeg-9-1.patch" # bug 607424 + # TODO upstream: + "${FILESDIR}/${P}-jpeg-9-2.patch" # bug 646456 +) src_prepare() { use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" ) -- cgit v1.2.3