From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 47D0658973 for ; Wed, 20 Jan 2016 15:28:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2F81B21C0D6; Wed, 20 Jan 2016 15:28:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A408D21C0D6 for ; Wed, 20 Jan 2016 15:28:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BED9E340B87 for ; Wed, 20 Jan 2016 15:28:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7F080102E for ; Wed, 20 Jan 2016 15:28:45 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1453303719.635b7b8ca77decef9a87de147ddb7d1dcc7f160d.pesa@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtwebkit/qtwebkit-5.5.1-r1.ebuild X-VCS-Directories: dev-qt/qtwebkit/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 635b7b8ca77decef9a87de147ddb7d1dcc7f160d X-VCS-Branch: master Date: Wed, 20 Jan 2016 15:28:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: fd571892-7c2b-45b0-af2d-27c11a5a37c1 X-Archives-Hash: bfd6e278055c113e48bdffca37483d10 commit: 635b7b8ca77decef9a87de147ddb7d1dcc7f160d Author: Davide Pesavento gentoo org> AuthorDate: Wed Jan 20 15:28:02 2016 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Wed Jan 20 15:28:39 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=635b7b8c dev-qt/qtwebkit: fix build with USE=-webchannel Gentoo-Bug: 572442 Package-Manager: portage-2.2.27 dev-qt/qtwebkit/qtwebkit-5.5.1-r1.ebuild | 14 ++++++++------ 1 file 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 7153b72..f54851b 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 }