diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2016-01-20 16:28:02 +0100 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2016-01-20 16:28:39 +0100 |
| commit | 635b7b8ca77decef9a87de147ddb7d1dcc7f160d (patch) | |
| tree | dfae4b335cc859988d4a1908d2cbdb1c4da926d6 | |
| parent | dev-qt/qtwebkit: remove old (diff) | |
| download | gentoo-635b7b8ca77decef9a87de147ddb7d1dcc7f160d.tar.gz gentoo-635b7b8ca77decef9a87de147ddb7d1dcc7f160d.tar.bz2 gentoo-635b7b8ca77decef9a87de147ddb7d1dcc7f160d.zip | |
dev-qt/qtwebkit: fix build with USE=-webchannel
Gentoo-Bug: 572442
Package-Manager: portage-2.2.27
| -rw-r--r-- | dev-qt/qtwebkit/qtwebkit-5.5.1-r1.ebuild | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/dev-qt/qtwebkit/qtwebkit-5.5.1-r1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.5.1-r1.ebuild index 7153b721a872..f54851bf0a50 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.5.1-r1.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.5.1-r1.ebuild @@ -83,7 +83,9 @@ src_prepare() { qt_use_disable_mod orientation sensors Tools/qmake/mkspecs/features/features.prf qt_use_disable_mod printsupport printsupport Tools/qmake/mkspecs/features/features.prf qt_use_disable_mod qml quick Tools/qmake/mkspecs/features/features.prf - qt_use_disable_mod webchannel webchannel Source/WebKit2/WebKit2.pri + qt_use_disable_mod webchannel webchannel \ + Source/WebKit2/Target.pri \ + Source/WebKit2/WebKit2.pri if use gstreamer010; then epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch" @@ -91,16 +93,16 @@ src_prepare() { epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch" fi - use opengl || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG += use_3d_graphics/d' \ + # bug 562396 + use jit || epatch "${FILESDIR}/${PN}-5.5.1-disable-jit.patch" + + use opengl || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG += use_3d_graphics/d' \ Tools/qmake/mkspecs/features/features.prf || die - use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \ + use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \ Tools/qmake/mkspecs/features/features.prf || die # bug 458222 sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die - # bug 562396 - use jit || epatch "${FILESDIR}/${PN}-5.5.1-disable-jit.patch" - qt5-build_src_prepare } |