gentoo resync : 18.05.2019

8 files changed, 238 insertions, 5 deletions

diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index ed10156d06b9..d2d115285188 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index d758e5a79961..a4b87d5be584 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,6 +1,8 @@
 DIST qt-creator-opensource-src-4.6.2.tar.xz 23397676 BLAKE2B a6c641d2daaa1d692919739de1a26da0a8806db3a8678dffc792fc77855ecf14136ad1e990e678f66afc471950c6bcc0803a6d47a21af6eb91ff010e77383ee6 SHA512 32d583cc3684b268a649e265ebe97bde0a9fdcea60013d8966edef6df3fa0097bcb19d9fc7abf5ece9b59870ad1049e8320477df4321f0f311843e359aaea6b6
 DIST qt-creator-opensource-src-4.8.0.tar.xz 24545016 BLAKE2B f2c4256ab2d2eb1ac8bf897df2517f8784b97723564a9f53347de858301997c4d02f6a20269a4d74d0305f27babc65491521965b7e1941cd3c3778cb9701c8d5 SHA512 4b6c6778493b7c8b593868ebfe90ccb21eb3daec16853604ea422f29fc57be5623033c79610507931202fa34a648760c29134670d26b1c4c098e1eae28bb1743
+DIST qt-creator-opensource-src-4.8.2.tar.xz 24600872 BLAKE2B c686ea4f0ab981cba98319d8d7dd8eee9fd967d17e80f2602e8416145bddcbd7cae928d06a950914d677c9b2e82ed855812e66d64ce7cc998742357284f41865 SHA512 9900a82b1298a1cc74b33eab6a1063ed77e11f3150b8f82a72b7703b88f979e5a332efee9a622554df5238b44470e99a061b6c70f0d8cdfc352a07ce51a4c450
 EBUILD qt-creator-4.6.2.ebuild 5489 BLAKE2B 9d5843e2606f36f8980ce92825798ccd4962e0b04681ffc210dfc6d45b39a4de4ae54605e53ddbcbcf7d130c30bfabac0d41fded953856b94cfac342caa76065 SHA512 bd02baabb6f105d59f3735c05f3052ad637815697ff1761169244cd526b0b32c63472a00b4545e7e827402cd7ed302cd862314920d4bf3c609e177f4101e48ed
-EBUILD qt-creator-4.8.0.ebuild 5704 BLAKE2B 31391f9e95e94737f1138aedf3b42d6358f9fb1226e004eb9cd8d22f27cec221f913ab99d561274300e355d0f3dec8db348c7f003d6998317f27ffe72565c6c2 SHA512 00f37924fe760f62aef1b534873105eed1bdb21c3d9d1540f5b3b619d3d01a3c792c503e9ac72ed5321f2d803fb377e3dba94e29a0dd843af2cd0536556b2400
-EBUILD qt-creator-9999.ebuild 5704 BLAKE2B 31391f9e95e94737f1138aedf3b42d6358f9fb1226e004eb9cd8d22f27cec221f913ab99d561274300e355d0f3dec8db348c7f003d6998317f27ffe72565c6c2 SHA512 00f37924fe760f62aef1b534873105eed1bdb21c3d9d1540f5b3b619d3d01a3c792c503e9ac72ed5321f2d803fb377e3dba94e29a0dd843af2cd0536556b2400
+EBUILD qt-creator-4.8.0.ebuild 5703 BLAKE2B 634b34715e7e507ddceb4af58a64fbc764691ca42d9fb845e5b14de4b01bb4e958cbd1c92bc43aa556478710e8ab73903c7f01557bfb6f1467902c97c4ecf3b6 SHA512 6bc974bfdd2bdb30a888fd93c69a71671e73e1543ef1d6cc7fdeb288ce2b19a2c32807c5ed63a1e5bf447d62c875263b0a2b923bb059f00fd3e10b741b1ad18d
+EBUILD qt-creator-4.8.2.ebuild 5832 BLAKE2B 9849055c22a1ad0eab2c23358188900ac0ef79422c75d0024a3d0ff35f4f9012920a5b21e8ebf199e9503f163264e2d78f2ad49a99d9082f5f2d0497b12ac2d8 SHA512 295dc199c867529335e5fb222539391e8dea32442b45b37f56e0c7a8747ee794b02327f7562cec3141a0839b837254ab9331cccaddf46f2e03cd14f6e0102144
+EBUILD qt-creator-9999.ebuild 5833 BLAKE2B f585fc7be05b6714d4ac9cf6297df5d775facbe5e9ee9b4a26b4bc8897cfec3f015ed9c05d41f46433cc7541cdd80d1247e01715bf54e3060369364d5e45c66b SHA512 0d11125e27fc81f86281c4e1f10f983c9a39542252fc47b341060860ca01034931752d526c2d9391a2b7d62ba11768dcbb90faf57d6a6eebf7d5bca59ac0af1d
 MISC metadata.xml 2716 BLAKE2B 171285a8ef6f2a73d3dba545e7e6f44eba9f1d180ea28d78e8697691e20fb23b871403e6928d0505e464d6a3820837f7060740877c54e7f727fe0706cee94bd5 SHA512 7875017b499987e058a243086cc843d9bb12e8578ffc48831c49185aafa9fa698070e59d4dc3fc1066b14e563a7a76abb0142474577aadd43be798f4ccbd5550
