commit: 9990afda36c5d276b01dbf0533e8d2d30069087d
Author: Axel Rasmussen <axel.rasmussen1 <AT> gmail <DOT> com>
AuthorDate: Sat May 17 05:35:08 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun May 18 19:36:13 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=9990afda
[dev-qt/qtwebkit:5] Add printsupport USE flag
This commit updates the =dev-qt/qtwebkit-5.3.0_rc ebuild to allow for
enabling/disabling of its qtprintsupport dependency.
---
dev-qt/qtwebkit/metadata.xml | 1 +
dev-qt/qtwebkit/qtwebkit-5.3.0_rc.ebuild | 25 ++++++++++++++-----------
dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild | 25 ++++++++++++++-----------
dev-qt/qtwebkit/qtwebkit-5.9999.ebuild | 25 ++++++++++++++-----------
4 files changed, 43 insertions(+), 33 deletions(-)
diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml
index 7676f35..952e31f 100644
--- a/dev-qt/qtwebkit/metadata.xml
+++ b/dev-qt/qtwebkit/metadata.xml
@@ -8,6 +8,7 @@
<flag name="gstreamer">Enable HTML5 audio/video support via
<pkg>media-libs/gstreamer</pkg></flag>
<flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> for XML
parsing</flag>
<flag name="multimedia">Enable HTML5 audio/video support via
<pkg>dev-qt/qtmultimedia</pkg></flag>
+ <flag name="printsupport">Enable printing via
<pkg>dev-qt/qtprintsupport</pkg></flag>
<flag name="qml">Build QML/QtQuick bindings</flag>
<flag name="webp">Add support for WebP image format</flag>
<flag name="widgets">Build various things that depend on
<pkg>dev-qt/qtwidgets</pkg>,
diff --git a/dev-qt/qtwebkit/qtwebkit-5.3.0_rc.ebuild
b/dev-qt/qtwebkit/qtwebkit-5.3.0_rc.ebuild
index 80b12e7..9b5046c 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.3.0_rc.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.3.0_rc.ebuild
@@ -16,9 +16,9 @@ else
KEYWORDS="~amd64"
fi
-# TODO: qtprintsupport, qttestlib, geolocation, orientation/sensors
+# TODO: qttestlib, geolocation, orientation/sensors
-IUSE="gstreamer libxml2 multimedia opengl qml udev webp widgets xslt"
+IUSE="gstreamer libxml2 multimedia opengl printsupport qml udev webp widgets
xslt"
RDEPEND="
dev-db/sqlite:3
@@ -42,6 +42,7 @@ RDEPEND="
libxml2? ( dev-libs/libxml2:2 )
multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[debug=] )
opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
+ printsupport? ( >=dev-qt/qtprintsupport-${PV}:5[debug=] )
qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
udev? ( virtual/udev )
webp? ( media-libs/libwebp:0= )
@@ -64,22 +65,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' \
+ 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' \
+ 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' \
+ 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'
\
+ use printsupport || sed -i -e '/WEBKIT_CONFIG += have_qtprintsupport/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' \
+ 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' \
+ 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' \
+ use widgets || sed -i -e '/SUBDIRS += webkitwidgets/d' \
Source/QtWebKit.pro || die
- use xslt || sed -i -e '/config_libxslt: WEBKIT_CONFIG += xslt/d' \
+ use xslt || sed -i -e '/config_libxslt: WEBKIT_CONFIG +=
xslt/d' \
Tools/qmake/mkspecs/features/features.prf || die
# bug 458222
diff --git a/dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild
b/dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild
index 80b12e7..9b5046c 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild
@@ -16,9 +16,9 @@ else
KEYWORDS="~amd64"
fi
-# TODO: qtprintsupport, qttestlib, geolocation, orientation/sensors
+# TODO: qttestlib, geolocation, orientation/sensors
-IUSE="gstreamer libxml2 multimedia opengl qml udev webp widgets xslt"
+IUSE="gstreamer libxml2 multimedia opengl printsupport qml udev webp widgets
xslt"
RDEPEND="
dev-db/sqlite:3
@@ -42,6 +42,7 @@ RDEPEND="
libxml2? ( dev-libs/libxml2:2 )
multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[debug=] )
opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
+ printsupport? ( >=dev-qt/qtprintsupport-${PV}:5[debug=] )
qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
udev? ( virtual/udev )
webp? ( media-libs/libwebp:0= )
@@ -64,22 +65,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' \
+ 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' \
+ 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' \
+ 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'
\
+ use printsupport || sed -i -e '/WEBKIT_CONFIG += have_qtprintsupport/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' \
+ 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' \
+ 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' \
+ use widgets || sed -i -e '/SUBDIRS += webkitwidgets/d' \
Source/QtWebKit.pro || die
- use xslt || sed -i -e '/config_libxslt: WEBKIT_CONFIG += xslt/d' \
+ use xslt || sed -i -e '/config_libxslt: WEBKIT_CONFIG +=
xslt/d' \
Tools/qmake/mkspecs/features/features.prf || die
# bug 458222
diff --git a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
index 80b12e7..9b5046c 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
@@ -16,9 +16,9 @@ else
KEYWORDS="~amd64"
fi
-# TODO: qtprintsupport, qttestlib, geolocation, orientation/sensors
+# TODO: qttestlib, geolocation, orientation/sensors
-IUSE="gstreamer libxml2 multimedia opengl qml udev webp widgets xslt"
+IUSE="gstreamer libxml2 multimedia opengl printsupport qml udev webp widgets
xslt"
RDEPEND="
dev-db/sqlite:3
@@ -42,6 +42,7 @@ RDEPEND="
libxml2? ( dev-libs/libxml2:2 )
multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[debug=] )
opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
+ printsupport? ( >=dev-qt/qtprintsupport-${PV}:5[debug=] )
qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
udev? ( virtual/udev )
webp? ( media-libs/libwebp:0= )
@@ -64,22 +65,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' \
+ 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' \
+ 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' \
+ 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'
\
+ use printsupport || sed -i -e '/WEBKIT_CONFIG += have_qtprintsupport/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' \
+ 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' \
+ 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' \
+ use widgets || sed -i -e '/SUBDIRS += webkitwidgets/d' \
Source/QtWebKit.pro || die
- use xslt || sed -i -e '/config_libxslt: WEBKIT_CONFIG += xslt/d' \
+ use xslt || sed -i -e '/config_libxslt: WEBKIT_CONFIG +=
xslt/d' \
Tools/qmake/mkspecs/features/features.prf || die
# bug 458222
