Gentoo Archives: gentoo-commits

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