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

Gentoo Archives: gentoo-commits

From: "Alexandre Rostovtsev (tetromino)" <tetromino@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-libs/webkit-gtk: ChangeLog webkit-gtk-1.8.1-r300.ebuild webkit-gtk-1.8.1-r200.ebuild
Date: Wed, 02 May 2012 06:37:35
Message-Id: 20120502063710.CA99E2004B@flycatcher.gentoo.org
1 tetromino 12/05/02 06:37:10
2
3 Modified: ChangeLog
4 Added: webkit-gtk-1.8.1-r300.ebuild
5 webkit-gtk-1.8.1-r200.ebuild
6 Log:
7 Version bump, should reduce flickering with gtk+-3.4.
8
9 (Portage version: 2.2.0_alpha101/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.160 net-libs/webkit-gtk/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/ChangeLog?rev=1.160&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/ChangeLog?rev=1.160&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/ChangeLog?r1=1.159&r2=1.160
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v
21 retrieving revision 1.159
22 retrieving revision 1.160
23 diff -u -r1.159 -r1.160
24 --- ChangeLog 29 Apr 2012 16:12:42 -0000 1.159
25 +++ ChangeLog 2 May 2012 06:37:10 -0000 1.160
26 @@ -1,6 +1,13 @@
27 # ChangeLog for net-libs/webkit-gtk
28 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.159 2012/04/29 16:12:42 maekke Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.160 2012/05/02 06:37:10 tetromino Exp $
31 +
32 +*webkit-gtk-1.8.1-r300 (02 May 2012)
33 +*webkit-gtk-1.8.1-r200 (02 May 2012)
34 +
35 + 02 May 2012; Alexandre Rostovtsev <tetromino@g.o>
36 + +webkit-gtk-1.8.1-r200.ebuild, +webkit-gtk-1.8.1-r300.ebuild:
37 + Version bump, should reduce flickering with gtk+-3.4.
38
39 29 Apr 2012; Markus Meier <maekke@g.o> webkit-gtk-1.6.3-r200.ebuild:
40 x86 stable, bug #410611
41
42
43
44 1.1 net-libs/webkit-gtk/webkit-gtk-1.8.1-r300.ebuild
45
46 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.1-r300.ebuild?rev=1.1&view=markup
47 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.1-r300.ebuild?rev=1.1&content-type=text/plain
48
49 Index: webkit-gtk-1.8.1-r300.ebuild
50 ===================================================================
51 # Copyright 1999-2012 Gentoo Foundation
52 # Distributed under the terms of the GNU General Public License v2
53 # $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.1-r300.ebuild,v 1.1 2012/05/02 06:37:10 tetromino Exp $
54
55 EAPI="4"
56
57 # Don't define PYTHON_DEPEND: python only needed at build time
58 inherit autotools eutils flag-o-matic gnome2-utils pax-utils python virtualx
59
60 MY_P="webkit-${PV}"
61 DESCRIPTION="Open source web browser engine"
62 HOMEPAGE="http://www.webkitgtk.org/"
63 SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
64 #SRC_URI="mirror://gentoo/${P}.tar.xz"
65
66 LICENSE="LGPL-2 LGPL-2.1 BSD"
67 SLOT="3"
68 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
69 # geoclue
70 IUSE="aqua coverage debug doc +geoloc +gstreamer +introspection +jit spell +webgl webkit2"
71 # bug 372493
72 REQUIRED_USE="introspection? ( gstreamer )"
73
74 # use sqlite, svg by default
75 # dependency on >=x11-libs/gtk+-2.13:2 for gail
76 # Aqua support in gtk3 is untested
77 # gtk2 is needed for plugin process support
78 RDEPEND="
79 dev-libs/libxml2:2
80 dev-libs/libxslt
81 virtual/jpeg
82 >=media-libs/libpng-1.4:0
83 >=x11-libs/cairo-1.10
84 >=dev-libs/glib-2.31.8:2
85 >=x11-libs/gtk+-3.0:3[aqua=,introspection?]
86 >=dev-libs/icu-3.8.1-r1
87 >=net-libs/libsoup-2.37.92:2.4[introspection?]
88 dev-db/sqlite:3
89 >=x11-libs/pango-1.21
90 x11-libs/libXrender
91
92 geoloc? ( app-misc/geoclue )
93
94 gstreamer? (
95 media-libs/gstreamer:0.10
96 >=media-libs/gst-plugins-base-0.10.30:0.10 )
97
98 introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
99
100 spell? ( >=app-text/enchant-0.22 )
101
102 webgl? ( virtual/opengl )
103
104 webkit2? ( >=x11-libs/gtk+-2.13:2 )
105 "
106 # paxctl needed for bug #407085
107 DEPEND="${RDEPEND}
108 dev-lang/perl
109 =dev-lang/python-2*
110 sys-devel/bison
111 >=sys-devel/flex-2.5.33
112 sys-devel/gettext
113 dev-util/gperf
114 dev-util/pkgconfig
115 dev-util/gtk-doc-am
116 doc? ( >=dev-util/gtk-doc-1.10 )
117 introspection? ( jit? ( sys-apps/paxctl ) )
118 test? (
119 x11-themes/hicolor-icon-theme
120 jit? ( sys-apps/paxctl ) )
121 webkit2? ( app-accessibility/at-spi2-core )
122 "
123 # Need real bison, not yacc
124
125 S="${WORKDIR}/${MY_P}"
126
127 pkg_setup() {
128 # Needed for CodeGeneratorInspector.py
129 python_set_active_version 2
130 python_pkg_setup
131 }
132
133 src_prepare() {
134 DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install
135
136 # FIXME: Fix unaligned accesses on ARM, IA64 and SPARC
137 # https://bugs.webkit.org/show_bug.cgi?id=19775
138 # TODO: FAILS TO APPLY!
139 #use sparc && epatch "${FILESDIR}"/${PN}-1.2.3-fix-pool-sparc.patch
140
141 # CVE-2011-3064, https://bugzilla.redhat.com/show_bug.cgi?id=807596
142 epatch "${FILESDIR}/${PN}-1.8.0-svgimagebuffer-clip.patch"
143
144 # webkit2 build failure with gcc-4.5, bug #412027
145 epatch "${FILESDIR}/${PN}-1.8.0-typedef-WebKitWebView.patch"
146
147 # intermediate MacPorts hack while upstream bug is not fixed properly
148 # https://bugs.webkit.org/show_bug.cgi?id=28727
149 use aqua && epatch "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch
150
151 # Bug #403049, https://bugs.webkit.org/show_bug.cgi?id=79605
152 epatch "${FILESDIR}/${PN}-1.7.5-linguas.patch"
153
154 # Drop DEPRECATED flags
155 sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' GNUmakefile.am || die
156
157 # Don't force -O2
158 sed -i 's/-O2//g' "${S}"/configure.ac || die
159
160 # Build-time segfaults under PaX with USE="introspection jit", bug #404215
161 if use introspection && use jit; then
162 epatch "${FILESDIR}/${PN}-1.6.3-paxctl-introspection.patch"
163 cp "${FILESDIR}/gir-paxctl-lt-wrapper" "${S}/" || die
164 fi
165
166 # We need to reset some variables to prevent permissions problems and failures
167 # like https://bugs.webkit.org/show_bug.cgi?id=35471 and bug #323669
168 gnome2_environment_reset
169
170 # https://bugs.webkit.org/show_bug.cgi?id=79498
171 epatch "${FILESDIR}/${PN}-1.7.90-parallel-make-hack.patch"
172
173 # XXX: failing tests
174 # https://bugs.webkit.org/show_bug.cgi?id=50744
175 # testkeyevents is interactive
176 # mimehandling test sometimes fails under Xvfb (works fine manually)
177 # datasource test needs a network connection and intermittently fails with
178 # icedtea-web
179 sed -e '/Programs\/unittests\/testwebinspector/ d' \
180 -e '/Programs\/unittests\/testkeyevents/ d' \
181 -e '/Programs\/unittests\/testmimehandling/ d' \
182 -e '/Programs\/unittests\/testwebdatasource/ d' \
183 -i Source/WebKit/gtk/GNUmakefile.am || die
184 # garbage collection test fails intermittently if icedtea-web is installed
185 epatch "${FILESDIR}/${PN}-1.7.90-test_garbage_collection.patch"
186
187 # Respect CC, otherwise fails on prefix #395875
188 tc-export CC
189
190 # Prevent maintainer mode from being triggered during make
191 AT_M4DIR=Source/autotools eautoreconf
192
193 # Ugly hack of a workaround for bizarre paludis behavior, bug #406117
194 # http://paludis.exherbo.org/trac/ticket/1230
195 sed -e '/ --\(en\|dis\)able-dependency-tracking/ d' -i configure || die
196 }
197
198 src_configure() {
199 # It doesn't compile on alpha without this in LDFLAGS
200 use alpha && append-ldflags "-Wl,--no-relax"
201
202 # Sigbuses on SPARC with mcpu and co.
203 use sparc && filter-flags "-mvis"
204
205 # https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
206 use ppc64 && append-flags "-mminimal-toc"
207
208 local myconf
209
210 # XXX: Check Web Audio support
211 # XXX: dependency-tracking is required so parallel builds won't fail
212 myconf="
213 $(use_enable coverage)
214 $(use_enable debug)
215 $(use_enable debug debug-features)
216 $(use_enable doc gtk-doc)
217 $(use_enable geoloc geolocation)
218 $(use_enable spell spellcheck)
219 $(use_enable introspection)
220 $(use_enable gstreamer video)
221 $(use_enable jit)
222 $(use_enable webgl)
223 $(use_enable webkit2)
224 --enable-web-sockets
225 --with-gtk=3.0
226 --enable-dependency-tracking
227 $(use aqua && echo "--with-font-backend=pango --with-target=quartz")"
228 # Aqua support in gtk3 is untested
229
230 econf ${myconf}
231 }
232
233 src_compile() {
234 # Horrible failure of a hack to work around parallel make problems,
235 # see https://bugs.webkit.org/show_bug.cgi?id=79498
236 emake -j1 all-built-sources-local
237 emake all-ltlibraries-local
238 emake all-programs-local
239 use introspection && emake WebKit-3.0.gir
240 emake all-data-local
241 default
242 }
243
244 src_test() {
245 # Tests expect an out-of-source build in WebKitBuild
246 ln -s . WebKitBuild || die "ln failed"
247
248 # Prevents test failures on PaX systems
249 use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) \
250 Programs/unittests/.libs/test*
251 unset DISPLAY
252 # Tests need virtualx, bug #294691, bug #310695
253 # Parallel tests sometimes fail
254 Xemake -j1 check
255 }
256
257 src_install() {
258 default
259
260 newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk
261 newdoc Source/WebKit/gtk/po/ChangeLog ChangeLog.gtk-po
262 newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore
263 newdoc Source/WebCore/ChangeLog ChangeLog.WebCore
264
265 # Remove .la files
266 find "${D}" -name '*.la' -exec rm -f '{}' +
267
268 # Prevents crashes on PaX systems
269 use jit && pax-mark m "${ED}usr/bin/jsc-3"
270 }
271
272
273
274 1.1 net-libs/webkit-gtk/webkit-gtk-1.8.1-r200.ebuild
275
276 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.1-r200.ebuild?rev=1.1&view=markup
277 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.1-r200.ebuild?rev=1.1&content-type=text/plain
278
279 Index: webkit-gtk-1.8.1-r200.ebuild
280 ===================================================================
281 # Copyright 1999-2012 Gentoo Foundation
282 # Distributed under the terms of the GNU General Public License v2
283 # $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.1-r200.ebuild,v 1.1 2012/05/02 06:37:10 tetromino Exp $
284
285 EAPI="4"
286
287 # Don't define PYTHON_DEPEND: python only needed at build time
288 inherit autotools eutils flag-o-matic gnome2-utils pax-utils python virtualx
289
290 MY_P="webkit-${PV}"
291 DESCRIPTION="Open source web browser engine"
292 HOMEPAGE="http://www.webkitgtk.org/"
293 SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
294 #SRC_URI="mirror://gentoo/${P}.tar.xz"
295
296 LICENSE="LGPL-2 LGPL-2.1 BSD"
297 SLOT="2"
298 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
299 # geoclue
300 IUSE="aqua coverage debug +geoloc +gstreamer +introspection +jit spell +webgl"
301 # bug 372493
302 REQUIRED_USE="introspection? ( gstreamer )"
303
304 # use sqlite, svg by default
305 # dependency on >=x11-libs/gtk+-2.13:2 for gail
306 RDEPEND="
307 dev-libs/libxml2:2
308 dev-libs/libxslt
309 virtual/jpeg
310 >=media-libs/libpng-1.4:0
311 >=x11-libs/cairo-1.10
312 >=dev-libs/glib-2.31.8:2
313 >=x11-libs/gtk+-2.13:2[aqua=,introspection?]
314 >=dev-libs/icu-3.8.1-r1
315 >=net-libs/libsoup-2.37.92:2.4[introspection?]
316 dev-db/sqlite:3
317 >=x11-libs/pango-1.21
318 x11-libs/libXrender
319
320 geoloc? ( app-misc/geoclue )
321
322 gstreamer? (
323 media-libs/gstreamer:0.10
324 >=media-libs/gst-plugins-base-0.10.30:0.10 )
325
326 introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
327
328 spell? ( >=app-text/enchant-0.22 )
329
330 webgl? ( virtual/opengl )
331 "
332 # paxctl needed for bug #407085
333 DEPEND="${RDEPEND}
334 dev-lang/perl
335 =dev-lang/python-2*
336 sys-devel/bison
337 >=sys-devel/flex-2.5.33
338 sys-devel/gettext
339 dev-util/gperf
340 dev-util/pkgconfig
341 dev-util/gtk-doc-am
342 introspection? ( jit? ( sys-apps/paxctl ) )
343 test? ( x11-themes/hicolor-icon-theme
344 jit? ( sys-apps/paxctl ) )
345 "
346 # Need real bison, not yacc
347
348 S="${WORKDIR}/${MY_P}"
349
350 pkg_setup() {
351 # Needed for CodeGeneratorInspector.py
352 python_set_active_version 2
353 python_pkg_setup
354 }
355
356 src_prepare() {
357 DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install
358
359 # FIXME: Fix unaligned accesses on ARM, IA64 and SPARC
360 # https://bugs.webkit.org/show_bug.cgi?id=19775
361 # TODO: FAILS TO APPLY!
362 #use sparc && epatch "${FILESDIR}"/${PN}-1.2.3-fix-pool-sparc.patch
363
364 # CVE-2011-3064, https://bugzilla.redhat.com/show_bug.cgi?id=807596
365 epatch "${FILESDIR}/${PN}-1.8.0-svgimagebuffer-clip.patch"
366
367 # intermediate MacPorts hack while upstream bug is not fixed properly
368 # https://bugs.webkit.org/show_bug.cgi?id=28727
369 use aqua && epatch "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch
370
371 # Bug #403049, https://bugs.webkit.org/show_bug.cgi?id=79605
372 epatch "${FILESDIR}/${PN}-1.7.5-linguas.patch"
373
374 # Drop DEPRECATED flags
375 sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' GNUmakefile.am || die
376
377 # Don't force -O2
378 sed -i 's/-O2//g' "${S}"/configure.ac || die
379
380 # Build-time segfaults under PaX with USE="introspection jit", bug #404215
381 if use introspection && use jit; then
382 epatch "${FILESDIR}/${PN}-1.6.3-paxctl-introspection.patch"
383 cp "${FILESDIR}/gir-paxctl-lt-wrapper" "${S}/" || die
384 fi
385
386 # We need to reset some variables to prevent permissions problems and failures
387 # like https://bugs.webkit.org/show_bug.cgi?id=35471 and bug #323669
388 gnome2_environment_reset
389
390 # https://bugs.webkit.org/show_bug.cgi?id=79498
391 epatch "${FILESDIR}/${PN}-1.7.90-parallel-make-hack.patch"
392
393 # XXX: failing tests
394 # https://bugs.webkit.org/show_bug.cgi?id=50744
395 # testkeyevents is interactive
396 # mimehandling test sometimes fails under Xvfb (works fine manually)
397 # datasource test needs a network connection and intermittently fails with
398 # icedtea-web
399 sed -e '/Programs\/unittests\/testwebinspector/ d' \
400 -e '/Programs\/unittests\/testkeyevents/ d' \
401 -e '/Programs\/unittests\/testmimehandling/ d' \
402 -e '/Programs\/unittests\/testwebdatasource/ d' \
403 -i Source/WebKit/gtk/GNUmakefile.am || die
404 # garbage collection test fails intermittently if icedtea-web is installed
405 epatch "${FILESDIR}/${PN}-1.7.90-test_garbage_collection.patch"
406
407 # Respect CC, otherwise fails on prefix #395875
408 tc-export CC
409
410 # Prevent maintainer mode from being triggered during make
411 AT_M4DIR=Source/autotools eautoreconf
412
413 # Ugly hack of a workaround for bizarre paludis behavior, bug #406117
414 # http://paludis.exherbo.org/trac/ticket/1230
415 sed -e '/ --\(en\|dis\)able-dependency-tracking/ d' -i configure || die
416 }
417
418 src_configure() {
419 # It doesn't compile on alpha without this in LDFLAGS
420 use alpha && append-ldflags "-Wl,--no-relax"
421
422 # Sigbuses on SPARC with mcpu and co.
423 use sparc && filter-flags "-mvis"
424
425 # https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
426 use ppc64 && append-flags "-mminimal-toc"
427
428 local myconf
429
430 # XXX: Check Web Audio support
431 # XXX: dependency-tracking is required so parallel builds won't fail
432 # WebKit2 can only be built with gtk3
433 # API documentation (gtk-doc) is built in webkit-gtk:3, always disable here
434 myconf="
435 $(use_enable coverage)
436 $(use_enable debug)
437 $(use_enable debug debug-features)
438 $(use_enable geoloc geolocation)
439 $(use_enable spell spellcheck)
440 $(use_enable introspection)
441 $(use_enable gstreamer video)
442 $(use_enable jit)
443 $(use_enable webgl)
444 --enable-web-sockets
445 --with-gtk=2.0
446 --disable-gtk-doc
447 --disable-webkit2
448 --enable-dependency-tracking
449 $(use aqua && echo "--with-font-backend=pango --with-target=quartz")"
450
451 econf ${myconf}
452 }
453
454 src_compile() {
455 # Horrible failure of a hack to work around parallel make problems,
456 # see https://bugs.webkit.org/show_bug.cgi?id=79498
457 emake -j1 all-built-sources-local
458 emake all-ltlibraries-local
459 emake all-programs-local
460 use introspection && emake WebKit-1.0.gir
461 emake all-data-local
462 default
463 }
464
465 src_test() {
466 # Tests expect an out-of-source build in WebKitBuild
467 ln -s . WebKitBuild || die "ln failed"
468 # Prevents test failures on PaX systems
469 use jit && pax-mark m $(list-paxables Programs/unittests/test*) \
470 Programs/unittests/.libs/test*
471 unset DISPLAY
472 # Tests need virtualx, bug #294691, bug #310695
473 # Parallel tests sometimes fail
474 Xemake -j1 check
475 }
476
477 src_install() {
478 default
479
480 newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk
481 newdoc Source/WebKit/gtk/po/ChangeLog ChangeLog.gtk-po
482 newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore
483 newdoc Source/WebCore/ChangeLog ChangeLog.WebCore
484
485 # Remove .la files
486 find "${D}" -name '*.la' -exec rm -f '{}' +
487
488 # Prevents crashes on PaX systems
489 use jit && pax-mark m "${ED}usr/bin/jsc-1"
490
491 # File collisions with slot 3
492 # bug #402699, https://bugs.webkit.org/show_bug.cgi?id=78134
493 rm -rf "${ED}usr/share/gtk-doc" || die
494 }
Report Message
Find on MARC Find on Google Groups