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

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

From: "Michael Palimaka" <kensington@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/
Date: Wed, 22 Oct 2014 17:27:16 +0000 (UTC)	[thread overview]
Message-ID: <1413998831.a4aa2ab527a53d34537b9deaa89333e83611e365.kensington@gentoo> (raw)

commit:     a4aa2ab527a53d34537b9deaa89333e83611e365
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 22 17:19:40 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Oct 22 17:27:11 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=a4aa2ab5

[dev-qt/qtwebkit] Remove libxml2 and xslt USE flags wrt bug #511594.

Package-Manager: portage-2.2.12

---
 dev-qt/qtwebkit/metadata.xml               |  2 --
 dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild   | 13 +++----------
 dev-qt/qtwebkit/qtwebkit-5.4.0_beta.ebuild | 13 +++----------
 dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild   | 13 +++----------
 dev-qt/qtwebkit/qtwebkit-5.9999.ebuild     | 13 +++----------
 5 files changed, 12 insertions(+), 42 deletions(-)

diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml
index 0d4bcf5..b8a1666 100644
--- a/dev-qt/qtwebkit/metadata.xml
+++ b/dev-qt/qtwebkit/metadata.xml
@@ -7,12 +7,10 @@
 			inside the event loop (recommended by Nokia)</flag>
 		<flag name="gstreamer">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer:1.0</pkg></flag>
 		<flag name="gstreamer010">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer:0.10</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="xslt">Enable XSLT support</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt-project.org/</bugs-to>

diff --git a/dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild
index f59c599..cc1567b 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild
@@ -18,12 +18,14 @@ fi
 
 # TODO: qttestlib, geolocation, orientation/sensors
 
-IUSE="gstreamer gstreamer010 libxml2 multimedia opengl printsupport qml udev webp xslt"
+IUSE="gstreamer gstreamer010 multimedia opengl printsupport qml udev webp"
 REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )"
 
 RDEPEND="
 	dev-db/sqlite:3
 	dev-libs/icu:=
+	dev-libs/libxml2:2
+	dev-libs/libxslt
 	>=dev-qt/qtcore-${PV}:5[debug=,icu]
 	>=dev-qt/qtgui-${PV}:5[debug=]
 	>=dev-qt/qtnetwork-${PV}:5[debug=]
@@ -47,17 +49,12 @@ RDEPEND="
 		media-libs/gstreamer:0.10
 		media-libs/gst-plugins-base:0.10
 	)
-	libxml2? ( dev-libs/libxml2:2 )
 	multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[debug=,widgets] )
 	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= )
-	xslt? (
-		libxml2? ( dev-libs/libxslt )
-		!libxml2? ( >=dev-qt/qtxmlpatterns-${PV}:5[debug=] )
-	)
 "
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
@@ -72,8 +69,6 @@ src_prepare() {
 	elif ! use gstreamer; then
 		epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
 	fi
-	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' \
@@ -86,8 +81,6 @@ src_prepare() {
 		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 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.4.0_beta.ebuild b/dev-qt/qtwebkit/qtwebkit-5.4.0_beta.ebuild
index f59c599..cc1567b 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.4.0_beta.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.4.0_beta.ebuild
@@ -18,12 +18,14 @@ fi
 
 # TODO: qttestlib, geolocation, orientation/sensors
 
-IUSE="gstreamer gstreamer010 libxml2 multimedia opengl printsupport qml udev webp xslt"
+IUSE="gstreamer gstreamer010 multimedia opengl printsupport qml udev webp"
 REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )"
 
 RDEPEND="
 	dev-db/sqlite:3
 	dev-libs/icu:=
+	dev-libs/libxml2:2
+	dev-libs/libxslt
 	>=dev-qt/qtcore-${PV}:5[debug=,icu]
 	>=dev-qt/qtgui-${PV}:5[debug=]
 	>=dev-qt/qtnetwork-${PV}:5[debug=]
@@ -47,17 +49,12 @@ RDEPEND="
 		media-libs/gstreamer:0.10
 		media-libs/gst-plugins-base:0.10
 	)