diff --git a/dev-qt/qt-creator/qt-creator-4.8.0.ebuild b/dev-qt/qt-creator/qt-creator-4.8.0.ebuild
index fa9b4277be58..bdcfafacbebf 100644
--- a/dev-qt/qt-creator/qt-creator-4.8.0.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.8.0.ebuild
@@ -56,7 +56,7 @@ CDEPEND="
 		>=dev-qt/qthelp-${QT_PV}
 		webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
 	)
-	qbs? ( >=dev-util/qbs-1.12.2 )
+	qbs? ( ~dev-util/qbs-1.12.2 )
 	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
 	systemd? ( sys-apps/systemd:= )
 "
diff --git a/dev-qt/qt-creator/qt-creator-4.8.2.ebuild b/dev-qt/qt-creator/qt-creator-4.8.2.ebuild
new file mode 100644
index 000000000000..8d0c85c4e5bb
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-4.8.2.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PLOCALES="cs da de fr ja pl ru sl uk zh-CN zh-TW"
+
+inherit llvm qmake-utils virtualx xdg
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="https://doc.qt.io/qtcreator/"
+LICENSE="GPL-3"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://code.qt.io/${PN}/${PN}.git"
+else
+	MY_PV=${PV/_/-}
+	MY_P=${PN}-opensource-src-${MY_PV}
+	[[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
+	SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S=${WORKDIR}/${MY_P}
+fi
+
+# TODO: unbundle sqlite
+
+QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
+	'+clang:clangcodemodel|clangformat|clangtools' clearcase cmake:cmakeprojectmanager cppcheck
+	cvs +designer git glsl:glsleditor +help ios lsp:languageclient mercurial modeling:modeleditor
+	nim perforce python:pythoneditor qbs:qbsprojectmanager qnx scxml:scxmleditor serialterminal
+	silversearcher subversion valgrind winrt)
+IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
+
+# minimum Qt version required
+QT_PV="5.9.0:5"
+
+CDEPEND="
+	>=dev-libs/botan-2.8:2=[-bindist]
+	>=dev-qt/qtconcurrent-${QT_PV}
+	>=dev-qt/qtcore-${QT_PV}
+	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
+	>=dev-qt/qtgui-${QT_PV}
+	>=dev-qt/qtnetwork-${QT_PV}[ssl]
+	>=dev-qt/qtprintsupport-${QT_PV}
+	>=dev-qt/qtquickcontrols-${QT_PV}
+	>=dev-qt/qtscript-${QT_PV}
+	>=dev-qt/qtsql-${QT_PV}[sqlite]
+	>=dev-qt/qtsvg-${QT_PV}
+	>=dev-qt/qtwidgets-${QT_PV}
+	>=dev-qt/qtx11extras-${QT_PV}
+	>=dev-qt/qtxml-${QT_PV}
+	clang? ( >=sys-devel/clang-6:= )
+	designer? ( >=dev-qt/designer-${QT_PV} )
+	help? (
+		>=dev-qt/qthelp-${QT_PV}
+		webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
+	)
+	qbs? ( ~dev-util/qbs-1.12.2 )
+	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
+	systemd? ( sys-apps/systemd:= )
+"
+DEPEND="${CDEPEND}
+	>=dev-qt/linguist-tools-${QT_PV}
+	virtual/pkgconfig
+	doc? ( >=dev-qt/qdoc-${QT_PV} )
+	test? (
+		>=dev-qt/qtdeclarative-${QT_PV}[localstorage]
+		|| (
+			>=dev-qt/qtxmlpatterns-5.12.1-r1:5[qml(+)]
+			<dev-qt/qtdeclarative-5.12.0[xml]
+		)
+		>=dev-qt/qtquickcontrols2-${QT_PV}
+		>=dev-qt/qttest-${QT_PV}
+	)
+"
+RDEPEND="${CDEPEND}
+	sys-devel/gdb[client,python]
+	autotools? ( sys-devel/autoconf )
+	bazaar? ( dev-vcs/bzr )
+	cmake? ( dev-util/cmake[server(+)] )
+	cppcheck? ( dev-util/cppcheck )
+	cvs? ( dev-vcs/cvs )
+	git? ( dev-vcs/git )
+	mercurial? ( dev-vcs/mercurial )
+	silversearcher? ( sys-apps/the_silver_searcher )
+	subversion? ( dev-vcs/subversion )
+	valgrind? ( dev-util/valgrind )
+"
+# qt translations must also be installed or qt-creator translations won't be loaded
+for x in ${PLOCALES}; do
+	IUSE+=" l10n_${x}"
+	RDEPEND+=" l10n_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
+done
+unset x
+
+pkg_setup() {
+	use clang && llvm_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# disable unwanted plugins
+	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
+		if ! use ${plugin%:*}; then
+			einfo "Disabling ${plugin%:*} plugin"
+			sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
+				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
+		fi
+	done
+	sed -i -e '/updateinfo/d' src/plugins/plugins.pro || die
+
+	# avoid building unused support libraries and tools
+	if ! use clang; then
+		sed -i -e '/clangsupport/d' src/libs/libs.pro || die
+		sed -i -e '/SUBDIRS += clangbackend/d' src/tools/tools.pro || die
+	fi
+	if ! use glsl; then
+		sed -i -e '/glsl/d' src/libs/libs.pro || die
+	fi
+	if ! use lsp; then
+		sed -i -e '/languageserverprotocol/d' src/libs/libs.pro tests/auto/auto.pro || die
+	fi
+	if ! use modeling; then
+		sed -i -e '/modelinglib/d' src/libs/libs.pro || die
+	fi
+	if ! use valgrind; then
+		sed -i -e '/valgrindfake/d' src/tools/tools.pro || die
+		sed -i -e '/valgrind/d' tests/auto/auto.pro || die
+	fi
+
+	# automagic dep on qtwebengine
+	if ! use webengine; then
+		sed -i -e 's/isEmpty(QT\.webenginewidgets\.name)/true/' src/plugins/help/help.pro || die
+	fi
+
+	# disable broken or unreliable tests
+	sed -i -e 's/\(manual\|tools\|unit\)//g' tests/tests.pro || die
+	sed -i -e '/\(dumpers\|namedemangler\)\.pro/d' tests/auto/debugger/debugger.pro || die
+	sed -i -e '/CONFIG -=/s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die
+
+	# do not install test binaries
+	sed -i -e '/CONFIG +=/s/$/ no_testcase_installs/' tests/auto/{qttest.pri,json/json.pro} || die
+
+	# fix path to some clang headers
+	sed -i -e "/^CLANG_RESOURCE_DIR\s*=/s:\$\${LLVM_LIBDIR}:${EPREFIX}/usr/lib:" src/shared/clang/clang_defines.pri || die
+
+	# fix translations
+	local lang languages=
+	for lang in ${PLOCALES}; do
+		use l10n_${lang} && languages+=" ${lang/-/_}"
+	done
+	sed -i -e "/^LANGUAGES\s*=/s:=.*:=${languages}:" share/qtcreator/translations/translations.pro || die
+
+	# remove bundled botan
+	rm -rf src/libs/3rdparty/botan || die
+
+	# remove bundled qbs
+	rm -rf src/shared/qbs || die
+}
+
+src_configure() {
+	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
+		IDE_PACKAGE_MODE=1 \
+		$(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix)") \
+		$(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \
+		CONFIG+=qbs_disable_rpath \
+		CONFIG+=qbs_enable_project_file_updates \
+		CONFIG+=use_system_botan \
+		$(use systemd && echo CONFIG+=journald) \
+		$(use test && echo BUILD_TESTS=1)
+}
+
+src_test() {
+	cd tests/auto && virtx default
+}
+
+src_install() {
+	emake INSTALL_ROOT="${ED}usr" install
+
+	dodoc dist/{changes-*,known-issues}
+
+	# install documentation
+	if use doc; then
+		emake docs
+		# don't use ${PF} or the doc will not be found
+		insinto /usr/share/doc/qtcreator
+		doins share/doc/qtcreator/qtcreator{,-dev}.qch
+		docompress -x /usr/share/doc/qtcreator/qtcreator{,-dev}.qch
+	fi
+}
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index fa9b4277be58..8f3a9f11681f 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -56,7 +56,7 @@ CDEPEND="
 		>=dev-qt/qthelp-${QT_PV}
 		webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
 	)
