pesa 14/09/28 18:24:38 Modified: metadata.xml ChangeLog Added: qtwebkit-5.3.2-r1.ebuild Removed: qtwebkit-5.3.2.ebuild Log: Build against gstreamer:1.0 with USE=gstreamer, and introduce USE=gstreamer010 to build against old gstreamer:0.10. Patch by Uwe L. Korn, fixes bug #523518. (Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)
Revision Changes Path 1.6 dev-qt/qtwebkit/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/metadata.xml?rev=1.6&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/metadata.xml?rev=1.6&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/metadata.xml?r1=1.5&r2=1.6 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/metadata.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- metadata.xml 25 Sep 2014 11:18:13 -0000 1.5 +++ metadata.xml 28 Sep 2014 18:24:38 -0000 1.6 @@ -6,6 +6,8 @@ <flag name="exceptions">Add support for exceptions - like catching them inside the event loop (recommended by upstream)</flag> <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> 1.18 dev-qt/qtwebkit/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/ChangeLog?rev=1.18&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/ChangeLog?rev=1.18&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/ChangeLog?r1=1.17&r2=1.18 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- ChangeLog 25 Sep 2014 11:18:13 -0000 1.17 +++ ChangeLog 28 Sep 2014 18:24:38 -0000 1.18 @@ -1,6 +1,13 @@ # 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.17 2014/09/25 11:18:13 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v 1.18 2014/09/28 18:24:38 pesa Exp $ + +*qtwebkit-5.3.2-r1 (28 Sep 2014) + + 28 Sep 2014; Davide Pesavento <[email protected]> +qtwebkit-5.3.2-r1.ebuild, + -qtwebkit-5.3.2.ebuild, metadata.xml: + Build against gstreamer:1.0 with USE=gstreamer, and introduce USE=gstreamer010 + to build against old gstreamer:0.10. Patch by Uwe L. Korn, fixes bug #523518. 25 Sep 2014; Michael Palimaka <[email protected]> metadata.xml: Remove unused USE flag. 1.1 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.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/qtwebkit-5.3.2-r1.ebuild?rev=1.1&content-type=text/plain Index: qtwebkit-5.3.2-r1.ebuild =================================================================== # 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 $ EAPI=5 PYTHON_COMPAT=( python2_7 ) inherit python-any-r1 qt5-build DESCRIPTION="WebKit rendering library for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == live ]]; then KEYWORDS="" else KEYWORDS="~amd64 ~x86" fi # TODO: qttestlib, geolocation, orientation/sensors IUSE="gstreamer gstreamer010 libxml2 multimedia opengl printsupport qml udev webp xslt" REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )" RDEPEND=" dev-db/sqlite:3 dev-libs/icu:= >=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=] >=dev-qt/qtwidgets-${PV}:5[debug=] media-libs/fontconfig:1.0 media-libs/libpng:0= sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXrender gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gstreamer010? ( dev-libs/glib:2 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} dev-lang/ruby sys-devel/bison sys-devel/flex " src_prepare() { if use gstreamer010; then epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch" 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' \ Tools/qmake/mkspecs/features/features.prf || die 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' \ 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 qt5-build_src_prepare }
