Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/files/, net-libs/webkit-gtk/
Date: Sun, 29 May 2016 10:06:53
Message-Id: 1464516002.265dd163680e7cf5bc7bfb93582737a32bd6d3d7.pacho@gentoo
1 commit: 265dd163680e7cf5bc7bfb93582737a32bd6d3d7
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 29 10:00:02 2016 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Sun May 29 10:00:02 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=265dd163
7
8 net-libs/webkit-gtk: Version bump
9
10 Package-Manager: portage-2.3.0_rc1
11
12 net-libs/webkit-gtk/Manifest | 1 +
13 .../files/webkit-gtk-1.11.90-gtk-docize-fix.patch | 4 +-
14 .../files/webkit-gtk-2.4.11-video-web-audio.patch | 11 +
15 .../files/webkit-gtk-2.4.4-atomic-ppc.patch | 8 +-
16 .../files/webkit-gtk-2.4.4-jpeg-9a.patch | 4 +-
17 net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild | 260 ++++++++++++++++++++
18 net-libs/webkit-gtk/webkit-gtk-2.4.11.ebuild | 271 +++++++++++++++++++++
19 7 files changed, 551 insertions(+), 8 deletions(-)
20
21 diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
22 index 2c59e22..5e5c220 100644
23 --- a/net-libs/webkit-gtk/Manifest
24 +++ b/net-libs/webkit-gtk/Manifest
25 @@ -1,5 +1,6 @@
26 DIST webkitgtk-2.10.7.tar.xz 10988396 SHA256 990d62c82ed6dede31a6ff0a82d847f16b812842ff3e1093d17113627652864e SHA512 f0d7b303236910d18568ab1e0a522915a70e9d3658537b32ea2c6a42b8b3ece034a292490f7882760338f2afc56468fd7a8ad8659b7afaf87906220a5c815b5b WHIRLPOOL 7cbe8c42e9c245709eee19a9a01f2a4b238596d8119e3420ca750abb3518e1333ff99a596e9f09d511773a964bafed5baa91efca7b711ddc1c91cb601c520328
27 DIST webkitgtk-2.10.9.tar.xz 10992980 SHA256 bbb18d741780b1b7fa284beb9a97361ac57cda2e42bad2ae2fcdbf797919e969 SHA512 a8eda5381f227098e208a81c093f0b83f4996378e8f54ddfbe5c164254d7e1ff4a260c827e2521c748ca02bc5a691e8bbd0f59da0718cfe18812c3b257ec5228 WHIRLPOOL c6f36d4195bbd9f97358700ac446ad65d5a426ba7f0913d69163b2f37c1aedc623bdea3650f2ad7da009f1d234c9d54a163e9155794d8218342332b82ead76df
28 DIST webkitgtk-2.4.10.tar.xz 9867504 SHA256 33fda4b20d7fec2d6e9399ba03ef3f6d2a733c628bd77d397880c44e4bf7c614 SHA512 09cff437dadfa6ba1b90674ef4d9db558710247559bb8c2894b54a43504428b99465aa5d35bf3323c22827b67711e8dc031d4b63361eb9906c96e2bfd8ee11a8 WHIRLPOOL af08ef45249313915003a150a56228b1edc25f870c149d4ece5783da302d307b40046a05bf3c157807465f248d083ebe549c48d13eefdf820eb51c2efe0f5f98
29 +DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3
30 DIST webkitgtk-2.4.9.tar.xz 9840740 SHA256 afdf29e7828816cad0be2604cf19421e96d96bf493987328ffc8813bb20ac564 SHA512 5dfe5c31e0fcbab5e468a18e08918a439b214dcd620386fa32d35e9110e479b552a4b0b88a1bb8574b34445d5cc5219be349feded32fc1d2791a6c6279d61f98 WHIRLPOOL 26141cd12878bc8136ecffc1636fdcb037f342e5c27c8c557117564af9d1673af84c8c4fd10d3fdbe890bdf183791b18a210f57de9750422959a45c60390076c
31 DIST webkitgtk-2.8.5.tar.xz 10455256 SHA256 3d1f0c534935f43fd74df90f2648fcee672d60f1f57a30fa557a77891ae04d20 SHA512 b87a4149aa133824c7855d562a872fef9067d8c7a78026b9ec29d9eb0798a4da827aac4a1ec4eb1a117f7ae50b14c415c6f04ba4ddee851cf55e2dc503c3eddb WHIRLPOOL 1bb1c542d73db31985d4afc6a9ab59730118e57f99aba1a8e81820880bf832386f77aee70f4a50cece180fdb905b7aa5a0f08b91a5eb64a77c3ad5dd82792ead
32
33 diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.11.90-gtk-docize-fix.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.11.90-gtk-docize-fix.patch
34 index 8f56ab2..c94f545 100644
35 --- a/net-libs/webkit-gtk/files/webkit-gtk-1.11.90-gtk-docize-fix.patch
36 +++ b/net-libs/webkit-gtk/files/webkit-gtk-1.11.90-gtk-docize-fix.patch
37 @@ -1,5 +1,5 @@
38 ---- configure.ac.old 2013-03-02 09:22:53.791750644 +0200
39 -+++ configure.ac 2013-03-02 09:24:56.725213764 +0200
40 +--- a/configure.ac.old 2013-03-02 09:22:53.791750644 +0200
41 ++++ b/configure.ac 2013-03-02 09:24:56.725213764 +0200
42 @@ -24,6 +24,7 @@
43 m4_include([Source/autotools/SetupLibtool.m4])
44 m4_include([Source/autotools/ReadCommandLineArguments.m4])
45
46 diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.11-video-web-audio.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.11-video-web-audio.patch
47 new file mode 100644
48 index 0000000..ead696c
49 --- /dev/null
50 +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.4.11-video-web-audio.patch
51 @@ -0,0 +1,11 @@
52 +diff -purN a/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp b/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp
53 +--- a/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp 2016-03-14 08:09:01.000000000 +0100
54 ++++ b/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp 2016-04-10 19:43:00.215345381 +0200
55 +@@ -40,6 +40,7 @@
56 + #include "PaintInfo.h"
57 + #include "PlatformContextCairo.h"
58 + #include "RenderElement.h"
59 ++#include "RenderBox.h"
60 + #include "TextDirection.h"
61 + #include "UserAgentStyleSheets.h"
62 + #include "WidgetRenderingContext.h"
63
64 diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-atomic-ppc.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-atomic-ppc.patch
65 index 3c0ea88..c160376 100644
66 --- a/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-atomic-ppc.patch
67 +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-atomic-ppc.patch
68 @@ -1,7 +1,7 @@
69 $OpenBSD: patch-Source_WebKit2_Platform_IPC_Connection_h,v 1.2 2014/07/14 21:13:31 ajacoutot Exp $
70 https://bugs.webkit.org/show_bug.cgi?id=130837
71 ---- Source/WebKit2/Platform/IPC/Connection.h.orig Fri Jul 4 11:06:55 2014
72 -+++ Source/WebKit2/Platform/IPC/Connection.h Mon Jul 14 19:31:35 2014
73 +--- a/Source/WebKit2/Platform/IPC/Connection.h.orig Fri Jul 4 11:06:55 2014
74 ++++ b/Source/WebKit2/Platform/IPC/Connection.h Mon Jul 14 19:31:35 2014
75 @@ -216,7 +216,11 @@ class Connection : public ThreadSafeRefCounted<Connect
76
77 Client* m_client;
78 @@ -16,8 +16,8 @@ https://bugs.webkit.org/show_bug.cgi?id=130837
79 bool m_shouldExitOnSyncMessageSendFailure;
80 $OpenBSD: patch-Source_WebKit2_UIProcess_StatisticsRequest_cpp,v 1.3 2014/03/27 22:03:48 landry Exp $
81 https://bugs.webkit.org/show_bug.cgi?id=130837
82 ---- Source/WebKit2/UIProcess/StatisticsRequest.cpp.orig Thu Mar 27 21:13:49 2014
83 -+++ Source/WebKit2/UIProcess/StatisticsRequest.cpp Thu Mar 27 21:14:23 2014
84 +--- a/Source/WebKit2/UIProcess/StatisticsRequest.cpp.orig Thu Mar 27 21:13:49 2014
85 ++++ b/Source/WebKit2/UIProcess/StatisticsRequest.cpp Thu Mar 27 21:14:23 2014
86 @@ -44,7 +44,11 @@ StatisticsRequest::~StatisticsRequest()
87
88 uint64_t StatisticsRequest::addOutstandingRequest()
89
90 diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-jpeg-9a.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-jpeg-9a.patch
91 index 4226f2f..cded605 100644
92 --- a/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-jpeg-9a.patch
93 +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-jpeg-9a.patch
94 @@ -1,8 +1,8 @@
95 http://bugs.gentoo.org/481688
96 http://trac.webkit.org/changeset/166490/trunk/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
97
98 ---- Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
99 -+++ Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
100 +--- a/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
101 ++++ b/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
102 @@ -334,5 +334,5 @@
103 case JPEG_HEADER:
104 // Read file parameters with jpeg_read_header().
105
106 diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild
107 new file mode 100644
108 index 0000000..cd463f1
109 --- /dev/null
110 +++ b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild
111 @@ -0,0 +1,260 @@
112 +# Copyright 1999-2016 Gentoo Foundation
113 +# Distributed under the terms of the GNU General Public License v2
114 +# $Id$
115 +
116 +EAPI="6"
117 +PYTHON_COMPAT=( python2_7 )
118 +USE_RUBY="ruby20 ruby21 ruby22 ruby23"
119 +
120 +inherit autotools check-reqs flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
121 +
122 +MY_P="webkitgtk-${PV}"
123 +DESCRIPTION="Open source web browser engine"
124 +HOMEPAGE="http://www.webkitgtk.org/"
125 +SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
126 +
127 +LICENSE="LGPL-2+ BSD"
128 +SLOT="2" # no usable subslot
129 +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
130 +
131 +IUSE="aqua coverage debug +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit +opengl spell +webgl +X"
132 +# bugs 372493, 416331
133 +REQUIRED_USE="
134 + geoloc? ( introspection )
135 + gles2? ( egl )
136 + introspection? ( gstreamer )
137 + webgl? ( ^^ ( gles2 opengl ) )
138 + !webgl? ( ?? ( gles2 opengl ) )
139 + || ( aqua X )
140 +"
141 +
142 +# use sqlite, svg by default
143 +RDEPEND="
144 + dev-db/sqlite:3=
145 + >=dev-libs/glib-2.36:2
146 + >=dev-libs/icu-3.8.1-r1:=
147 + >=dev-libs/libxml2-2.6:2
148 + >=dev-libs/libxslt-1.1.7
149 + >=media-libs/fontconfig-2.5:1.0
150 + >=media-libs/freetype-2.4.2:2
151 + >=media-libs/harfbuzz-0.9.7:=[icu(+)]
152 + >=media-libs/libpng-1.4:0=
153 + media-libs/libwebp:=
154 + >=net-libs/libsoup-2.42:2.4[introspection?]
155 + virtual/jpeg:0=
156 + >=x11-libs/cairo-1.10:=[X]
157 + >=x11-libs/gtk+-2.24.10:2[aqua?,introspection?]
158 + x11-libs/libXrender
159 + x11-libs/libXt
160 + >=x11-libs/pango-1.30.0
161 +
162 + egl? ( media-libs/mesa[egl] )
163 + geoloc? ( >=app-misc/geoclue-2.1.5:2.0 )
164 + gles2? ( media-libs/mesa[gles2] )
165 + gnome-keyring? ( app-crypt/libsecret )
166 + gstreamer? (
167 + >=media-libs/gstreamer-1.2:1.0
168 + >=media-libs/gst-plugins-base-1.2:1.0 )
169 + introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
170 + opengl? ( virtual/opengl )
171 + spell? ( >=app-text/enchant-0.22:= )
172 + webgl? (
173 + x11-libs/cairo[opengl]
174 + x11-libs/libXcomposite
175 + x11-libs/libXdamage )
176 +"
177 +
178 +# paxctl needed for bug #407085
179 +# Need real bison, not yacc
180 +DEPEND="${RDEPEND}
181 + ${PYTHON_DEPS}
182 + ${RUBY_DEPS}
183 + >=dev-lang/perl-5.10
184 + >=dev-libs/atk-2.8.0
185 + >=dev-util/gtk-doc-am-1.10
186 + >=dev-util/gperf-3.0.1
187 + >=sys-devel/bison-2.4.3
188 + >=sys-devel/flex-2.5.34
189 + || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )
190 + sys-devel/gettext
191 + >=sys-devel/make-3.82-r4
192 + virtual/pkgconfig
193 +
194 + geoloc? ( dev-util/gdbus-codegen )
195 + introspection? ( jit? ( sys-apps/paxctl ) )
196 + test? (
197 + dev-lang/python:2.7
198 + dev-python/pygobject:3[python_targets_python2_7]
199 + x11-themes/hicolor-icon-theme
200 + jit? ( sys-apps/paxctl ) )
201 +"
202 +
203 +S="${WORKDIR}/${MY_P}"
204 +
205 +CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
206 +
207 +pkg_pretend() {
208 + if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
209 + einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
210 + check-reqs_pkg_pretend
211 + fi
212 +
213 + if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
214 + die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
215 + fi
216 +}
217 +
218 +pkg_setup() {
219 + # Check whether any of the debugging flags is enabled
220 + if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
221 + if is-flagq "-ggdb" && [[ ${WEBKIT_GTK_GGDB} != "yes" ]]; then
222 + replace-flags -ggdb -g
223 + ewarn "Replacing \"-ggdb\" with \"-g\" in your CFLAGS."
224 + ewarn "Building ${PN} with \"-ggdb\" produces binaries which are too"
225 + ewarn "large for current binutils releases (bug #432784) and has very"
226 + ewarn "high temporary build space and memory requirements."
227 + ewarn "If you really want to build ${PN} with \"-ggdb\", add"
228 + ewarn "WEBKIT_GTK_GGDB=yes"
229 + ewarn "to your make.conf file."
230 + fi
231 + einfo "You need to have at least 18GB of temporary build space available"
232 + einfo "to build ${PN} with debugging CFLAGS. Note that it might still"
233 + einfo "not be enough, as the total space requirements depend on the flags"
234 + einfo "(-ggdb vs -g1) and enabled features."
235 + check-reqs_pkg_setup
236 + fi
237 +
238 + [[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
239 +}
240 +
241 +src_prepare() {
242 + # intermediate MacPorts hack while upstream bug is not fixed properly
243 + # https://bugs.webkit.org/show_bug.cgi?id=28727
244 + use aqua && eapply "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch
245 +
246 + # Leave optimization level to user CFLAGS
247 + # FORTIFY_SOURCE is enabled by default in Gentoo
248 + sed -e 's/-O[012]//g' \
249 + -e 's/-D_FORTIFY_SOURCE=2//g' \
250 + -i Source/autotools/SetupCompilerFlags.m4 || die
251 +
252 + # bug #459978, upstream bug #113397
253 + eapply "${FILESDIR}"/${PN}-1.11.90-gtk-docize-fix.patch
254 +
255 + # Debian patches to fix support for some arches
256 + # https://bugs.webkit.org/show_bug.cgi?id=129540
257 + eapply "${FILESDIR}"/${PN}-2.2.5-{hppa,ia64}-platform.patch
258 + # https://bugs.webkit.org/show_bug.cgi?id=129542
259 + eapply "${FILESDIR}"/${PN}-2.4.1-ia64-malloc.patch
260 +
261 + # Fix build with recent libjpeg, bug #481688
262 + # https://bugs.webkit.org/show_bug.cgi?id=122412
263 + eapply "${FILESDIR}"/${PN}-2.4.4-jpeg-9a.patch
264 +
265 + # Fix building with --disable-webgl, bug #500966
266 + # https://bugs.webkit.org/show_bug.cgi?id=131267
267 + eapply "${FILESDIR}"/${PN}-2.4.7-disable-webgl.patch
268 +
269 + # https://bugs.webkit.org/show_bug.cgi?id=156510
270 + eapply "${FILESDIR}"/${PN}-2.4.11-video-web-audio.patch
271 +
272 + AT_M4DIR=Source/autotools eautoreconf
273 +
274 + gnome2_src_prepare
275 +}
276 +
277 +src_configure() {
278 + # Respect CC, otherwise fails on prefix #395875
279 + tc-export CC
280 +
281 + # Arches without JIT support also need this to really disable it in all places
282 + use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
283 +
284 + # It does not compile on alpha without this in LDFLAGS
285 + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
286 + use alpha && append-ldflags "-Wl,--no-relax"
287 +
288 + # Sigbuses on SPARC with mcpu and co., bug #???
289 + use sparc && filter-flags "-mvis"
290 +
291 + # https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
292 + use ppc64 && append-flags "-mminimal-toc"
293 +
294 + # Try to use less memory, bug #469942 (see Fedora .spec for reference)
295 + # --no-keep-memory doesn't work on ia64, bug #502492
296 + if ! use ia64; then
297 + append-ldflags "-Wl,--no-keep-memory"
298 + fi
299 + if ! $(tc-getLD) --version | grep -q "GNU gold"; then
300 + append-ldflags "-Wl,--reduce-memory-overheads"
301 + fi
302 +
303 + local ruby_interpreter=""
304 +
305 + if has_version "virtual/rubygems[ruby_targets_ruby23]"; then
306 + ruby_interpreter="RUBY=$(type -P ruby23)"
307 + elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
308 + ruby_interpreter="RUBY=$(type -P ruby22)"
309 + elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
310 + ruby_interpreter="RUBY=$(type -P ruby21)"
311 + else
312 + ruby_interpreter="RUBY=$(type -P ruby20)"
313 + fi
314 +
315 + # TODO: Check Web Audio support
316 + # should somehow let user select between them?
317 + #
318 + # * dependency-tracking is required so parallel builds won't fail
319 + gnome2_src_configure \
320 + $(use_enable aqua quartz-target) \
321 + $(use_enable coverage) \
322 + $(use_enable debug) \
323 + $(use_enable egl) \
324 + $(use_enable geoloc geolocation) \
325 + $(use_enable gles2) \
326 + $(use_enable gnome-keyring credential_storage) \
327 + $(use_enable gstreamer video) \
328 + $(use_enable gstreamer web-audio) \
329 + $(use_enable introspection) \
330 + $(use_enable jit) \
331 + $(use_enable opengl glx) \
332 + $(use_enable spell spellcheck) \
333 + $(use_enable webgl) \
334 + $(use_enable webgl accelerated-compositing) \
335 + $(use_enable X x11-target) \
336 + --with-gtk=2.0 \
337 + --disable-webkit2 \
338 + --enable-dependency-tracking \
339 + --disable-gtk-doc \
340 + ${ruby_interpreter}
341 +}
342 +
343 +src_test() {
344 + # Tests expect an out-of-source build in WebKitBuild
345 + ln -s . WebKitBuild || die "ln failed"
346 +
347 + # Prevents test failures on PaX systems
348 + use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
349 +
350 + # Tests need virtualx, bug #294691, bug #310695
351 + # Parallel tests sometimes fail
352 + Xemake -j1 check
353 +}
354 +
355 +src_install() {
356 + DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install
357 +
358 + # https://bugs.webkit.org/show_bug.cgi?id=129242
359 + MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
360 +
361 + newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk
362 + newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore
363 + newdoc Source/WebCore/ChangeLog ChangeLog.WebCore
364 +
365 + # Prevents crashes on PaX systems
366 + use jit && pax-mark m "${ED}usr/bin/jsc-1"
367 +
368 + # File collisions with slot 3
369 + # bug #402699, https://bugs.webkit.org/show_bug.cgi?id=78134
370 + rm -rf "${ED}usr/share/gtk-doc" || die
371 +}
372
373 diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.11.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.11.ebuild
374 new file mode 100644
375 index 0000000..0b6e646
376 --- /dev/null
377 +++ b/net-libs/webkit-gtk/webkit-gtk-2.4.11.ebuild
378 @@ -0,0 +1,271 @@
379 +# Copyright 1999-2016 Gentoo Foundation
380 +# Distributed under the terms of the GNU General Public License v2
381 +# $Id$
382 +
383 +EAPI="6"
384 +PYTHON_COMPAT=( python2_7 )
385 +USE_RUBY="ruby20 ruby21 ruby22 ruby23"
386 +
387 +inherit autotools check-reqs flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
388 +
389 +MY_P="webkitgtk-${PV}"
390 +DESCRIPTION="Open source web browser engine"
391 +HOMEPAGE="http://www.webkitgtk.org/"
392 +SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
393 +
394 +LICENSE="LGPL-2+ BSD"
395 +SLOT="3/25" # soname version of libwebkit2gtk-3.0
396 +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
397 +
398 +IUSE="aqua coverage debug +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit +opengl spell wayland +webgl +X"
399 +# bugs 372493, 416331
400 +REQUIRED_USE="
401 + geoloc? ( introspection )
402 + gles2? ( egl )
403 + introspection? ( gstreamer )
404 + webgl? ( ^^ ( gles2 opengl ) )
405 + !webgl? ( ?? ( gles2 opengl ) )
406 + || ( aqua wayland X )
407 +"
408 +
409 +# use sqlite, svg by default
410 +# Aqua support in gtk3 is untested
411 +# gtk2 is needed for plugin process support
412 +# gtk3-3.10 required for wayland
413 +RDEPEND="
414 + dev-db/sqlite:3=
415 + >=dev-libs/glib-2.36:2
416 + >=dev-libs/icu-3.8.1-r1:=
417 + >=dev-libs/libxml2-2.6:2
418 + >=dev-libs/libxslt-1.1.7
419 + >=media-libs/fontconfig-2.5:1.0
420 + >=media-libs/freetype-2.4.2:2
421 + >=media-libs/harfbuzz-0.9.7:=[icu(+)]
422 + >=media-libs/libpng-1.4:0=
423 + media-libs/libwebp:=
424 + >=net-libs/libsoup-2.42:2.4[introspection?]
425 + virtual/jpeg:0=
426 + >=x11-libs/cairo-1.10:=[X?]
427 + >=x11-libs/gtk+-3.6.0:3[X?,aqua?,introspection?]
428 + >=x11-libs/pango-1.30.0
429 +
430 + >=x11-libs/gtk+-2.24.10:2
431 +
432 + egl? ( media-libs/mesa[egl] )
433 + geoloc? ( >=app-misc/geoclue-2.1.5:2.0 )
434 + gles2? ( media-libs/mesa[gles2] )
435 + gnome-keyring? ( app-crypt/libsecret )
436 + gstreamer? (
437 + >=media-libs/gstreamer-1.2:1.0
438 + >=media-libs/gst-plugins-base-1.2:1.0 )
439 + introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
440 + opengl? ( virtual/opengl )
441 + spell? ( >=app-text/enchant-0.22:= )
442 + wayland? ( >=x11-libs/gtk+-3.10:3[wayland] )
443 + webgl? (
444 + x11-libs/cairo[opengl]
445 + x11-libs/libXcomposite
446 + x11-libs/libXdamage )
447 + X? (
448 + x11-libs/libX11
449 + x11-libs/libXrender
450 + x11-libs/libXt )
451 +"
452 +
453 +# paxctl needed for bug #407085
454 +# Need real bison, not yacc
455 +DEPEND="${RDEPEND}
456 + ${PYTHON_DEPS}
457 + ${RUBY_DEPS}
458 + >=dev-lang/perl-5.10
459 + >=app-accessibility/at-spi2-core-2.5.3
460 + >=dev-libs/atk-2.8.0
461 + >=dev-util/gtk-doc-am-1.10
462 + >=dev-util/gperf-3.0.1
463 + >=sys-devel/bison-2.4.3
464 + >=sys-devel/flex-2.5.34
465 + || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )
466 + sys-devel/gettext
467 + >=sys-devel/make-3.82-r4
468 + virtual/pkgconfig
469 +
470 + geoloc? ( dev-util/gdbus-codegen )
471 + introspection? ( jit? ( sys-apps/paxctl ) )
472 + test? (
473 + dev-lang/python:2.7
474 + dev-python/pygobject:3[python_targets_python2_7]
475 + x11-themes/hicolor-icon-theme
476 + jit? ( sys-apps/paxctl ) )
477 +"
478 +
479 +S="${WORKDIR}/${MY_P}"
480 +
481 +CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
482 +
483 +pkg_pretend() {
484 + if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
485 + einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
486 + check-reqs_pkg_pretend
487 + fi
488 +
489 + if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
490 + die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
491 + fi
492 +}
493 +
494 +pkg_setup() {
495 + # Check whether any of the debugging flags is enabled
496 + if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
497 + if is-flagq "-ggdb" && [[ ${WEBKIT_GTK_GGDB} != "yes" ]]; then
498 + replace-flags -ggdb -g
499 + ewarn "Replacing \"-ggdb\" with \"-g\" in your CFLAGS."
500 + ewarn "Building ${PN} with \"-ggdb\" produces binaries which are too"
501 + ewarn "large for current binutils releases (bug #432784) and has very"
502 + ewarn "high temporary build space and memory requirements."
503 + ewarn "If you really want to build ${PN} with \"-ggdb\", add"
504 + ewarn "WEBKIT_GTK_GGDB=yes"
505 + ewarn "to your make.conf file."
506 + fi
507 + einfo "You need to have at least 18GB of temporary build space available"
508 + einfo "to build ${PN} with debugging CFLAGS. Note that it might still"
509 + einfo "not be enough, as the total space requirements depend on the flags"
510 + einfo "(-ggdb vs -g1) and enabled features."
511 + check-reqs_pkg_setup
512 + fi
513 +
514 + [[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
515 +}
516 +
517 +src_prepare() {
518 + # intermediate MacPorts hack while upstream bug is not fixed properly
519 + # https://bugs.webkit.org/show_bug.cgi?id=28727
520 + use aqua && eapply "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch
521 +
522 + # Leave optimization level to user CFLAGS
523 + # FORTIFY_SOURCE is enabled by default in Gentoo
524 + sed -e 's/-O[012]//g' \
525 + -e 's/-D_FORTIFY_SOURCE=2//g' \
526 + -i Source/autotools/SetupCompilerFlags.m4 || die
527 +
528 + # bug #459978, upstream bug #113397
529 + eapply "${FILESDIR}"/${PN}-1.11.90-gtk-docize-fix.patch
530 +
531 + # Debian patches to fix support for some arches
532 + # https://bugs.webkit.org/show_bug.cgi?id=129540
533 + eapply "${FILESDIR}"/${PN}-2.2.5-{hppa,ia64}-platform.patch
534 + # https://bugs.webkit.org/show_bug.cgi?id=129542
535 + eapply "${FILESDIR}"/${PN}-2.4.1-ia64-malloc.patch
536 +
537 + # Fix building on ppc (from OpenBSD, only needed on slot 3)
538 + # https://bugs.webkit.org/show_bug.cgi?id=130837
539 + eapply "${FILESDIR}"/${PN}-2.4.4-atomic-ppc.patch
540 +
541 + # Fix build with recent libjpeg, bug #481688
542 + # https://bugs.webkit.org/show_bug.cgi?id=122412
543 + eapply "${FILESDIR}"/${PN}-2.4.4-jpeg-9a.patch
544 +
545 + # Fix building with --disable-webgl, bug #500966
546 + # https://bugs.webkit.org/show_bug.cgi?id=131267
547 + eapply "${FILESDIR}"/${PN}-2.4.7-disable-webgl.patch
548 +
549 + # https://bugs.webkit.org/show_bug.cgi?id=156510
550 + eapply "${FILESDIR}"/${PN}-2.4.11-video-web-audio.patch
551 +
552 + AT_M4DIR=Source/autotools eautoreconf
553 +
554 + gnome2_src_prepare
555 +}
556 +
557 +src_configure() {
558 + # Respect CC, otherwise fails on prefix #395875
559 + tc-export CC
560 +
561 + # Arches without JIT support also need this to really disable it in all places
562 + use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
563 +
564 + # It does not compile on alpha without this in LDFLAGS
565 + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
566 + use alpha && append-ldflags "-Wl,--no-relax"
567 +
568 + # Sigbuses on SPARC with mcpu and co., bug #???
569 + use sparc && filter-flags "-mvis"
570 +
571 + # https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
572 + use ppc64 && append-flags "-mminimal-toc"
573 +
574 + # Try to use less memory, bug #469942 (see Fedora .spec for reference)
575 + # --no-keep-memory doesn't work on ia64, bug #502492
576 + if ! use ia64; then
577 + append-ldflags "-Wl,--no-keep-memory"
578 + fi
579 + if ! $(tc-getLD) --version | grep -q "GNU gold"; then
580 + append-ldflags "-Wl,--reduce-memory-overheads"
581 + fi
582 +
583 + local ruby_interpreter=""
584 +
585 + if has_version "virtual/rubygems[ruby_targets_ruby23]"; then
586 + ruby_interpreter="RUBY=$(type -P ruby23)"
587 + elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
588 + ruby_interpreter="RUBY=$(type -P ruby22)"
589 + elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
590 + ruby_interpreter="RUBY=$(type -P ruby21)"
591 + else
592 + ruby_interpreter="RUBY=$(type -P ruby20)"
593 + fi
594 +
595 + # TODO: Check Web Audio support
596 + # should somehow let user select between them?
597 + #
598 + # * Aqua support in gtk3 is untested
599 + # * dependency-tracking is required so parallel builds won't fail
600 + gnome2_src_configure \
601 + $(use_enable aqua quartz-target) \
602 + $(use_enable coverage) \
603 + $(use_enable debug) \
604 + $(use_enable egl) \
605 + $(use_enable geoloc geolocation) \
606 + $(use_enable gles2) \
607 + $(use_enable gnome-keyring credential_storage) \
608 + $(use_enable gstreamer video) \
609 + $(use_enable gstreamer web-audio) \
610 + $(use_enable introspection) \
611 + $(use_enable jit) \
612 + $(use_enable opengl glx) \
613 + $(use_enable spell spellcheck) \
614 + $(use_enable webgl) \
615 + $(use_enable webgl accelerated-compositing) \
616 + $(use_enable wayland wayland-target) \
617 + $(use_enable X x11-target) \
618 + --with-gtk=3.0 \
619 + --enable-dependency-tracking \
620 + --disable-gtk-doc \
621 + ${ruby_interpreter}
622 +}
623 +
624 +src_test() {
625 + # Tests expect an out-of-source build in WebKitBuild
626 + ln -s . WebKitBuild || die "ln failed"
627 +
628 + # Prevents test failures on PaX systems
629 + use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
630 +
631 + # Tests need virtualx, bug #294691, bug #310695
632 + # Parallel tests sometimes fail
633 + Xemake -j1 check
634 +}
635 +
636 +src_install() {
637 + DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install
638 +
639 + # https://bugs.webkit.org/show_bug.cgi?id=129242
640 + MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
641 +
642 + newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk
643 + newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore
644 + newdoc Source/WebCore/ChangeLog ChangeLog.WebCore
645 +
646 + # Prevents crashes on PaX systems, bug #522808
647 + use jit && pax-mark m "${ED}usr/bin/jsc-3" "${ED}usr/libexec/WebKitWebProcess"
648 + pax-mark m "${ED}usr/libexec/WebKitPluginProcess"
649 +}