Gentoo Archives: gentoo-commits

From: "Alex Alexander (wired)" <wired@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/qt-webkit: metadata.xml ChangeLog qt-webkit-4.8.0.ebuild
Date: Sun, 29 Jan 2012 17:10:43
Message-Id: 20120129171032.EA64420034@flycatcher.gentoo.org
1 wired 12/01/29 17:10:32
2
3 Modified: metadata.xml ChangeLog
4 Added: qt-webkit-4.8.0.ebuild
5 Log:
6 version bump
7
8 (Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.5 x11-libs/qt-webkit/metadata.xml
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/metadata.xml?rev=1.5&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/metadata.xml?rev=1.5&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/metadata.xml?r1=1.4&r2=1.5
16
17 Index: metadata.xml
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/metadata.xml,v
20 retrieving revision 1.4
21 retrieving revision 1.5
22 diff -u -r1.4 -r1.5
23 --- metadata.xml 19 Nov 2010 02:58:09 -0000 1.4
24 +++ metadata.xml 29 Jan 2012 17:10:32 -0000 1.5
25 @@ -9,5 +9,7 @@
26 Select <pkg>media-sound/phonon</pkg> as phonon variant needed for kde
27 </flag>
28 <flag name="jit">Enables JIT for Javascript usage inside Qt</flag>
29 + <flag name='c++0x'>Build Qt using the C++11 standard</flag>
30 + <flag name='qpa'>Build a window system agnostic implementation of Qt</flag>
31 </use>
32 </pkgmetadata>
33
34
35
36 1.130 x11-libs/qt-webkit/ChangeLog
37
38 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/ChangeLog?rev=1.130&view=markup
39 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/ChangeLog?rev=1.130&content-type=text/plain
40 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/ChangeLog?r1=1.129&r2=1.130
41
42 Index: ChangeLog
43 ===================================================================
44 RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v
45 retrieving revision 1.129
46 retrieving revision 1.130
47 diff -u -r1.129 -r1.130
48 --- ChangeLog 3 Jan 2012 08:56:26 -0000 1.129
49 +++ ChangeLog 29 Jan 2012 17:10:32 -0000 1.130
50 @@ -1,6 +1,12 @@
51 # ChangeLog for x11-libs/qt-webkit
52 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
53 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.129 2012/01/03 08:56:26 wired Exp $
54 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.130 2012/01/29 17:10:32 wired Exp $
55 +
56 +*qt-webkit-4.8.0 (29 Jan 2012)
57 +
58 + 29 Jan 2012; Alex Alexander <wired@g.o> +qt-webkit-4.8.0.ebuild,
59 + +files/qt-webkit-4.8.0-c++0x-fix.patch, metadata.xml:
60 + version bump
61
62 03 Jan 2012; Alex Alexander <wired@g.o> qt-webkit-4.6.3-r1.ebuild,
63 qt-webkit-4.6.3-r2.ebuild, qt-webkit-4.7.2.ebuild, qt-webkit-4.7.4.ebuild:
64
65
66
67 1.1 x11-libs/qt-webkit/qt-webkit-4.8.0.ebuild
68
69 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.0.ebuild?rev=1.1&view=markup
70 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.0.ebuild?rev=1.1&content-type=text/plain
71
72 Index: qt-webkit-4.8.0.ebuild
73 ===================================================================
74 # Copyright 1999-2012 Gentoo Foundation
75 # Distributed under the terms of the GNU General Public License v2
76 # $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.0.ebuild,v 1.1 2012/01/29 17:10:32 wired Exp $
77
78 EAPI="3"
79 inherit qt4-build
80
81 DESCRIPTION="The Webkit module for the Qt toolkit"
82 SLOT="4"
83 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"
84 IUSE="dbus +jit kde"
85
86 DEPEND="
87 dev-db/sqlite:3
88 ~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=,ssl]
89 ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,dbus?,debug=]
90 ~x11-libs/qt-xmlpatterns-${PV}[aqua=,c++0x=,qpa=,debug=]
91 dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,c++0x=,qpa=,debug=] )
92 !kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=,c++0x=,qpa=,dbus=,debug=]
93 media-libs/phonon[aqua=] ) )
94 kde? ( || ( media-libs/phonon[aqua=] ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=,dbus=,debug=] ) )"
95 RDEPEND="${DEPEND}"
96
97 PATCHES=( "${FILESDIR}/${P}-c++0x-fix.patch" )
98
99 pkg_setup() {
100 QT4_TARGET_DIRECTORIES="
101 src/3rdparty/webkit/Source/JavaScriptCore/
102 src/3rdparty/webkit/Source/WebCore/
103 src/3rdparty/webkit/Source/WebKit/qt/
104 tools/designer/src/plugins/qwebview"
105
106 QT4_EXTRACT_DIRECTORIES="
107 include/
108 src/
109 tools/"
110
111 QCONFIG_ADD="webkit"
112 QCONFIG_DEFINE="QT_WEBKIT"
113
114 qt4-build_pkg_setup
115 }
116
117 src_prepare() {
118 [[ $(tc-arch) == "ppc64" ]] && append-flags -mminimal-toc #241900
119 use c++0x && append-flags -fpermissive
120 sed -i -e "/Werror/d" "${S}/src/3rdparty/webkit/Source/WebKit.pri" || die
121 qt4-build_src_prepare
122 }
123
124 src_configure() {
125 # won't build with gcc 4.6 without this for now
126 myconf="${myconf}
127 -webkit -system-sqlite -no-gtkstyle
128 -D GST_DISABLE_DEPRECATED
129 $(qt_use jit javascript-jit)
130 $(qt_use dbus qdbus)"
131 qt4-build_src_configure
132 }