Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/
Date: Fri, 30 Apr 2021 22:06:22
Message-Id: 1619820374.7a8d3a6ed37d6d4870c91ba9691286e671092089.whissi@gentoo
1 commit: 7a8d3a6ed37d6d4870c91ba9691286e671092089
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Fri Apr 30 22:05:44 2021 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 30 22:06:14 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a8d3a6e
7
8 net-libs/webkit-gtk: security cleanup
9
10 Bug: https://bugs.gentoo.org/773193
11 Package-Manager: Portage-3.0.18, Repoman-3.0.3
12 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
13
14 net-libs/webkit-gtk/Manifest | 1 -
15 net-libs/webkit-gtk/webkit-gtk-2.30.5.ebuild | 300 ---------------------------
16 2 files changed, 301 deletions(-)
17
18 diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
19 index 60758d753b3..47c55e0ecf0 100644
20 --- a/net-libs/webkit-gtk/Manifest
21 +++ b/net-libs/webkit-gtk/Manifest
22 @@ -1,2 +1 @@
23 -DIST webkitgtk-2.30.5.tar.xz 22311832 BLAKE2B b00e889d59883e62bcf179df8a766e20a7cd7ee2db462c4eb4279686aac5ea1cad7903189b14031088ab23b8dfd89c1f09f90e2deb5d208281d55c262cc0cb3c SHA512 406fc767a806bb2af446c73e7079720a4d82d592a95a20f30f468c31cdc2efd25e082a5ecfbe00c27f62236e1e56a729c48191451d130188419967975378235d
24 DIST webkitgtk-2.30.6.tar.xz 22311524 BLAKE2B 369a2f03b99a17b3e7ffbd0a8528a0d7f65334138552e7684fdec6b3003fab8d9a946f1b549849562b71e9a0daa3f870578d088833db2e8e291974bd38eaed05 SHA512 fe2de42ea66162cf28002bd2bd83890c8f8f6336fea873f769a57bae4d6cb8fd6c41af224e320608bcb47c8f0f41d150ac47004e9ef52127d208c01ae6dcf47f
25
26 diff --git a/net-libs/webkit-gtk/webkit-gtk-2.30.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.30.5.ebuild
27 deleted file mode 100644
28 index b62e32197a1..00000000000
29 --- a/net-libs/webkit-gtk/webkit-gtk-2.30.5.ebuild
30 +++ /dev/null
31 @@ -1,300 +0,0 @@
32 -# Copyright 1999-2021 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=7
36 -PYTHON_COMPAT=( python3_{7..8} )
37 -USE_RUBY="ruby24 ruby25 ruby26 ruby27 ruby30"
38 -
39 -inherit check-reqs cmake flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
40 -
41 -MY_P="webkitgtk-${PV}"
42 -DESCRIPTION="Open source web browser engine"
43 -HOMEPAGE="https://www.webkitgtk.org"
44 -SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
45 -
46 -LICENSE="LGPL-2+ BSD"
47 -SLOT="4/37" # soname version of libwebkit2gtk-4.0
48 -KEYWORDS="amd64 arm arm64 ppc64 ~sparc x86"
49 -
50 -IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
51 -
52 -# gstreamer with opengl/gles2 needs egl
53 -REQUIRED_USE="
54 - gles2-only? ( egl !opengl )
55 - gstreamer? ( opengl? ( egl ) )
56 - wayland? ( egl )
57 - || ( aqua wayland X )
58 -"
59 -
60 -# Tests fail to link for inexplicable reasons
61 -# https://bugs.webkit.org/show_bug.cgi?id=148210
62 -RESTRICT="test"
63 -
64 -# Aqua support in gtk3 is untested
65 -# Dependencies found at Source/cmake/OptionsGTK.cmake
66 -# Various compile-time optionals for gtk+-3.22.0 - ensure it
67 -# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
68 -# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
69 -wpe_depend="
70 - >=gui-libs/libwpe-1.5.0:1.0
71 - >=gui-libs/wpebackend-fdo-1.7.0:1.0
72 -"
73 -# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
74 -RDEPEND="
75 - >=x11-libs/cairo-1.16.0:=[X?]
76 - >=media-libs/fontconfig-2.13.0:1.0
77 - >=media-libs/freetype-2.9.0:2
78 - >=dev-libs/libgcrypt-1.7.0:0=
79 - >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
80 - >=media-libs/harfbuzz-1.4.2:=[icu(+)]
81 - >=dev-libs/icu-60.2:=
82 - virtual/jpeg:0=
83 - >=net-libs/libsoup-2.54:2.4[introspection?]
84 - >=dev-libs/libxml2-2.8.0:2
85 - >=media-libs/libpng-1.4:0=
86 - dev-db/sqlite:3=
87 - sys-libs/zlib:0
88 - >=dev-libs/atk-2.16.0
89 - media-libs/libwebp:=
90 -
91 - >=dev-libs/glib-2.44.0:2
92 - >=dev-libs/libxslt-1.1.7
93 - media-libs/woff2
94 - gnome-keyring? ( app-crypt/libsecret )
95 - introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
96 - dev-libs/libtasn1:=
97 - spell? ( >=app-text/enchant-0.22:2 )
98 - gstreamer? (
99 - >=media-libs/gstreamer-1.14:1.0
100 - >=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?]
101 - gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
102 - >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
103 - >=media-libs/gst-plugins-bad-1.14:1.0 )
104 -
105 - X? (
106 - x11-libs/libX11
107 - x11-libs/libXcomposite
108 - x11-libs/libXdamage
109 - x11-libs/libXrender
110 - x11-libs/libXt )
111 -
112 - libnotify? ( x11-libs/libnotify )
113 - dev-libs/hyphen
114 - jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
115 -
116 - egl? ( media-libs/mesa[egl] )
117 - gles2-only? ( media-libs/mesa[gles2] )
118 - opengl? ( virtual/opengl )
119 - wayland? (
120 - dev-libs/wayland
121 - >=dev-libs/wayland-protocols-1.12
122 - opengl? ( ${wpe_depend} )
123 - gles2-only? ( ${wpe_depend} )
124 - )
125 -
126 - seccomp? (
127 - >=sys-apps/bubblewrap-0.3.1
128 - sys-libs/libseccomp
129 - sys-apps/xdg-dbus-proxy
130 - )
131 -
132 - systemd? ( sys-apps/systemd:= )
133 - gamepad? ( >=dev-libs/libmanette-0.2.4 )
134 -"
135 -unset wpe_depend
136 -DEPEND="${RDEPEND}"
137 -# paxctl needed for bug #407085
138 -# Need real bison, not yacc
139 -BDEPEND="
140 - ${PYTHON_DEPS}
141 - ${RUBY_DEPS}
142 - >=app-accessibility/at-spi2-core-2.5.3
143 - dev-util/glib-utils
144 - >=dev-util/gperf-3.0.1
145 - >=sys-devel/bison-2.4.3
146 - || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
147 - sys-devel/gettext
148 - virtual/pkgconfig
149 -
150 - >=dev-lang/perl-5.10
151 - virtual/perl-Data-Dumper
152 - virtual/perl-Carp
153 - virtual/perl-JSON-PP
154 -
155 - gtk-doc? ( >=dev-util/gtk-doc-1.32 )
156 - geolocation? ( dev-util/gdbus-codegen )
157 - >=dev-util/cmake-3.10
158 -"
159 -# test? (
160 -# dev-python/pygobject:3[python_targets_python2_7]
161 -# x11-themes/hicolor-icon-theme
162 -# jit? ( sys-apps/paxctl ) )
163 -RDEPEND="${RDEPEND}
164 - geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
165 -"
166 -
167 -S="${WORKDIR}/${MY_P}"
168 -
169 -CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
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++17 ; then
179 - die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
180 - fi
181 - fi
182 -
183 - if ! use opengl && ! use gles2-only; then
184 - ewarn
185 - ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles2-only) completely."
186 - ewarn "This is an unsupported configuration meant for very specific embedded"
187 - ewarn "use cases, where there truly is no GL possible (and even that use case"
188 - ewarn "is very unlikely to come by). If you have GL (even software-only), you"
189 - ewarn "really really should be enabling OpenGL!"
190 - ewarn
191 - fi
192 -}
193 -
194 -pkg_setup() {
195 - if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
196 - check-reqs_pkg_setup
197 - fi
198 -
199 - python-any-r1_pkg_setup
200 -}
201 -
202 -src_prepare() {
203 - eapply "${FILESDIR}"/${PN}-2.24.4-eglmesaext-include.patch # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108
204 - eapply "${FILESDIR}"/2.28.2-opengl-without-X-fixes.patch
205 - eapply "${FILESDIR}"/2.28.2-non-jumbo-fix.patch
206 - eapply "${FILESDIR}"/2.28.4-non-jumbo-fix2.patch
207 - eapply "${FILESDIR}"/2.30.3-fix-noGL-build.patch
208 - cmake_src_prepare
209 - gnome2_src_prepare
210 -}
211 -
212 -src_configure() {
213 - # Respect CC, otherwise fails on prefix #395875
214 - tc-export CC
215 -
216 - # It does not compile on alpha without this in LDFLAGS
217 - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
218 - use alpha && append-ldflags "-Wl,--no-relax"
219 -
220 - # ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
221 - use ia64 && append-ldflags "-Wl,--no-as-needed"
222 -
223 - # Sigbuses on SPARC with mcpu and co., bug #???
224 - use sparc && filter-flags "-mvis"
225 -
226 - # https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
227 - use ppc64 && append-flags "-mminimal-toc"
228 -
229 - # Try to use less memory, bug #469942 (see Fedora .spec for reference)
230 - # --no-keep-memory doesn't work on ia64, bug #502492
231 - if ! use ia64; then
232 - append-ldflags "-Wl,--no-keep-memory"
233 - fi
234 -
235 - # We try to use gold when possible for this package
236 -# if ! tc-ld-is-gold ; then
237 -# append-ldflags "-Wl,--reduce-memory-overheads"
238 -# fi
239 -
240 - # Ruby situation is a bit complicated. See bug 513888
241 - local rubyimpl
242 - local ruby_interpreter=""
243 - for rubyimpl in ${USE_RUBY}; do
244 - if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
245 - ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
246 - fi
247 - done
248 - # This will rarely occur. Only a couple of corner cases could lead us to
249 - # that failure. See bug 513888
250 - [[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
251 -
252 - # TODO: Check Web Audio support
253 - # should somehow let user select between them?
254 - #
255 - # opengl needs to be explicetly handled, bug #576634
256 -
257 - local use_wpe_renderer=OFF
258 - local opengl_enabled
259 - if use opengl || use gles2-only; then
260 - opengl_enabled=ON
261 - use wayland && use_wpe_renderer=ON
262 - else
263 - opengl_enabled=OFF
264 - fi
265 -
266 - local mycmakeargs=(
267 - -DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
268 - -DENABLE_QUARTZ_TARGET=$(usex aqua)
269 - -DENABLE_API_TESTS=$(usex test)
270 - -DENABLE_GTKDOC=$(usex gtk-doc)
271 - -DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
272 - $(cmake_use_find_package gles2-only OpenGLES2)
273 - -DENABLE_GLES2=$(usex gles2-only)
274 - -DENABLE_MINIBROWSER=$(usex examples)
275 - -DENABLE_VIDEO=$(usex gstreamer)
276 - -DENABLE_WEB_AUDIO=$(usex gstreamer)
277 - -DENABLE_INTROSPECTION=$(usex introspection)
278 - -DUSE_LIBNOTIFY=$(usex libnotify)
279 - -DUSE_LIBSECRET=$(usex gnome-keyring)
280 - -DUSE_OPENJPEG=$(usex jpeg2k)
281 - -DUSE_WOFF2=ON
282 - -DENABLE_SPELLCHECK=$(usex spell)
283 - -DUSE_SYSTEMD=$(usex systemd) # Whether to enable journald logging
284 - -DENABLE_GAMEPAD=$(usex gamepad)
285 - -DENABLE_WAYLAND_TARGET=$(usex wayland)
286 - -DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
287 - $(cmake_use_find_package egl EGL)
288 - $(cmake_use_find_package opengl OpenGL)
289 - -DENABLE_X11_TARGET=$(usex X)
290 - -DENABLE_GRAPHICS_CONTEXT_GL=${opengl_enabled}
291 - -DENABLE_WEBGL=${opengl_enabled}
292 - -DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
293 - -DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
294 - -DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
295 - -DPORT=GTK
296 - ${ruby_interpreter}
297 - )
298 -
299 - # Allow it to use GOLD when possible as it has all the magic to
300 - # detect when to use it and using gold for this concrete package has
301 - # multiple advantages and is also the upstream default, bug #585788
302 -# if tc-ld-is-gold ; then
303 -# mycmakeargs+=( -DUSE_LD_GOLD=ON )
304 -# else
305 -# mycmakeargs+=( -DUSE_LD_GOLD=OFF )
306 -# fi
307 -
308 - # https://bugs.gentoo.org/761238
309 - append-cppflags -DNDEBUG
310 -
311 - WK_USE_CCACHE=NO cmake_src_configure
312 -}
313 -
314 -src_compile() {
315 - cmake_src_compile
316 -}
317 -
318 -src_test() {
319 - # Prevents test failures on PaX systems
320 - pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
321 -
322 - cmake_src_test
323 -}
324 -
325 -src_install() {
326 - cmake_src_install
327 -
328 - # Prevents crashes on PaX systems, bug #522808
329 - pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/jsc" "${ED}/usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
330 - pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
331 -}