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