-	libxml2? ( dev-libs/libxml2:2 )
 	multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[debug=,widgets] )
 	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= )
-	xslt? (
-		libxml2? ( dev-libs/libxslt )
-		!libxml2? ( >=dev-qt/qtxmlpatterns-${PV}:5[debug=] )
-	)
 "
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
@@ -72,8 +69,6 @@ src_prepare() {
 	elif ! use gstreamer; then
 		epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
 	fi
-	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' \
@@ -86,8 +81,6 @@ src_prepare() {
 		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 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.4.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild
index f59c599..cc1567b 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild
@@ -18,12 +18,14 @@ fi
 
 # TODO: qttestlib, geolocation, orientation/sensors
 
-IUSE="gstreamer gstreamer010 libxml2 multimedia opengl printsupport qml udev webp xslt"
+IUSE="gstreamer gstreamer010 multimedia opengl printsupport qml udev webp"
 REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )"
 
 RDEPEND="
 	dev-db/sqlite:3
 	dev-libs/icu:=
+	dev-libs/libxml2:2
+	dev-libs/libxslt
 	>=dev-qt/qtcore-${PV}:5[debug=,icu]
 	>=dev-qt/qtgui-${PV}:5[debug=]
 	>=dev-qt/qtnetwork-${PV}:5[debug=]
@@ -47,17 +49,12 @@ RDEPEND="
 		media-libs/gstreamer:0.10
 		media-libs/gst-plugins-base:0.10
 	)
-	libxml2? ( dev-libs/libxml2:2 )
 	multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[debug=,widgets] )
 	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= )
-	xslt? (
-		libxml2? ( dev-libs/libxslt )
-		!libxml2? ( >=dev-qt/qtxmlpatterns-${PV}:5[debug=] )
-	)
 "
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
@@ -72,8 +69,6 @@ src_prepare() {
 	elif ! use gstreamer; then
 		epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
 	fi
-	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' \
@@ -86,8 +81,6 @@ src_prepare() {
 		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 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 f59c599..cc1567b 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
@@ -18,12 +18,14 @@ fi
 
 # TODO: qttestlib, geolocation, orientation/sensors
 
-IUSE="gstreamer gstreamer010 libxml2 multimedia opengl printsupport qml udev webp xslt"
+IUSE="gstreamer gstreamer010 multimedia opengl printsupport qml udev webp"
 REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )"
 
 RDEPEND="
 	dev-db/sqlite:3
 	dev-libs/icu:=
+	dev-libs/libxml2:2
+	dev-libs/libxslt
 	>=dev-qt/qtcore-${PV}:5[debug=,icu]
 	>=dev-qt/qtgui-${PV}:5[debug=]
 	>=dev-qt/qtnetwork-${PV}:5[debug=]
@@ -47,17 +49,12 @@ RDEPEND="
 		media-libs/gstreamer:0.10
 		media-libs/gst-plugins-base:0.10
 	)
-	libxml2? ( dev-libs/libxml2:2 )
 	multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[debug=,widgets] )
 	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= )
-	xslt? (
-		libxml2? ( dev-libs/libxslt )
-		!libxml2? ( >=dev-qt/qtxmlpatterns-${PV}:5[debug=] )
-	)
 "
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
@@ -72,8 +69,6 @@ src_prepare() {
 	elif ! use gstreamer; then
 		epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
 	fi
-	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' \
@@ -86,8 +81,6 @@ src_prepare() {
 		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 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

next             reply	other threads:[~2014-10-22 17:27 UTC|newest]

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-22 17:27 Michael Palimaka [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-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-05-18 20:05 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:0d4bcf5 dfblob:b8a1666 dfblob:f59c599 dfblob:cc1567b
dfblob:f59c599 dfblob:cc1567b dfblob:f59c599 dfblob:cc1567b
dfblob:f59c599 dfblob:cc1567b )
 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=1413998831.a4aa2ab527a53d34537b9deaa89333e83611e365.kensington@gentoo \
    --to=kensington@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