1 |
commit: b94baeb75e07778c102c537d421f6c2f91e6b6ea |
2 |
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
3 |
AuthorDate: Thu Mar 1 17:19:39 2018 +0000 |
4 |
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
5 |
CommitDate: Thu Mar 1 17:19:39 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=b94baeb7 |
7 |
|
8 |
net-libs/webkit-gtk: sync with tree |
9 |
|
10 |
also add ruby25 to possible interpreters because it works |
11 |
|
12 |
net-libs/webkit-gtk/Manifest | 1 - |
13 |
net-libs/webkit-gtk/webkit-gtk-2.18.5.ebuild | 286 --------------------------- |
14 |
net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild | 8 +- |
15 |
3 files changed, 5 insertions(+), 290 deletions(-) |
16 |
|
17 |
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest |
18 |
index d2c7b1f..8c34d62 100644 |
19 |
--- a/net-libs/webkit-gtk/Manifest |
20 |
+++ b/net-libs/webkit-gtk/Manifest |
21 |
@@ -1,3 +1,2 @@ |
22 |
-DIST webkitgtk-2.18.5.tar.xz 14828616 BLAKE2B 850d5b74327975060615d9bb481c8ec264eb862e63c5fc9bfa59bdab0edfbc3ad81c989df0fce13beb61bcbaed9c63571ad9aa3b9c5ad6137c662cf2f89ebc90 SHA512 f11a45150af4ba36192380ad0757da53d50b660f0a4f127a71123a6d80e9757d16a1deb1d69b235852c62bb1225352823932c60df7d6aa9372442ed7a165068c |
23 |
DIST webkitgtk-2.18.6.tar.xz 14829316 BLAKE2B 4c0140c17d513f064efe09aaefff434e3cbf2a88691c7916ed393bf9bd25a3cb5a1d4ea8699eb7e0d678d807293b66c4629e46df9088df9b4d122c554b280ead SHA512 375907d4c84e27aaa4b5df9a71424488c1b2ba0cf1d63e107d678c0f55f677996a80e9d9a9d4a412b40d1d0dde77b88464c54246cbafe70751042ec8a7bbe029 |
24 |
DIST webkitgtk-2.4.11.tar.xz 9869100 BLAKE2B 9b1351976dc753025e6aba86a40f97fdf58821a6a7af109140a18adc7a0e1d8c140711b48bceeb3c4c189e7d52f258520623c7d971c46b6f2572c0e1de0d0100 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb |
25 |
|
26 |
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.5.ebuild |
27 |
deleted file mode 100644 |
28 |
index 3f11c04..0000000 |
29 |
--- a/net-libs/webkit-gtk/webkit-gtk-2.18.5.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,286 +0,0 @@ |
32 |
-# Copyright 1999-2018 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="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="amd64 ~arm ~ppc x86" |
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 |
-# 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 |
-RDEPEND=" |
75 |
- >=x11-libs/cairo-1.10.2:= |
76 |
- >=media-libs/fontconfig-2.8.0:1.0 |
77 |
- >=media-libs/freetype-2.4.2:2 |
78 |
- >=dev-libs/libgcrypt-1.6.0:0= |
79 |
- >=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?] |
80 |
- >=media-libs/harfbuzz-1.3.3:=[icu(+)] |
81 |
- >=dev-libs/icu-3.8.1-r1:= |
82 |
- virtual/jpeg:0= |
83 |
- >=net-libs/libsoup-2.48: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.8.0 |
89 |
- media-libs/libwebp:= |
90 |
- |
91 |
- >=dev-libs/glib-2.40:2 |
92 |
- >=dev-libs/libxslt-1.1.7 |
93 |
- gnome-keyring? ( app-crypt/libsecret ) |
94 |
- geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) |
95 |
- introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) |
96 |
- dev-libs/libtasn1:= |
97 |
- >=dev-libs/libgcrypt-1.7.0:0= |
98 |
- nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) |
99 |
- spell? ( >=app-text/enchant-0.22:= ) |
100 |
- gstreamer? ( |
101 |
- >=media-libs/gstreamer-1.2.3:1.0 |
102 |
- >=media-libs/gst-plugins-base-1.2.3:1.0 |
103 |
- >=media-libs/gst-plugins-bad-1.10:1.0[opengl?,egl?] ) |
104 |
- |
105 |
- X? ( |
106 |
- x11-libs/cairo[X] |
107 |
- x11-libs/libX11 |
108 |
- x11-libs/libXcomposite |
109 |
- x11-libs/libXdamage |
110 |
- x11-libs/libXrender |
111 |
- x11-libs/libXt ) |
112 |
- |
113 |
- libnotify? ( x11-libs/libnotify ) |
114 |
- dev-libs/hyphen |
115 |
- |
116 |
- egl? ( media-libs/mesa[egl] ) |
117 |
- gles2? ( media-libs/mesa[gles2] ) |
118 |
- opengl? ( virtual/opengl |
119 |
- x11-libs/cairo[opengl] ) |
120 |
- webgl? ( |
121 |
- x11-libs/cairo[opengl] |
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-lang/perl-5.10 |
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-4.9 >=sys-devel/clang-3.3 ) |
137 |
- sys-devel/gettext |
138 |
- virtual/pkgconfig |
139 |
- |
140 |
- dev-lang/perl |
141 |
- virtual/perl-Data-Dumper |
142 |
- virtual/perl-Carp |
143 |
- |
144 |
- doc? ( >=dev-util/gtk-doc-1.10 ) |
145 |
- geolocation? ( dev-util/gdbus-codegen ) |
146 |
- introspection? ( jit? ( sys-apps/paxctl ) ) |
147 |
- test? ( |
148 |
- dev-lang/python:2.7 |
149 |
- dev-python/pygobject:3[python_targets_python2_7] |
150 |
- x11-themes/hicolor-icon-theme |
151 |
- jit? ( sys-apps/paxctl ) ) |
152 |
-" |
153 |
- |
154 |
-S="${WORKDIR}/${MY_P}" |
155 |
- |
156 |
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307 |
157 |
- |
158 |
-pkg_pretend() { |
159 |
- if [[ ${MERGE_TYPE} != "binary" ]] ; then |
160 |
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then |
161 |
- einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS" |
162 |
- check-reqs_pkg_pretend |
163 |
- fi |
164 |
- |
165 |
- if ! test-flag-CXX -std=c++11 ; then |
166 |
- die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags" |
167 |
- fi |
168 |
- |
169 |
- if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then |
170 |
- die 'The active compiler needs to be gcc 4.9 (or newer)' |
171 |
- fi |
172 |
- fi |
173 |
-} |
174 |
- |
175 |
-pkg_setup() { |
176 |
- if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then |
177 |
- check-reqs_pkg_setup |
178 |
- fi |
179 |
- |
180 |
- python-any-r1_pkg_setup |
181 |
-} |
182 |
- |
183 |
-src_prepare() { |
184 |
- # https://bugs.gentoo.org/show_bug.cgi?id=555504 |
185 |
- eapply "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch |
186 |
- # musl and jit |
187 |
- eapply "${FILESDIR}"/${PN}-2.18.1-musl.patch |
188 |
- cmake-utils_src_prepare |
189 |
- gnome2_src_prepare |
190 |
-} |
191 |
- |
192 |
-src_configure() { |
193 |
- # Respect CC, otherwise fails on prefix #395875 |
194 |
- tc-export CC |
195 |
- |
196 |
- # Arches without JIT support also need this to really disable it in all places |
197 |
- use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0 |
198 |
- |
199 |
- # It does not compile on alpha without this in LDFLAGS |
200 |
- # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761 |
201 |
- use alpha && append-ldflags "-Wl,--no-relax" |
202 |
- |
203 |
- # ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504 |
204 |
- use ia64 && append-ldflags "-Wl,--no-as-needed" |
205 |
- |
206 |
- # Sigbuses on SPARC with mcpu and co., bug #??? |
207 |
- use sparc && filter-flags "-mvis" |
208 |
- |
209 |
- # https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634 |
210 |
- use ppc64 && append-flags "-mminimal-toc" |
211 |
- |
212 |
- # Try to use less memory, bug #469942 (see Fedora .spec for reference) |
213 |
- # --no-keep-memory doesn't work on ia64, bug #502492 |
214 |
- if ! use ia64; then |
215 |
- append-ldflags "-Wl,--no-keep-memory" |
216 |
- fi |
217 |
- |
218 |
- # We try to use gold when possible for this package |
219 |
-# if ! tc-ld-is-gold ; then |
220 |
-# append-ldflags "-Wl,--reduce-memory-overheads" |
221 |
-# fi |
222 |
- |
223 |
- # Multiple rendering bugs on youtube, github, etc without this, bug #547224 |
224 |
- append-flags $(test-flags -fno-strict-aliasing) |
225 |
- |
226 |
- local ruby_interpreter="" |
227 |
- |
228 |
- if has_version "virtual/rubygems[ruby_targets_ruby24]"; then |
229 |
- ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)" |
230 |
- elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then |
231 |
- ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)" |
232 |
- elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then |
233 |
- ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)" |
234 |
- else |
235 |
- ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)" |
236 |
- fi |
237 |
- |
238 |
- # TODO: Check Web Audio support |
239 |
- # should somehow let user select between them? |
240 |
- # |
241 |
- # FTL_JIT requires llvm |
242 |
- # |
243 |
- # opengl needs to be explicetly handled, bug #576634 |
244 |
- |
245 |
- local opengl_enabled |
246 |
- if use opengl || use gles2; then |
247 |
- opengl_enabled=ON |
248 |
- else |
249 |
- opengl_enabled=OFF |
250 |
- fi |
251 |
- |
252 |
- # support for webgl (aka 2d-canvas accelerating) |
253 |
- local canvas_enabled |
254 |
- if use webgl && ! use gles2 ; then |
255 |
- canvas_enabled=ON |
256 |
- else |
257 |
- canvas_enabled=OFF |
258 |
- fi |
259 |
- |
260 |
- local mycmakeargs=( |
261 |
- -DENABLE_QUARTZ_TARGET=$(usex aqua) |
262 |
- -DENABLE_API_TESTS=$(usex test) |
263 |
- -DENABLE_GTKDOC=$(usex doc) |
264 |
- -DENABLE_GEOLOCATION=$(usex geolocation) |
265 |
- $(cmake-utils_use_find_package gles2 OpenGLES2) |
266 |
- -DENABLE_GLES2=$(usex gles2) |
267 |
- -DENABLE_VIDEO=$(usex gstreamer) |
268 |
- -DENABLE_WEB_AUDIO=$(usex gstreamer) |
269 |
- -DENABLE_INTROSPECTION=$(usex introspection) |
270 |
- -DENABLE_JIT=$(usex jit) |
271 |
- -DUSE_LIBNOTIFY=$(usex libnotify) |
272 |
- -DUSE_LIBSECRET=$(usex gnome-keyring) |
273 |
- -DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin) |
274 |
- -DENABLE_SPELLCHECK=$(usex spell) |
275 |
- -DENABLE_WAYLAND_TARGET=$(usex wayland) |
276 |
- -DENABLE_WEBGL=$(usex webgl) |
277 |
- $(cmake-utils_use_find_package egl EGL) |
278 |
- $(cmake-utils_use_find_package opengl OpenGL) |
279 |
- -DENABLE_X11_TARGET=$(usex X) |
280 |
- -DENABLE_OPENGL=${opengl_enabled} |
281 |
- -DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled} |
282 |
- -DCMAKE_BUILD_TYPE=Release |
283 |
- -DPORT=GTK |
284 |
- ${ruby_interpreter} |
285 |
- ) |
286 |
- |
287 |
- # Allow it to use GOLD when possible as it has all the magic to |
288 |
- # detect when to use it and using gold for this concrete package has |
289 |
- # multiple advantages and is also the upstream default, bug #585788 |
290 |
-# if tc-ld-is-gold ; then |
291 |
-# mycmakeargs+=( -DUSE_LD_GOLD=ON ) |
292 |
-# else |
293 |
-# mycmakeargs+=( -DUSE_LD_GOLD=OFF ) |
294 |
-# fi |
295 |
- |
296 |
- cmake-utils_src_configure |
297 |
-} |
298 |
- |
299 |
-src_compile() { |
300 |
- cmake-utils_src_compile |
301 |
-} |
302 |
- |
303 |
-src_test() { |
304 |
- # Prevents test failures on PaX systems |
305 |
- use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test* |
306 |
- |
307 |
- cmake-utils_src_test |
308 |
-} |
309 |
- |
310 |
-src_install() { |
311 |
- cmake-utils_src_install |
312 |
- |
313 |
- # Prevents crashes on PaX systems, bug #522808 |
314 |
- use jit && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess" |
315 |
- pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess" |
316 |
- use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2 |
317 |
-} |
318 |
|
319 |
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild |
320 |
index a545458..127c2ba 100644 |
321 |
--- a/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild |
322 |
+++ b/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild |
323 |
@@ -4,7 +4,7 @@ |
324 |
EAPI=6 |
325 |
CMAKE_MAKEFILE_GENERATOR="ninja" |
326 |
PYTHON_COMPAT=( python2_7 ) |
327 |
-USE_RUBY="ruby22 ruby23 ruby24" |
328 |
+USE_RUBY="ruby22 ruby23 ruby24 ruby25" |
329 |
|
330 |
inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx |
331 |
|
332 |
@@ -15,7 +15,7 @@ SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz" |
333 |
|
334 |
LICENSE="LGPL-2+ BSD" |
335 |
SLOT="4/37" # soname version of libwebkit2gtk-4.0 |
336 |
-KEYWORDS="~amd64 ~arm ~ppc ~x86" |
337 |
+KEYWORDS="amd64 ~arm ~ppc x86" |
338 |
|
339 |
IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl +X" |
340 |
|
341 |
@@ -194,7 +194,9 @@ src_configure() { |
342 |
|
343 |
local ruby_interpreter="" |
344 |
|
345 |
- if has_version "virtual/rubygems[ruby_targets_ruby24]"; then |
346 |
+ if has_version "virtual/rubygems[ruby_targets_ruby25]"; then |
347 |
+ ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby25)" |
348 |
+ elif has_version "virtual/rubygems[ruby_targets_ruby24]"; then |
349 |
ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)" |
350 |
elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then |
351 |
ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)" |