Gentoo Archives: gentoo-commits

From: Gilles Dartiguelongue <eva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/
Date: Fri, 22 Sep 2017 07:56:31
Message-Id: 1506066977.7eb0f70f64ae75ab1c3d4e2c8eeed7e7fa713e88.eva@gentoo
1 commit: 7eb0f70f64ae75ab1c3d4e2c8eeed7e7fa713e88
2 Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 22 07:37:56 2017 +0000
4 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 22 07:56:17 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7eb0f70f
7
8 net-libs/webkit-gtk: cleanup security vulnerable 2.16.5, bug #626142
9
10 Bug: https://bugs.gentoo.org/show_bug.cgi?id=626142
11 Package-Manager: Portage-2.3.8, Repoman-2.3.3
12
13 net-libs/webkit-gtk/Manifest | 1 -
14 net-libs/webkit-gtk/webkit-gtk-2.16.5.ebuild | 288 ---------------------------
15 2 files changed, 289 deletions(-)
16
17 diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
18 index 8ee679e6755..85828c2eb8e 100644
19 --- a/net-libs/webkit-gtk/Manifest
20 +++ b/net-libs/webkit-gtk/Manifest
21 @@ -1,3 +1,2 @@
22 -DIST webkitgtk-2.16.5.tar.xz 14655656 SHA256 8e0396f3428e757898c5856e642eed4fcd5a20ae03d96d3eaa03b76634be7dd4 SHA512 9d7573da44267edcd83b4918e5f1e0516eb8d84c58ac6b239a2328448f96b39067b62bcd18e7d730ec0ef44b9f4b0a03712d17f9f465f00346a1f45a0a4ebb10 WHIRLPOOL 76fc7cc7dfb326d3600396bc1e486acd26cca1eda779d9a06ad123c60f8cba9eee162b626abe95a09c9e8ed0b308f341a818ebf833f6b902812c644e5925aacd
23 DIST webkitgtk-2.16.6.tar.xz 14658120 SHA256 fc23650df953123c59b9c0edf3855e7bd55bd107820997fc72375811e1ea4b21 SHA512 bb488d7a60e4d6f9683ac343852a75854ef73e6b5aa093361ffe2d08e71e2f11c19da4447f9937221e518cda784bdacfcfd151f9395605a1957380fbc5b1533b WHIRLPOOL b3053979c1837d97ba525e078d4a14c64a66c61cb0117041af02c8fd250b2062fda66e782134d6bf44f3f80a04917a9b2ac61aa4e800f0011e5243d7eb8583f4
24 DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3
25
26 diff --git a/net-libs/webkit-gtk/webkit-gtk-2.16.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.16.5.ebuild
27 deleted file mode 100644
28 index 44c39f36968..00000000000
29 --- a/net-libs/webkit-gtk/webkit-gtk-2.16.5.ebuild
30 +++ /dev/null
31 @@ -1,288 +0,0 @@
32 -# Copyright 1999-2017 Gentoo Foundation
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=6
36 -CMAKE_MAKEFILE_GENERATOR="ninja"
37 -PYTHON_COMPAT=( python2_7 )
38 -USE_RUBY="ruby21 ruby22 ruby23 ruby24"
39 -
40 -inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
41 -
42 -MY_P="webkitgtk-${PV}"
43 -DESCRIPTION="Open source web browser engine"
44 -HOMEPAGE="http://www.webkitgtk.org/"
45 -SRC_URI="http://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 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
50 -
51 -IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
52 -
53 -# webgl needs gstreamer, bug #560612
54 -REQUIRED_USE="
55 - geolocation? ( introspection )
56 - gles2? ( egl )
57 - introspection? ( gstreamer )
58 - nsplugin? ( X )
59 - webgl? ( ^^ ( gles2 opengl ) )
60 - !webgl? ( ?? ( gles2 opengl ) )
61 - webgl? ( gstreamer )
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 -# use sqlite, svg by default
71 -# Aqua support in gtk3 is untested
72 -# Dependencies found at Source/cmake/OptionsGTK.cmake
73 -# Various compile-time optionals for gtk+-3.22.0 - ensure it
74 -RDEPEND="
75 - dev-db/sqlite:3=
76 - >=dev-libs/glib-2.36:2
77 - dev-libs/hyphen
78 - >=dev-libs/icu-3.8.1-r1:=
79 - >=dev-libs/libxml2-2.8:2
80 - >=dev-libs/libxslt-1.1.7
81 - >=media-libs/fontconfig-2.8:1.0
82 - >=media-libs/freetype-2.4.2:2
83 - >=media-libs/harfbuzz-1.3.3:=[icu(+)]
84 - >=media-libs/libpng-1.4:0=
85 - media-libs/libwebp:=
86 - dev-libs/libgcrypt:0=
87 - >=net-libs/libsoup-2.42:2.4[introspection?]
88 - >=x11-libs/cairo-1.10.2:=
89 - >=x11-libs/gtk+-3.22:3[introspection?]
90 - >=x11-libs/pango-1.30.0
91 - virtual/jpeg:0=
92 -
93 - aqua? ( >=x11-libs/gtk+-3.14:3[aqua] )
94 - egl? ( media-libs/mesa[egl] )
95 - geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
96 - gles2? ( media-libs/mesa[gles2] )
97 - gnome-keyring? ( app-crypt/libsecret )
98 - gstreamer? (
99 - >=media-libs/gstreamer-1.2.3:1.0
100 - >=media-libs/gst-plugins-base-1.2.3:1.0
101 - >=media-libs/gst-plugins-bad-1.8:1.0[opengl?] )
102 - introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
103 - libnotify? ( x11-libs/libnotify )
104 - nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
105 - opengl? ( virtual/opengl
106 - x11-libs/cairo[opengl] )
107 - spell? ( >=app-text/enchant-0.22:= )
108 - wayland? ( >=x11-libs/gtk+-3.14:3[wayland] )
109 - webgl? (
110 - x11-libs/cairo[opengl]
111 - x11-libs/libXcomposite
112 - x11-libs/libXdamage )
113 - X? (
114 - x11-libs/cairo[X]
115 - >=x11-libs/gtk+-3.14:3[X]
116 - x11-libs/libX11
117 - x11-libs/libXcomposite
118 - x11-libs/libXrender
119 - x11-libs/libXt )
120 -"
121 -
122 -# paxctl needed for bug #407085
123 -# Need real bison, not yacc
124 -DEPEND="${RDEPEND}
125 - ${PYTHON_DEPS}
126 - ${RUBY_DEPS}
127 - >=dev-lang/perl-5.10
128 - >=app-accessibility/at-spi2-core-2.5.3
129 - >=dev-libs/atk-2.8.0
130 - >=dev-util/gtk-doc-am-1.10
131 - >=dev-util/gperf-3.0.1
132 - >=sys-devel/bison-2.4.3
133 - || ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
134 - sys-devel/gettext
135 - virtual/pkgconfig
136 -
137 - dev-lang/perl
138 - virtual/perl-Data-Dumper
139 - virtual/perl-Carp
140 -
141 - doc? ( >=dev-util/gtk-doc-1.10 )
142 - geolocation? ( dev-util/gdbus-codegen )
143 - introspection? ( jit? ( sys-apps/paxctl ) )
144 - test? (
145 - dev-lang/python:2.7
146 - dev-python/pygobject:3[python_targets_python2_7]
147 - x11-themes/hicolor-icon-theme
148 - jit? ( sys-apps/paxctl ) )
149 -"
150 -
151 -S="${WORKDIR}/${MY_P}"
152 -
153 -CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
154 -
155 -PATCHES=(
156 - # https://bugs.gentoo.org/show_bug.cgi?id=555504
157 - "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
158 -
159 - # https://bugs.gentoo.org/show_bug.cgi?id=564352
160 - # https://bugs.webkit.org/show_bug.cgi?id=167283
161 - "${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
162 -)
163 -
164 -pkg_pretend() {
165 - if [[ ${MERGE_TYPE} != "binary" ]] ; then
166 - if is-flagq "-g*" && ! is-flagq "-g*0" ; then
167 - einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
168 - check-reqs_pkg_pretend
169 - fi
170 -
171 - if ! test-flag-CXX -std=c++11 ; then
172 - die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
173 - fi
174 -
175 - if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
176 - die 'The active compiler needs to be gcc 4.9 (or newer)'
177 - fi
178 - fi
179 -}
180 -
181 -pkg_setup() {
182 - if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
183 - check-reqs_pkg_setup
184 - fi
185 -
186 - python-any-r1_pkg_setup
187 -}
188 -
189 -src_configure() {
190 - # Respect CC, otherwise fails on prefix #395875
191 - tc-export CC
192 -
193 - # Arches without JIT support also need this to really disable it in all places
194 - use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
195 -
196 - # It does not compile on alpha without this in LDFLAGS
197 - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
198 - use alpha && append-ldflags "-Wl,--no-relax"
199 -
200 - # ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
201 - use ia64 && append-ldflags "-Wl,--no-as-needed"
202 -
203 - # Sigbuses on SPARC with mcpu and co., bug #???
204 - use sparc && filter-flags "-mvis"
205 -
206 - # https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
207 - use ppc64 && append-flags "-mminimal-toc"
208 -
209 - # Try to use less memory, bug #469942 (see Fedora .spec for reference)
210 - # --no-keep-memory doesn't work on ia64, bug #502492
211 - if ! use ia64; then
212 - append-ldflags "-Wl,--no-keep-memory"
213 - fi
214 -
215 - # We try to use gold when possible for this package
216 -# if ! tc-ld-is-gold ; then
217 -# append-ldflags "-Wl,--reduce-memory-overheads"
218 -# fi
219 -
220 - # older glibc needs this for INTPTR_MAX, bug #533976
221 - if has_version "<sys-libs/glibc-2.18" ; then
222 - append-cppflags "-D__STDC_LIMIT_MACROS"
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 - local ruby_interpreter=""
229 -
230 - if has_version "virtual/rubygems[ruby_targets_ruby24]"; then
231 - ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)"
232 - elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then
233 - ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
234 - elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
235 - ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
236 - else
237 - ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
238 - fi
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 - # support for webgl (aka 2d-canvas accelerating)
255 - local canvas_enabled
256 - if use webgl && ! use gles2 ; then
257 - canvas_enabled=ON
258 - else
259 - canvas_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 - -DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
276 - -DENABLE_SPELLCHECK=$(usex spell)
277 - -DENABLE_WAYLAND_TARGET=$(usex wayland)
278 - -DENABLE_WEBGL=$(usex webgl)
279 - $(cmake-utils_use_find_package egl EGL)
280 - $(cmake-utils_use_find_package opengl OpenGL)
281 - -DENABLE_X11_TARGET=$(usex X)
282 - -DENABLE_OPENGL=${opengl_enabled}
283 - -DENABLE_ACCELERATED_2D_CANVAS=${canvas_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/bin/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 -}