-	qbs? ( >=dev-util/qbs-1.12.2 )
+	qbs? ( >=dev-util/qbs-1.13.0 )
 	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
 	systemd? ( sys-apps/systemd:= )
 "
@@ -140,6 +140,9 @@ src_prepare() {
 	sed -i -e '/\(dumpers\|namedemangler\)\.pro/d' tests/auto/debugger/debugger.pro || die
 	sed -i -e '/CONFIG -=/s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die
 
+	# do not install test binaries
+	sed -i -e '/CONFIG +=/s/$/ no_testcase_installs/' tests/auto/{qttest.pri,json/json.pro} || die
+
 	# fix path to some clang headers
 	sed -i -e "/^CLANG_RESOURCE_DIR\s*=/s:\$\${LLVM_LIBDIR}:${EPREFIX}/usr/lib:" src/shared/clang/clang_defines.pri || die
 
diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index 6ad426301de2..3c12b04d809c 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -1,6 +1,7 @@
 AUX qtwebkit-5.212.0_pre20180120-cmake-fix-pkgconfig_deps-spelling.patch 4466 BLAKE2B 62a135c8f7270077873291dec3d2d29bd663e3c4583c4886e781a974704628bc46aa4aa24ac45ea3a70c2b8652e78029eed4bba441a6a02eafb6d9b34562ff6c SHA512 9feab732ee2bb7aaeb67049d202e8f6b12ac92b0a1e963b518e85c13e7e3a856c842c3c12c9662ce06d0d77d7a61795270749eba73070eadbb066dcb88aa066e
 AUX qtwebkit-5.212.0_pre20180120-fix-pkgconfig.patch 1164 BLAKE2B d0d12652387ed24a21548746687fb4689d3d9198e66ba5bb3fa6ec3aeb83db610f5f9e9910ec6c5f240ac6a0f2af855afa4413f971585588fe0d9bd6b718203c SHA512 52f34491d15cc8ca381347427cb440788f8ac6d7d8e52bab067fe997e321bd9e693c9d48669b6bbc23f060c9475d25563496e368b7a94198aff25a21a1491e3e
 AUX qtwebkit-5.212.0_pre20180120-functional.patch 723 BLAKE2B dec67933a798f485e59ea87fbcc2f9475f426427cbc80dff39808b48bcf4dd74f802b648db11f2611e85364e978f55eab029e09c7c88d9524a961bb6627682c1 SHA512 7f54f26a18f91ba7dd71e1c82c22533b13707d045c0d693c4102bd95c9a77ba74678c90394ea65816e9fa80845d46735d7c8b178e1b5ad34e6214e9a5ae8947f
+AUX qtwebkit-5.212.0_pre20180120-js-build-error.patch 2124 BLAKE2B 2c09bff3d9bcc950b7305c7aa943d5af8d47572b2b38063fe4de0e8d48768e9fd337e09fdcc314bd9ceda3e51f8bd6731beb4660a95104c0f1d8e6063d01c294 SHA512 01e090b390dcb78a998203806baa0677d39aa680107ee523e4fe1c26d9fa8750836a715a107eb00487e1ef100cdbfcb8ee9d2d9bb47f5f336dd153b591fb26d3
 DIST qtwebkit-5.212.0_pre20180120.tar.gz 18830192 BLAKE2B a74329c424f5546cbbfda8f398da8547a78661c66e26e8168ba2fc35140070cbd0e826aeadc6b4f1b30ef3f8dc5259a017fb4cb73990b1f03ed541afcab50ec0 SHA512 582b0c5cb10756d88206a9b935a868026f2c2294c6476c0668ad416880b921735efbad32635671daa89792ba9a6d4ff397534df150fe641d984d5784ce0bf047
-EBUILD qtwebkit-5.212.0_pre20180120.ebuild 3938 BLAKE2B 6c562b02ac8d52ced734b51958204820aa310f6ff875f7d87abd97ba44d35fc921eb1923786acf1aa4ae9fef058bb10bc00792593a0040dd6e59895dc301766e SHA512 d0594c8700f73d53043073f19a4fc31e5afad7f0208004b65e72502e8cdd7eea048c74f21df3990570bb1f999fabf96432c78b56e184e0c91b98040b7e6eee71
+EBUILD qtwebkit-5.212.0_pre20180120.ebuild 3979 BLAKE2B 244019efa18a144e2c0fefc91cee6848796add49f9096b8220a713eb6f79cd94f66a86864a40c4c92bb69e9b16d642958dd890b3981384d7100ab7f017d2762d SHA512 2f551f2077bb1bc718fc26a4d922e948b5074a34e7c51dc4c79f254a4e3066f86c507778dccce0ca87b2dfe45cdb059306c4ac8967857226873438916ef8c786
 MISC metadata.xml 1225 BLAKE2B 29d533721955dea3cd9f1d23494438d3abc079d713cf77d707920a765e3eba4e2160d0f80b05ec2ba8cbcf7999aad51201bbf002e8b59161bb2d0d85cd945e50 SHA512 b382f115f4705a577e210760d499fde421d0091818914674f0c2eb7fc4967d19d5dbf752be19f43f0edb27493ebec58b89e07a65ffa505842a089d06353aa122
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-js-build-error.patch b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-js-build-error.patch
new file mode 100644
index 000000000000..904957c71861
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20180120-js-build-error.patch
@@ -0,0 +1,34 @@
+From e9a78eafc172a69d48ee48d971b3e430613ab513 Mon Sep 17 00:00:00 2001
+From: bernhardu <bernhardu@mailbox.org>
+Date: Mon, 25 Mar 2019 01:57:26 +0100
+Subject: [PATCH] Add attribute fastcall to derived class member
+ JSImageConstructor::construct (#803)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Otherwise the Debian build on i386 fails with this error:
+In file included from ../Source/WebCore/bindings/js/JSImageConstructor.cpp:24,
+                 from ../Source/WebCore/bindings/js/JSBindingsAllInOne.cpp:101:
+../Source/WebCore/bindings/js/JSDOMConstructor.h: In instantiation of ‘static JSC::ConstructType WebCore::JSDOMNamedConstructor<JSClass>::getConstructData(JSC::JSCell*, JSC::ConstructData&) [with JSClass = WebCore::JSHTMLImageElement]’:
+../Source/WebCore/bindings/js/JSImageConstructor.cpp:75:97:   required from here
+../Source/WebCore/bindings/js/JSDOMConstructor.h:195:35: error: invalid conversion from ‘JSC::EncodedJSValue (*)(JSC::ExecState*)’ {aka ‘long long int (*)(JSC::ExecState*)’} to ‘JSC::NativeFunction’ {aka ‘long long int (__attribute__((fastcall)) *)(JSC::ExecState*)’} [-fpermissive]
+     constructData.native.function = construct;
+     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~
+---
+ Source/WebCore/bindings/js/JSImageConstructor.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Source/WebCore/bindings/js/JSImageConstructor.cpp b/Source/WebCore/bindings/js/JSImageConstructor.cpp
+index 923690600ab1..de553f5fa899 100644
+--- a/Source/WebCore/bindings/js/JSImageConstructor.cpp
++++ b/Source/WebCore/bindings/js/JSImageConstructor.cpp
+@@ -44,7 +44,7 @@ template<> JSValue JSImageConstructor::prototypeForStructure(VM& vm, const JSDOM
+     return JSHTMLElement::getConstructor(vm, &globalObject);
+ }
+ 
+-template<> EncodedJSValue JSImageConstructor::construct(ExecState* state)
++template<> EncodedJSValue JSC_HOST_CALL JSImageConstructor::construct(ExecState* state)
+ {
+     JSImageConstructor* jsConstructor = jsCast<JSImageConstructor*>(state->callee());
+     Document* document = jsConstructor->document();
\ No newline at end of file
diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild
index 09a58197a997..f288314ce872 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild
@@ -80,6 +80,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-functional.patch"
 	"${FILESDIR}/${P}-fix-pkgconfig.patch"
 	"${FILESDIR}/${P}-cmake-fix-pkgconfig_deps-spelling.patch"
+	"${FILESDIR}/${P}-js-build-error.patch"
 )
 
 CHECKREQS_DISK_BUILD="16G" # bug 417307