1 |
commit: 873439d6af5263f1a4aaf6b4a5b09329f5471295 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jun 27 18:19:55 2017 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jun 27 18:20:45 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=873439d6 |
7 |
|
8 |
net-libs/webkit-gtk: bump to 2.16.5 for a crash and a wayland regression fix |
9 |
|
10 |
Upstream changes: |
11 |
* Fix a web process crash when page finishes loading in several web sites. |
12 |
* Fix the menu of select elements not showing in some cases under Wayland. |
13 |
|
14 |
This is meant to be the security stabilization target for CVE-2017-2538 for |
15 |
a regression free upgrade |
16 |
|
17 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
18 |
|
19 |
net-libs/webkit-gtk/Manifest | 1 + |
20 |
net-libs/webkit-gtk/webkit-gtk-2.16.5.ebuild | 288 +++++++++++++++++++++++++++ |
21 |
2 files changed, 289 insertions(+) |
22 |
|
23 |
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest |
24 |
index a7753d75c91..d27d03ac0c6 100644 |
25 |
--- a/net-libs/webkit-gtk/Manifest |
26 |
+++ b/net-libs/webkit-gtk/Manifest |
27 |
@@ -1,3 +1,4 @@ |
28 |
DIST webkitgtk-2.16.3.tar.xz 14652068 SHA256 204e9131da0101b9bc8765716e70a897121af04b964d9827cd9f20816a77b512 SHA512 551367551ed1bceaf9c70269f229e97972706820c6ae2d4444bc6d8b0992d6de34a156f9c245813c1f1701ce54f5476a44512590acfa6cfd6e67663d94caa91e WHIRLPOOL bac846be9d5f7b0a4c08b201d338bed6b84e65bdb105f2689350e02e0f0011944f5e23961e9411f712040c26a5313ef9bb4e30dda2cb19216c8e8d665ab0550f |
29 |
DIST webkitgtk-2.16.4.tar.xz 14655288 SHA256 f9aba4338319bd539785345144e28c8027dc8cb526b2e443e0c8f2c0239f5128 SHA512 9643b40f5425cb6c13daf39cbe66db7103e588c8a6a1822709d1b2d24ddf73662c139337327a403c25678cec96df7e5ccf186c14aca162b6f32b5bc31310709c WHIRLPOOL ac6300646017eaa8d68b4628b3df6cb4b82c6fdf7472c07e6cdba0e0bd55cc1ad8d15e779d528c89477363292586be0e48d01c977dad9dd05269f37c415a4fa5 |
30 |
+DIST webkitgtk-2.16.5.tar.xz 14655656 SHA256 8e0396f3428e757898c5856e642eed4fcd5a20ae03d96d3eaa03b76634be7dd4 SHA512 9d7573da44267edcd83b4918e5f1e0516eb8d84c58ac6b239a2328448f96b39067b62bcd18e7d730ec0ef44b9f4b0a03712d17f9f465f00346a1f45a0a4ebb10 WHIRLPOOL 76fc7cc7dfb326d3600396bc1e486acd26cca1eda779d9a06ad123c60f8cba9eee162b626abe95a09c9e8ed0b308f341a818ebf833f6b902812c644e5925aacd |
31 |
DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3 |
32 |
|
33 |
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.16.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.16.5.ebuild |
34 |
new file mode 100644 |
35 |
index 00000000000..2c100975823 |
36 |
--- /dev/null |
37 |
+++ b/net-libs/webkit-gtk/webkit-gtk-2.16.5.ebuild |
38 |
@@ -0,0 +1,288 @@ |
39 |
+# Copyright 1999-2017 Gentoo Foundation |
40 |
+# Distributed under the terms of the GNU General Public License v2 |
41 |
+ |
42 |
+EAPI=6 |
43 |
+CMAKE_MAKEFILE_GENERATOR="ninja" |
44 |
+PYTHON_COMPAT=( python2_7 ) |
45 |
+USE_RUBY="ruby21 ruby22 ruby23 ruby24" |
46 |
+ |
47 |
+inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx |
48 |
+ |
49 |
+MY_P="webkitgtk-${PV}" |
50 |
+DESCRIPTION="Open source web browser engine" |
51 |
+HOMEPAGE="http://www.webkitgtk.org/" |
52 |
+SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz" |
53 |
+ |
54 |
+LICENSE="LGPL-2+ BSD" |
55 |
+SLOT="4/37" # soname version of libwebkit2gtk-4.0 |
56 |
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" |
57 |
+ |
58 |
+IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X" |
59 |
+ |
60 |
+# webgl needs gstreamer, bug #560612 |
61 |
+REQUIRED_USE=" |
62 |
+ geolocation? ( introspection ) |
63 |
+ gles2? ( egl ) |
64 |
+ introspection? ( gstreamer ) |
65 |
+ nsplugin? ( X ) |
66 |
+ webgl? ( ^^ ( gles2 opengl ) ) |
67 |
+ !webgl? ( ?? ( gles2 opengl ) ) |
68 |
+ webgl? ( gstreamer ) |
69 |
+ wayland? ( egl ) |
70 |
+ || ( aqua wayland X ) |
71 |
+" |
72 |
+ |
73 |
+# Tests fail to link for inexplicable reasons |
74 |
+# https://bugs.webkit.org/show_bug.cgi?id=148210 |
75 |
+RESTRICT="test" |
76 |
+ |
77 |
+# use sqlite, svg by default |
78 |
+# Aqua support in gtk3 is untested |
79 |
+# Dependencies found at Source/cmake/OptionsGTK.cmake |
80 |
+# Various compile-time optionals for gtk+-3.22.0 - ensure it |
81 |
+RDEPEND=" |
82 |
+ dev-db/sqlite:3= |
83 |
+ >=dev-libs/glib-2.36:2 |
84 |
+ dev-libs/hyphen |
85 |
+ >=dev-libs/icu-3.8.1-r1:= |
86 |
+ >=dev-libs/libxml2-2.8:2 |
87 |
+ >=dev-libs/libxslt-1.1.7 |
88 |
+ >=media-libs/fontconfig-2.8:1.0 |
89 |
+ >=media-libs/freetype-2.4.2:2 |
90 |
+ >=media-libs/harfbuzz-1.3.3:=[icu(+)] |
91 |
+ >=media-libs/libpng-1.4:0= |
92 |
+ media-libs/libwebp:= |
93 |
+ dev-libs/libgcrypt:0= |
94 |
+ >=net-libs/libsoup-2.42:2.4[introspection?] |
95 |
+ >=x11-libs/cairo-1.10.2:= |
96 |
+ >=x11-libs/gtk+-3.22:3[introspection?] |
97 |
+ >=x11-libs/pango-1.30.0 |
98 |
+ virtual/jpeg:0= |
99 |
+ |
100 |
+ aqua? ( >=x11-libs/gtk+-3.14:3[aqua] ) |
101 |
+ egl? ( media-libs/mesa[egl] ) |
102 |
+ geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) |
103 |
+ gles2? ( media-libs/mesa[gles2] ) |
104 |
+ gnome-keyring? ( app-crypt/libsecret ) |
105 |
+ gstreamer? ( |
106 |
+ >=media-libs/gstreamer-1.2.3:1.0 |
107 |
+ >=media-libs/gst-plugins-base-1.2.3:1.0 |
108 |
+ >=media-libs/gst-plugins-bad-1.8:1.0[opengl?] ) |
109 |
+ introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) |
110 |
+ libnotify? ( x11-libs/libnotify ) |
111 |
+ nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) |
112 |
+ opengl? ( virtual/opengl |
113 |
+ x11-libs/cairo[opengl] ) |
114 |
+ spell? ( >=app-text/enchant-0.22:= ) |
115 |
+ wayland? ( >=x11-libs/gtk+-3.14:3[wayland] ) |
116 |
+ webgl? ( |
117 |
+ x11-libs/cairo[opengl] |
118 |
+ x11-libs/libXcomposite |
119 |
+ x11-libs/libXdamage ) |
120 |
+ X? ( |
121 |
+ x11-libs/cairo[X] |
122 |
+ >=x11-libs/gtk+-3.14:3[X] |
123 |
+ x11-libs/libX11 |
124 |
+ x11-libs/libXcomposite |
125 |
+ x11-libs/libXrender |
126 |
+ x11-libs/libXt ) |
127 |
+" |
128 |
+ |
129 |
+# paxctl needed for bug #407085 |
130 |
+# Need real bison, not yacc |
131 |
+DEPEND="${RDEPEND} |
132 |
+ ${PYTHON_DEPS} |
133 |
+ ${RUBY_DEPS} |
134 |
+ >=dev-lang/perl-5.10 |
135 |
+ >=app-accessibility/at-spi2-core-2.5.3 |
136 |
+ >=dev-libs/atk-2.8.0 |
137 |
+ >=dev-util/gtk-doc-am-1.10 |
138 |
+ >=dev-util/gperf-3.0.1 |
139 |
+ >=sys-devel/bison-2.4.3 |
140 |
+ || ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 ) |
141 |
+ sys-devel/gettext |
142 |
+ virtual/pkgconfig |
143 |
+ |
144 |
+ dev-lang/perl |
145 |
+ virtual/perl-Data-Dumper |
146 |
+ virtual/perl-Carp |
147 |
+ |
148 |
+ doc? ( >=dev-util/gtk-doc-1.10 ) |
149 |
+ geolocation? ( dev-util/gdbus-codegen ) |
150 |
+ introspection? ( jit? ( sys-apps/paxctl ) ) |
151 |
+ test? ( |
152 |
+ dev-lang/python:2.7 |
153 |
+ dev-python/pygobject:3[python_targets_python2_7] |
154 |
+ x11-themes/hicolor-icon-theme |
155 |
+ jit? ( sys-apps/paxctl ) ) |
156 |
+" |
157 |
+ |
158 |
+S="${WORKDIR}/${MY_P}" |
159 |
+ |
160 |
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307 |
161 |
+ |
162 |
+PATCHES=( |
163 |
+ # https://bugs.gentoo.org/show_bug.cgi?id=555504 |
164 |
+ "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch |
165 |
+ |
166 |
+ # https://bugs.gentoo.org/show_bug.cgi?id=564352 |
167 |
+ # https://bugs.webkit.org/show_bug.cgi?id=167283 |
168 |
+ "${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch |
169 |
+) |
170 |
+ |
171 |
+pkg_pretend() { |
172 |
+ if [[ ${MERGE_TYPE} != "binary" ]] ; then |
173 |
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then |
174 |
+ einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS" |
175 |
+ check-reqs_pkg_pretend |
176 |
+ fi |
177 |
+ |
178 |
+ if ! test-flag-CXX -std=c++11 ; then |
179 |
+ die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags" |
180 |
+ fi |
181 |
+ |
182 |
+ if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then |
183 |
+ die 'The active compiler needs to be gcc 4.9 (or newer)' |
184 |
+ fi |
185 |
+ fi |
186 |
+} |
187 |
+ |
188 |
+pkg_setup() { |
189 |
+ if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then |
190 |
+ check-reqs_pkg_setup |
191 |
+ fi |
192 |
+ |
193 |
+ python-any-r1_pkg_setup |
194 |
+} |
195 |
+ |
196 |
+src_configure() { |
197 |
+ # Respect CC, otherwise fails on prefix #395875 |
198 |
+ tc-export CC |
199 |
+ |
200 |
+ # Arches without JIT support also need this to really disable it in all places |
201 |
+ use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0 |
202 |
+ |
203 |
+ # It does not compile on alpha without this in LDFLAGS |
204 |
+ # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761 |
205 |
+ use alpha && append-ldflags "-Wl,--no-relax" |
206 |
+ |
207 |
+ # ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504 |
208 |
+ use ia64 && append-ldflags "-Wl,--no-as-needed" |
209 |
+ |
210 |
+ # Sigbuses on SPARC with mcpu and co., bug #??? |
211 |
+ use sparc && filter-flags "-mvis" |
212 |
+ |
213 |
+ # https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634 |
214 |
+ use ppc64 && append-flags "-mminimal-toc" |
215 |
+ |
216 |
+ # Try to use less memory, bug #469942 (see Fedora .spec for reference) |
217 |
+ # --no-keep-memory doesn't work on ia64, bug #502492 |
218 |
+ if ! use ia64; then |
219 |
+ append-ldflags "-Wl,--no-keep-memory" |
220 |
+ fi |
221 |
+ |
222 |
+ # We try to use gold when possible for this package |
223 |
+# if ! tc-ld-is-gold ; then |
224 |
+# append-ldflags "-Wl,--reduce-memory-overheads" |
225 |
+# fi |
226 |
+ |
227 |
+ # older glibc needs this for INTPTR_MAX, bug #533976 |
228 |
+ if has_version "<sys-libs/glibc-2.18" ; then |
229 |
+ append-cppflags "-D__STDC_LIMIT_MACROS" |
230 |
+ fi |
231 |
+ |
232 |
+ # Multiple rendering bugs on youtube, github, etc without this, bug #547224 |
233 |
+ append-flags $(test-flags -fno-strict-aliasing) |
234 |
+ |
235 |
+ local ruby_interpreter="" |
236 |
+ |
237 |
+ if has_version "virtual/rubygems[ruby_targets_ruby24]"; then |
238 |
+ ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)" |
239 |
+ elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then |
240 |
+ ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)" |
241 |
+ elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then |
242 |
+ ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)" |
243 |
+ else |
244 |
+ ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)" |
245 |
+ fi |
246 |
+ |
247 |
+ # TODO: Check Web Audio support |
248 |
+ # should somehow let user select between them? |
249 |
+ # |
250 |
+ # FTL_JIT requires llvm |
251 |
+ # |
252 |
+ # opengl needs to be explicetly handled, bug #576634 |
253 |
+ |
254 |
+ local opengl_enabled |
255 |
+ if use opengl || use gles2; then |
256 |
+ opengl_enabled=ON |
257 |
+ else |
258 |
+ opengl_enabled=OFF |
259 |
+ fi |
260 |
+ |
261 |
+ # support for webgl (aka 2d-canvas accelerating) |
262 |
+ local canvas_enabled |
263 |
+ if use webgl && ! use gles2 ; then |
264 |
+ canvas_enabled=ON |
265 |
+ else |
266 |
+ canvas_enabled=OFF |
267 |
+ fi |
268 |
+ |
269 |
+ local mycmakeargs=( |
270 |
+ -DENABLE_QUARTZ_TARGET=$(usex aqua) |
271 |
+ -DENABLE_API_TESTS=$(usex test) |
272 |
+ -DENABLE_GTKDOC=$(usex doc) |
273 |
+ -DENABLE_GEOLOCATION=$(usex geolocation) |
274 |
+ $(cmake-utils_use_find_package gles2 OpenGLES2) |
275 |
+ -DENABLE_GLES2=$(usex gles2) |
276 |
+ -DENABLE_VIDEO=$(usex gstreamer) |
277 |
+ -DENABLE_WEB_AUDIO=$(usex gstreamer) |
278 |
+ -DENABLE_INTROSPECTION=$(usex introspection) |
279 |
+ -DENABLE_JIT=$(usex jit) |
280 |
+ -DUSE_LIBNOTIFY=$(usex libnotify) |
281 |
+ -DUSE_LIBSECRET=$(usex gnome-keyring) |
282 |
+ -DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin) |
283 |
+ -DENABLE_SPELLCHECK=$(usex spell) |
284 |
+ -DENABLE_WAYLAND_TARGET=$(usex wayland) |
285 |
+ -DENABLE_WEBGL=$(usex webgl) |
286 |
+ $(cmake-utils_use_find_package egl EGL) |
287 |
+ $(cmake-utils_use_find_package opengl OpenGL) |
288 |
+ -DENABLE_X11_TARGET=$(usex X) |
289 |
+ -DENABLE_OPENGL=${opengl_enabled} |
290 |
+ -DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled} |
291 |
+ -DCMAKE_BUILD_TYPE=Release |
292 |
+ -DPORT=GTK |
293 |
+ ${ruby_interpreter} |
294 |
+ ) |
295 |
+ |
296 |
+ # Allow it to use GOLD when possible as it has all the magic to |
297 |
+ # detect when to use it and using gold for this concrete package has |
298 |
+ # multiple advantages and is also the upstream default, bug #585788 |
299 |
+# if tc-ld-is-gold ; then |
300 |
+# mycmakeargs+=( -DUSE_LD_GOLD=ON ) |
301 |
+# else |
302 |
+# mycmakeargs+=( -DUSE_LD_GOLD=OFF ) |
303 |
+# fi |
304 |
+ |
305 |
+ cmake-utils_src_configure |
306 |
+} |
307 |
+ |
308 |
+src_compile() { |
309 |
+ cmake-utils_src_compile |
310 |
+} |
311 |
+ |
312 |
+src_test() { |
313 |
+ # Prevents test failures on PaX systems |
314 |
+ use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test* |
315 |
+ |
316 |
+ cmake-utils_src_test |
317 |
+} |
318 |
+ |
319 |
+src_install() { |
320 |
+ cmake-utils_src_install |
321 |
+ |
322 |
+ # Prevents crashes on PaX systems, bug #522808 |
323 |
+ use jit && pax-mark m "${ED}usr/bin/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess" |
324 |
+ pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess" |
325 |
+ use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2 |
326 |
+} |