summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavide Pesavento <pesa@gentoo.org>2012-03-07 15:02:56 +0000
committerDavide Pesavento <pesa@gentoo.org>2012-03-07 15:02:56 +0000
commit5136418a9c93a1a799e0f1782c97c5c25db35b53 (patch)
tree5be5cdb92cb4464d7320a3e39a4602b8ac5b678f /x11-libs
parentVersion bumped. (diff)
downloadhistorical-5136418a9c93a1a799e0f1782c97c5c25db35b53.tar.gz
historical-5136418a9c93a1a799e0f1782c97c5c25db35b53.tar.bz2
historical-5136418a9c93a1a799e0f1782c97c5c25db35b53.zip
Fix build with USE=gstreamer (bug 405701).
Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/qt-webkit/ChangeLog5
-rw-r--r--x11-libs/qt-webkit/Manifest30
-rw-r--r--x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild14
3 files changed, 27 insertions, 22 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/Manifest b/x11-libs/qt-webkit/Manifest
index 07fb38493727..f50182204fb5 100644
--- a/x11-libs/qt-webkit/Manifest
+++ b/x11-libs/qt-webkit/Manifest
@@ -22,24 +22,24 @@ EBUILD qt-webkit-4.6.3-r2.ebuild 1495 RMD160 3d26caa52863803b6641a03d0eb4229e5aa
EBUILD qt-webkit-4.6.3.ebuild 1402 RMD160 bdc781c1073a100fe46532f4de77c93eb4357870 SHA1 e4330e7e9b66c25ac78e705d34f2c0c2bf5719d0 SHA256 74269a78728a2029c5b6b34a4ba9c4b3a4324bf0aa154733e4edf069ec2d0c27
EBUILD qt-webkit-4.7.2.ebuild 1432 RMD160 1527244b7e58d0a2ad890c0a7e21602797d74251 SHA1 2a2d2e50e0b3edc419c93e3138a0121e4ed5bff4 SHA256 bb2bc83c40c2fddff5ba68c3a73169decc66052b1860fd4f30d415fb765135af
EBUILD qt-webkit-4.7.4.ebuild 1434 RMD160 cbde9a9941e4e8e9ec0ac07b787ee39944063b7f SHA1 eb960db0749193aa99643db2920827dd4281c67d SHA256 7e4d9ad6bd55c204cebeecb4a961cca108d6b09afd23d3874fcbd2c540ef41c3
-EBUILD qt-webkit-4.8.0-r1.ebuild 1680 RMD160 89794770e715c30b75a2884100020abe4cdaebe3 SHA1 6a61c9110a3ea90d41b75f606114eb484c01d6f3 SHA256 7fe9c57fd10f693fad42a03cbda9556d4d218807b770def6035593ac3bfac443
+EBUILD qt-webkit-4.8.0-r1.ebuild 1647 RMD160 00ed951a081b1e74f3f7b44c5fc055c84e4e7a3a SHA1 2b10e61575b0822e062924cbde15230356168a0a SHA256 f504902b93ac1268b6990a79d670b63c4df95f5e7a8c5f64cc3ddcd1b5d70ed1
EBUILD qt-webkit-4.8.0.ebuild 1816 RMD160 21538331ee616d5c679a16a7217c781bcad8826b SHA1 8f9956845ad5be70b6ae29e97da9baa54a0b19b5 SHA256 441e936ffa4bc5788fd2125ba1f8ddb0d12469326a48984b7095dbae97003459
-MISC ChangeLog 19266 RMD160 bd0eb18e83ec9e93b1d95201191be46db8c49a88 SHA1 1b14997a8dfc72206a5f1b72db9b7ccbaa795983 SHA256 2eb40012c72fd197759d9590220b25a1d3664097f0cd2c873fc336af45b1777b
+MISC ChangeLog 19389 RMD160 1d95b82f138bc462c0a05c7ab1c5375eef2993e8 SHA1 a8e907da9876647a7c63040703882402f4418131 SHA256 c45488beaa38198e7d9a9a7850598a3435eb49909d7d920753d9f5afd1e46fdd
MISC metadata.xml 739 RMD160 dc601459869cc7369c2a5abfe7c5ec1f078d277a SHA1 0303b5284bc0d788074b1ba33cbfab768651dea4 SHA256 86ce6ed256d328d3471b43fdb45a97102ff3acbcd69b29a8b95fd1547c925722
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iQIcBAEBCgAGBQJPR97ZAAoJENXLsxwXqFxy1P8P/iVwy1Hn8Oi2oJBU7CfzTfqb
-xJWMr06W2snYtM7NgYzNJ0j5mwMwDgNgrKewQzSYrCNkJABRjXx4Lm8DmQSw9VhK
-z6TDUqujFL0UnuDiVuy4TyuqOUOPD9mRklSFDGKfT/YSTRwTlmyVc+lSE6NRWXzV
-/yYC2WfjTacIfAloW9LkzhlQGW8DCrPAzN60orRwUSxWUiO9rWdBNNLztwzX49St
-0OJx5hmBlc7McC4Fcofsyzx4i1z2zhYQjckHdTFsFmhUOO7X+uN2wt2clI44eLVf
-3nlT3lsBXl/oG0zMXD1GLl2BP2elzxWoBZD284zC6tZFQ8U3QeeRvZLyJfIPeWWS
-7xtJJimTEEq1TFopDWDKIrJOK3IOCN9FJ0fmUCdYA1zhLFiD37KrB2Ko96iXbA/o
-kQvMsS1h/TO89UjmEuKURm8Ndgk/7KAyVCK1T8FceFQZ9KMbwh09wnPXcs1B1Pbk
-PvM4k97eaSXE9MInLiw+rycYBZY40JwypmvaJPZ8EDC0lK8tnxwNV09EDUd4hy/4
-llbwoIp2guxS5qljJSOxNCrcFDH3JKaAX5RKUtEp6cPxWe2f5BWRB6E216wMU/S7
-9Am5sCG5YCVHygvezL0SVIDDnQhxswul9SYngQuVnxtxmHo3kdusOoAXA7stVhkv
-Eg03cXWin7REj1Q9B0X7
-=R/3D
+iQIcBAEBCgAGBQJPV3inAAoJENXLsxwXqFxypwcP/293iG9kj3AX4RBk5PGbbb1n
+CVGWO1D0ibvwoChy7vjP1sRwldIpEgij/B1OV3+soKEsBUcJ9QM+FDiim9WjTOhz
+8w1g/8zI/U/RaqiS5u67O0wYAPd/IUaicNDw1/7vA1LVvb77nA2HYFlAPhFB/ULx
+G8IPY8wfdqyMCg30burMsL9ADnPciVKzi+PZwnqkpDP/9WeBk7bWhNXDzyL3n7Yp
+aI0XikAXhPedt7KIzihczXWrOLRD/JcpPIl4XkguU2f0urMqqAp5Du8SkXl+LXVA
+yVRRfEaPVREWzlYmAAvGKhnWqoUFsUARhePkC8HEq6JD27vz906A/9H+3j5FGsk/
+xU4rbz69nRvb2BGyHtVUwlwdhPWn6dGJjdgZGGZqGZ6FhtCMh0ZjCq/zfcvsigd0
+bvVxSmgvkQGoZbDGJHLAYi636kvHReVYYVCrG7tUQgmX4LJZ1lglTeU0EXiyEN1b
+TBLdEudLhX9WjMwGwkGGFxXbrfAxr6peFwNG6j73jQ5aLq7tLnHXkg2HM8VdchFq
+4t8muNfIeHFcTaWP6sktUJ4XiL1YPgb2C/J9Z2M1c+XGEq50bbkCpVkVoAHYwxFc
+ygSrlvI3pxIpAS+xyPQxjHpalmGSeiX8Y0FTh3r0KmG42zVV5jQpEmcDXq7O6POO
+bAj484rjw/+hWGtSRjlD
+=A1Cn
-----END PGP SIGNATURE-----
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
}