1 |
commit: 3b051f7b2952adfd1911a590f42aea6cecdddf5a |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jun 1 13:30:10 2017 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jun 1 13:30:10 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b051f7b |
7 |
|
8 |
net-libs/webkit-gtk: security cleanup |
9 |
|
10 |
Gentoo-bug: 619788 |
11 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
12 |
|
13 |
net-libs/webkit-gtk/Manifest | 1 - |
14 |
.../files/2.16.1-avoid-perl-ithreads.patch | 88 ------- |
15 |
.../files/2.16.2-avoid-perl-ithreads.patch | 130 --------- |
16 |
net-libs/webkit-gtk/webkit-gtk-2.16.2.ebuild | 291 --------------------- |
17 |
4 files changed, 510 deletions(-) |
18 |
|
19 |
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest |
20 |
index 50f03771242..b0ceed885d2 100644 |
21 |
--- a/net-libs/webkit-gtk/Manifest |
22 |
+++ b/net-libs/webkit-gtk/Manifest |
23 |
@@ -1,3 +1,2 @@ |
24 |
-DIST webkitgtk-2.16.2.tar.xz 14650116 SHA256 5ef689a202eb2b71141efbe8b7b53288adced90790f9f08df6e0a2ec1809f252 SHA512 0bd16f663dffd41d713a53e2186576c4a7c42e7f872605a1688c80e8b55408b5f96f1274a1fe24624b4974240e901df5b11d1ff27a03fa2d9950575f1260abc8 WHIRLPOOL 7268820bdee088eb639e4453c683e8f6b13e7cc7093f8d4148b3911aa7ea7807291ca443b18c885de4a9a838cd80ba9247f728d1cd8106b373b4c568a918a16b |
25 |
DIST webkitgtk-2.16.3.tar.xz 14652068 SHA256 204e9131da0101b9bc8765716e70a897121af04b964d9827cd9f20816a77b512 SHA512 551367551ed1bceaf9c70269f229e97972706820c6ae2d4444bc6d8b0992d6de34a156f9c245813c1f1701ce54f5476a44512590acfa6cfd6e67663d94caa91e WHIRLPOOL bac846be9d5f7b0a4c08b201d338bed6b84e65bdb105f2689350e02e0f0011944f5e23961e9411f712040c26a5313ef9bb4e30dda2cb19216c8e8d665ab0550f |
26 |
DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3 |
27 |
|
28 |
diff --git a/net-libs/webkit-gtk/files/2.16.1-avoid-perl-ithreads.patch b/net-libs/webkit-gtk/files/2.16.1-avoid-perl-ithreads.patch |
29 |
deleted file mode 100644 |
30 |
index 506696fcc7a..00000000000 |
31 |
--- a/net-libs/webkit-gtk/files/2.16.1-avoid-perl-ithreads.patch |
32 |
+++ /dev/null |
33 |
@@ -1,88 +0,0 @@ |
34 |
-From 1ac17bea2273df0dfec21897b00efb8351648e1b Mon Sep 17 00:00:00 2001 |
35 |
-From: Kent Fredric <kentnl@g.o> |
36 |
-Date: Sun, 9 Apr 2017 04:10:52 +1200 |
37 |
-Subject: Remove need for threaded perl at expense of being single-threaded |
38 |
- |
39 |
-This could theoretically be implemented with forks, but I opted not |
40 |
-to because its too hard, and the platform specifics are too messy. |
41 |
- |
42 |
-This could theoretically also have support for automatic detection |
43 |
-as to which strategy to use based on OS/availability, but the |
44 |
-implementation details of that are too much for my pateience today. |
45 |
- |
46 |
-In an ideal world, this file would support: |
47 |
- |
48 |
-1. Single threaded builds for spartans |
49 |
-2. Forked builds for people who are on linux but don't want to rebuild |
50 |
- their perl just to have threads ( which produce negligible benefit |
51 |
- and measurable performance penalties to all code ) |
52 |
-3. Threaded builds for people who are on windows where forks may not |
53 |
- be entirely sane. |
54 |
- |
55 |
-But #1 is good enough atm. |
56 |
- |
57 |
-This is important for Gentoo, because end users decide on their own |
58 |
-choices with regards to threading support for perl, and threading |
59 |
-support is off by default due to the performance issues mentioned in #2 |
60 |
-in conjunction with the fact that "threads" is officially discouraged |
61 |
-by Perl Upstream. |
62 |
- |
63 |
-And as Gentoo users have to have a system Perl to compile WebkitGTK, |
64 |
-this means installing WebkitGTK requires rebuilding their system Perl |
65 |
-with threads. |
66 |
- |
67 |
-And this *also* means that all packages presently compiled against Perl |
68 |
-become broken, because non-threaded perl and threaded perl are not ABI |
69 |
-compatible with each other, and this can scale into hundreds of |
70 |
-packages and significant transient breakage. |
71 |
- |
72 |
-This ends up in practice being *far* *worse* in terms of time wasted |
73 |
-than the mediocre time inefficiency created by needing a single |
74 |
-threaded build. |
75 |
---- |
76 |
- Source/WebCore/bindings/scripts/generate-bindings-all.pl | 15 +++++---------- |
77 |
- 1 file changed, 5 insertions(+), 10 deletions(-) |
78 |
- |
79 |
-diff --git a/Source/WebCore/bindings/scripts/generate-bindings-all.pl b/Source/WebCore/bindings/scripts/generate-bindings-all.pl |
80 |
-index 37b27cc74..b3a378df0 100755 |
81 |
---- a/Source/WebCore/bindings/scripts/generate-bindings-all.pl |
82 |
-+++ b/Source/WebCore/bindings/scripts/generate-bindings-all.pl |
83 |
-@@ -32,9 +32,6 @@ use File::Basename; |
84 |
- use File::Spec; |
85 |
- use File::Find; |
86 |
- use Getopt::Long; |
87 |
--use threads; |
88 |
--use threads::shared; |
89 |
--use Thread::Queue; |
90 |
- |
91 |
- my $perl = $^X; |
92 |
- my $scriptDir = $FindBin::Bin; |
93 |
-@@ -121,13 +118,11 @@ my @idlFilesToUpdate = grep &{sub { |
94 |
- implicitDependencies($depFile)); |
95 |
- needsUpdate(\@output, \@deps); |
96 |
- }}, @idlFiles; |
97 |
--my $queue = Thread::Queue->new(@idlFilesToUpdate); |
98 |
--my $abort :shared = 0; |
99 |
--my $totalCount = @idlFilesToUpdate; |
100 |
--my $currentCount :shared = 0; |
101 |
- |
102 |
--my @threadPool = map { threads->create(\&worker) } (1 .. $numOfJobs); |
103 |
--$_->join for @threadPool; |
104 |
-+my $abort = 0; |
105 |
-+my $totalCount = @idlFilesToUpdate; |
106 |
-+my $currentCount = 0; |
107 |
-+worker(); |
108 |
- exit $abort; |
109 |
- |
110 |
- sub needsUpdate |
111 |
-@@ -158,7 +153,7 @@ sub mtime |
112 |
- } |
113 |
- |
114 |
- sub worker { |
115 |
-- while (my $file = $queue->dequeue_nb()) { |
116 |
-+ while (my $file = shift @idlFilesToUpdate) { |
117 |
- last if $abort; |
118 |
- eval { |
119 |
- $currentCount++; |
120 |
--- |
121 |
-2.12.2 |
122 |
|
123 |
diff --git a/net-libs/webkit-gtk/files/2.16.2-avoid-perl-ithreads.patch b/net-libs/webkit-gtk/files/2.16.2-avoid-perl-ithreads.patch |
124 |
deleted file mode 100644 |
125 |
index fb49731de1f..00000000000 |
126 |
--- a/net-libs/webkit-gtk/files/2.16.2-avoid-perl-ithreads.patch |
127 |
+++ /dev/null |
128 |
@@ -1,130 +0,0 @@ |
129 |
-From b9ee99577992ccb7a94840f5f7f2d77b31c4e0bd Mon Sep 17 00:00:00 2001 |
130 |
-From: "commit-queue@××××××.org" |
131 |
- <commit-queue@××××××.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> |
132 |
-Date: Sun, 9 Apr 2017 21:48:06 +0000 |
133 |
-Subject: [PATCH] generate-bindings-all.pl shouldn't use Perl threads |
134 |
- https://bugs.webkit.org/show_bug.cgi?id=170106 |
135 |
- |
136 |
-Patch by Fujii Hironori <Hironori.Fujii@××××.com> on 2017-04-09 |
137 |
-Reviewed by Yusuke Suzuki. |
138 |
- |
139 |
-The use of interpreter-based threads in Perl is officially |
140 |
-discouraged and not all Linux distributions and BSD compile Perl |
141 |
-with threads support. Use fork instead of threads to run |
142 |
-generate-bindings.pl in parallel. |
143 |
- |
144 |
-* bindings/scripts/generate-bindings-all.pl: |
145 |
-(spawnGenerateBindingsIfNeeded): Added. |
146 |
-(executeCommand): Removed the workaround for Cygwin Perl threads. |
147 |
-(spawnCommand): Added. |
148 |
-(worker): Deleted. |
149 |
- |
150 |
-git-svn-id: http://svn.webkit.org/repository/webkit/trunk@215166 268f45cc-cd09-0410-ab3c-d52691b4dbfc |
151 |
---- |
152 |
- .../bindings/scripts/generate-bindings-all.pl | 63 +++++++++++----------- |
153 |
-diff --git a/Source/WebCore/bindings/scripts/generate-bindings-all.pl b/Source/WebCore/bindings/scripts/generate-bindings-all.pl |
154 |
-index 37b27cc..968ea11 100755 |
155 |
---- a/Source/WebCore/bindings/scripts/generate-bindings-all.pl |
156 |
-+++ b/Source/WebCore/bindings/scripts/generate-bindings-all.pl |
157 |
-@@ -32,9 +32,6 @@ use File::Basename; |
158 |
- use File::Spec; |
159 |
- use File::Find; |
160 |
- use Getopt::Long; |
161 |
--use threads; |
162 |
--use threads::shared; |
163 |
--use Thread::Queue; |
164 |
- |
165 |
- my $perl = $^X; |
166 |
- my $scriptDir = $FindBin::Bin; |
167 |
-@@ -121,13 +118,18 @@ my @idlFilesToUpdate = grep &{sub { |
168 |
- implicitDependencies($depFile)); |
169 |
- needsUpdate(\@output, \@deps); |
170 |
- }}, @idlFiles; |
171 |
--my $queue = Thread::Queue->new(@idlFilesToUpdate); |
172 |
--my $abort :shared = 0; |
173 |
-+ |
174 |
-+my $abort = 0; |
175 |
- my $totalCount = @idlFilesToUpdate; |
176 |
--my $currentCount :shared = 0; |
177 |
-+my $currentCount = 0; |
178 |
- |
179 |
--my @threadPool = map { threads->create(\&worker) } (1 .. $numOfJobs); |
180 |
--$_->join for @threadPool; |
181 |
-+spawnGenerateBindingsIfNeeded() for (1 .. $numOfJobs); |
182 |
-+while (waitpid(-1, 0) != -1) { |
183 |
-+ if ($?) { |
184 |
-+ $abort = 1; |
185 |
-+ } |
186 |
-+ spawnGenerateBindingsIfNeeded(); |
187 |
-+} |
188 |
- exit $abort; |
189 |
- |
190 |
- sub needsUpdate |
191 |
-@@ -157,20 +159,16 @@ sub mtime |
192 |
- return (stat $file)[9]; |
193 |
- } |
194 |
- |
195 |
--sub worker { |
196 |
-- while (my $file = $queue->dequeue_nb()) { |
197 |
-- last if $abort; |
198 |
-- eval { |
199 |
-- $currentCount++; |
200 |
-- my $basename = basename($file); |
201 |
-- printProgress("[$currentCount/$totalCount] $basename"); |
202 |
-- executeCommand($perl, @args, $file) == 0 or die; |
203 |
-- }; |
204 |
-- if ($@) { |
205 |
-- $abort = 1; |
206 |
-- die; |
207 |
-- } |
208 |
-- } |
209 |
-+sub spawnGenerateBindingsIfNeeded |
210 |
-+{ |
211 |
-+ return if $abort; |
212 |
-+ return unless @idlFilesToUpdate; |
213 |
-+ my $file = shift @idlFilesToUpdate; |
214 |
-+ $currentCount++; |
215 |
-+ my $basename = basename($file); |
216 |
-+ printProgress("[$currentCount/$totalCount] $basename"); |
217 |
-+ my $pid = spawnCommand($perl, @args, $file); |
218 |
-+ $abort = 1 unless defined $pid; |
219 |
- } |
220 |
- |
221 |
- sub buildDirectoryCache |
222 |
-@@ -196,22 +194,23 @@ sub implicitDependencies |
223 |
- |
224 |
- sub executeCommand |
225 |
- { |
226 |
-- if ($^O eq 'cygwin') { |
227 |
-- # 'system' of Cygwin Perl doesn't seem thread-safe |
228 |
-- my $pid = fork(); |
229 |
-- defined($pid) or die; |
230 |
-- if ($pid == 0) { |
231 |
-- exec(@_) or die; |
232 |
-- } |
233 |
-- waitpid($pid, 0); |
234 |
-- return $?; |
235 |
-- } |
236 |
- if ($^O eq 'MSWin32') { |
237 |
- return system(quoteCommand(@_)); |
238 |
- } |
239 |
- return system(@_); |
240 |
- } |
241 |
- |
242 |
-+sub spawnCommand |
243 |
-+{ |
244 |
-+ my $pid = fork(); |
245 |
-+ if ($pid == 0) { |
246 |
-+ @_ = quoteCommand(@_) if ($^O eq 'MSWin32'); |
247 |
-+ exec(@_); |
248 |
-+ die "Cannot exec"; |
249 |
-+ } |
250 |
-+ return $pid; |
251 |
-+} |
252 |
-+ |
253 |
- sub quoteCommand |
254 |
- { |
255 |
- return map { |
256 |
--- |
257 |
-1.8.3.1 |
258 |
- |
259 |
|
260 |
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.16.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.16.2.ebuild |
261 |
deleted file mode 100644 |
262 |
index 46999c045c6..00000000000 |
263 |
--- a/net-libs/webkit-gtk/webkit-gtk-2.16.2.ebuild |
264 |
+++ /dev/null |
265 |
@@ -1,291 +0,0 @@ |
266 |
-# Copyright 1999-2017 Gentoo Foundation |
267 |
-# Distributed under the terms of the GNU General Public License v2 |
268 |
- |
269 |
-EAPI=6 |
270 |
-CMAKE_MAKEFILE_GENERATOR="ninja" |
271 |
-PYTHON_COMPAT=( python2_7 ) |
272 |
-USE_RUBY="ruby21 ruby22 ruby23 ruby24" |
273 |
- |
274 |
-inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx |
275 |
- |
276 |
-MY_P="webkitgtk-${PV}" |
277 |
-DESCRIPTION="Open source web browser engine" |
278 |
-HOMEPAGE="http://www.webkitgtk.org/" |
279 |
-SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz" |
280 |
- |
281 |
-LICENSE="LGPL-2+ BSD" |
282 |
-SLOT="4/37" # soname version of libwebkit2gtk-4.0 |
283 |
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" |
284 |
- |
285 |
-IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X" |
286 |
- |
287 |
-# webgl needs gstreamer, bug #560612 |
288 |
-REQUIRED_USE=" |
289 |
- geolocation? ( introspection ) |
290 |
- gles2? ( egl ) |
291 |
- introspection? ( gstreamer ) |
292 |
- nsplugin? ( X ) |
293 |
- webgl? ( ^^ ( gles2 opengl ) ) |
294 |
- !webgl? ( ?? ( gles2 opengl ) ) |
295 |
- webgl? ( gstreamer ) |
296 |
- wayland? ( egl ) |
297 |
- || ( aqua wayland X ) |
298 |
-" |
299 |
- |
300 |
-# Tests fail to link for inexplicable reasons |
301 |
-# https://bugs.webkit.org/show_bug.cgi?id=148210 |
302 |
-RESTRICT="test" |
303 |
- |
304 |
-# use sqlite, svg by default |
305 |
-# Aqua support in gtk3 is untested |
306 |
-# Dependencies found at Source/cmake/OptionsGTK.cmake |
307 |
-RDEPEND=" |
308 |
- dev-db/sqlite:3= |
309 |
- >=dev-libs/glib-2.36:2 |
310 |
- dev-libs/hyphen |
311 |
- >=dev-libs/icu-3.8.1-r1:= |
312 |
- >=dev-libs/libxml2-2.8:2 |
313 |
- >=dev-libs/libxslt-1.1.7 |
314 |
- >=media-libs/fontconfig-2.8:1.0 |
315 |
- >=media-libs/freetype-2.4.2:2 |
316 |
- >=media-libs/harfbuzz-1.3.3:=[icu(+)] |
317 |
- >=media-libs/libpng-1.4:0= |
318 |
- media-libs/libwebp:= |
319 |
- dev-libs/libgcrypt:0= |
320 |
- >=net-libs/libsoup-2.42:2.4[introspection?] |
321 |
- >=x11-libs/cairo-1.10.2:= |
322 |
- >=x11-libs/gtk+-3.14:3[introspection?] |
323 |
- >=x11-libs/pango-1.30.0 |
324 |
- virtual/jpeg:0= |
325 |
- |
326 |
- aqua? ( >=x11-libs/gtk+-3.14:3[aqua] ) |
327 |
- egl? ( media-libs/mesa[egl] ) |
328 |
- geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) |
329 |
- gles2? ( media-libs/mesa[gles2] ) |
330 |
- gnome-keyring? ( app-crypt/libsecret ) |
331 |
- gstreamer? ( |
332 |
- >=media-libs/gstreamer-1.2.3:1.0 |
333 |
- >=media-libs/gst-plugins-base-1.2.3:1.0 |
334 |
- >=media-libs/gst-plugins-bad-1.8:1.0[opengl?] ) |
335 |
- introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) |
336 |
- libnotify? ( x11-libs/libnotify ) |
337 |
- nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) |
338 |
- opengl? ( virtual/opengl |
339 |
- x11-libs/cairo[opengl] ) |
340 |
- spell? ( >=app-text/enchant-0.22:= ) |
341 |
- wayland? ( >=x11-libs/gtk+-3.14:3[wayland] ) |
342 |
- webgl? ( |
343 |
- x11-libs/cairo[opengl] |
344 |
- x11-libs/libXcomposite |
345 |
- x11-libs/libXdamage ) |
346 |
- X? ( |
347 |
- x11-libs/cairo[X] |
348 |
- >=x11-libs/gtk+-3.14:3[X] |
349 |
- x11-libs/libX11 |
350 |
- x11-libs/libXcomposite |
351 |
- x11-libs/libXrender |
352 |
- x11-libs/libXt ) |
353 |
-" |
354 |
- |
355 |
-# paxctl needed for bug #407085 |
356 |
-# Need real bison, not yacc |
357 |
-DEPEND="${RDEPEND} |
358 |
- ${PYTHON_DEPS} |
359 |
- ${RUBY_DEPS} |
360 |
- >=dev-lang/perl-5.10 |
361 |
- >=app-accessibility/at-spi2-core-2.5.3 |
362 |
- >=dev-libs/atk-2.8.0 |
363 |
- >=dev-util/gtk-doc-am-1.10 |
364 |
- >=dev-util/gperf-3.0.1 |
365 |
- >=sys-devel/bison-2.4.3 |
366 |
- || ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 ) |
367 |
- sys-devel/gettext |
368 |
- virtual/pkgconfig |
369 |
- |
370 |
- dev-lang/perl |
371 |
- virtual/perl-Data-Dumper |
372 |
- virtual/perl-Carp |
373 |
- |
374 |
- doc? ( >=dev-util/gtk-doc-1.10 ) |
375 |
- geolocation? ( dev-util/gdbus-codegen ) |
376 |
- introspection? ( jit? ( sys-apps/paxctl ) ) |
377 |
- test? ( |
378 |
- dev-lang/python:2.7 |
379 |
- dev-python/pygobject:3[python_targets_python2_7] |
380 |
- x11-themes/hicolor-icon-theme |
381 |
- jit? ( sys-apps/paxctl ) ) |
382 |
-" |
383 |
- |
384 |
-S="${WORKDIR}/${MY_P}" |
385 |
- |
386 |
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307 |
387 |
- |
388 |
-PATCHES=( |
389 |
- # https://bugs.gentoo.org/show_bug.cgi?id=555504 |
390 |
- "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch |
391 |
- |
392 |
- # https://bugs.gentoo.org/show_bug.cgi?id=564352 |
393 |
- # https://bugs.webkit.org/show_bug.cgi?id=167283 |
394 |
- "${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch |
395 |
- |
396 |
- # Avoid perl[ithreads] build time requirement as that would be very very messy |
397 |
- # https://bugs.webkit.org/show_bug.cgi?id=170106 (should get backported for 2.16.3) |
398 |
- "${FILESDIR}"/${PV}-avoid-perl-ithreads.patch |
399 |
-) |
400 |
- |
401 |
-pkg_pretend() { |
402 |
- if [[ ${MERGE_TYPE} != "binary" ]] ; then |
403 |
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then |
404 |
- einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS" |
405 |
- check-reqs_pkg_pretend |
406 |
- fi |
407 |
- |
408 |
- if ! test-flag-CXX -std=c++11 ; then |
409 |
- die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags" |
410 |
- fi |
411 |
- |
412 |
- if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then |
413 |
- die 'The active compiler needs to be gcc 4.9 (or newer)' |
414 |
- fi |
415 |
- fi |
416 |
-} |
417 |
- |
418 |
-pkg_setup() { |
419 |
- if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then |
420 |
- check-reqs_pkg_setup |
421 |
- fi |
422 |
- |
423 |
- python-any-r1_pkg_setup |
424 |
-} |
425 |
- |
426 |
-src_configure() { |
427 |
- # Respect CC, otherwise fails on prefix #395875 |
428 |
- tc-export CC |
429 |
- |
430 |
- # Arches without JIT support also need this to really disable it in all places |
431 |
- use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0 |
432 |
- |
433 |
- # It does not compile on alpha without this in LDFLAGS |
434 |
- # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761 |
435 |
- use alpha && append-ldflags "-Wl,--no-relax" |
436 |
- |
437 |
- # ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504 |
438 |
- use ia64 && append-ldflags "-Wl,--no-as-needed" |
439 |
- |
440 |
- # Sigbuses on SPARC with mcpu and co., bug #??? |
441 |
- use sparc && filter-flags "-mvis" |
442 |
- |
443 |
- # https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634 |
444 |
- use ppc64 && append-flags "-mminimal-toc" |
445 |
- |
446 |
- # Try to use less memory, bug #469942 (see Fedora .spec for reference) |
447 |
- # --no-keep-memory doesn't work on ia64, bug #502492 |
448 |
- if ! use ia64; then |
449 |
- append-ldflags "-Wl,--no-keep-memory" |
450 |
- fi |
451 |
- |
452 |
- # We try to use gold when possible for this package |
453 |
-# if ! tc-ld-is-gold ; then |
454 |
-# append-ldflags "-Wl,--reduce-memory-overheads" |
455 |
-# fi |
456 |
- |
457 |
- # older glibc needs this for INTPTR_MAX, bug #533976 |
458 |
- if has_version "<sys-libs/glibc-2.18" ; then |
459 |
- append-cppflags "-D__STDC_LIMIT_MACROS" |
460 |
- fi |
461 |
- |
462 |
- # Multiple rendering bugs on youtube, github, etc without this, bug #547224 |
463 |
- append-flags $(test-flags -fno-strict-aliasing) |
464 |
- |
465 |
- local ruby_interpreter="" |
466 |
- |
467 |
- if has_version "virtual/rubygems[ruby_targets_ruby24]"; then |
468 |
- ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)" |
469 |
- elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then |
470 |
- ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)" |
471 |
- elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then |
472 |
- ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)" |
473 |
- else |
474 |
- ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)" |
475 |
- fi |
476 |
- |
477 |
- # TODO: Check Web Audio support |
478 |
- # should somehow let user select between them? |
479 |
- # |
480 |
- # FTL_JIT requires llvm |
481 |
- # |
482 |
- # opengl needs to be explicetly handled, bug #576634 |
483 |
- |
484 |
- local opengl_enabled |
485 |
- if use opengl || use gles2; then |
486 |
- opengl_enabled=ON |
487 |
- else |
488 |
- opengl_enabled=OFF |
489 |
- fi |
490 |
- |
491 |
- # support for webgl (aka 2d-canvas accelerating) |
492 |
- local canvas_enabled |
493 |
- if use webgl && ! use gles2 ; then |
494 |
- canvas_enabled=ON |
495 |
- else |
496 |
- canvas_enabled=OFF |
497 |
- fi |
498 |
- |
499 |
- local mycmakeargs=( |
500 |
- -DENABLE_QUARTZ_TARGET=$(usex aqua) |
501 |
- -DENABLE_API_TESTS=$(usex test) |
502 |
- -DENABLE_GTKDOC=$(usex doc) |
503 |
- -DENABLE_GEOLOCATION=$(usex geolocation) |
504 |
- $(cmake-utils_use_find_package gles2 OpenGLES2) |
505 |
- -DENABLE_GLES2=$(usex gles2) |
506 |
- -DENABLE_VIDEO=$(usex gstreamer) |
507 |
- -DENABLE_WEB_AUDIO=$(usex gstreamer) |
508 |
- -DENABLE_INTROSPECTION=$(usex introspection) |
509 |
- -DENABLE_JIT=$(usex jit) |
510 |
- -DUSE_LIBNOTIFY=$(usex libnotify) |
511 |
- -DUSE_LIBSECRET=$(usex gnome-keyring) |
512 |
- -DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin) |
513 |
- -DENABLE_SPELLCHECK=$(usex spell) |
514 |
- -DENABLE_WAYLAND_TARGET=$(usex wayland) |
515 |
- -DENABLE_WEBGL=$(usex webgl) |
516 |
- $(cmake-utils_use_find_package egl EGL) |
517 |
- $(cmake-utils_use_find_package opengl OpenGL) |
518 |
- -DENABLE_X11_TARGET=$(usex X) |
519 |
- -DENABLE_OPENGL=${opengl_enabled} |
520 |
- -DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled} |
521 |
- -DCMAKE_BUILD_TYPE=Release |
522 |
- -DPORT=GTK |
523 |
- ${ruby_interpreter} |
524 |
- ) |
525 |
- |
526 |
- # Allow it to use GOLD when possible as it has all the magic to |
527 |
- # detect when to use it and using gold for this concrete package has |
528 |
- # multiple advantages and is also the upstream default, bug #585788 |
529 |
-# if tc-ld-is-gold ; then |
530 |
-# mycmakeargs+=( -DUSE_LD_GOLD=ON ) |
531 |
-# else |
532 |
-# mycmakeargs+=( -DUSE_LD_GOLD=OFF ) |
533 |
-# fi |
534 |
- |
535 |
- cmake-utils_src_configure |
536 |
-} |
537 |
- |
538 |
-src_compile() { |
539 |
- cmake-utils_src_compile |
540 |
-} |
541 |
- |
542 |
-src_test() { |
543 |
- # Prevents test failures on PaX systems |
544 |
- use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test* |
545 |
- |
546 |
- cmake-utils_src_test |
547 |
-} |
548 |
- |
549 |
-src_install() { |
550 |
- cmake-utils_src_install |
551 |
- |
552 |
- # Prevents crashes on PaX systems, bug #522808 |
553 |
- use jit && pax-mark m "${ED}usr/bin/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess" |
554 |
- pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess" |
555 |
- use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2 |
556 |
-} |