[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Davide Pesavento" <pesa@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/
Date: Sun, 18 May 2014 20:05:14 +0000 (UTC)	[thread overview]
Message-ID: <1400441773.9990afda36c5d276b01dbf0533e8d2d30069087d.pesa@gentoo> (raw)

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

next             reply	other threads:[~2014-05-18 20:05 UTC|newest]

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-18 20:05 Davide Pesavento [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-05-24  9:08 [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/ Andreas Sturmlechner
2020-04-03 20:03 Andreas Sturmlechner
2020-03-11 17:13 Andreas Sturmlechner
2020-01-14 22:55 Andreas Sturmlechner
2020-01-04 12:45 Andreas Sturmlechner
2020-01-04 12:45 Andreas Sturmlechner
2020-01-04 12:45 Andreas Sturmlechner
2020-01-04 12:45 Andreas Sturmlechner
2019-10-23  6:35 Andreas Sturmlechner
2019-07-06 10:28 Andreas Sturmlechner
2018-06-18 13:34 Jimi Huotari
2017-10-07  6:09 Michael Palimaka
2017-10-07  3:38 Michael Palimaka
2017-10-07  3:38 Michael Palimaka
2017-07-23 11:57 Michael Palimaka
2017-07-23 11:35 Michael Palimaka
2017-07-23 10:30 Michael Palimaka
2017-07-23  8:36 Michael Palimaka
2017-06-18  7:54 Michael Palimaka
2017-06-11 13:09 Michael Palimaka
2016-04-23 17:20 Michael Palimaka
2016-04-09 15:48 Davide Pesavento
2016-04-06 15:00 Davide Pesavento
2016-04-06 15:00 Davide Pesavento
2016-04-02 13:54 Michael Palimaka
2016-04-01 15:26 Michael Palimaka
2016-03-17  9:43 Michael Palimaka
2016-01-20 17:35 Davide Pesavento
2016-01-19 19:19 Davide Pesavento
2015-10-17 17:02 Michael Palimaka
2015-10-17 17:02 Michael Palimaka
2015-10-17 17:02 Michael Palimaka
2015-07-10 14:43 Davide Pesavento
2015-06-23 12:49 Vladimir Smirnov
2015-04-26 23:12 Davide Pesavento
2015-03-26  1:49 Davide Pesavento
2015-03-15 14:44 Michael Palimaka
2015-03-05  9:49 Michael Palimaka
2015-01-11 18:17 Davide Pesavento
2014-10-22 17:27 Michael Palimaka
2014-09-28 17:40 Davide Pesavento
2014-09-02  0:08 Davide Pesavento
2014-06-10  7:58 Michael Palimaka
2014-05-26 13:35 Davide Pesavento
2014-02-26 11:39 Michael Palimaka
2013-10-20 23:03 Davide Pesavento
2013-08-08 10:53 Michael Palimaka
2013-08-06  8:04 Michael Palimaka
2013-04-07 23:11 Davide Pesavento

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:7676f35 dfblob:952e31f dfblob:80b12e7 dfblob:9b5046c
dfblob:80b12e7 dfblob:9b5046c dfblob:80b12e7 dfblob:9b5046c )
 OR (
bs:"[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1400441773.9990afda36c5d276b01dbf0533e8d2d30069087d.pesa@gentoo \
    --to=pesa@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox