[gentoo-commits] gentoo-x86 commit in x11-libs/qt-webkit: metadata.xml qt-webkit-4.8.0-r1.ebuild ChangeLog

[Davide Pesavento (pesa)]

pesa        12/02/24 19:02:42

  Modified:             metadata.xml ChangeLog
  Added:                qt-webkit-4.8.0-r1.ebuild
  Log:
  Add proper support for HTML5 audio/video via USE=gstreamer (bug #368047). Remove phonon deps, it's nowhere used in QtWebKit. Remove dbus and kde USE flags, no longer needed.
  
  (Portage version: 2.2.0_alpha89/cvs/Linux x86_64)

Revision  Changes    Path
1.6                  x11-libs/qt-webkit/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/metadata.xml?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/metadata.xml?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/metadata.xml?r1=1.5&r2=1.6

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/metadata.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- metadata.xml	29 Jan 2012 17:10:32 -0000	1.5
+++ metadata.xml	24 Feb 2012 19:02:42 -0000	1.6
@@ -3,13 +3,12 @@
 <pkgmetadata>
 	<herd>qt</herd>
 	<use>
-		<flag name='exceptions'>Add support for exceptions - like catching them
+		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by Nokia)</flag>
-		<flag name='kde'>
-			Select <pkg>media-sound/phonon</pkg> as phonon variant needed for kde
-		</flag>
-		<flag name="jit">Enables JIT for Javascript usage inside Qt</flag>
-		<flag name='c++0x'>Build Qt using the C++11 standard</flag>
-		<flag name='qpa'>Build a window system agnostic implementation of Qt</flag>
+		<flag name="gstreamer">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer</pkg></flag>
+		<flag name="kde">Select <pkg>media-sound/phonon</pkg> as phonon variant needed for kde</flag>
+		<flag name="jit">Enable JavaScriptCore just-in-time compiler for faster JavaScript execution</flag>
+		<flag name="c++0x">Build Qt using the C++11 standard</flag>
+		<flag name="qpa">Build a window system agnostic implementation of Qt</flag>
 	</use>
 </pkgmetadata>



1.132                x11-libs/qt-webkit/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/ChangeLog?rev=1.132&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/ChangeLog?rev=1.132&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/ChangeLog?r1=1.131&r2=1.132

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- ChangeLog	29 Jan 2012 23:36:31 -0000	1.131
+++ ChangeLog	24 Feb 2012 19:02:42 -0000	1.132
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/qt-webkit
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.131 2012/01/29 23:36:31 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.132 2012/02/24 19:02:42 pesa Exp $
+
+*qt-webkit-4.8.0-r1 (24 Feb 2012)
+
+  24 Feb 2012; Davide Pesavento <pesa@g.o> +qt-webkit-4.8.0-r1.ebuild,
+  metadata.xml:
+  Add proper support for HTML5 audio/video via USE=gstreamer (bug #368047).
+  Remove phonon deps, it's nowhere used in QtWebKit. Remove dbus and kde USE
+  flags, no longer needed.
 
   29 Jan 2012; Joseph Jezak <josejx@g.o> qt-webkit-4.7.4.ebuild:
   Marked ppc ppc64 stable for bug #390963.



1.1                  x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild?rev=1.1&content-type=text/plain

Index: qt-webkit-4.8.0-r1.ebuild
===================================================================
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild,v 1.1 2012/02/24 19:02:42 pesa Exp $

EAPI="3"
inherit qt4-build flag-o-matic toolchain-funcs

DESCRIPTION="The WebKit module for the Qt toolkit"
SLOT="4"
KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="+gstreamer +jit"

DEPEND="
	dev-db/sqlite:3
	x11-libs/libXrender
	~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=,ssl]
	~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=]
	~x11-libs/qt-xmlpatterns-${PV}[aqua=,c++0x=,qpa=,debug=]
	gstreamer? (
		dev-libs/glib:2
		media-libs/gstreamer:0.10
		media-libs/gst-plugins-base:0.10
	)"
RDEPEND="${DEPEND}"

PATCHES=( "${FILESDIR}/${P}-c++0x-fix.patch" )

pkg_setup() {
	QT4_TARGET_DIRECTORIES="
		src/3rdparty/webkit/Source/JavaScriptCore
		src/3rdparty/webkit/Source/WebCore
		src/3rdparty/webkit/Source/WebKit/qt
		tools/designer/src/plugins/qwebview"

	QT4_EXTRACT_DIRECTORIES="
		include
		src
		tools"

	QCONFIG_ADD="webkit"
	QCONFIG_DEFINE="QT_WEBKIT"

	qt4-build_pkg_setup
}

src_prepare() {
	[[ $(tc-arch) == "ppc64" ]] && append-flags -mminimal-toc #241900
	use c++0x && append-cxxflags -fpermissive

	sed -i -e '/QMAKE_CXXFLAGS[[:blank:]]*+=/s:-Werror::g' \
		src/3rdparty/webkit/Source/WebKit.pri || die

	qt4-build_src_prepare
}

src_configure() {
	myconf+="
		-webkit -system-sqlite
		$(qt_use jit javascript-jit)
		-DENABLE_VIDEO=$(use gstreamer && echo 1 || echo 0)
		-DGST_DISABLE_DEPRECATED"

	qt4-build_src_configure
}