1 |
commit: 9f66223deed143581fc3cf553f52cc05143eba5d |
2 |
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Dec 25 23:24:28 2012 +0000 |
4 |
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Dec 25 23:55:45 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=9f66223d |
7 |
|
8 |
net-libs/webkit-gtk: moved 1.10 to gx86 |
9 |
|
10 |
* Sync 1.11 with gx86 changes. |
11 |
|
12 |
--- |
13 |
net-libs/webkit-gtk/metadata.xml | 10 +- |
14 |
net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild | 238 --------------------- |
15 |
net-libs/webkit-gtk/webkit-gtk-1.11.2-r300.ebuild | 53 ++--- |
16 |
3 files changed, 27 insertions(+), 274 deletions(-) |
17 |
|
18 |
diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml |
19 |
index 4232b5d..f18e5d4 100644 |
20 |
--- a/net-libs/webkit-gtk/metadata.xml |
21 |
+++ b/net-libs/webkit-gtk/metadata.xml |
22 |
@@ -3,14 +3,12 @@ |
23 |
<pkgmetadata> |
24 |
<herd>gnome</herd> |
25 |
<use> |
26 |
- <flag name="coverage">Enable code coverage support</flag> |
27 |
- <flag name="geoloc">Enable geolocation support through |
28 |
+ <flag name="coverage">Enable code coverage support</flag> |
29 |
+ <flag name="geoloc">Enable geolocation support through |
30 |
<pkg>app-misc/geoclue</pkg></flag> |
31 |
- <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> |
32 |
- for introspection</flag> |
33 |
- <flag name="webgl">Build support for the WebGL HTML API using |
34 |
+ <flag name="webgl">Build support for the WebGL HTML API using |
35 |
<pkg>virtual/opengl</pkg></flag> |
36 |
- <flag name="webkit2">Enable WebKit2 API that splits web content rendering |
37 |
+ <flag name="webkit2">Enable WebKit2 API that splits web content rendering |
38 |
and application UI into separate processes</flag> |
39 |
</use> |
40 |
</pkgmetadata> |
41 |
|
42 |
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild |
43 |
deleted file mode 100644 |
44 |
index 8ab781d..0000000 |
45 |
--- a/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild |
46 |
+++ /dev/null |
47 |
@@ -1,238 +0,0 @@ |
48 |
-# Copyright 1999-2012 Gentoo Foundation |
49 |
-# Distributed under the terms of the GNU General Public License v2 |
50 |
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.1-r301.ebuild,v 1.5 2012/06/20 06:34:59 ssuominen Exp $ |
51 |
- |
52 |
-EAPI="4" |
53 |
- |
54 |
-# Don't define PYTHON_DEPEND: python only needed at build time |
55 |
-inherit autotools check-reqs flag-o-matic gnome2-utils pax-utils python virtualx |
56 |
- |
57 |
-MY_P="webkitgtk-${PV}" |
58 |
-DESCRIPTION="Open source web browser engine" |
59 |
-HOMEPAGE="http://www.webkitgtk.org/" |
60 |
-SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz" |
61 |
-#SRC_URI="mirror://gentoo/${P}.tar.xz" |
62 |
- |
63 |
-LICENSE="LGPL-2+ BSD" |
64 |
-SLOT="3" |
65 |
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos" |
66 |
-# geoclue |
67 |
-IUSE="aqua coverage debug doc +geoloc +gstreamer +introspection +jit spell +webgl" |
68 |
-# bugs 372493, 416331 |
69 |
-REQUIRED_USE="introspection? ( geoloc gstreamer )" |
70 |
- |
71 |
-# use sqlite, svg by default |
72 |
-# dependency on >=x11-libs/gtk+-2.13:2 for gail |
73 |
-# Aqua support in gtk3 is untested |
74 |
-# gtk2 is needed for plugin process support |
75 |
-RDEPEND=" |
76 |
- dev-libs/libxml2:2 |
77 |
- dev-libs/libxslt |
78 |
- virtual/jpeg |
79 |
- >=media-libs/libpng-1.4:0 |
80 |
- >=x11-libs/cairo-1.10 |
81 |
- >=dev-libs/glib-2.32:2 |
82 |
- >=x11-libs/gtk+-3.4:3[aqua=,introspection?] |
83 |
- >=dev-libs/icu-3.8.1-r1 |
84 |
- >=net-libs/libsoup-2.39.2:2.4[introspection?] |
85 |
- dev-db/sqlite:3 |
86 |
- >=x11-libs/pango-1.21 |
87 |
- x11-libs/libXrender |
88 |
- >=x11-libs/gtk+-2.13:2 |
89 |
- |
90 |
- geoloc? ( app-misc/geoclue ) |
91 |
- |
92 |
- gstreamer? ( |
93 |
- media-libs/gstreamer:0.10 |
94 |
- >=media-libs/gst-plugins-base-0.10.30:0.10 ) |
95 |
- |
96 |
- introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) |
97 |
- |
98 |
- spell? ( >=app-text/enchant-0.22 ) |
99 |
- |
100 |
- webgl? ( |
101 |
- virtual/opengl |
102 |
- x11-libs/libXcomposite ) |
103 |
-" |
104 |
-# paxctl needed for bug #407085 |
105 |
-DEPEND="${RDEPEND} |
106 |
- dev-lang/perl |
107 |
- =dev-lang/python-2* |
108 |
- || ( virtual/rubygems[ruby_targets_ruby19] |
109 |
- virtual/rubygems[ruby_targets_ruby18] ) |
110 |
- sys-devel/bison |
111 |
- >=sys-devel/flex-2.5.33 |
112 |
- sys-devel/gettext |
113 |
- dev-util/gperf |
114 |
- virtual/pkgconfig |
115 |
- dev-util/gtk-doc-am |
116 |
- app-accessibility/at-spi2-core |
117 |
- |
118 |
- >=sys-devel/make-3.82-r4 |
119 |
- |
120 |
- doc? ( >=dev-util/gtk-doc-1.10 ) |
121 |
- introspection? ( jit? ( sys-apps/paxctl ) ) |
122 |
- test? ( |
123 |
- x11-themes/hicolor-icon-theme |
124 |
- jit? ( sys-apps/paxctl ) ) |
125 |
-" |
126 |
-# Need real bison, not yacc |
127 |
- |
128 |
-S="${WORKDIR}/${MY_P}" |
129 |
- |
130 |
-CHECKREQS_DISK_BUILD="6G" |
131 |
- |
132 |
-pkg_pretend() { |
133 |
- if is-flagq "-g*" ; then |
134 |
- check-reqs_pkg_pretend |
135 |
- fi |
136 |
-} |
137 |
- |
138 |
-pkg_setup() { |
139 |
- # Check whether any of the debugging flags is enabled |
140 |
- if is-flagq "-g*" ; then |
141 |
- check-reqs_pkg_setup |
142 |
- einfo "You have at least 6GB of temporary build space available, but " |
143 |
- einfo "it may still not be enough, as the total space requirements " |
144 |
- einfo "depends on the debugging flags (-ggdb vs -g1) and enabled features." |
145 |
- fi |
146 |
- # Needed for CodeGeneratorInspector.py |
147 |
- python_set_active_version 2 |
148 |
- python_pkg_setup |
149 |
-} |
150 |
- |
151 |
-src_prepare() { |
152 |
- DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install |
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.6.1-darwin-quartz.patch |
157 |
- |
158 |
- # Drop DEPRECATED flags |
159 |
- LC_ALL=C sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' GNUmakefile.am || die |
160 |
- |
161 |
- # Don't force -O2 |
162 |
- sed -i 's/-O2//g' "${S}"/configure.ac || die |
163 |
- |
164 |
- # Build-time segfaults under PaX with USE="introspection jit", bug #404215 |
165 |
- if use introspection && use jit; then |
166 |
- epatch "${FILESDIR}/${PN}-1.6.3-paxctl-introspection.patch" |
167 |
- cp "${FILESDIR}/gir-paxctl-lt-wrapper" "${S}/" || die |
168 |
- fi |
169 |
- |
170 |
- # We need to reset some variables to prevent permissions problems and failures |
171 |
- # like https://bugs.webkit.org/show_bug.cgi?id=35471 and bug #323669 |
172 |
- gnome2_environment_reset |
173 |
- |
174 |
- # XXX: failing tests |
175 |
- # https://bugs.webkit.org/show_bug.cgi?id=50744 |
176 |
- # testkeyevents is interactive |
177 |
- # mimehandling test sometimes fails under Xvfb (works fine manually) |
178 |
- # datasource test needs a network connection and intermittently fails with |
179 |
- # icedtea-web |
180 |
- sed -e '/Programs\/unittests\/testwebinspector/ d' \ |
181 |
- -e '/Programs\/unittests\/testkeyevents/ d' \ |
182 |
- -e '/Programs\/unittests\/testmimehandling/ d' \ |
183 |
- -e '/Programs\/unittests\/testwebdatasource/ d' \ |
184 |
- -i Source/WebKit/gtk/GNUmakefile.am || die |
185 |
- if ! use gstreamer; then |
186 |
- # webkit2's TestWebKitWebView requires <video> support |
187 |
- sed -e '/Programs\/WebKit2APITests\/TestWebKitWebView/ d' \ |
188 |
- -i Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am || die |
189 |
- fi |
190 |
- # garbage collection test fails intermittently if icedtea-web is installed |
191 |
- epatch "${FILESDIR}/${PN}-1.7.90-test_garbage_collection.patch" |
192 |
- |
193 |
- # occasional test failure due to additional Xvfb process spawned |
194 |
- # TODO epatch "${FILESDIR}/${PN}-1.8.1-tests-xvfb.patch" |
195 |
- |
196 |
- # bug #417523, https://bugs.webkit.org/show_bug.cgi?id=96602 |
197 |
- epatch "${FILESDIR}/${PN}-1.9.91-libdl.patch" |
198 |
- |
199 |
- # uclibc fix, bug #441674 |
200 |
- epatch "${FILESDIR}/${PN}-1.10.1-disable-backtrace-uclibc.patch" |
201 |
- |
202 |
- # Respect CC, otherwise fails on prefix #395875 |
203 |
- tc-export CC |
204 |
- |
205 |
- # Prevent maintainer mode from being triggered during make |
206 |
- AT_M4DIR=Source/autotools eautoreconf |
207 |
- |
208 |
- # Ugly hack of a workaround for bizarre paludis behavior, bug #406117 |
209 |
- # http://paludis.exherbo.org/trac/ticket/1230 |
210 |
- sed -e '/ --\(en\|dis\)able-dependency-tracking/ d' -i configure || die |
211 |
-} |
212 |
- |
213 |
-src_configure() { |
214 |
- # It doesn't compile on alpha without this in LDFLAGS |
215 |
- use alpha && append-ldflags "-Wl,--no-relax" |
216 |
- |
217 |
- # Sigbuses on SPARC with mcpu and co. |
218 |
- use sparc && filter-flags "-mvis" |
219 |
- |
220 |
- # https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634 |
221 |
- use ppc64 && append-flags "-mminimal-toc" |
222 |
- |
223 |
- local myconf |
224 |
- |
225 |
- # XXX: Check Web Audio support |
226 |
- # XXX: dependency-tracking is required so parallel builds won't fail |
227 |
- myconf=" |
228 |
- $(use_enable coverage) |
229 |
- $(use_enable debug) |
230 |
- $(use_enable debug debug-features) |
231 |
- $(use_enable doc gtk-doc) |
232 |
- $(use_enable geoloc geolocation) |
233 |
- $(use_enable spell spellcheck) |
234 |
- $(use_enable introspection) |
235 |
- $(use_enable gstreamer video) |
236 |
- $(use_enable jit) |
237 |
- $(use_enable webgl) |
238 |
- --with-gtk=3.0 |
239 |
- --enable-dependency-tracking |
240 |
- --with-gstreamer=0.10 |
241 |
- $(use aqua && echo "--with-font-backend=pango --with-target=quartz")" |
242 |
- # Aqua support in gtk3 is untested |
243 |
- |
244 |
- if has_version "virtual/rubygems[ruby_targets_ruby19]"; then |
245 |
- myconf="${myconf} RUBY=$(type -P ruby19)" |
246 |
- else |
247 |
- myconf="${myconf} RUBY=$(type -P ruby18)" |
248 |
- fi |
249 |
- |
250 |
- econf ${myconf} |
251 |
-} |
252 |
- |
253 |
-src_compile() { |
254 |
- # Avoid parallel make failure with -j9 |
255 |
- emake DerivedSources/WebCore/JSNode.h |
256 |
- default |
257 |
-} |
258 |
- |
259 |
-src_test() { |
260 |
- # Tests expect an out-of-source build in WebKitBuild |
261 |
- ln -s . WebKitBuild || die "ln failed" |
262 |
- |
263 |
- # Prevents test failures on PaX systems |
264 |
- use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) \ |
265 |
- Programs/unittests/.libs/test* |
266 |
- unset DISPLAY |
267 |
- # Tests need virtualx, bug #294691, bug #310695 |
268 |
- # Parallel tests sometimes fail |
269 |
- Xemake -j1 check |
270 |
-} |
271 |
- |
272 |
-src_install() { |
273 |
- default |
274 |
- |
275 |
- newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk |
276 |
- newdoc Source/WebKit/gtk/po/ChangeLog ChangeLog.gtk-po |
277 |
- newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore |
278 |
- newdoc Source/WebCore/ChangeLog ChangeLog.WebCore |
279 |
- |
280 |
- # Remove .la files |
281 |
- find "${D}" -name '*.la' -exec rm -f '{}' + |
282 |
- |
283 |
- # Prevents crashes on PaX systems |
284 |
- use jit && pax-mark m "${ED}usr/bin/jsc-3" |
285 |
-} |
286 |
|
287 |
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.11.2-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.11.2-r300.ebuild |
288 |
index 748ddb6..b6769a5 100644 |
289 |
--- a/net-libs/webkit-gtk/webkit-gtk-1.11.2-r300.ebuild |
290 |
+++ b/net-libs/webkit-gtk/webkit-gtk-1.11.2-r300.ebuild |
291 |
@@ -1,11 +1,11 @@ |
292 |
# Copyright 1999-2012 Gentoo Foundation |
293 |
# Distributed under the terms of the GNU General Public License v2 |
294 |
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.1-r301.ebuild,v 1.5 2012/06/20 06:34:59 ssuominen Exp $ |
295 |
+# $Header: $ |
296 |
|
297 |
-EAPI="4" |
298 |
+EAPI="5" |
299 |
+PYTHON_COMPAT=( python2_{5,6,7} ) |
300 |
|
301 |
-# Don't define PYTHON_DEPEND: python only needed at build time |
302 |
-inherit autotools check-reqs flag-o-matic gnome2-utils pax-utils python virtualx |
303 |
+inherit autotools check-reqs eutils flag-o-matic gnome2-utils pax-utils python-single-r1 virtualx |
304 |
|
305 |
MY_P="webkitgtk-${PV}" |
306 |
DESCRIPTION="Open source web browser engine" |
307 |
@@ -17,13 +17,11 @@ LICENSE="LGPL-2+ BSD" |
308 |
SLOT="3" |
309 |
#KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos" |
310 |
KEYWORDS="" |
311 |
-# geoclue |
312 |
-IUSE="aqua coverage debug doc +geoloc +gstreamer +introspection +jit spell +webgl" |
313 |
+IUSE="aqua coverage debug +geoloc +gstreamer +introspection +jit spell +webgl" |
314 |
# bugs 372493, 416331 |
315 |
REQUIRED_USE="introspection? ( geoloc gstreamer )" |
316 |
|
317 |
# use sqlite, svg by default |
318 |
-# dependency on >=x11-libs/gtk+-2.13:2 for gail |
319 |
# Aqua support in gtk3 is untested |
320 |
# gtk2 is needed for plugin process support |
321 |
# TODO: There's 3 acceleration backends: opengl, egl and gles2 |
322 |
@@ -32,11 +30,11 @@ RDEPEND=" |
323 |
dev-libs/libxml2:2 |
324 |
dev-libs/libxslt |
325 |
virtual/jpeg |
326 |
- >=media-libs/libpng-1.4:0 |
327 |
+ >=media-libs/libpng-1.4:0= |
328 |
>=x11-libs/cairo-1.10 |
329 |
>=dev-libs/glib-2.32:2 |
330 |
>=x11-libs/gtk+-3.4:3[aqua=,introspection?] |
331 |
- >=dev-libs/icu-3.8.1-r1 |
332 |
+ >=dev-libs/icu-3.8.1-r1:= |
333 |
>=net-libs/libsoup-2.39.2:2.4[introspection?] |
334 |
dev-db/sqlite:3 |
335 |
>=x11-libs/pango-1.21 |
336 |
@@ -44,15 +42,11 @@ RDEPEND=" |
337 |
>=x11-libs/gtk+-2.13:2 |
338 |
|
339 |
geoloc? ( app-misc/geoclue ) |
340 |
- |
341 |
gstreamer? ( |
342 |
- media-libs/gstreamer:0.10 |
343 |
- >=media-libs/gst-plugins-base-0.10.30:0.10 ) |
344 |
- |
345 |
+ media-libs/gstreamer:1.0 |
346 |
+ media-libs/gst-plugins-base:1.0 ) |
347 |
introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) |
348 |
- |
349 |
spell? ( >=app-text/enchant-0.22 ) |
350 |
- |
351 |
webgl? ( |
352 |
virtual/opengl |
353 |
x11-libs/libXcomposite |
354 |
@@ -61,20 +55,18 @@ RDEPEND=" |
355 |
# paxctl needed for bug #407085 |
356 |
DEPEND="${RDEPEND} |
357 |
dev-lang/perl |
358 |
- =dev-lang/python-2* |
359 |
+ ${PYTHON_DEPS} |
360 |
|| ( virtual/rubygems[ruby_targets_ruby19] |
361 |
virtual/rubygems[ruby_targets_ruby18] ) |
362 |
+ app-accessibility/at-spi2-core |
363 |
+ >=dev-util/gtk-doc-am-1.10 |
364 |
+ dev-util/gperf |
365 |
sys-devel/bison |
366 |
>=sys-devel/flex-2.5.33 |
367 |
sys-devel/gettext |
368 |
- dev-util/gperf |
369 |
- virtual/pkgconfig |
370 |
- dev-util/gtk-doc-am |
371 |
- app-accessibility/at-spi2-core |
372 |
- |
373 |
>=sys-devel/make-3.82-r4 |
374 |
+ virtual/pkgconfig |
375 |
|
376 |
- doc? ( >=dev-util/gtk-doc-1.10 ) |
377 |
introspection? ( jit? ( sys-apps/paxctl ) ) |
378 |
test? ( |
379 |
x11-themes/hicolor-icon-theme |
380 |
@@ -101,8 +93,7 @@ pkg_setup() { |
381 |
einfo "depends on the debugging flags (-ggdb vs -g1) and enabled features." |
382 |
fi |
383 |
# Needed for CodeGeneratorInspector.py |
384 |
- python_set_active_version 2 |
385 |
- python_pkg_setup |
386 |
+ python-single-r1_pkg_setup |
387 |
} |
388 |
|
389 |
src_prepare() { |
390 |
@@ -132,13 +123,15 @@ src_prepare() { |
391 |
# https://bugs.webkit.org/show_bug.cgi?id=50744 |
392 |
# testkeyevents is interactive |
393 |
# mimehandling test sometimes fails under Xvfb (works fine manually) |
394 |
- # datasource test needs a network connection and intermittently fails with |
395 |
- # icedtea-web |
396 |
+ # datasource test needs a network connection and intermittently fails with icedtea-web |
397 |
+ # webplugindatabase intermittently fails with icedtea-web |
398 |
sed -e '/Programs\/unittests\/testwebinspector/ d' \ |
399 |
-e '/Programs\/unittests\/testkeyevents/ d' \ |
400 |
-e '/Programs\/unittests\/testmimehandling/ d' \ |
401 |
-e '/Programs\/unittests\/testwebdatasource/ d' \ |
402 |
+ -e '/Programs\/unittests\/testwebplugindatabase/ d' \ |
403 |
-i Source/WebKit/gtk/GNUmakefile.am || die |
404 |
+ |
405 |
if ! use gstreamer; then |
406 |
# webkit2's TestWebKitWebView requires <video> support |
407 |
sed -e '/Programs\/WebKit2APITests\/TestWebKitWebView/ d' \ |
408 |
@@ -187,7 +180,6 @@ src_configure() { |
409 |
$(use_enable coverage) |
410 |
$(use_enable debug) |
411 |
$(use_enable debug debug-features) |
412 |
- $(use_enable doc gtk-doc) |
413 |
$(use_enable geoloc geolocation) |
414 |
$(use_enable spell spellcheck) |
415 |
$(use_enable introspection) |
416 |
@@ -197,8 +189,10 @@ src_configure() { |
417 |
--disable-egl |
418 |
--disable-gles2 |
419 |
--with-gtk=3.0 |
420 |
+ --with-gstreamer=1.0 |
421 |
+ --with-accelerated-compositing |
422 |
--enable-dependency-tracking |
423 |
- --with-gstreamer=0.10 |
424 |
+ --disable-gtk-doc |
425 |
$(use aqua && echo "--with-font-backend=pango --with-target=quartz")" |
426 |
# Aqua support in gtk3 is untested |
427 |
|
428 |
@@ -238,8 +232,7 @@ src_install() { |
429 |
newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore |
430 |
newdoc Source/WebCore/ChangeLog ChangeLog.WebCore |
431 |
|
432 |
- # Remove .la files |
433 |
- find "${D}" -name '*.la' -exec rm -f '{}' + |
434 |
+ prune_libtool_files |
435 |
|
436 |
# Prevents crashes on PaX systems |
437 |
use jit && pax-mark m "${ED}usr/bin/jsc-3" |