kensington 14/10/22 17:39:38 Modified: metadata.xml qtwebkit-5.3.2-r1.ebuild ChangeLog Log: Remove libxml2 and xslt USE flags wrt bug #511594. (Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)
Revision Changes Path 1.7 dev-qt/qtwebkit/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/metadata.xml?rev=1.7&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/metadata.xml?rev=1.7&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/metadata.xml?r1=1.6&r2=1.7 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/metadata.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- metadata.xml 28 Sep 2014 18:24:38 -0000 1.6 +++ metadata.xml 22 Oct 2014 17:39:37 -0000 1.7 @@ -8,12 +8,10 @@ <flag name="gstreamer">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer</pkg></flag> <flag name="gstreamer010">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer:0.10</pkg> instead of :1.0</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> 1.2 dev-qt/qtwebkit/qtwebkit-5.3.2-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/qtwebkit-5.3.2-r1.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/qtwebkit-5.3.2-r1.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/qtwebkit-5.3.2-r1.ebuild?r1=1.1&r2=1.2 Index: qtwebkit-5.3.2-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/qtwebkit-5.3.2-r1.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qtwebkit-5.3.2-r1.ebuild 28 Sep 2014 18:24:38 -0000 1.1 +++ qtwebkit-5.3.2-r1.ebuild 22 Oct 2014 17:39:37 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/qtwebkit-5.3.2-r1.ebuild,v 1.1 2014/09/28 18:24:38 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/qtwebkit-5.3.2-r1.ebuild,v 1.2 2014/10/22 17:39:37 kensington Exp $ EAPI=5 @@ -18,12 +18,14 @@ # 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 @@ 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 @@ 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 @@ 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 1.20 dev-qt/qtwebkit/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/ChangeLog?rev=1.20&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/ChangeLog?rev=1.20&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/ChangeLog?r1=1.19&r2=1.20 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- ChangeLog 28 Sep 2014 18:27:38 -0000 1.19 +++ ChangeLog 22 Oct 2014 17:39:37 -0000 1.20 @@ -1,6 +1,10 @@ # ChangeLog for dev-qt/qtwebkit # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v 1.19 2014/09/28 18:27:38 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v 1.20 2014/10/22 17:39:37 kensington Exp $ + + 22 Oct 2014; Michael Palimaka <kensing...@gentoo.org> metadata.xml, + qtwebkit-5.3.2-r1.ebuild: + Remove libxml2 and xslt USE flags wrt bug #511594. 28 Sep 2014; Davide Pesavento <p...@gentoo.org> +files/qtwebkit-5.3.2-use-gstreamer010.patch:
