pesa 15/07/23 20:36:44 Modified: metadata.xml ChangeLog Added: qtwebkit-4.10.4.ebuild Log: Import qtwebkit23-2.3.4 from qt overlay as qtwebkit-4.10.4 (version of the installed library). See bug 388207. (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)
Revision Changes Path 1.11 dev-qt/qtwebkit/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/metadata.xml?rev=1.11&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/metadata.xml?rev=1.11&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/metadata.xml?r1=1.10&r2=1.11 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/metadata.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- metadata.xml 17 Jun 2015 15:24:04 -0000 1.10 +++ metadata.xml 23 Jul 2015 20:36:44 -0000 1.11 @@ -5,8 +5,8 @@ <use> <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:1.0</pkg></flag> - <flag name="gstreamer010">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer:0.10</pkg></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 legacy <pkg>media-libs/gstreamer:0.10</pkg></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> 1.40 dev-qt/qtwebkit/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/ChangeLog?rev=1.40&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/ChangeLog?rev=1.40&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/ChangeLog?r1=1.39&r2=1.40 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- ChangeLog 15 Jul 2015 01:37:03 -0000 1.39 +++ ChangeLog 23 Jul 2015 20:36:44 -0000 1.40 @@ -1,6 +1,14 @@ # ChangeLog for dev-qt/qtwebkit # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v 1.39 2015/07/15 01:37:03 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v 1.40 2015/07/23 20:36:44 pesa Exp $ + +*qtwebkit-4.10.4 (23 Jul 2015) + + 23 Jul 2015; Davide Pesavento <p...@gentoo.org> + +files/4.10.4-use-correct-icu-typedef.patch, +qtwebkit-4.10.4.ebuild, + metadata.xml: + Import qtwebkit23-2.3.4 from qt overlay as qtwebkit-4.10.4 (version of the + installed library). See bug 388207. 15 Jul 2015; Davide Pesavento <p...@gentoo.org> qtwebkit-5.4.2.ebuild: Disable rpath wrt bug 466216. 1.1 dev-qt/qtwebkit/qtwebkit-4.10.4.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/qtwebkit-4.10.4.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/qtwebkit-4.10.4.ebuild?rev=1.1&content-type=text/plain Index: qtwebkit-4.10.4.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/qtwebkit-4.10.4.ebuild,v 1.1 2015/07/23 20:36:44 pesa Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 ) inherit eutils multilib python-any-r1 qmake-utils toolchain-funcs multilib-minimal MY_PV=${PV/4.10/2.3} DESCRIPTION="The WebKit module for the Qt toolkit" HOMEPAGE="https://www.qt.io/ http://trac.webkit.org/wiki/QtWebKit"; SRC_URI="mirror://kde/stable/${PN}-2.3/${MY_PV}/src/${PN}-${MY_PV}.tar.gz" LICENSE="|| ( LGPL-2.1 GPL-3 )" SLOT="4" KEYWORDS="~amd64" IUSE="debug +gstreamer" RDEPEND=" >=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}] dev-libs/libxml2:2[${MULTILIB_USEDEP}] dev-libs/libxslt[${MULTILIB_USEDEP}] >=dev-qt/qtcore-4.8.6-r1:4[ssl,${MULTILIB_USEDEP}] >=dev-qt/qtdeclarative-4.8.6-r1:4[${MULTILIB_USEDEP}] >=dev-qt/qtgui-4.8.6-r1:4[${MULTILIB_USEDEP}] >=dev-qt/qtopengl-4.8.6-r1:4[${MULTILIB_USEDEP}] >=dev-qt/qtscript-4.8.6-r1:4[${MULTILIB_USEDEP}] >=dev-qt/qtsql-4.8.6-r1:4[sqlite,${MULTILIB_USEDEP}] >=media-libs/fontconfig-2.10.2-r1[${MULTILIB_USEDEP}] media-libs/libpng:0=[${MULTILIB_USEDEP}] >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] virtual/jpeg:0[${MULTILIB_USEDEP}] virtual/libudev:=[${MULTILIB_USEDEP}] >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] x11-libs/libX11[${MULTILIB_USEDEP}] x11-libs/libXrender[${MULTILIB_USEDEP}] gstreamer? ( dev-libs/glib:2[${MULTILIB_USEDEP}] media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] ) " DEPEND="${RDEPEND} ${PYTHON_DEPS} dev-lang/perl dev-lang/ruby dev-util/gperf sys-devel/bison sys-devel/flex virtual/perl-Digest-MD5 virtual/perl-File-Spec virtual/perl-Getopt-Long " S=${WORKDIR} PATCHES=( "${FILESDIR}/${PV}-use-correct-icu-typedef.patch" ) src_prepare() { # examples cause a sandbox violation (bug 458222) sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die # respect CXXFLAGS sed -i -e '/QMAKE_CXXFLAGS_RELEASE.*=/d' \ Source/WTF/WTF.pro \ Source/JavaScriptCore/Target.pri || die # apply patches [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}" epatch_user } multilib_src_compile() { local -x \ QTDIR=${EPREFIX}/usr/$(get_libdir)/qt4 \ WEBKITOUTPUTDIR=${BUILD_DIR} local myconf=( "${S}"/Tools/Scripts/build-webkit --qt # tell the build system where to find the qmake binary for the current ABI --qmake="$(qt4_get_bindir)"/qmake --qmakearg="CONFIG+=nostrip DEFINES+=HAVE_QTTESTLIB=0" --makeargs="${MAKEOPTS}" --$(usex debug debug release) --$(usex gstreamer video no-video) # disable WebKit2 since it requires Qt5 --no-webkit2 # prevent automagic dependency on qt-mobility (bug 547350) --no-geolocation --no-device-orientation --no-orientation-events # copied from eqmake4 QMAKE_AR="'$(tc-getAR) cqs'" QMAKE_CC="'$(tc-getCC)'" QMAKE_CXX="'$(tc-getCXX)'" QMAKE_LINK="'$(tc-getCXX)'" QMAKE_LINK_C="'$(tc-getCC)'" QMAKE_OBJCOPY="'$(tc-getOBJCOPY)'" QMAKE_RANLIB= QMAKE_STRIP= QMAKE_CFLAGS="'${CFLAGS}'" QMAKE_CFLAGS_RELEASE= QMAKE_CFLAGS_DEBUG= QMAKE_CXXFLAGS="'${CXXFLAGS}'" QMAKE_CXXFLAGS_RELEASE= QMAKE_CXXFLAGS_DEBUG= QMAKE_LFLAGS="'${LDFLAGS}'" QMAKE_LFLAGS_RELEASE= QMAKE_LFLAGS_DEBUG= ) echo "${myconf[@]}" "${myconf[@]}" || die } multilib_src_install() { emake INSTALL_ROOT="${D}" install -C $(usex debug Debug Release) # move pkgconfig file to the correct location mv "${ED}"/usr/$(get_libdir){/qt4/pkgconfig,} || die }
