From de49812990871e1705b64051c35161d5e6400269 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 24 Dec 2018 14:11:38 +0000 Subject: gentoo resync : 24.12.2018 --- dev-qt/qtwebengine/Manifest | 9 +- .../qtwebengine-5.9.3-paxmark-mksnapshot.patch | 41 ------ .../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.11.2.ebuild | 140 --------------------- dev-qt/qtwebengine/qtwebengine-5.11.3.ebuild | 140 +++++++++++++++++++++ dev-qt/qtwebengine/qtwebengine-5.9.6-r1.ebuild | 130 ------------------- 7 files changed, 142 insertions(+), 434 deletions(-) delete mode 100644 dev-qt/qtwebengine/files/qtwebengine-5.9.3-paxmark-mksnapshot.patch delete mode 100644 dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-1.patch delete mode 100644 dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-2.patch delete mode 100644 dev-qt/qtwebengine/qtwebengine-5.11.2.ebuild create mode 100644 dev-qt/qtwebengine/qtwebengine-5.11.3.ebuild delete mode 100644 dev-qt/qtwebengine/qtwebengine-5.9.6-r1.ebuild (limited to 'dev-qt/qtwebengine') diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index 0f758081895c..37ce0c000b27 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -4,14 +4,9 @@ AUX qtwebengine-5.11.1-libxml2-disable-catalogs.patch 1609 BLAKE2B c3683d221556c AUX qtwebengine-5.11.1-nouveau-disable-gpu.patch 3710 BLAKE2B 880d63b7552973cf91bb1411f92ab3ee2d88013f144bdfcc6b5e1eec1d886bf76ab2166bc7600212701031da63a69ed2f5e03a4bc15549834a9a770ed68f35ef SHA512 a0b9592201d950ae97b92d5d0161ccc5bc675a37fbf657fe15ea0fe12870a370cf3ce54f5f033c073af23defded5c4ad0b43993c5b559024b285c5341b4673a0 AUX qtwebengine-5.11.1-paxmark-mksnapshot.patch 1007 BLAKE2B 3f7acf876b78caa945a72a797c08da9b24cb7e6363a904734265872c382789d5aec8e67e0ece7b0e50b6e7ccd9dc15f1e8aa7936736bed3ce14897c706d07938 SHA512 9a89eda73c08279d9bd6e871d138e670f8d6fb2e9efb191effe2c9063cf4eb007c6fbbd907005ebcc57f576a8faa5cb8a5ce996b9692aa226703765ddd939c06 AUX qtwebengine-5.11.2-paxmark-mksnapshot.patch 888 BLAKE2B d44e8772dafd8962805abe412470d94ced2d11e47d3e7e25acbfafa54669677a1e072b435a06ed093f7c9ce27d8d98fab4b042cd49862350d77c944418a335b9 SHA512 893aef4801d1f2a3fad1f4d1ef2c2b122d4004b7966e76d8e1adeb8cc5b03ce8b0ddf30d20690ca6e0b15b76074aa386b46b00d0c828b7684c6fcacc33b2865f -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-5.9.6-gcc8.patch 1184 BLAKE2B aea72fb7563517f6c1f0f1330bad21ae71bbadc7b74e13b5c9280074ba5ae642be1df6c6e3014464f4b9aa26dd5620b5c5ef5b7139256c6a48fe58ed911e54e0 SHA512 21e79c6fc1575728d658c31bc68da66a5b9840c6fee7c442218ec8ac6009d5df1436bea931aa56439965987ec1ccdac32afce2b0a246c3d7bb2d0b0536717be5 DIST qtwebengine-everywhere-src-5.11.1.tar.xz 233633572 BLAKE2B 06fb9d490377ebb4af937e0fa1688cdfeb9bfdadf6c80afeef609d20a76bdb7c4fed6c1042405b762e59b11d7b16369990c66a395ec1b6b48bbb1ea5b8cd47f2 SHA512 3e17f88b690c06f6d28c30d8d43588eaad9b0b214434b219c3d8fe11969cca515a68c731d176cf640940fd3db12e95de8f723d3717555504c5b95d135fa4a596 -DIST qtwebengine-everywhere-src-5.11.2.tar.xz 233642812 BLAKE2B fbf1ac14cec9a515fb9c401f1a04487aec2ebe1b64103db5ec2625791356cae71ff9a0048d3485d7fcbce4e0eb8bc77550f99b19542c7a0f8b56f902df4958cb SHA512 be8db67a9cd46bdff24a4fc3882193dbe2c7bd487822ad7345bf3464f8c21713b6e459867c9e9678bc33e9d14ea7e09cbaa171139799810c131c7b625c742e64 -DIST qtwebengine-opensource-src-5.9.6.tar.xz 216733460 BLAKE2B 6f6f4d89559899b7faa6c8a31187967e5dab357d63f6c096953bdffa9ff8e8299f22f3fe97bc5295093a89200b38f47b4b214ff91765f8da3a992c5058f06e1e SHA512 493e9b4fb7274253eca107bfbb6ff044068c78997299c48b62a504ba5511c4d3e2a7f481d986f34c75d035e4804b18f74bf6a4bf0daf0f6a5778abd8aa7ee68a +DIST qtwebengine-everywhere-src-5.11.3.tar.xz 233678844 BLAKE2B 451a2f8361b158835f7f565aea9e7e372ea5670f56a5eef918d0340857e1b336d7147c5f87417a21ea225c248cfda8248869c2023b2e359aa9216ec472dea4b9 SHA512 323179244187b075836101eec15fc96569e31dee7ca0b28d51833cf02a55439ca0ab8e3e14acf970eb0258e1f5187b6b33fc1a35bf9056e4941a2b20be9b0431 EBUILD qtwebengine-5.11.1.ebuild 3535 BLAKE2B e806536baec3071808ff3c0a7f5f0d7f287b1c4489bd51f76fdc5d3eb5951c047199660c5daddec7f75dee50f1d7fdfbe2e6e6859d89979e1b28c8bdb79ad686 SHA512 9fb74dedea97963bd8363c6861e92395c0a4d9152dfe1ef26f8df7ad9e55ae4c6f60858c52fc6a9df90a3c96460230fbda099fd22dbb6c2eef7899963e7c1daa -EBUILD qtwebengine-5.11.2.ebuild 3538 BLAKE2B efa4a066cdfdc976d535a305c317032f893890c074ae3b92e35f4baa9cb28e84bbcab43b5fc9b78c332da56d2fdd689cd3be7637b49a0eaa0d8629ed054fe0f6 SHA512 a3fa0563d7615a7063776669bef280eb74ee64bb7cc21acd3e832b00936ff0e9973bb7d543816bd7b21f68b6a1a14bd41a28eb4613f8e222dcc199082b09b31c -EBUILD qtwebengine-5.9.6-r1.ebuild 3411 BLAKE2B 146d96022668be866f724a8905c82ed139a517cb68492dd97c554c3389e97b7fa4125afa5b4ca343fe4057bccc9efa25566ebf76d26d9e40b43968838cbaa96e SHA512 6d84cc73e712355e3c0069d753556f0f9e8e64a89a4574bde151bc776fecc67f01923c973af64258163ebe9d5950582c6bb5fd02ced78c121f86e3c6907a7066 +EBUILD qtwebengine-5.11.3.ebuild 3546 BLAKE2B 792ebcd946de8cae3fabfcd191f4281887bfc93237cbc5aff4ceacadf69427ef2dabb099ccd4c4dc66c0349925a4d1f896eec88c3e0ce09117f1fc423d0b61e3 SHA512 e2706cc7a24bea4d883dd67a9022a603916fa8a7dd039fb694414b59446029d52f1fd9318f277a5ed01631826e8847490f6e9213066bd19f7ac32f1099b55bc3 MISC metadata.xml 1178 BLAKE2B 3c9dc86e76a316c93c637b10d9939e95e86bda9bbf3d349575594ab68457b72bc72b9c92ab5650dae9e15cf7726ad904b478b6888744f4cac2382d5f9a9943cd SHA512 20bfcdd36c2f2a6fc95f402bfb6a79982b9fd5e16b659395fef3e41cf475ab76493a93cfa30fca505b0d31c0d2b2d4ef9a297ef8d64fe4d50617b74a7b81c707 diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.9.3-paxmark-mksnapshot.patch b/dev-qt/qtwebengine/files/qtwebengine-5.9.3-paxmark-mksnapshot.patch deleted file mode 100644 index ecedaf62f344..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.9.3-paxmark-mksnapshot.patch +++ /dev/null @@ -1,41 +0,0 @@ -Bug: https://bugs.gentoo.org/634220 - ---- a/src/3rdparty/chromium/v8/BUILD.gn -+++ b/src/3rdparty/chromium/v8/BUILD.gn -@@ -661,6 +661,7 @@ action("run_mksnapshot") { - - deps = [ - ":mksnapshot($v8_snapshot_toolchain)", -+ ":run_paxmark", - ] - - script = "tools/run.py" -@@ -706,6 +707,28 @@ action("run_mksnapshot") { - args += [ rebase_path(v8_embed_script, root_build_dir) ] - } - } -+action("run_paxmark") { -+ visibility = [ ":*" ] # Only targets in this file can depend on this. -+ -+ deps = [ -+ ":mksnapshot($v8_snapshot_toolchain)", -+ ] -+ -+ script = "/usr/sbin/pypaxctl" -+ -+ sources = [] -+ -+ outputs = [ -+ "$target_out_dir/mksnapshot", -+ ] -+ -+ args = [ -+ "-sm", -+ "./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)", -+ "root_out_dir") + "/mksnapshot", -+ root_build_dir), -+ ] -+} - - action("run_mkpeephole") { - visibility = [ ":*" ] # Only targets in this file can depend on this. 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 deleted file mode 100644 index 8b739680f685..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-1.patch +++ /dev/null @@ -1,70 +0,0 @@ -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 deleted file mode 100644 index ef5f44efcf23..000000000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-2.patch +++ /dev/null @@ -1,46 +0,0 @@ -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.11.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.2.ebuild deleted file mode 100644 index 503918439e7a..000000000000 --- a/dev-qt/qtwebengine/qtwebengine-5.11.2.ebuild +++ /dev/null @@ -1,140 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# 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 designer geolocation +jumbo-build pax_kernel pulseaudio - +system-ffmpeg +system-icu widgets" -REQUIRED_USE="designer? ( 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/re2:= - media-libs/fontconfig - media-libs/freetype - media-libs/harfbuzz:= - media-libs/lcms:2 - media-libs/libjpeg-turbo:= - media-libs/libpng:0= - >=media-libs/libvpx-1.5:=[svc] - media-libs/libwebp:= - media-libs/mesa[egl] - media-libs/opus - sys-apps/dbus - sys-apps/pciutils - sys-libs/libcap - sys-libs/zlib[minizip] - 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 ) - designer? ( ~dev-qt/designer-${PV} ) - geolocation? ( ~dev-qt/qtpositioning-${PV} ) - pulseaudio? ( media-sound/pulseaudio:= ) - system-ffmpeg? ( media-video/ffmpeg:0= ) - system-icu? ( >=dev-libs/icu-60.2:= ) - 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}/${PN}-5.9.6-gcc8.patch" # bug 657124 - "${FILESDIR}/${PN}-5.11.1-nouveau-disable-gpu.patch" # bug 609752 -) - -src_prepare() { - use pax_kernel && PATCHES+=( "${FILESDIR}/${P}-paxmark-mksnapshot.patch" ) - - if ! use jumbo-build; then - sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \ - src/core/config/common.pri || die - fi - - # 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 webengine-alsa src/core/config/linux.pri - qt_use_disable_config pulseaudio webengine-pulseaudio src/core/config/linux.pri - - qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro - - 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=( - -- - -opus - -printing-and-pdf - -webp - $(usex alsa '-alsa' '') - $(usex bindist '' '-proprietary-codecs') - $(usex pulseaudio '-pulseaudio' '') - $(usex system-ffmpeg '-ffmpeg' '') - $(usex system-icu '-webengine-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.11.3.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.3.ebuild new file mode 100644 index 000000000000..ea4481da33d1 --- /dev/null +++ b/dev-qt/qtwebengine/qtwebengine-5.11.3.ebuild @@ -0,0 +1,140 @@ +# Copyright 1999-2018 Gentoo Authors +# 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 designer geolocation +jumbo-build pax_kernel pulseaudio + +system-ffmpeg +system-icu widgets" +REQUIRED_USE="designer? ( 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/re2:= + media-libs/fontconfig + media-libs/freetype + media-libs/harfbuzz:= + media-libs/lcms:2 + media-libs/libjpeg-turbo:= + media-libs/libpng:0= + >=media-libs/libvpx-1.5:=[svc] + media-libs/libwebp:= + media-libs/mesa[egl] + media-libs/opus + sys-apps/dbus + sys-apps/pciutils + sys-libs/libcap + sys-libs/zlib[minizip] + 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 ) + designer? ( ~dev-qt/designer-${PV} ) + geolocation? ( ~dev-qt/qtpositioning-${PV} ) + pulseaudio? ( media-sound/pulseaudio:= ) + system-ffmpeg? ( media-video/ffmpeg:0= ) + system-icu? ( >=dev-libs/icu-60.2:= ) + 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}/${PN}-5.9.6-gcc8.patch" # bug 657124 + "${FILESDIR}/${PN}-5.11.1-nouveau-disable-gpu.patch" # bug 609752 +) + +src_prepare() { + use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" ) + + if ! use jumbo-build; then + sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \ + src/core/config/common.pri || die + fi + + # 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 webengine-alsa src/core/config/linux.pri + qt_use_disable_config pulseaudio webengine-pulseaudio src/core/config/linux.pri + + qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro + + 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=( + -- + -opus + -printing-and-pdf + -webp + $(usex alsa '-alsa' '') + $(usex bindist '' '-proprietary-codecs') + $(usex pulseaudio '-pulseaudio' '') + $(usex system-ffmpeg '-ffmpeg' '') + $(usex system-icu '-webengine-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.6-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.6-r1.ebuild deleted file mode 100644 index aa584285a43c..000000000000 --- a/dev-qt/qtwebengine/qtwebengine-5.9.6-r1.ebuild +++ /dev/null @@ -1,130 +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 designer geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets" -REQUIRED_USE="designer? ( 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/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[egl] - 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 ) - designer? ( ~dev-qt/designer-${PV} ) - geolocation? ( ~dev-qt/qtpositioning-${PV} ) - pulseaudio? ( media-sound/pulseaudio:= ) - system-ffmpeg? (