1 |
commit: 8e95feeba1c88436eb5b3403c849351a4f17ae7d |
2 |
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
3 |
AuthorDate: Wed Nov 22 04:57:26 2017 +0000 |
4 |
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
5 |
CommitDate: Wed Nov 22 04:57:26 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=8e95feeb |
7 |
|
8 |
net-libs/webkit-gtk: version bump to 2.18.3 |
9 |
|
10 |
net-libs/webkit-gtk/Manifest | 3 +- |
11 |
.../webkit-gtk/files/webkit-gtk-2.14.3-musl.patch | 82 ------ |
12 |
net-libs/webkit-gtk/webkit-gtk-2.16.6.ebuild | 291 --------------------- |
13 |
...-gtk-2.18.1.ebuild => webkit-gtk-2.18.3.ebuild} | 0 |
14 |
4 files changed, 1 insertion(+), 375 deletions(-) |
15 |
|
16 |
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest |
17 |
index 00ca6f0..dc75e12 100644 |
18 |
--- a/net-libs/webkit-gtk/Manifest |
19 |
+++ b/net-libs/webkit-gtk/Manifest |
20 |
@@ -1,4 +1,3 @@ |
21 |
-DIST webkitgtk-2.16.6.tar.xz 14658120 SHA256 fc23650df953123c59b9c0edf3855e7bd55bd107820997fc72375811e1ea4b21 SHA512 bb488d7a60e4d6f9683ac343852a75854ef73e6b5aa093361ffe2d08e71e2f11c19da4447f9937221e518cda784bdacfcfd151f9395605a1957380fbc5b1533b WHIRLPOOL b3053979c1837d97ba525e078d4a14c64a66c61cb0117041af02c8fd250b2062fda66e782134d6bf44f3f80a04917a9b2ac61aa4e800f0011e5243d7eb8583f4 |
22 |
-DIST webkitgtk-2.18.1.tar.xz 14823708 SHA256 9cdb7b302fbc8a2a7e1e783b80391e64f8b12d70d6ebad4eb756dd59bf3ed795 SHA512 671392f46a34def51df34e5ce384acdcf7526b286e64f1220921f6c654a28148553e815f6f0fd02252b642dcabef9c646f5386b9ec3d2cb01520782833bb650b WHIRLPOOL e16e1e295d99d6589787fb51e2e3c5867877206428294b824307a5e7af43bdebeda3050a397fffee154c1a624fd21d59e25387fba58c91ce5ab30613773db056 |
23 |
DIST webkitgtk-2.18.2.tar.xz 14823612 SHA256 b14cb3f1b5321b1dc50abcc0445a97f8e2f8813562bca7ce4d2f8069f6fec8e7 SHA512 94c8ce0fcee741dc9c054fa3f8ecac9756245c623f36e6b0bb5588d12b660aaa8bbbe28e82d0f694b94b75f1985f9dbf9231a4b63832fcf4efbe7a0116c7585c WHIRLPOOL a1ccd765d6699f07ecad8b4c899398bb2152076eda4f3a86af61d67c741229cf3d0ef02a7c8fbca2fb494e1bb1822518a18aa4f88026e91ebd2d4835d6807545 |
24 |
+DIST webkitgtk-2.18.3.tar.xz 14824668 SHA256 e15420e1616a6f70f321541d467af5ca285bff66b1e0fa68a01df3ccf1b18f9e SHA512 8ba68d7234205728ed4b92358304cf0d0b771647d9b4316085241adeacafe67dee685225b0b46752087b93416ce8d2053a5a7c2376fda1eee7bc6d9024ae787e WHIRLPOOL 1151c09119bfbb213bb3cd291f3ddcc49e3c9f77396bc960e381754e564d72ea21e70641f3cd57f42b2dcb77c05fd92e158b02b0ae94fade22129d8ae114524a |
25 |
DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3 |
26 |
|
27 |
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.14.3-musl.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.14.3-musl.patch |
28 |
deleted file mode 100644 |
29 |
index f5b40f9..0000000 |
30 |
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.14.3-musl.patch |
31 |
+++ /dev/null |
32 |
@@ -1,82 +0,0 @@ |
33 |
-diff -Naur webkitgtk-2.14.3.orig/Source/JavaScriptCore/heap/MachineStackMarker.cpp webkitgtk-2.14.3/Source/JavaScriptCore/heap/MachineStackMarker.cpp |
34 |
---- webkitgtk-2.14.3.orig/Source/JavaScriptCore/heap/MachineStackMarker.cpp 2017-01-21 14:57:58.821113862 -0800 |
35 |
-+++ webkitgtk-2.14.3/Source/JavaScriptCore/heap/MachineStackMarker.cpp 2017-01-21 14:59:46.889444106 -0800 |
36 |
-@@ -549,7 +549,7 @@ |
37 |
- #error Unknown Architecture |
38 |
- #endif |
39 |
- |
40 |
--#elif defined(__GLIBC__) && ENABLE(JIT) |
41 |
-+#elif OS(LINUX) && ENABLE(JIT) |
42 |
- |
43 |
- #if CPU(X86) |
44 |
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_ESP]); |
45 |
-@@ -648,9 +648,8 @@ |
46 |
- #error Unknown Architecture |
47 |
- #endif |
48 |
- |
49 |
--#elif defined(__GLIBC__) |
50 |
-+#elif OS(LINUX) |
51 |
- |
52 |
--// The following sequence depends on glibc's sys/ucontext.h. |
53 |
- #if CPU(X86) |
54 |
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_EBP]); |
55 |
- #elif CPU(X86_64) |
56 |
-@@ -730,9 +729,8 @@ |
57 |
- #error Unknown Architecture |
58 |
- #endif |
59 |
- |
60 |
--#elif defined(__GLIBC__) |
61 |
-+#elif OS(LINUX) |
62 |
- |
63 |
--// The following sequence depends on glibc's sys/ucontext.h. |
64 |
- #if CPU(X86) |
65 |
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_EIP]); |
66 |
- #elif CPU(X86_64) |
67 |
-@@ -821,9 +819,8 @@ |
68 |
- #error Unknown Architecture |
69 |
- #endif |
70 |
- |
71 |
--#elif defined(__GLIBC__) |
72 |
-+#elif OS(LINUX) |
73 |
- |
74 |
--// The following sequence depends on glibc's sys/ucontext.h. |
75 |
- #if CPU(X86) |
76 |
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_ESI]); |
77 |
- #elif CPU(X86_64) |
78 |
-diff -Naur webkitgtk-2.14.3.orig/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp webkitgtk-2.14.3/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp |
79 |
---- webkitgtk-2.14.3.orig/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp 2017-01-21 14:57:58.933115241 -0800 |
80 |
-+++ webkitgtk-2.14.3/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp 2017-01-21 15:00:42.712131243 -0800 |
81 |
-@@ -49,7 +49,7 @@ |
82 |
- #include "ScriptCallStackFactory.h" |
83 |
- #include <wtf/Stopwatch.h> |
84 |
- |
85 |
--#if OS(DARWIN) || (OS(LINUX) && !PLATFORM(GTK)) |
86 |
-+#if OS(DARWIN) || (OS(LINUX) && !PLATFORM(GTK) && defined(__GLIBC__) && !defined(__UCLIBC__)) |
87 |
- #include <cxxabi.h> |
88 |
- #include <dlfcn.h> |
89 |
- #include <execinfo.h> |
90 |
-@@ -187,7 +187,7 @@ |
91 |
- |
92 |
- void JSGlobalObjectInspectorController::appendAPIBacktrace(ScriptCallStack* callStack) |
93 |
- { |
94 |
--#if OS(DARWIN) || (OS(LINUX) && !PLATFORM(GTK)) |
95 |
-+#if OS(DARWIN) || (OS(LINUX) && !PLATFORM(GTK) && defined(__GLIBC__) && !defined(__UCLIBC__)) |
96 |
- static const int framesToShow = 31; |
97 |
- static const int framesToSkip = 3; // WTFGetBacktrace, appendAPIBacktrace, reportAPIException. |
98 |
- |
99 |
-diff -Naur webkitgtk-2.14.3.orig/Source/JavaScriptCore/runtime/Options.h webkitgtk-2.14.3/Source/JavaScriptCore/runtime/Options.h |
100 |
---- webkitgtk-2.14.3.orig/Source/JavaScriptCore/runtime/Options.h 2017-01-21 14:57:59.074116976 -0800 |
101 |
-+++ webkitgtk-2.14.3/Source/JavaScriptCore/runtime/Options.h 2017-01-21 15:01:36.813797195 -0800 |
102 |
-@@ -112,9 +112,9 @@ |
103 |
- \ |
104 |
- v(bool, reportMustSucceedExecutableAllocations, false, Normal, nullptr) \ |
105 |
- \ |
106 |
-- v(unsigned, maxPerThreadStackUsage, 4 * MB, Normal, "Max allowed stack usage by the VM") \ |
107 |
-- v(unsigned, softReservedZoneSize, 128 * KB, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \ |
108 |
-- v(unsigned, reservedZoneSize, 64 * KB, Normal, "The amount of stack space we guarantee to our clients (and to interal VM code that does not call out to clients).") \ |
109 |
-+ v(unsigned, maxPerThreadStackUsage, 80 * KB, Normal, "Max allowed stack usage by the VM") \ |
110 |
-+ v(unsigned, softReservedZoneSize, 32 * KB, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \ |
111 |
-+ v(unsigned, reservedZoneSize, 16 * KB, Normal, "The amount of stack space we guarantee to our clients (and to interal VM code that does not call out to clients).") \ |
112 |
- \ |
113 |
- v(bool, crashIfCantAllocateJITMemory, false, Normal, nullptr) \ |
114 |
- v(unsigned, jitMemoryReservationSize, 0, Normal, "Set this number to change the executable allocation size in ExecutableAllocatorFixedVMPool. (In bytes.)") \ |
115 |
|
116 |
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.16.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.16.6.ebuild |
117 |
deleted file mode 100644 |
118 |
index 2b3f210..0000000 |
119 |
--- a/net-libs/webkit-gtk/webkit-gtk-2.16.6.ebuild |
120 |
+++ /dev/null |
121 |
@@ -1,291 +0,0 @@ |
122 |
-# Copyright 1999-2017 Gentoo Foundation |
123 |
-# Distributed under the terms of the GNU General Public License v2 |
124 |
- |
125 |
-EAPI=6 |
126 |
-CMAKE_MAKEFILE_GENERATOR="ninja" |
127 |
-PYTHON_COMPAT=( python2_7 ) |
128 |
-USE_RUBY="ruby21 ruby22 ruby23 ruby24" |
129 |
- |
130 |
-inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx |
131 |
- |
132 |
-MY_P="webkitgtk-${PV}" |
133 |
-DESCRIPTION="Open source web browser engine" |
134 |
-HOMEPAGE="http://www.webkitgtk.org/" |
135 |
-SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz" |
136 |
- |
137 |
-LICENSE="LGPL-2+ BSD" |
138 |
-SLOT="4/37" # soname version of libwebkit2gtk-4.0 |
139 |
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" |
140 |
- |
141 |
-IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X" |
142 |
- |
143 |
-# webgl needs gstreamer, bug #560612 |
144 |
-REQUIRED_USE=" |
145 |
- geolocation? ( introspection ) |
146 |
- gles2? ( egl ) |
147 |
- introspection? ( gstreamer ) |
148 |
- nsplugin? ( X ) |
149 |
- webgl? ( ^^ ( gles2 opengl ) ) |
150 |
- !webgl? ( ?? ( gles2 opengl ) ) |
151 |
- webgl? ( gstreamer ) |
152 |
- wayland? ( egl ) |
153 |
- || ( aqua wayland X ) |
154 |
-" |
155 |
- |
156 |
-# Tests fail to link for inexplicable reasons |
157 |
-# https://bugs.webkit.org/show_bug.cgi?id=148210 |
158 |
-RESTRICT="test" |
159 |
- |
160 |
-# use sqlite, svg by default |
161 |
-# Aqua support in gtk3 is untested |
162 |
-# Dependencies found at Source/cmake/OptionsGTK.cmake |
163 |
-# Various compile-time optionals for gtk+-3.22.0 - ensure it |
164 |
-RDEPEND=" |
165 |
- dev-db/sqlite:3= |
166 |
- >=dev-libs/glib-2.36:2 |
167 |
- dev-libs/hyphen |
168 |
- >=dev-libs/icu-3.8.1-r1:= |
169 |
- >=dev-libs/libxml2-2.8:2 |
170 |
- >=dev-libs/libxslt-1.1.7 |
171 |
- >=media-libs/fontconfig-2.8:1.0 |
172 |
- >=media-libs/freetype-2.4.2:2 |
173 |
- >=media-libs/harfbuzz-1.3.3:=[icu(+)] |
174 |
- >=media-libs/libpng-1.4:0= |
175 |
- media-libs/libwebp:= |
176 |
- dev-libs/libgcrypt:0= |
177 |
- >=net-libs/libsoup-2.42:2.4[introspection?] |
178 |
- >=x11-libs/cairo-1.10.2:= |
179 |
- >=x11-libs/gtk+-3.22:3[introspection?] |
180 |
- >=x11-libs/pango-1.30.0 |
181 |
- virtual/jpeg:0= |
182 |
- |
183 |
- aqua? ( >=x11-libs/gtk+-3.14:3[aqua] ) |
184 |
- egl? ( media-libs/mesa[egl] ) |
185 |
- geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) |
186 |
- gles2? ( media-libs/mesa[gles2] ) |
187 |
- gnome-keyring? ( app-crypt/libsecret ) |
188 |
- gstreamer? ( |
189 |
- >=media-libs/gstreamer-1.2.3:1.0 |
190 |
- >=media-libs/gst-plugins-base-1.2.3:1.0 |
191 |
- >=media-libs/gst-plugins-bad-1.8:1.0[opengl?] ) |
192 |
- introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) |
193 |
- libnotify? ( x11-libs/libnotify ) |
194 |
- nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) |
195 |
- opengl? ( virtual/opengl |
196 |
- x11-libs/cairo[opengl] ) |
197 |
- spell? ( >=app-text/enchant-0.22:= ) |
198 |
- wayland? ( >=x11-libs/gtk+-3.14:3[wayland] ) |
199 |
- webgl? ( |
200 |
- x11-libs/cairo[opengl] |
201 |
- x11-libs/libXcomposite |
202 |
- x11-libs/libXdamage ) |
203 |
- X? ( |
204 |
- x11-libs/cairo[X] |
205 |
- >=x11-libs/gtk+-3.14:3[X] |
206 |
- x11-libs/libX11 |
207 |
- x11-libs/libXcomposite |
208 |
- x11-libs/libXrender |
209 |
- x11-libs/libXt ) |
210 |
-" |
211 |
- |
212 |
-# paxctl needed for bug #407085 |
213 |
-# Need real bison, not yacc |
214 |
-DEPEND="${RDEPEND} |
215 |
- ${PYTHON_DEPS} |
216 |
- ${RUBY_DEPS} |
217 |
- >=dev-lang/perl-5.10 |
218 |
- >=app-accessibility/at-spi2-core-2.5.3 |
219 |
- >=dev-libs/atk-2.8.0 |
220 |
- >=dev-util/gtk-doc-am-1.10 |
221 |
- >=dev-util/gperf-3.0.1 |
222 |
- >=sys-devel/bison-2.4.3 |
223 |
- || ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 ) |
224 |
- sys-devel/gettext |
225 |
- virtual/pkgconfig |
226 |
- |
227 |
- dev-lang/perl |
228 |
- virtual/perl-Data-Dumper |
229 |
- virtual/perl-Carp |
230 |
- |
231 |
- doc? ( >=dev-util/gtk-doc-1.10 ) |
232 |
- geolocation? ( dev-util/gdbus-codegen ) |
233 |
- introspection? ( jit? ( sys-apps/paxctl ) ) |
234 |
- test? ( |
235 |
- dev-lang/python:2.7 |
236 |
- dev-python/pygobject:3[python_targets_python2_7] |
237 |
- x11-themes/hicolor-icon-theme |
238 |
- jit? ( sys-apps/paxctl ) ) |
239 |
-" |
240 |
- |
241 |
-S="${WORKDIR}/${MY_P}" |
242 |
- |
243 |
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307 |
244 |
- |
245 |
-PATCHES=( |
246 |
- # https://bugs.gentoo.org/show_bug.cgi?id=555504 |
247 |
- "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch |
248 |
- |
249 |
- # https://bugs.gentoo.org/show_bug.cgi?id=564352 |
250 |
- # https://bugs.webkit.org/show_bug.cgi?id=167283 |
251 |
- "${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch |
252 |
- |
253 |
- # musl and jit |
254 |
- "${FILESDIR}"/${PN}-2.14.3-musl.patch |
255 |
-) |
256 |
- |
257 |
-pkg_pretend() { |
258 |
- if [[ ${MERGE_TYPE} != "binary" ]] ; then |
259 |
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then |
260 |
- einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS" |
261 |
- check-reqs_pkg_pretend |
262 |
- fi |
263 |
- |
264 |
- if ! test-flag-CXX -std=c++11 ; then |
265 |
- die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags" |
266 |
- fi |
267 |
- |
268 |
- if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then |
269 |
- die 'The active compiler needs to be gcc 4.9 (or newer)' |
270 |
- fi |
271 |
- fi |
272 |
-} |
273 |
- |
274 |
-pkg_setup() { |
275 |
- if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then |
276 |
- check-reqs_pkg_setup |
277 |
- fi |
278 |
- |
279 |
- python-any-r1_pkg_setup |
280 |
-} |
281 |
- |
282 |
-src_configure() { |
283 |
- # Respect CC, otherwise fails on prefix #395875 |
284 |
- tc-export CC |
285 |
- |
286 |
- # Arches without JIT support also need this to really disable it in all places |
287 |
- use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0 |
288 |
- |
289 |
- # It does not compile on alpha without this in LDFLAGS |
290 |
- # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761 |
291 |
- use alpha && append-ldflags "-Wl,--no-relax" |
292 |
- |
293 |
- # ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504 |
294 |
- use ia64 && append-ldflags "-Wl,--no-as-needed" |
295 |
- |
296 |
- # Sigbuses on SPARC with mcpu and co., bug #??? |
297 |
- use sparc && filter-flags "-mvis" |
298 |
- |
299 |
- # https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634 |
300 |
- use ppc64 && append-flags "-mminimal-toc" |
301 |
- |
302 |
- # Try to use less memory, bug #469942 (see Fedora .spec for reference) |
303 |
- # --no-keep-memory doesn't work on ia64, bug #502492 |
304 |
- if ! use ia64; then |
305 |
- append-ldflags "-Wl,--no-keep-memory" |
306 |
- fi |
307 |
- |
308 |
- # We try to use gold when possible for this package |
309 |
-# if ! tc-ld-is-gold ; then |
310 |
-# append-ldflags "-Wl,--reduce-memory-overheads" |
311 |
-# fi |
312 |
- |
313 |
- # older glibc needs this for INTPTR_MAX, bug #533976 |
314 |
- if has_version "<sys-libs/glibc-2.18" ; then |
315 |
- append-cppflags "-D__STDC_LIMIT_MACROS" |
316 |
- fi |
317 |
- |
318 |
- # Multiple rendering bugs on youtube, github, etc without this, bug #547224 |
319 |
- append-flags $(test-flags -fno-strict-aliasing) |
320 |
- |
321 |
- local ruby_interpreter="" |
322 |
- |
323 |
- if has_version "virtual/rubygems[ruby_targets_ruby24]"; then |
324 |
- ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)" |
325 |
- elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then |
326 |
- ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)" |
327 |
- elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then |
328 |
- ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)" |
329 |
- else |
330 |
- ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)" |
331 |
- fi |
332 |
- |
333 |
- # TODO: Check Web Audio support |
334 |
- # should somehow let user select between them? |
335 |
- # |
336 |
- # FTL_JIT requires llvm |
337 |
- # |
338 |
- # opengl needs to be explicetly handled, bug #576634 |
339 |
- |
340 |
- local opengl_enabled |
341 |
- if use opengl || use gles2; then |
342 |
- opengl_enabled=ON |
343 |
- else |
344 |
- opengl_enabled=OFF |
345 |
- fi |
346 |
- |
347 |
- # support for webgl (aka 2d-canvas accelerating) |
348 |
- local canvas_enabled |
349 |
- if use webgl && ! use gles2 ; then |
350 |
- canvas_enabled=ON |
351 |
- else |
352 |
- canvas_enabled=OFF |
353 |
- fi |
354 |
- |
355 |
- local mycmakeargs=( |
356 |
- -DENABLE_QUARTZ_TARGET=$(usex aqua) |
357 |
- -DENABLE_API_TESTS=$(usex test) |
358 |
- -DENABLE_GTKDOC=$(usex doc) |
359 |
- -DENABLE_GEOLOCATION=$(usex geolocation) |
360 |
- $(cmake-utils_use_find_package gles2 OpenGLES2) |
361 |
- -DENABLE_GLES2=$(usex gles2) |
362 |
- -DENABLE_VIDEO=$(usex gstreamer) |
363 |
- -DENABLE_WEB_AUDIO=$(usex gstreamer) |
364 |
- -DENABLE_INTROSPECTION=$(usex introspection) |
365 |
- -DENABLE_JIT=$(usex jit) |
366 |
- -DUSE_LIBNOTIFY=$(usex libnotify) |
367 |
- -DUSE_LIBSECRET=$(usex gnome-keyring) |
368 |
- -DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin) |
369 |
- -DENABLE_SPELLCHECK=$(usex spell) |
370 |
- -DENABLE_WAYLAND_TARGET=$(usex wayland) |
371 |
- -DENABLE_WEBGL=$(usex webgl) |
372 |
- $(cmake-utils_use_find_package egl EGL) |
373 |
- $(cmake-utils_use_find_package opengl OpenGL) |
374 |
- -DENABLE_X11_TARGET=$(usex X) |
375 |
- -DENABLE_OPENGL=${opengl_enabled} |
376 |
- -DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled} |
377 |
- -DCMAKE_BUILD_TYPE=Release |
378 |
- -DPORT=GTK |
379 |
- ${ruby_interpreter} |
380 |
- ) |
381 |
- |
382 |
- # Allow it to use GOLD when possible as it has all the magic to |
383 |
- # detect when to use it and using gold for this concrete package has |
384 |
- # multiple advantages and is also the upstream default, bug #585788 |
385 |
-# if tc-ld-is-gold ; then |
386 |
-# mycmakeargs+=( -DUSE_LD_GOLD=ON ) |
387 |
-# else |
388 |
-# mycmakeargs+=( -DUSE_LD_GOLD=OFF ) |
389 |
-# fi |
390 |
- |
391 |
- cmake-utils_src_configure |
392 |
-} |
393 |
- |
394 |
-src_compile() { |
395 |
- cmake-utils_src_compile |
396 |
-} |
397 |
- |
398 |
-src_test() { |
399 |
- # Prevents test failures on PaX systems |
400 |
- use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test* |
401 |
- |
402 |
- cmake-utils_src_test |
403 |
-} |
404 |
- |
405 |
-src_install() { |
406 |
- cmake-utils_src_install |
407 |
- |
408 |
- # Prevents crashes on PaX systems, bug #522808 |
409 |
- use jit && pax-mark m "${ED}usr/bin/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess" |
410 |
- pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess" |
411 |
- use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2 |
412 |
-} |
413 |
|
414 |
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.3.ebuild |
415 |
similarity index 100% |
416 |
rename from net-libs/webkit-gtk/webkit-gtk-2.18.1.ebuild |
417 |
rename to net-libs/webkit-gtk/webkit-gtk-2.18.3.ebuild |