Gentoo Archives: gentoo-commits

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