commit: 36fd4098dcc93086d39c1e3fcef4c462173e09a6
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 1 13:36:39 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Jun 1 13:36:39 2016 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=36fd4098
net-libs/webkit-gtk: update to keep up with main tree
net-libs/webkit-gtk/Manifest | 12 +++----
...h => webkit-gtk-2.10.9-remove-execinfo_h.patch} | 19 +++++------
...-gtk-2.10.7.ebuild => webkit-gtk-2.10.9.ebuild} | 17 ++++++++--
...9-r200.ebuild => webkit-gtk-2.4.10-r200.ebuild} | 38 +++++-----------------
...t-gtk-2.4.9.ebuild => webkit-gtk-2.4.10.ebuild} | 36 +++++---------------
5 files changed, 46 insertions(+), 76 deletions(-)
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 9a6bcec..68b9afd 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,6 +1,6 @@
AUX webkit-gtk-1.11.90-gtk-docize-fix.patch 422 SHA256
4ee4f54be107bf947b39266c868671670cf759ca52879382dddcef66168b841c SHA512
bb56020948d255f1e9de06528cebd921820862593b865cc6a2ba9e1c0e734dc7bb9bcbd5c6e8a735e4ee3afd906b0d17bc43a4a262a98f28a467c649d9d15a3c
WHIRLPOOL
5793470581e9971eb699f464e15153b9080225d6e44011c5af14dd379da4d3f8c614a1029f9b98bcaa5d5ba649d0b542e8796fc564baf31cddafe675df317818
AUX webkit-gtk-1.6.1-darwin-quartz.patch 1516 SHA256
34ad751c33e868d85b41e06ecbd085b61a81c42bd52063bada52bc59b9e05a23 SHA512
ca8c80d06aa93c07d658ebf3433f5fdee9225616740a075f5606df87e3b90a83b2c492777a8e30255cdd4f11f889be789544ac1fc4a39056e1929a72720347ea
WHIRLPOOL
558250f3cf6de4d511a26afb0aeacc04b7049b3d0499362d320c035acac20932d7c16f6ff99d83833498296e3a21b5e2bab985b1ee5fca709754b582195a0fd1
-AUX webkit-gtk-2.10.7-remove-execinfo_h.patch 1364 SHA256
ba69f07fcc325efc8b97bf828c2fbc145feeaa71b49195ccf08277d3ed6e185b SHA512
0738518490aedd5fe4dbec4cd21c3e67cb93dcbefe41fb621f66f4550a6439a370b61e836a6b3aea3709cd5ccb7643f2eac124b98cf069202b48f21d63f8dfb1
WHIRLPOOL
e49766772e8a1cfa5f844dfe0024a238bedab42a977a5036476b0e02eb013b0785a6a744c5adca4eda46d8728ce7b018d970bde99d98377047ef2d118ab91e40
+AUX webkit-gtk-2.10.9-remove-execinfo_h.patch 1239 SHA256
71ce90e34c6ebfd4836e1f7a3307204fd0432c18e592ce6ec1ead7ece12afbee SHA512
1496cbc7b111f720f852d2dfee77214d43b7e3fca804dbbd7704a335a6f5e09d2fd38724d212a4aa7987ba9bf0d35b838b9473e69a890802be862fd003c8e9ca
WHIRLPOOL
17a19a4bec478ddb9558918c58c39d023e59196b6bc286e638aec7f7bc80d6ac1a249dd94547361d8ad821a8338ec8e0ea64b8bd3ae1fb9deff3f055701a0d6e
AUX webkit-gtk-2.2.5-hppa-platform.patch 530 SHA256
9a2b8311a89aa3500d19d2425c0f12f67c1457c67ecaa322511170461c4c6be7 SHA512
168d4f8acddf4a5fa6ddc3661ef3ec344824c854db036b279d38d526b6025cfbb8bbd15bc64ddd846876749823796ca7d05e4083cf35a744d46b00cfd5179ae1
WHIRLPOOL
5fc8070bf07eef199578db5802452b4443ee3a00b555325b430a3cfd923a0cbb827497907462cb224b07f2f1713d65a26af4adf24b3dca59cb9040dbd6227f92
AUX webkit-gtk-2.2.5-ia64-platform.patch 331 SHA256
1ac5327f4f190bc4cbee9e62d4a2805879bbffd914ba75be17afd1aa245e6693 SHA512
dae3cde801d2d29c61abb64c00bf33ac1f7080dd2085cc9a1520c8606ef65538ccee9b1e4c4c16a3dba551acd035542f80b6e808ae5090bb883c85ecfa7ac36e
WHIRLPOOL
d9ca8172f685f515bb22a38d269e73f1e0fdcbf487bb83557f41649cd9ff5883d1fe0827aef3c753d975895252db3e3fa5eef3f72b43a6557492effd5db10072
AUX webkit-gtk-2.4.1-ia64-malloc.patch 807 SHA256
8e01dee48af7e8e0d24729dd9b99e88b47125b5f91d07df29d579785e60d398d SHA512
d9e7a792861ff30137072eba6b5b80e7b37e47e7302bf1cd56027b5c30aea3fd215891f6272d85b80e98c826b3216d0701fe92f06b76e7d1fb860028d7a701c0
WHIRLPOOL
7cf769d9752cf800f72e76233ef299e2da8c13f427cd8d312d47d76282091f06ec32a618dda9d0bacedbc5dcf8aa4289ce9ce089cdbb90be28deeb75e449a925
@@ -12,9 +12,9 @@ AUX webkit-gtk-2.4.9-remove-execinfo_h.patch 1374 SHA256
9a6cea9456c7d38b280be1d
AUX webkit-gtk-2.8.5-fix-alpha-build.patch 910 SHA256
2e3ea0b6288ff3471349243edd75d1a97fbacdc6a426874f4c9be8a64d2c2b7f SHA512
748ef4b431c02b3b4ba8908b8bdf28f5b11b90a798ac21484d99a3941e0306102b9d8a298f177da63cd86579b64def31e6f2abe66044b5c211bb4382c5a57f86
WHIRLPOOL
4a8ee812d543c016a02321e5e6db83580c6f0301dd57b5cd5bf4e22b7a6f214ac6b41229160d60db42982fd37a11c5f654ef81a8c1b178a6d78e54ed6076ea11
AUX webkit-gtk-2.8.5-fix-ia64-build.patch 663 SHA256
d076739707de117fbc9aebc684c4a43024e1673e4c30fdfa3be529331f0c1f78 SHA512
ce8dbe7f2bacfc6d1ad70d39d80447ab90e6daf63bc1dc4a49c406255f76eff090f79e6076ebc349d69193b72a821fa6591692cf74a28e529f8db95cf86358fc
WHIRLPOOL
adf8e11ee3060bcba606cf17673d06d9c98034a71f6a7406832fabf461c4697abcd0c3d4cdb8d8298caf221c797e0732a9f865d761fcf05753a1dfd96dfd3d82
AUX webkit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch 876 SHA256
50052d2a82d6c0d19af0bfb476824059e4448652c6533275084e24dfb5ef19c3 SHA512
ad0925070277d97fce3713f66ffcbfa193fdb3231d63717dfd8b217b420bf6f8665694eef2fcf9d2eef2abefe0fe5406759287395117497de34a00dba1b9c144
WHIRLPOOL
d4da619b5bf1000d5dee409b07bcce6ba8da25f0e726e22433e2a3a610773ee4394becd55ccf7efaddebb86e74f1f97868e98240fa9bb80c0ab7a320f03c666e
-DIST webkitgtk-2.10.7.tar.xz 10988396 SHA256
990d62c82ed6dede31a6ff0a82d847f16b812842ff3e1093d17113627652864e SHA512
f0d7b303236910d18568ab1e0a522915a70e9d3658537b32ea2c6a42b8b3ece034a292490f7882760338f2afc56468fd7a8ad8659b7afaf87906220a5c815b5b
WHIRLPOOL
7cbe8c42e9c245709eee19a9a01f2a4b238596d8119e3420ca750abb3518e1333ff99a596e9f09d511773a964bafed5baa91efca7b711ddc1c91cb601c520328
-DIST webkitgtk-2.4.9.tar.xz 9840740 SHA256
afdf29e7828816cad0be2604cf19421e96d96bf493987328ffc8813bb20ac564 SHA512
5dfe5c31e0fcbab5e468a18e08918a439b214dcd620386fa32d35e9110e479b552a4b0b88a1bb8574b34445d5cc5219be349feded32fc1d2791a6c6279d61f98
WHIRLPOOL
26141cd12878bc8136ecffc1636fdcb037f342e5c27c8c557117564af9d1673af84c8c4fd10d3fdbe890bdf183791b18a210f57de9750422959a45c60390076c
-EBUILD webkit-gtk-2.10.7.ebuild 7954 SHA256
ace3c75363b69437e233abf9bff0c8e46db6b063135de9f10e532f9f7afdded5 SHA512
048faf1b48b3b3c337f2ef4fec480a18c808d0aedd3f7b9ce0b510c77f49453244cca210b004251f480c97ff7f0a107da6989fcea7d2c5a1299affabc3e37601
WHIRLPOOL
b4f2073784c186c11a106d21c44732a57856e66fc694635bd9ceded5e982106ee88b32d05ded3f7000f01afe3872fe296861429f23df8566a756ad0d03e3b02b
-EBUILD webkit-gtk-2.4.9-r200.ebuild 9355 SHA256
e575d08794b0c8ec2c1282c21c6eb82bb10b8b741924e8596504ff196397ca6b SHA512
8904f1e912bbcb8e817a0fb8343440279a0ec6b72d682d9957b4043492587f40823ee0e15d549377a4974b10bd5f7bc7579c9e41d268f749856e7bb1603549dc
WHIRLPOOL
cefbee06f3fbed09655107bdb58abdeda4da0d048111ece027277ebd19cc65c90de1f668836b40f28bfd94a04e20177a96ea1c5b1aeaee157c4178e20f492885
-EBUILD webkit-gtk-2.4.9.ebuild 9834 SHA256
eaa6df05bbf906160c3864d181c7f582a54a2804a9d5400e462f56eaf54ce037 SHA512
c7436ea640c76f118ed1794fe0fc769ce10a0b57c9d92932f3da10cd57d33f085f5656b2b86e3fe3f2bd6992c9b88591f53eede9de6f61d57531f3f61eab8e2d
WHIRLPOOL
1759d9515453ded2058bf1c8cae35e91ddc4882706eb7f83187a641c0217d7519fe1df18f73d6b3a76579d36cac0e2dfbade9723b0f7775c1b55eeae22240d20
+DIST webkitgtk-2.10.9.tar.xz 10992980 SHA256
bbb18d741780b1b7fa284beb9a97361ac57cda2e42bad2ae2fcdbf797919e969 SHA512
a8eda5381f227098e208a81c093f0b83f4996378e8f54ddfbe5c164254d7e1ff4a260c827e2521c748ca02bc5a691e8bbd0f59da0718cfe18812c3b257ec5228
WHIRLPOOL
c6f36d4195bbd9f97358700ac446ad65d5a426ba7f0913d69163b2f37c1aedc623bdea3650f2ad7da009f1d234c9d54a163e9155794d8218342332b82ead76df
+DIST webkitgtk-2.4.10.tar.xz 9867504 SHA256
33fda4b20d7fec2d6e9399ba03ef3f6d2a733c628bd77d397880c44e4bf7c614 SHA512
09cff437dadfa6ba1b90674ef4d9db558710247559bb8c2894b54a43504428b99465aa5d35bf3323c22827b67711e8dc031d4b63361eb9906c96e2bfd8ee11a8
WHIRLPOOL
af08ef45249313915003a150a56228b1edc25f870c149d4ece5783da302d307b40046a05bf3c157807465f248d083ebe549c48d13eefdf820eb51c2efe0f5f98
+EBUILD webkit-gtk-2.10.9.ebuild 8215 SHA256
bbed605d7e11fe85643355306d44c4ef269038e74c1fe1613fe0a2da740e0f95 SHA512
fc4affe4c157aa5c119d2b33f6a0436fa9fd41ced3020cc31eafdbe4181c27c5d51f2a5a8395ee7586d4820223af719ada02941bee8087d910e7c7fe87ed1962
WHIRLPOOL
eb092102c34cf5770649bf5af05f227b67fe31d20820a9db2ce0b43a68754c7ec5e565f0c730c6a84f369437b77a814cbb79d6ba593d6f8225f8db41095a4c71
+EBUILD webkit-gtk-2.4.10-r200.ebuild 8475 SHA256
145d3cf546353f92325f3d98752903231867a56a6ef59ff8e0191c6e3b959afe SHA512
b1cdaf32976ee41a4acd0f877cf19ef133d979ec618d2d22f1d9d1170f3573fd3f553845a03c4f7b054657aa7f92d959974a6f8d35d150f5545903ecabcfa92f
WHIRLPOOL
584c3f2b8942ddfffdff321544c253f698c002d51d0383fb837477f70c8d7196798a6bf9a909dc64bc0bf481875f998fa348e7ed40af8254ded52ec5741570a8
+EBUILD webkit-gtk-2.4.10.ebuild 8845 SHA256
9cdea807cc1dbe3b4c4f62b47de9b19f683fb5826546f892009aa26bb848cb9b SHA512
c615b9b07ec37a9aca81e6a4cb82cba52c24fb26cc22e5ee4f016cc951e922541d1a102e278ef6e69a56e1d62c50d72dca2ec221729a7ea58d677d2cb960930c
WHIRLPOOL
d099dc2555147efa2145bcad5eff2b61ade60d16b8ce3652ffaf116ad95ca12d939091b679d0b1f58600a0295b3d3deb095b6a5ab9f40fa44725778e5e6ba347
MISC metadata.xml 717 SHA256
0b14a37b119705ad7c50e3857d51674eaade8148fed94caf07ca2afd5282fa58 SHA512
996dbd54e6670cde58d6fca941fd6d1a11a054e42791e1b451005c2c6b5b46d14454869cbc9e4911e5b7c0119b8a04096c95ac7c20f8389ab9cd866c9947b365
WHIRLPOOL
531accd99228e552b04a9644b470db00f9c633021a438bc1895e517e848ea73ce807ddb5225df5fd3f74af19b80e86ab83ae83c8254de4a6b246dea3f7cc1803
diff --git
a/net-libs/webkit-gtk/files/webkit-gtk-2.10.7-remove-execinfo_h.patch
b/net-libs/webkit-gtk/files/webkit-gtk-2.10.9-remove-execinfo_h.patch
similarity index 54%
rename from net-libs/webkit-gtk/files/webkit-gtk-2.10.7-remove-execinfo_h.patch
rename to net-libs/webkit-gtk/files/webkit-gtk-2.10.9-remove-execinfo_h.patch
index 07705ac..5e661d9 100644
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.10.7-remove-execinfo_h.patch
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.10.9-remove-execinfo_h.patch
@@ -1,34 +1,31 @@
-diff -Naur webkitgtk-2.10.7.orig/Source/WTF/wtf/Assertions.cpp
webkitgtk-2.10.7/Source/WTF/wtf/Assertions.cpp
---- webkitgtk-2.10.7.orig/Source/WTF/wtf/Assertions.cpp 2016-01-29
16:29:32.000000000 +0000
-+++ webkitgtk-2.10.7/Source/WTF/wtf/Assertions.cpp 2016-03-15
00:12:11.432000000 +0000
-@@ -71,7 +71,8 @@
- #if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))
+diff -Naur webkitgtk-2.10.9.orig/Source/WTF/wtf/Assertions.cpp
webkitgtk-2.10.9/Source/WTF/wtf/Assertions.cpp
+--- webkitgtk-2.10.9.orig/Source/WTF/wtf/Assertions.cpp 2016-03-17
02:48:18.000000000 -0400
++++ webkitgtk-2.10.9/Source/WTF/wtf/Assertions.cpp 2016-06-01
09:31:42.345411637 -0400
+@@ -71,7 +71,7 @@
+ #if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))
#include <cxxabi.h>
#include <dlfcn.h>
-#include <execinfo.h>
-+// removed for musl - we need better intelligence here
+//#include <execinfo.h>
#endif
extern "C" {
-@@ -226,7 +227,8 @@
+@@ -226,7 +226,7 @@
void WTFGetBacktrace(void** stack, int* size)
{
- #if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))
+ #if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))
- *size = backtrace(stack, *size);
-+// removed for musl - we need better intelligence here
+// *size = backtrace(stack, *size);
#elif OS(WINDOWS)
// The CaptureStackBackTrace function is available in XP, but it is not
defined
// in the Windows Server 2003 R2 Platform SDK. So, we'll grab the function
-@@ -272,9 +274,10 @@
+@@ -272,9 +272,9 @@
void WTFPrintBacktrace(void** stack, int size)
{
#if USE(BACKTRACE_SYMBOLS)
- char** symbols = backtrace_symbols(stack, size);
- if (!symbols)
- return;
-+// removed for musl - we need better intelligence here
+// char** symbols = backtrace_symbols(stack, size);
+// if (!symbols)
+// return;
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.10.7.ebuild
b/net-libs/webkit-gtk/webkit-gtk-2.10.9.ebuild
similarity index 95%
rename from net-libs/webkit-gtk/webkit-gtk-2.10.7.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-2.10.9.ebuild
index 647b8dd..57248e3 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.10.7.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.10.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -22,6 +22,7 @@ KEYWORDS="amd64 ~arm ~mips ~ppc x86"
IUSE="aqua coverage doc +egl +geoloc gles2 gnome-keyring +gstreamer
+introspection +jit nsplugin +opengl spell wayland +webgl X"
# seccomp
+# webgl needs gstreamer, bug #560612
REQUIRED_USE="
geoloc? ( introspection )
gles2? ( egl )
@@ -29,6 +30,7 @@ REQUIRED_USE="
nsplugin? ( X )
webgl? ( ^^ ( gles2 opengl ) )
!webgl? ( ?? ( gles2 opengl ) )
+ webgl? ( gstreamer )
|| ( aqua wayland X )
"
@@ -150,7 +152,7 @@ src_prepare() {
# musl patches
epatch
"${FILESDIR}"/${PN}-2.4.9-remove-disallow_ctypes_h-braindead.patch
- epatch "${FILESDIR}"/${PN}-2.10.7-remove-execinfo_h.patch
+ epatch "${FILESDIR}"/${PN}-2.10.9-remove-execinfo_h.patch
# https://bugs.gentoo.org/show_bug.cgi?id=564352
epatch "${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
@@ -214,6 +216,16 @@ src_configure() {
# should somehow let user select between them?
#
# FTL_JIT requires llvm
+ #
+ # opengl needs to be explicetly handled, bug #576634
+
+ local opengl_enabled
+ if use opengl || use gles2; then
+ opengl_enabled=ON
+ else
+ opengl_enabled=OFF
+ fi
+
local mycmakeargs=(
$(cmake-utils_use_enable aqua QUARTZ_TARGET)
$(cmake-utils_use_enable test API_TESTS)
@@ -233,6 +245,7 @@ src_configure() {
$(cmake-utils_use_find_package egl EGL)
$(cmake-utils_use_find_package opengl OpenGL)
$(cmake-utils_use_enable X X11_TARGET)
+ -DENABLE_OPENGL=${opengl_enabled}
-DCMAKE_BUILD_TYPE=Release
-DPORT=GTK
${ruby_interpreter}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild
b/net-libs/webkit-gtk/webkit-gtk-2.4.10-r200.ebuild
similarity index 84%
rename from net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-2.4.10-r200.ebuild
index e5480ae..32ad6ed 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.10-r200.ebuild
@@ -5,8 +5,9 @@
EAPI="5"
GCONF_DEBUG="no"
PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-inherit autotools check-reqs eutils flag-o-matic gnome2 pax-utils
python-any-r1 toolchain-funcs versionator virtualx
+inherit autotools check-reqs eutils flag-o-matic gnome2 pax-utils
python-any-r1 ruby-single toolchain-funcs versionator virtualx
MY_P="webkitgtk-${PV}"
DESCRIPTION="Open source web browser engine"
@@ -15,9 +16,9 @@ SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz";
LICENSE="LGPL-2+ BSD"
SLOT="2" # no usable subslot
-KEYWORDS="amd64 ~arm ~mips ~ppc x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
-IUSE="aqua coverage debug +egl +geoloc gles2 +gstreamer +introspection +jit
libsecret +opengl spell +webgl +X"
+IUSE="aqua coverage debug +egl +geoloc gles2 gnome-keyring +gstreamer
+introspection +jit +opengl spell +webgl +X"
# bugs 372493, 416331
REQUIRED_USE="
geoloc? ( introspection )
@@ -51,11 +52,11 @@ RDEPEND="
egl? ( media-libs/mesa[egl] )
geoloc? ( >=app-misc/geoclue-2.1.5:2.0 )
gles2? ( media-libs/mesa[gles2] )
+ gnome-keyring? ( app-crypt/libsecret )
gstreamer? (
>=media-libs/gstreamer-1.2:1.0
>=media-libs/gst-plugins-base-1.2:1.0 )
- introspection? ( >=dev-libs/gobject-introspection-1.32.0 )
- libsecret? ( app-crypt/libsecret )
+ introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
opengl? ( virtual/opengl )
spell? ( >=app-text/enchant-0.22:= )
webgl? (
@@ -68,14 +69,8 @@ RDEPEND="
# Need real bison, not yacc
DEPEND="${RDEPEND}
${PYTHON_DEPS}
+ ${RUBY_DEPS}
>=dev-lang/perl-5.10
- || (
- virtual/rubygems[ruby_targets_ruby20]
- virtual/rubygems[ruby_targets_ruby21]
- virtual/rubygems[ruby_targets_ruby22]
- virtual/rubygems[ruby_targets_ruby23]
- virtual/rubygems[ruby_targets_ruby19]
- )
>=dev-libs/atk-2.8.0
>=dev-util/gtk-doc-am-1.10
>=dev-util/gperf-3.0.1
@@ -144,19 +139,6 @@ src_prepare() {
-e 's/-D_FORTIFY_SOURCE=2//g' \
-i Source/autotools/SetupCompilerFlags.m4 || die
- # Failing tests
- # * webinspector -> https://bugs.webkit.org/show_bug.cgi?id=50744
- # * keyevents is interactive
- # * mimehandling test sometimes fails under Xvfb (works fine manually),
bug #???
- # * webdatasource test needs a network connection and intermittently
fails with icedtea-web
- # * webplugindatabase intermittently fails with icedtea-web, bug #????
-# sed -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebinspector/ d' \
-# -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testkeyevents/ d' \
-# -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testmimehandling/ d' \
-# -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebdatasource/ d' \
-# -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebplugindatabase/
d' \
-# -i Tools/TestWebKitAPI/GNUmakefile.am || die
-
# bug #459978, upstream bug #113397
epatch "${FILESDIR}"/${PN}-1.11.90-gtk-docize-fix.patch
@@ -217,10 +199,8 @@ src_configure() {
ruby_interpreter="RUBY=$(type -P ruby22)"
elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
ruby_interpreter="RUBY=$(type -P ruby21)"
- elif has_version "virtual/rubygems[ruby_targets_ruby20]"; then
- ruby_interpreter="RUBY=$(type -P ruby20)"
else
- ruby_interpreter="RUBY=$(type -P ruby19)"
+ ruby_interpreter="RUBY=$(type -P ruby20)"
fi
# TODO: Check Web Audio support
@@ -234,11 +214,11 @@ src_configure() {
$(use_enable egl) \
$(use_enable geoloc geolocation) \
$(use_enable gles2) \
+ $(use_enable gnome-keyring credential_storage) \
$(use_enable gstreamer video) \
$(use_enable gstreamer web-audio) \
$(use_enable introspection) \
$(use_enable jit) \
- $(use_enable libsecret credential_storage) \
$(use_enable opengl glx) \
$(use_enable spell spellcheck) \
$(use_enable webgl) \
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild
b/net-libs/webkit-gtk/webkit-gtk-2.4.10.ebuild
similarity index 85%
rename from net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-2.4.10.ebuild
index 4e181be..05127ab 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.10.ebuild
@@ -5,8 +5,9 @@
EAPI="5"
GCONF_DEBUG="no"
PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-inherit autotools check-reqs eutils flag-o-matic gnome2 pax-utils
python-any-r1 toolchain-funcs versionator virtualx
+inherit autotools check-reqs eutils flag-o-matic gnome2 pax-utils
python-any-r1 ruby-single toolchain-funcs versionator virtualx
MY_P="webkitgtk-${PV}"
DESCRIPTION="Open source web browser engine"
@@ -17,7 +18,7 @@ LICENSE="LGPL-2+ BSD"
SLOT="3/25" # soname version of libwebkit2gtk-3.0
KEYWORDS="amd64 ~arm ~mips ~ppc x86"
-IUSE="aqua coverage debug +egl +geoloc gles2 +gstreamer +introspection +jit
libsecret +opengl spell wayland +webgl +X"
+IUSE="aqua coverage debug +egl +geoloc gles2 gnome-keyring +gstreamer
+introspection +jit +opengl spell wayland +webgl +X"
# bugs 372493, 416331
REQUIRED_USE="
geoloc? ( introspection )
@@ -54,11 +55,11 @@ RDEPEND="
egl? ( media-libs/mesa[egl] )
geoloc? ( >=app-misc/geoclue-2.1.5:2.0 )
gles2? ( media-libs/mesa[gles2] )
+ gnome-keyring? ( app-crypt/libsecret )
gstreamer? (
>=media-libs/gstreamer-1.2:1.0
>=media-libs/gst-plugins-base-1.2:1.0 )
- introspection? ( >=dev-libs/gobject-introspection-1.32.0 )
- libsecret? ( app-crypt/libsecret )
+ introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
opengl? ( virtual/opengl )
spell? ( >=app-text/enchant-0.22:= )
wayland? ( >=x11-libs/gtk+-3.10:3[wayland] )
@@ -76,14 +77,8 @@ RDEPEND="
# Need real bison, not yacc
DEPEND="${RDEPEND}
${PYTHON_DEPS}
+ ${RUBY_DEPS}
>=dev-lang/perl-5.10
- || (
- virtual/rubygems[ruby_targets_ruby20]
- virtual/rubygems[ruby_targets_ruby21]
- virtual/rubygems[ruby_targets_ruby22]
- virtual/rubygems[ruby_targets_ruby23]
- virtual/rubygems[ruby_targets_ruby19]
- )
>=app-accessibility/at-spi2-core-2.5.3
>=dev-libs/atk-2.8.0
>=dev-util/gtk-doc-am-1.10
@@ -153,19 +148,6 @@ src_prepare() {
-e 's/-D_FORTIFY_SOURCE=2//g' \
-i Source/autotools/SetupCompilerFlags.m4 || die
- # Failing tests
- # * webinspector -> https://bugs.webkit.org/show_bug.cgi?id=50744
- # * keyevents is interactive
- # * mimehandling test sometimes fails under Xvfb (works fine manually),
bug #???
- # * webdatasource test needs a network connection and intermittently
fails with icedtea-web
- # * webplugindatabase intermittently fails with icedtea-web, bug #????
-# sed -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebinspector/ d' \
-# -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testkeyevents/ d' \
-# -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testmimehandling/ d' \
-# -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebdatasource/ d' \
-# -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebplugindatabase/
d' \
-# -i Tools/TestWebKitAPI/GNUmakefile.am || die
-
# bug #459978, upstream bug #113397
epatch "${FILESDIR}"/${PN}-1.11.90-gtk-docize-fix.patch
@@ -230,10 +212,8 @@ src_configure() {
ruby_interpreter="RUBY=$(type -P ruby22)"
elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
ruby_interpreter="RUBY=$(type -P ruby21)"
- elif has_version "virtual/rubygems[ruby_targets_ruby20]"; then
- ruby_interpreter="RUBY=$(type -P ruby20)"
else
- ruby_interpreter="RUBY=$(type -P ruby19)"
+ ruby_interpreter="RUBY=$(type -P ruby20)"
fi
# TODO: Check Web Audio support
@@ -248,11 +228,11 @@ src_configure() {
$(use_enable egl) \
$(use_enable geoloc geolocation) \
$(use_enable gles2) \
+ $(use_enable gnome-keyring credential_storage) \
$(use_enable gstreamer video) \
$(use_enable gstreamer web-audio) \
$(use_enable introspection) \
$(use_enable jit) \
- $(use_enable libsecret credential_storage) \
$(use_enable opengl glx) \
$(use_enable spell spellcheck) \
$(use_enable webgl) \
