commit: b329efb084c05ffb8ba4ca65bf6ba2b2cb8190c8
Author: Uwe L. Korn <uwelk <AT> xhochy <DOT> com>
AuthorDate: Fri Mar 21 12:45:03 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Mar 25 16:26:09 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=b329efb0
[dev-qt/qtwebkit:5] Remove automagic dependencies.
Package-Manager: portage-2.2.8-r1
---
.../files/qtwebkit-5.2.1-disable-gstreamer.patch | 15 +++++++++++
dev-qt/qtwebkit/qtwebkit-5.2.1.ebuild | 29 +++++++++++++++++-----
dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild | 29 +++++++++++++++++-----
dev-qt/qtwebkit/qtwebkit-5.9999.ebuild | 29 +++++++++++++++++-----
4 files changed, 84 insertions(+), 18 deletions(-)
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch
b/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch
new file mode 100644
index 0000000..05e41a1
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch
@@ -0,0 +1,15 @@
+--- Tools/qmake/mkspecs/features/features.prf 2014-03-19 18:35:47.795676444
+0000
++++ Tools/qmake/mkspecs/features/features.prf 2014-03-19 18:36:38.602433220
+0000
+@@ -99,12 +99,6 @@
+
+ # HTML5 Media Support for builds with GStreamer
+ unix:!mac:!contains(QT_CONFIG, no-pkg-config) {
+- packagesExist("glib-2.0 gio-2.0 gstreamer-1.0
gstreamer-plugins-base-1.0") {
+- WEBKIT_CONFIG += video use_gstreamer
+- } else: packagesExist("glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\'
\'gstreamer-plugins-base-0.10 >= 0.10.30\'") {
+- WEBKIT_CONFIG += video use_gstreamer use_gstreamer010
+- }
+- use?(gstreamer): WEBKIT_CONFIG += use_native_fullscreen_video
+ }
+
+ !enable?(video):qtHaveModule(multimediawidgets) {
diff --git a/dev-qt/qtwebkit/qtwebkit-5.2.1.ebuild
b/dev-qt/qtwebkit/qtwebkit-5.2.1.ebuild
index b32a7a1..80b12e7 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.2.1.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -17,17 +17,16 @@ else
fi
# TODO: qtprintsupport, qttestlib, geolocation, orientation/sensors
-# FIXME: tons of automagic deps
IUSE="gstreamer libxml2 multimedia opengl qml udev webp widgets xslt"
RDEPEND="
- dev-db/sqlite
+ dev-db/sqlite:3
>=dev-qt/qtcore-${PV}:5[debug=,icu]
>=dev-qt/qtgui-${PV}:5[debug=]
>=dev-qt/qtnetwork-${PV}:5[debug=]
>=dev-qt/qtsql-${PV}:5[debug=]
- media-libs/fontconfig
+ media-libs/fontconfig:1.0
media-libs/libpng:0=
sys-libs/zlib
virtual/jpeg:0
@@ -40,12 +39,12 @@ RDEPEND="
>=media-libs/gstreamer-0.10.30:0.10
>=media-libs/gst-plugins-base-0.10.30:0.10
)
- libxml2? ( dev-libs/libxml2 )
+ libxml2? ( dev-libs/libxml2:2 )
multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[debug=] )
opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
udev? ( virtual/udev )
- webp? ( media-libs/libwebp:= )
+ webp? ( media-libs/libwebp:0= )
widgets? ( >=dev-qt/qtwidgets-${PV}:5[debug=] )
xslt? (
libxml2? ( dev-libs/libxslt )
@@ -65,6 +64,24 @@ pkg_setup() {
}
src_prepare() {
+ use gstreamer || epatch
"${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
+ use libxml2 || sed -i -e '/config_libxml2: WEBKIT_CONFIG +=
use_libxml2/d' \
+ Tools/qmake/mkspecs/features/features.prf || die
+ use multimedia || sed -i -e '/WEBKIT_CONFIG += video
use_qt_multimedia/d' \
+ Tools/qmake/mkspecs/features/features.prf || die
+ use opengl || sed -i -e '/contains(QT_CONFIG, opengl):
WEBKIT_CONFIG += use_3d_graphics/d' \
+ Tools/qmake/mkspecs/features/features.prf || die
+ use qml || sed -i -e '/have?(QTQUICK): SUBDIRS += declarative/d'
\
+ Source/QtWebKit.pro || die
+ use udev || sed -i -e '/linux: WEBKIT_CONFIG += gamepad/d' \
+ Tools/qmake/mkspecs/features/features.prf || die
+ use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG +=
use_webp/d' \
+ Tools/qmake/mkspecs/features/features.prf || die
+ use widgets || sed -i -e '/SUBDIRS += webkitwidgets/d' \
+ Source/QtWebKit.pro || die
+ use xslt || sed -i -e '/config_libxslt: WEBKIT_CONFIG += xslt/d' \
+ Tools/qmake/mkspecs/features/features.prf || die
+
# bug 458222
sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die
diff --git a/dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild
b/dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild
index b32a7a1..80b12e7 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -17,17 +17,16 @@ else
fi
# TODO: qtprintsupport, qttestlib, geolocation, orientation/sensors
-# FIXME: tons of automagic deps
IUSE="gstreamer libxml2 multimedia opengl qml udev webp widgets xslt"
RDEPEND="
- dev-db/sqlite
+ dev-db/sqlite:3
>=dev-qt/qtcore-${PV}:5[debug=,icu]
>=dev-qt/qtgui-${PV}:5[debug=]
>=dev-qt/qtnetwork-${PV}:5[debug=]
>=dev-qt/qtsql-${PV}:5[debug=]
- media-libs/fontconfig
+ media-libs/fontconfig:1.0
media-libs/libpng:0=
sys-libs/zlib
virtual/jpeg:0
@@ -40,12 +39,12 @@ RDEPEND="
>=media-libs/gstreamer-0.10.30:0.10
>=media-libs/gst-plugins-base-0.10.30:0.10
)
- libxml2? ( dev-libs/libxml2 )
+ libxml2? ( dev-libs/libxml2:2 )
multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[debug=] )
opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
udev? ( virtual/udev )
- webp? ( media-libs/libwebp:= )
+ webp? ( media-libs/libwebp:0= )
widgets? ( >=dev-qt/qtwidgets-${PV}:5[debug=] )
xslt? (
libxml2? ( dev-libs/libxslt )
@@ -65,6 +64,24 @@ pkg_setup() {
}
src_prepare() {
+ use gstreamer || epatch
"${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
+ use libxml2 || sed -i -e '/config_libxml2: WEBKIT_CONFIG +=
use_libxml2/d' \
+ Tools/qmake/mkspecs/features/features.prf || die
+ use multimedia || sed -i -e '/WEBKIT_CONFIG += video
use_qt_multimedia/d' \
+ Tools/qmake/mkspecs/features/features.prf || die
+ use opengl || sed -i -e '/contains(QT_CONFIG, opengl):
WEBKIT_CONFIG += use_3d_graphics/d' \
+ Tools/qmake/mkspecs/features/features.prf || die
+ use qml || sed -i -e '/have?(QTQUICK): SUBDIRS += declarative/d'
\
+ Source/QtWebKit.pro || die
+ use udev || sed -i -e '/linux: WEBKIT_CONFIG += gamepad/d' \
+ Tools/qmake/mkspecs/features/features.prf || die
+ use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG +=
use_webp/d' \
+ Tools/qmake/mkspecs/features/features.prf || die
+ use widgets || sed -i -e '/SUBDIRS += webkitwidgets/d' \
+ Source/QtWebKit.pro || die
+ use xslt || sed -i -e '/config_libxslt: WEBKIT_CONFIG += xslt/d' \
+ Tools/qmake/mkspecs/features/features.prf || die
+
# bug 458222
sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die
diff --git a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
index b32a7a1..80b12e7 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -17,17 +17,16 @@ else
fi
# TODO: qtprintsupport, qttestlib, geolocation, orientation/sensors
-# FIXME: tons of automagic deps
IUSE="gstreamer libxml2 multimedia opengl qml udev webp widgets xslt"
RDEPEND="
- dev-db/sqlite
+ dev-db/sqlite:3
>=dev-qt/qtcore-${PV}:5[debug=,icu]
>=dev-qt/qtgui-${PV}:5[debug=]
>=dev-qt/qtnetwork-${PV}:5[debug=]
>=dev-qt/qtsql-${PV}:5[debug=]
- media-libs/fontconfig
+ media-libs/fontconfig:1.0
media-libs/libpng:0=
sys-libs/zlib
virtual/jpeg:0
@@ -40,12 +39,12 @@ RDEPEND="
>=media-libs/gstreamer-0.10.30:0.10
>=media-libs/gst-plugins-base-0.10.30:0.10
)
- libxml2? ( dev-libs/libxml2 )
+ libxml2? ( dev-libs/libxml2:2 )
multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[debug=] )
opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
udev? ( virtual/udev )
- webp? ( media-libs/libwebp:= )
+ webp? ( media-libs/libwebp:0= )
widgets? ( >=dev-qt/qtwidgets-${PV}:5[debug=] )
xslt? (
libxml2? ( dev-libs/libxslt )
@@ -65,6 +64,24 @@ pkg_setup() {
}
src_prepare() {
+ use gstreamer || epatch
"${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
+ use libxml2 || sed -i -e '/config_libxml2: WEBKIT_CONFIG +=
use_libxml2/d' \
+ Tools/qmake/mkspecs/features/features.prf || die
+ use multimedia || sed -i -e '/WEBKIT_CONFIG += video
use_qt_multimedia/d' \
+ Tools/qmake/mkspecs/features/features.prf || die
+ use opengl || sed -i -e '/contains(QT_CONFIG, opengl):
WEBKIT_CONFIG += use_3d_graphics/d' \
+ Tools/qmake/mkspecs/features/features.prf || die
+ use qml || sed -i -e '/have?(QTQUICK): SUBDIRS += declarative/d'
\
+ Source/QtWebKit.pro || die
+ use udev || sed -i -e '/linux: WEBKIT_CONFIG += gamepad/d' \
+ Tools/qmake/mkspecs/features/features.prf || die
+ use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG +=
use_webp/d' \
+ Tools/qmake/mkspecs/features/features.prf || die
+ use widgets || sed -i -e '/SUBDIRS += webkitwidgets/d' \
+ Source/QtWebKit.pro || die
+ use xslt || sed -i -e '/config_libxslt: WEBKIT_CONFIG += xslt/d' \
+ Tools/qmake/mkspecs/features/features.prf || die
+
# bug 458222
sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die
