1 |
commit: 5fdb99434f2f0b64ca23dd516458c78421143872 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 27 08:31:23 2018 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 27 09:57:19 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fdb9943 |
7 |
|
8 |
net-libs/webkit-gtk: sec bump to 2.22.4; require GL |
9 |
|
10 |
* Security bump to 2.22.4 for WSA-2018-0008 |
11 |
* Builds without GL (opengl or gles2) are currently broken, thus |
12 |
REQUIRED_USE it. |
13 |
* Stop requiring gstreamer for introspection - seems to work fine |
14 |
without by now. |
15 |
* GstreamerGL requires EGL, so REQUIRED_USE it by requiring EGL if |
16 |
USE="gstreamer opengl" (USE="gstreamer gles2" is already covered |
17 |
by gles2 itself also requiring egl). |
18 |
* Raise gstreamer deps to ensure working MSE, as hopefully we can |
19 |
handle the stabilization of newer gst-plugins-opus for this |
20 |
security stabilization round. |
21 |
* Add references to upstream bugs above REQUIRED_USE - we should |
22 |
monitor them on bumps to relax the requirements when/if the |
23 |
upstream bugs are fixed. |
24 |
|
25 |
Closes: https://bugs.gentoo.org/671002 |
26 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
27 |
Package-Manager: Portage-2.3.52, Repoman-2.3.11 |
28 |
|
29 |
net-libs/webkit-gtk/Manifest | 1 + |
30 |
net-libs/webkit-gtk/webkit-gtk-2.22.4.ebuild | 279 +++++++++++++++++++++++++++ |
31 |
2 files changed, 280 insertions(+) |
32 |
|
33 |
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest |
34 |
index 2351bf98487..7595a1dad6f 100644 |
35 |
--- a/net-libs/webkit-gtk/Manifest |
36 |
+++ b/net-libs/webkit-gtk/Manifest |
37 |
@@ -1 +1,2 @@ |
38 |
DIST webkitgtk-2.22.2.tar.xz 16769120 BLAKE2B 19b226e657a324ab0efcfdcda3b22bc21a3b1cae29325f89ebd555dfb45d02d23f495ebf3817cb4c5e662c813b8d75754e0051d84afb84ea1347bf25a321e5d0 SHA512 0bb885726872f128a0e0d71cbc75ba076e5c0c928c40e71e030c87444a7068568c568587514407d6549c27d0bfe121dc33f96f0c516d2ae1c6801e005ad52756 |
39 |
+DIST webkitgtk-2.22.4.tar.xz 16752132 BLAKE2B a60f1c6168ba1ef19c931030017a58a640f0ff4a8d5bf97b278fff50f86374d5e10e06d95837e90c5a653a4c226095321ae86fdd64e61d846821979343b7350b SHA512 a46107f7da8513b06bd1e5685c03ca7f1a48af66b817908b8e61f1b343d98e122af73ccdeb47657cf4378fe33107fdc119a9a51d87db07ad5316ab39ed0db55f |
40 |
|
41 |
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.22.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.22.4.ebuild |
42 |
new file mode 100644 |
43 |
index 00000000000..3b79a260396 |
44 |
--- /dev/null |
45 |
+++ b/net-libs/webkit-gtk/webkit-gtk-2.22.4.ebuild |
46 |
@@ -0,0 +1,279 @@ |
47 |
+# Copyright 1999-2018 Gentoo Authors |
48 |
+# Distributed under the terms of the GNU General Public License v2 |
49 |
+ |
50 |
+EAPI=6 |
51 |
+CMAKE_MAKEFILE_GENERATOR="ninja" |
52 |
+PYTHON_COMPAT=( python2_7 ) |
53 |
+USE_RUBY="ruby23 ruby24 ruby25" |
54 |
+ |
55 |
+inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx |
56 |
+ |
57 |
+MY_P="webkitgtk-${PV}" |
58 |
+DESCRIPTION="Open source web browser engine" |
59 |
+HOMEPAGE="https://www.webkitgtk.org" |
60 |
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz" |
61 |
+ |
62 |
+LICENSE="LGPL-2+ BSD" |
63 |
+SLOT="4/37" # soname version of libwebkit2gtk-4.0 |
64 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos" |
65 |
+ |
66 |
+IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl +X" |
67 |
+ |
68 |
+# webgl needs gstreamer, bug #560612 |
69 |
+# gstreamer with opengl/gles2 needs egl |
70 |
+# Review on bumps if fixed upstream and adjust accordingly: |
71 |
+# non-GL builds are broken - https://bugs.webkit.org/show_bug.cgi?id=191997 |
72 |
+# GstreamerGL gets built even with GL disabled (thus requiring opengl or gles2 with gstreamer) - https://bugs.webkit.org/show_bug.cgi?id=191998 |
73 |
+REQUIRED_USE=" |
74 |
+ ^^ ( opengl gles2 ) |
75 |
+ geolocation? ( introspection ) |
76 |
+ gles2? ( egl !opengl ) |
77 |
+ gstreamer? ( opengl? ( egl ) ) |
78 |
+ nsplugin? ( X ) |
79 |
+ webgl? ( gstreamer |
80 |
+ || ( gles2 opengl ) ) |
81 |
+ wayland? ( egl ) |
82 |
+ || ( aqua wayland X ) |
83 |
+" |
84 |
+ |
85 |
+# Tests fail to link for inexplicable reasons |
86 |
+# https://bugs.webkit.org/show_bug.cgi?id=148210 |
87 |
+RESTRICT="test" |
88 |
+ |
89 |
+# Aqua support in gtk3 is untested |
90 |
+# Dependencies found at Source/cmake/OptionsGTK.cmake |
91 |
+# Various compile-time optionals for gtk+-3.22.0 - ensure it |
92 |
+# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) |
93 |
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE) |
94 |
+RDEPEND=" |
95 |
+ >=x11-libs/cairo-1.10.2:=[X?] |
96 |
+ >=media-libs/fontconfig-2.8.0:1.0 |
97 |
+ >=media-libs/freetype-2.4.2:2 |
98 |
+ >=dev-libs/libgcrypt-1.6.0:0= |
99 |
+ >=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?] |
100 |
+ >=media-libs/harfbuzz-1.3.3:=[icu(+)] |
101 |
+ >=dev-libs/icu-3.8.1-r1:= |
102 |
+ virtual/jpeg:0= |
103 |
+ >=net-libs/libsoup-2.48:2.4[introspection?] |
104 |
+ >=dev-libs/libxml2-2.8.0:2 |
105 |
+ >=media-libs/libpng-1.4:0= |
106 |
+ dev-db/sqlite:3= |
107 |
+ sys-libs/zlib:0 |
108 |
+ >=dev-libs/atk-2.8.0 |
109 |
+ media-libs/libwebp:= |
110 |
+ |
111 |
+ >=dev-libs/glib-2.40:2 |
112 |
+ >=dev-libs/libxslt-1.1.7 |
113 |
+ media-libs/woff2 |
114 |
+ gnome-keyring? ( app-crypt/libsecret ) |
115 |
+ geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) |
116 |
+ introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) |
117 |
+ dev-libs/libtasn1:= |
118 |
+ >=dev-libs/libgcrypt-1.7.0:0= |
119 |
+ nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) |
120 |
+ spell? ( >=app-text/enchant-0.22:= ) |
121 |
+ gstreamer? ( |
122 |
+ >=media-libs/gstreamer-1.14:1.0 |
123 |
+ >=media-libs/gst-plugins-base-1.14:1.0[egl?,gles2?,opengl?] |
124 |
+ >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 |
125 |
+ >=media-libs/gst-plugins-bad-1.14:1.0 ) |
126 |
+ |
127 |
+ X? ( |
128 |
+ x11-libs/libX11 |
129 |
+ x11-libs/libXcomposite |
130 |
+ x11-libs/libXdamage |
131 |
+ x11-libs/libXrender |
132 |
+ x11-libs/libXt ) |
133 |
+ |
134 |
+ libnotify? ( x11-libs/libnotify ) |
135 |
+ dev-libs/hyphen |
136 |
+ |
137 |
+ egl? ( media-libs/mesa[egl] ) |
138 |
+ gles2? ( media-libs/mesa[gles2] ) |
139 |
+ opengl? ( virtual/opengl ) |
140 |
+ webgl? ( |
141 |
+ x11-libs/libXcomposite |
142 |
+ x11-libs/libXdamage ) |
143 |
+" |
144 |
+ |
145 |
+# paxctl needed for bug #407085 |
146 |
+# Need real bison, not yacc |
147 |
+DEPEND="${RDEPEND} |
148 |
+ ${PYTHON_DEPS} |
149 |
+ ${RUBY_DEPS} |
150 |
+ >=app-accessibility/at-spi2-core-2.5.3 |
151 |
+ >=dev-lang/perl-5.10 |
152 |
+ dev-util/glib-utils |
153 |
+ >=dev-util/gtk-doc-am-1.10 |
154 |
+ >=dev-util/gperf-3.0.1 |
155 |
+ >=sys-devel/bison-2.4.3 |
156 |
+ || ( >=sys-devel/gcc-6.0 >=sys-devel/clang-3.3 ) |
157 |
+ sys-devel/gettext |
158 |
+ virtual/pkgconfig |
159 |
+ |
160 |
+ dev-lang/perl |
161 |
+ virtual/perl-Data-Dumper |
162 |
+ virtual/perl-Carp |
163 |
+ virtual/perl-JSON-PP |
164 |
+ |
165 |
+ doc? ( >=dev-util/gtk-doc-1.10 ) |
166 |
+ geolocation? ( dev-util/gdbus-codegen ) |
167 |
+ introspection? ( jit? ( sys-apps/paxctl ) ) |
168 |
+" |
169 |
+# test? ( |
170 |
+# dev-python/pygobject:3[python_targets_python2_7] |
171 |
+# x11-themes/hicolor-icon-theme |
172 |
+# jit? ( sys-apps/paxctl ) ) |
173 |
+ |
174 |
+S="${WORKDIR}/${MY_P}" |
175 |
+ |
176 |
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307 |
177 |
+ |
178 |
+pkg_pretend() { |
179 |
+ if [[ ${MERGE_TYPE} != "binary" ]] ; then |
180 |
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then |
181 |
+ einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS" |
182 |
+ check-reqs_pkg_pretend |
183 |
+ fi |
184 |
+ |
185 |
+ if ! test-flag-CXX -std=c++11 ; then |
186 |
+ die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags" |
187 |
+ fi |
188 |
+ |
189 |
+ if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then |
190 |
+ die 'The active compiler needs to be gcc 4.9 (or newer)' |
191 |
+ fi |
192 |
+ fi |
193 |
+} |
194 |
+ |
195 |
+pkg_setup() { |
196 |
+ if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then |
197 |
+ check-reqs_pkg_setup |
198 |
+ fi |
199 |
+ |
200 |
+ python-any-r1_pkg_setup |
201 |
+} |
202 |
+ |
203 |
+src_prepare() { |
204 |
+ cmake-utils_src_prepare |
205 |
+ gnome2_src_prepare |
206 |
+} |
207 |
+ |
208 |
+src_configure() { |
209 |
+ # Respect CC, otherwise fails on prefix #395875 |
210 |
+ tc-export CC |
211 |
+ |
212 |
+ # Arches without JIT support also need this to really disable it in all places |
213 |
+ use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0 |
214 |
+ |
215 |
+ # It does not compile on alpha without this in LDFLAGS |
216 |
+ # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761 |
217 |
+ use alpha && append-ldflags "-Wl,--no-relax" |
218 |
+ |
219 |
+ # ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504 |
220 |
+ use ia64 && append-ldflags "-Wl,--no-as-needed" |
221 |
+ |
222 |
+ # Sigbuses on SPARC with mcpu and co., bug #??? |
223 |
+ use sparc && filter-flags "-mvis" |
224 |
+ |
225 |
+ # https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634 |
226 |
+ use ppc64 && append-flags "-mminimal-toc" |
227 |
+ |
228 |
+ # Try to use less memory, bug #469942 (see Fedora .spec for reference) |
229 |
+ # --no-keep-memory doesn't work on ia64, bug #502492 |
230 |
+ if ! use ia64; then |
231 |
+ append-ldflags "-Wl,--no-keep-memory" |
232 |
+ fi |
233 |
+ |
234 |
+ # We try to use gold when possible for this package |
235 |
+# if ! tc-ld-is-gold ; then |
236 |
+# append-ldflags "-Wl,--reduce-memory-overheads" |
237 |
+# fi |
238 |
+ |
239 |
+ # Multiple rendering bugs on youtube, github, etc without this, bug #547224 |
240 |
+ append-flags $(test-flags -fno-strict-aliasing) |
241 |
+ |
242 |
+ # Ruby situation is a bit complicated. See bug 513888 |
243 |
+ local rubyimpl |
244 |
+ local ruby_interpreter="" |
245 |
+ for rubyimpl in ${USE_RUBY}; do |
246 |
+ if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then |
247 |
+ ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})" |
248 |
+ fi |
249 |
+ done |
250 |
+ # This will rarely occur. Only a couple of corner cases could lead us to |
251 |
+ # that failure. See bug 513888 |
252 |
+ [[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found" |
253 |
+ |
254 |
+ # TODO: Check Web Audio support |
255 |
+ # should somehow let user select between them? |
256 |
+ # |
257 |
+ # FTL_JIT requires llvm |
258 |
+ # |
259 |
+ # opengl needs to be explicetly handled, bug #576634 |
260 |
+ |
261 |
+ local opengl_enabled |
262 |
+ if use opengl || use gles2; then |
263 |
+ opengl_enabled=ON |
264 |
+ else |
265 |
+ opengl_enabled=OFF |
266 |
+ fi |
267 |
+ |
268 |
+ local mycmakeargs=( |
269 |
+ -DENABLE_QUARTZ_TARGET=$(usex aqua) |
270 |
+ -DENABLE_API_TESTS=$(usex test) |
271 |
+ -DENABLE_GTKDOC=$(usex doc) |
272 |
+ -DENABLE_GEOLOCATION=$(usex geolocation) |
273 |
+ $(cmake-utils_use_find_package gles2 OpenGLES2) |
274 |
+ -DENABLE_GLES2=$(usex gles2) |
275 |
+ -DENABLE_VIDEO=$(usex gstreamer) |
276 |
+ -DENABLE_WEB_AUDIO=$(usex gstreamer) |
277 |
+ -DENABLE_INTROSPECTION=$(usex introspection) |
278 |
+ -DENABLE_JIT=$(usex jit) |
279 |
+ -DUSE_LIBNOTIFY=$(usex libnotify) |
280 |
+ -DUSE_LIBSECRET=$(usex gnome-keyring) |
281 |
+ -DUSE_WOFF2=ON |
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 |
+ -DCMAKE_BUILD_TYPE=Release |
291 |
+ -DPORT=GTK |
292 |
+ ${ruby_interpreter} |
293 |
+ ) |
294 |
+ |
295 |
+ # Allow it to use GOLD when possible as it has all the magic to |
296 |
+ # detect when to use it and using gold for this concrete package has |
297 |
+ # multiple advantages and is also the upstream default, bug #585788 |
298 |
+# if tc-ld-is-gold ; then |
299 |
+# mycmakeargs+=( -DUSE_LD_GOLD=ON ) |
300 |
+# else |
301 |
+# mycmakeargs+=( -DUSE_LD_GOLD=OFF ) |
302 |
+# fi |
303 |
+ |
304 |
+ cmake-utils_src_configure |
305 |
+} |
306 |
+ |
307 |
+src_compile() { |
308 |
+ cmake-utils_src_compile |
309 |
+} |
310 |
+ |
311 |
+src_test() { |
312 |
+ # Prevents test failures on PaX systems |
313 |
+ use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test* |
314 |
+ |
315 |
+ cmake-utils_src_test |
316 |
+} |
317 |
+ |
318 |
+src_install() { |
319 |
+ cmake-utils_src_install |
320 |
+ |
321 |
+ # Prevents crashes on PaX systems, bug #522808 |
322 |
+ use jit && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess" |
323 |
+ pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess" |
324 |
+ use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2 |
325 |
+} |