diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2012-03-07 15:02:56 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2012-03-07 15:02:56 +0000 |
| commit | 86127edef28f9d7efb61808c31ee3bd9dc9f38e9 (patch) | |
| tree | 90e4874f74b332b0bf12ba376aef8cc7c6fdf550 /x11-libs | |
| parent | Version bumped. (diff) | |
| download | gentoo-2-86127edef28f9d7efb61808c31ee3bd9dc9f38e9.tar.gz gentoo-2-86127edef28f9d7efb61808c31ee3bd9dc9f38e9.tar.bz2 gentoo-2-86127edef28f9d7efb61808c31ee3bd9dc9f38e9.zip | |
Fix build with USE=gstreamer (bug 405701).
(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/qt-webkit/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild | 14 |
2 files changed, 12 insertions, 7 deletions
diff --git a/x11-libs/qt-webkit/ChangeLog b/x11-libs/qt-webkit/ChangeLog index 523bb4e834d9..5389438f3668 100644 --- a/x11-libs/qt-webkit/ChangeLog +++ b/x11-libs/qt-webkit/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qt-webkit # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.132 2012/02/24 19:02:42 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.133 2012/03/07 15:02:56 pesa Exp $ + + 07 Mar 2012; Davide Pesavento <pesa@gentoo.org> qt-webkit-4.8.0-r1.ebuild: + Fix build with USE=gstreamer (bug 405701). *qt-webkit-4.8.0-r1 (24 Feb 2012) diff --git a/x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild b/x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild index 54512b3c8ca1..49f5e4f6bc0d 100644 --- a/x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild +++ b/x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild,v 1.1 2012/02/24 19:02:42 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild,v 1.2 2012/03/07 15:02:56 pesa Exp $ EAPI="3" inherit qt4-build flag-o-matic toolchain-funcs @@ -23,7 +23,9 @@ DEPEND=" )" RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${P}-c++0x-fix.patch" ) +PATCHES=( + "${FILESDIR}/${P}-c++0x-fix.patch" +) pkg_setup() { QT4_TARGET_DIRECTORIES=" @@ -55,10 +57,10 @@ src_prepare() { src_configure() { myconf+=" - -webkit -system-sqlite + -webkit + -system-sqlite $(qt_use jit javascript-jit) - -DENABLE_VIDEO=$(use gstreamer && echo 1 || echo 0) - -DGST_DISABLE_DEPRECATED" - + $(use gstreamer || echo -DENABLE_VIDEO=0) + " qt4-build_src_configure } |