Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Nirbheek Chauhan (nirbheek)" <nirbheek@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-libs/webkit-gtk: metadata.xml ChangeLog webkit-gtk-1.6.1-r300.ebuild webkit-gtk-1.6.1-r200.ebuild
Date: Fri, 30 Sep 2011 13:52:45
Message-Id: 20110930135233.5095F20036@flycatcher.gentoo.org
1 nirbheek 11/09/30 13:52:33
2
3 Modified: metadata.xml ChangeLog
4 Added: webkit-gtk-1.6.1-r300.ebuild
5 webkit-gtk-1.6.1-r200.ebuild
6 Log:
7 Bump to 1.6.1, optional partly-broken webgl support, build and install API docs with USE=doc, generate an xz tarball and use that
8
9 (Portage version: 2.2.0_alpha51/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.12 net-libs/webkit-gtk/metadata.xml
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/metadata.xml?rev=1.12&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/metadata.xml?rev=1.12&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/metadata.xml?r1=1.11&r2=1.12
17
18 Index: metadata.xml
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/metadata.xml,v
21 retrieving revision 1.11
22 retrieving revision 1.12
23 diff -u -r1.11 -r1.12
24 --- metadata.xml 4 Jan 2011 21:54:01 -0000 1.11
25 +++ metadata.xml 30 Sep 2011 13:52:33 -0000 1.12
26 @@ -5,8 +5,10 @@
27 <use>
28 <flag name="coverage">Enable code coverage support</flag>
29 <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
30 - for introspection</flag>
31 + for introspection</flag>
32 <flag name="jit">Enable JIT javascript compiler (disabling it will
33 - cause performance penalty)</flag>
34 + cause performance penalty)</flag>
35 + <flag name="webgl">Build support for the WebGL HTML API using
36 + <pkg>virtual/opengl</pkg></flag>
37 </use>
38 </pkgmetadata>
39
40
41
42 1.122 net-libs/webkit-gtk/ChangeLog
43
44 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/ChangeLog?rev=1.122&view=markup
45 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/ChangeLog?rev=1.122&content-type=text/plain
46 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/ChangeLog?r1=1.121&r2=1.122
47
48 Index: ChangeLog
49 ===================================================================
50 RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v
51 retrieving revision 1.121
52 retrieving revision 1.122
53 diff -u -r1.121 -r1.122
54 --- ChangeLog 24 Sep 2011 13:53:13 -0000 1.121
55 +++ ChangeLog 30 Sep 2011 13:52:33 -0000 1.122
56 @@ -1,6 +1,14 @@
57 # ChangeLog for net-libs/webkit-gtk
58 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
59 -# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.121 2011/09/24 13:53:13 pacho Exp $
60 +# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.122 2011/09/30 13:52:33 nirbheek Exp $
61 +
62 +*webkit-gtk-1.6.1-r300 (30 Sep 2011)
63 +*webkit-gtk-1.6.1-r200 (30 Sep 2011)
64 +
65 + 30 Sep 2011; Nirbheek Chauhan <nirbheek@g.o>
66 + +webkit-gtk-1.6.1-r200.ebuild, +webkit-gtk-1.6.1-r300.ebuild, metadata.xml:
67 + Bump to 1.6.1, optional partly-broken webgl support, build and install API
68 + docs with USE=doc, generate an xz tarball and use that
69
70 24 Sep 2011; Pacho Ramos <pacho@g.o> webkit-gtk-1.4.3-r300.ebuild,
71 -files/webkit-gtk-1.4.3-underlinking.patch:
72
73
74
75 1.1 net-libs/webkit-gtk/webkit-gtk-1.6.1-r300.ebuild
76
77 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.1-r300.ebuild?rev=1.1&view=markup
78 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.1-r300.ebuild?rev=1.1&content-type=text/plain
79
80 Index: webkit-gtk-1.6.1-r300.ebuild
81 ===================================================================
82 # Copyright 1999-2011 Gentoo Foundation
83 # Distributed under the terms of the GNU General Public License v2
84 # $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.1-r300.ebuild,v 1.1 2011/09/30 13:52:33 nirbheek Exp $
85
86 EAPI="4"
87
88 inherit autotools eutils flag-o-matic eutils virtualx
89
90 MY_P="webkit-${PV}"
91 DESCRIPTION="Open source web browser engine"
92 HOMEPAGE="http://www.webkitgtk.org/"
93 # Upstream is still shipping silly gzip files
94 #SRC_URI="http://www.webkitgtk.org/${MY_P}.tar.gz"
95 SRC_URI="mirror://gentoo/${P}.tar.xz"
96
97 LICENSE="LGPL-2 LGPL-2.1 BSD"
98 SLOT="3"
99 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
100 ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
101 # geoclue
102 IUSE="aqua coverage debug doc +gstreamer +introspection +jit spell webgl"
103 # bug 372493
104 REQUIRED_USE="introspection? ( gstreamer )"
105
106 # use sqlite, svg by default
107 # dependency on >=x11-libs/gtk+-2.13:2 for gail
108 # Aqua support in gtk3 is untested
109 # gtk2 is needed for plugin process support
110 RDEPEND="
111 dev-libs/libxml2:2
112 dev-libs/libxslt
113 virtual/jpeg
114 >=media-libs/libpng-1.4:0
115 >=x11-libs/cairo-1.10
116 >=dev-libs/glib-2.27.90:2
117 >=x11-libs/gtk+-3.0:3[aqua=,introspection?]
118 >=dev-libs/icu-3.8.1-r1
119 >=net-libs/libsoup-2.33.6:2.4[introspection?]
120 dev-db/sqlite:3
121 >=x11-libs/pango-1.12
122 x11-libs/libXrender
123
124 gstreamer? (
125 media-libs/gstreamer:0.10
126 >=media-libs/gst-plugins-base-0.10.30:0.10 )
127
128 introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
129
130 spell? ( >=app-text/enchant-0.22 )
131
132 webgl? ( virtual/opengl )
133 "
134 DEPEND="${RDEPEND}
135 >=sys-devel/flex-2.5.33
136 sys-devel/gettext
137 virtual/yacc
138 dev-util/gperf
139 dev-util/pkgconfig
140 dev-util/gtk-doc-am
141 doc? ( >=dev-util/gtk-doc-1.10 )
142 test? ( x11-themes/hicolor-icon-theme )
143 "
144
145 S="${WORKDIR}/${MY_P}"
146
147 src_prepare() {
148 DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install
149
150 # FIXME: Fix unaligned accesses on ARM, IA64 and SPARC
151 # https://bugs.webkit.org/show_bug.cgi?id=19775
152 use sparc && epatch "${FILESDIR}"/${PN}-1.2.3-fix-pool-sparc.patch
153
154 # intermediate MacPorts hack while upstream bug is not fixed properly
155 # https://bugs.webkit.org/show_bug.cgi?id=28727
156 use aqua && epatch "${FILESDIR}"/${PN}-1.2.5-darwin-quartz.patch
157
158 # Fix build on Darwin8 (10.4 Tiger)
159 # XXX: Fails to apply
160 #epatch "${FILESDIR}"/${PN}-1.2.5-darwin8.patch
161
162 # Don't force -O2
163 sed -i 's/-O2//g' "${S}"/configure.ac
164
165 # Don't build tests if not needed, part of bug #343249
166 # XXX: Fails to apply
167 #epatch "${FILESDIR}/${PN}-1.2.5-tests-build.patch"
168
169 # Required for webgl; https://bugs.webkit.org/show_bug.cgi?id=69085
170 mkdir -p DerivedSources/ANGLE
171
172 # Prevent maintainer mode from being triggered during make
173 AT_M4DIR=Source/autotools eautoreconf
174 }
175
176 src_configure() {
177 # It doesn't compile on alpha without this in LDFLAGS
178 use alpha && append-ldflags "-Wl,--no-relax"
179
180 # Sigbuses on SPARC with mcpu and co.
181 use sparc && filter-flags "-mcpu=*" "-mvis" "-mtune=*"
182
183 # https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
184 use ppc64 && append-flags "-mminimal-toc"
185
186 local myconf
187
188 # XXX: Check Web Audio support
189 # XXX: files for generating DerivedSources/WebKit2/* are missing, see
190 # https://bugs.webkit.org/show_bug.cgi?id=66527
191 myconf="
192 $(use_enable coverage)
193 $(use_enable debug)
194 $(use_enable debug debug-features)
195 $(use_enable doc gtk-doc)
196 $(use_enable spell spellcheck)
197 $(use_enable introspection)
198 $(use_enable gstreamer video)
199 $(use_enable jit)
200 $(use_enable webgl)
201 --enable-web-sockets
202 --with-gtk=3.0
203 --disable-webkit2
204 $(use aqua && echo "--with-font-backend=pango --with-target=quartz")"
205 # Aqua support in gtk3 is untested
206
207 econf ${myconf}
208 }
209
210 src_compile() {
211 # Fix sandbox error with USE="introspection"
212 # https://bugs.webkit.org/show_bug.cgi?id=35471
213 emake XDG_DATA_HOME="${T}/.local"
214
215 # ${PN} neither ships, nor builds documentation on its own
216 if use doc; then
217 emake -C "${S}/Source/WebKit/gtk/docs"
218 fi
219 }
220
221 src_test() {
222 unset DISPLAY
223 # Tests need virtualx, bug #294691, bug #310695
224 # Set XDG_DATA_HOME for introspection tools, bug #323669
225 # Parallel tests sometimes fail
226 Xemake -j1 check XDG_DATA_HOME="${T}/.local"
227 }
228
229 src_install() {
230 default
231
232 # ${PN} doesn't install documentation on its own
233 if use doc; then
234 emake DESTDIR=${D} -C "${S}/Source/WebKit/gtk/docs" install
235 fi
236
237 newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk
238 newdoc Source/WebKit/gtk/po/ChangeLog ChangeLog.gtk-po
239 newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore
240 newdoc Source/WebCore/ChangeLog ChangeLog.WebCore
241
242 # Remove .la files
243 find "${D}" -name '*.la' -exec rm -f '{}' +
244 }
245
246
247
248 1.1 net-libs/webkit-gtk/webkit-gtk-1.6.1-r200.ebuild
249
250 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.1-r200.ebuild?rev=1.1&view=markup
251 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.1-r200.ebuild?rev=1.1&content-type=text/plain
252
253 Index: webkit-gtk-1.6.1-r200.ebuild
254 ===================================================================
255 # Copyright 1999-2011 Gentoo Foundation
256 # Distributed under the terms of the GNU General Public License v2
257 # $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.1-r200.ebuild,v 1.1 2011/09/30 13:52:33 nirbheek Exp $
258
259 EAPI="4"
260
261 inherit autotools eutils flag-o-matic eutils virtualx
262
263 MY_P="webkit-${PV}"
264 DESCRIPTION="Open source web browser engine"
265 HOMEPAGE="http://www.webkitgtk.org/"
266 # Upstream is still shipping silly gzip files
267 #SRC_URI="http://www.webkitgtk.org/${MY_P}.tar.gz"
268 SRC_URI="mirror://gentoo/${P}.tar.xz"
269
270 LICENSE="LGPL-2 LGPL-2.1 BSD"
271 SLOT="2"
272 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
273 ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
274 # geoclue
275 IUSE="aqua coverage debug +gstreamer +introspection +jit spell webgl"
276 # bug 372493
277 REQUIRED_USE="introspection? ( gstreamer )"
278
279 # use sqlite, svg by default
280 # dependency on >=x11-libs/gtk+-2.13:2 for gail
281 RDEPEND="
282 dev-libs/libxml2:2
283 dev-libs/libxslt
284 virtual/jpeg
285 >=media-libs/libpng-1.4:0
286 >=x11-libs/cairo-1.10
287 >=dev-libs/glib-2.27.90:2
288 >=x11-libs/gtk+-2.13:2[aqua=,introspection?]
289 >=dev-libs/icu-3.8.1-r1
290 >=net-libs/libsoup-2.33.6:2.4[introspection?]
291 dev-db/sqlite:3
292 >=x11-libs/pango-1.12
293 x11-libs/libXrender
294
295 gstreamer? (
296 media-libs/gstreamer:0.10
297 >=media-libs/gst-plugins-base-0.10.30:0.10 )
298
299 introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
300
301 spell? ( >=app-text/enchant-0.22 )
302
303 webgl? ( virtual/opengl )
304 "
305 DEPEND="${RDEPEND}
306 >=sys-devel/flex-2.5.33
307 sys-devel/gettext
308 virtual/yacc
309 dev-util/gperf
310 dev-util/pkgconfig
311 dev-util/gtk-doc-am
312 test? ( x11-themes/hicolor-icon-theme )
313 "
314
315 S="${WORKDIR}/${MY_P}"
316
317 src_prepare() {
318 DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install
319
320 # FIXME: Fix unaligned accesses on ARM, IA64 and SPARC
321 # https://bugs.webkit.org/show_bug.cgi?id=19775
322 use sparc && epatch "${FILESDIR}"/${PN}-1.2.3-fix-pool-sparc.patch
323
324 # intermediate MacPorts hack while upstream bug is not fixed properly
325 # https://bugs.webkit.org/show_bug.cgi?id=28727
326 use aqua && epatch "${FILESDIR}"/${PN}-1.2.5-darwin-quartz.patch
327
328 # Fix build on Darwin8 (10.4 Tiger)
329 # XXX: Fails to apply
330 #epatch "${FILESDIR}"/${PN}-1.2.5-darwin8.patch
331
332 # Don't force -O2
333 sed -i 's/-O2//g' "${S}"/configure.ac
334
335 # Don't build tests if not needed, part of bug #343249
336 # XXX: Fails to apply
337 #epatch "${FILESDIR}/${PN}-1.2.5-tests-build.patch"
338
339 # Required for webgl; https://bugs.webkit.org/show_bug.cgi?id=69085
340 mkdir -p DerivedSources/ANGLE
341
342 # Prevent maintainer mode from being triggered during make
343 AT_M4DIR=Source/autotools eautoreconf
344 }
345
346 src_configure() {
347 # It doesn't compile on alpha without this in LDFLAGS
348 use alpha && append-ldflags "-Wl,--no-relax"
349
350 # Sigbuses on SPARC with mcpu and co.
351 use sparc && filter-flags "-mcpu=*" "-mvis" "-mtune=*"
352
353 # https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
354 use ppc64 && append-flags "-mminimal-toc"
355
356 local myconf
357
358 # XXX: Check Web Audio support
359 # WebKit2 can only be built with gtk3
360 # API documentation (gtk-doc) is built in webkit-gtk:3, always disable here
361 myconf="
362 $(use_enable coverage)
363 $(use_enable debug)
364 $(use_enable debug debug-features)
365 $(use_enable spell spellcheck)
366 $(use_enable introspection)
367 $(use_enable gstreamer video)
368 $(use_enable jit)
369 $(use_enable webgl)
370 --enable-web-sockets
371 --with-gtk=2.0
372 --disable-gtk-doc
373 --disable-webkit2
374 $(use aqua && echo "--with-font-backend=pango --with-target=quartz")"
375
376 econf ${myconf}
377 }
378
379 src_compile() {
380 # Fix sandbox error with USE="introspection"
381 # https://bugs.webkit.org/show_bug.cgi?id=35471
382 emake XDG_DATA_HOME="${T}/.local"
383 }
384
385 src_test() {
386 unset DISPLAY
387 # Tests need virtualx, bug #294691, bug #310695
388 # Set XDG_DATA_HOME for introspection tools, bug #323669
389 # Parallel tests sometimes fail
390 Xemake -j1 check XDG_DATA_HOME="${T}/.local"
391 }
392
393 src_install() {
394 default
395
396 newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk
397 newdoc Source/WebKit/gtk/po/ChangeLog ChangeLog.gtk-po
398 newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore
399 newdoc Source/WebCore/ChangeLog ChangeLog.WebCore
400
401 # Remove .la files
402 find "${D}" -name '*.la' -exec rm -f '{}' +
403 }
Report Message
Find on MARC Find on Google Groups