Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/musl:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/
Date: Wed, 01 Jun 2016 13:35:02
Message-Id: 1464788199.36fd4098dcc93086d39c1e3fcef4c462173e09a6.blueness@gentoo
1 commit: 36fd4098dcc93086d39c1e3fcef4c462173e09a6
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 1 13:36:39 2016 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 1 13:36:39 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=36fd4098
7
8 net-libs/webkit-gtk: update to keep up with main tree
9
10 net-libs/webkit-gtk/Manifest | 12 +++----
11 ...h => webkit-gtk-2.10.9-remove-execinfo_h.patch} | 19 +++++------
12 ...-gtk-2.10.7.ebuild => webkit-gtk-2.10.9.ebuild} | 17 ++++++++--
13 ...9-r200.ebuild => webkit-gtk-2.4.10-r200.ebuild} | 38 +++++-----------------
14 ...t-gtk-2.4.9.ebuild => webkit-gtk-2.4.10.ebuild} | 36 +++++---------------
15 5 files changed, 46 insertions(+), 76 deletions(-)
16
17 diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
18 index 9a6bcec..68b9afd 100644
19 --- a/net-libs/webkit-gtk/Manifest
20 +++ b/net-libs/webkit-gtk/Manifest
21 @@ -1,6 +1,6 @@
22 AUX webkit-gtk-1.11.90-gtk-docize-fix.patch 422 SHA256 4ee4f54be107bf947b39266c868671670cf759ca52879382dddcef66168b841c SHA512 bb56020948d255f1e9de06528cebd921820862593b865cc6a2ba9e1c0e734dc7bb9bcbd5c6e8a735e4ee3afd906b0d17bc43a4a262a98f28a467c649d9d15a3c WHIRLPOOL 5793470581e9971eb699f464e15153b9080225d6e44011c5af14dd379da4d3f8c614a1029f9b98bcaa5d5ba649d0b542e8796fc564baf31cddafe675df317818
23 AUX webkit-gtk-1.6.1-darwin-quartz.patch 1516 SHA256 34ad751c33e868d85b41e06ecbd085b61a81c42bd52063bada52bc59b9e05a23 SHA512 ca8c80d06aa93c07d658ebf3433f5fdee9225616740a075f5606df87e3b90a83b2c492777a8e30255cdd4f11f889be789544ac1fc4a39056e1929a72720347ea WHIRLPOOL 558250f3cf6de4d511a26afb0aeacc04b7049b3d0499362d320c035acac20932d7c16f6ff99d83833498296e3a21b5e2bab985b1ee5fca709754b582195a0fd1
24 -AUX webkit-gtk-2.10.7-remove-execinfo_h.patch 1364 SHA256 ba69f07fcc325efc8b97bf828c2fbc145feeaa71b49195ccf08277d3ed6e185b SHA512 0738518490aedd5fe4dbec4cd21c3e67cb93dcbefe41fb621f66f4550a6439a370b61e836a6b3aea3709cd5ccb7643f2eac124b98cf069202b48f21d63f8dfb1 WHIRLPOOL e49766772e8a1cfa5f844dfe0024a238bedab42a977a5036476b0e02eb013b0785a6a744c5adca4eda46d8728ce7b018d970bde99d98377047ef2d118ab91e40
25 +AUX webkit-gtk-2.10.9-remove-execinfo_h.patch 1239 SHA256 71ce90e34c6ebfd4836e1f7a3307204fd0432c18e592ce6ec1ead7ece12afbee SHA512 1496cbc7b111f720f852d2dfee77214d43b7e3fca804dbbd7704a335a6f5e09d2fd38724d212a4aa7987ba9bf0d35b838b9473e69a890802be862fd003c8e9ca WHIRLPOOL 17a19a4bec478ddb9558918c58c39d023e59196b6bc286e638aec7f7bc80d6ac1a249dd94547361d8ad821a8338ec8e0ea64b8bd3ae1fb9deff3f055701a0d6e
26 AUX webkit-gtk-2.2.5-hppa-platform.patch 530 SHA256 9a2b8311a89aa3500d19d2425c0f12f67c1457c67ecaa322511170461c4c6be7 SHA512 168d4f8acddf4a5fa6ddc3661ef3ec344824c854db036b279d38d526b6025cfbb8bbd15bc64ddd846876749823796ca7d05e4083cf35a744d46b00cfd5179ae1 WHIRLPOOL 5fc8070bf07eef199578db5802452b4443ee3a00b555325b430a3cfd923a0cbb827497907462cb224b07f2f1713d65a26af4adf24b3dca59cb9040dbd6227f92
27 AUX webkit-gtk-2.2.5-ia64-platform.patch 331 SHA256 1ac5327f4f190bc4cbee9e62d4a2805879bbffd914ba75be17afd1aa245e6693 SHA512 dae3cde801d2d29c61abb64c00bf33ac1f7080dd2085cc9a1520c8606ef65538ccee9b1e4c4c16a3dba551acd035542f80b6e808ae5090bb883c85ecfa7ac36e WHIRLPOOL d9ca8172f685f515bb22a38d269e73f1e0fdcbf487bb83557f41649cd9ff5883d1fe0827aef3c753d975895252db3e3fa5eef3f72b43a6557492effd5db10072
28 AUX webkit-gtk-2.4.1-ia64-malloc.patch 807 SHA256 8e01dee48af7e8e0d24729dd9b99e88b47125b5f91d07df29d579785e60d398d SHA512 d9e7a792861ff30137072eba6b5b80e7b37e47e7302bf1cd56027b5c30aea3fd215891f6272d85b80e98c826b3216d0701fe92f06b76e7d1fb860028d7a701c0 WHIRLPOOL 7cf769d9752cf800f72e76233ef299e2da8c13f427cd8d312d47d76282091f06ec32a618dda9d0bacedbc5dcf8aa4289ce9ce089cdbb90be28deeb75e449a925
29 @@ -12,9 +12,9 @@ AUX webkit-gtk-2.4.9-remove-execinfo_h.patch 1374 SHA256 9a6cea9456c7d38b280be1d
30 AUX webkit-gtk-2.8.5-fix-alpha-build.patch 910 SHA256 2e3ea0b6288ff3471349243edd75d1a97fbacdc6a426874f4c9be8a64d2c2b7f SHA512 748ef4b431c02b3b4ba8908b8bdf28f5b11b90a798ac21484d99a3941e0306102b9d8a298f177da63cd86579b64def31e6f2abe66044b5c211bb4382c5a57f86 WHIRLPOOL 4a8ee812d543c016a02321e5e6db83580c6f0301dd57b5cd5bf4e22b7a6f214ac6b41229160d60db42982fd37a11c5f654ef81a8c1b178a6d78e54ed6076ea11
31 AUX webkit-gtk-2.8.5-fix-ia64-build.patch 663 SHA256 d076739707de117fbc9aebc684c4a43024e1673e4c30fdfa3be529331f0c1f78 SHA512 ce8dbe7f2bacfc6d1ad70d39d80447ab90e6daf63bc1dc4a49c406255f76eff090f79e6076ebc349d69193b72a821fa6591692cf74a28e529f8db95cf86358fc WHIRLPOOL adf8e11ee3060bcba606cf17673d06d9c98034a71f6a7406832fabf461c4697abcd0c3d4cdb8d8298caf221c797e0732a9f865d761fcf05753a1dfd96dfd3d82
32 AUX webkit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch 876 SHA256 50052d2a82d6c0d19af0bfb476824059e4448652c6533275084e24dfb5ef19c3 SHA512 ad0925070277d97fce3713f66ffcbfa193fdb3231d63717dfd8b217b420bf6f8665694eef2fcf9d2eef2abefe0fe5406759287395117497de34a00dba1b9c144 WHIRLPOOL d4da619b5bf1000d5dee409b07bcce6ba8da25f0e726e22433e2a3a610773ee4394becd55ccf7efaddebb86e74f1f97868e98240fa9bb80c0ab7a320f03c666e
33 -DIST webkitgtk-2.10.7.tar.xz 10988396 SHA256 990d62c82ed6dede31a6ff0a82d847f16b812842ff3e1093d17113627652864e SHA512 f0d7b303236910d18568ab1e0a522915a70e9d3658537b32ea2c6a42b8b3ece034a292490f7882760338f2afc56468fd7a8ad8659b7afaf87906220a5c815b5b WHIRLPOOL 7cbe8c42e9c245709eee19a9a01f2a4b238596d8119e3420ca750abb3518e1333ff99a596e9f09d511773a964bafed5baa91efca7b711ddc1c91cb601c520328
34 -DIST webkitgtk-2.4.9.tar.xz 9840740 SHA256 afdf29e7828816cad0be2604cf19421e96d96bf493987328ffc8813bb20ac564 SHA512 5dfe5c31e0fcbab5e468a18e08918a439b214dcd620386fa32d35e9110e479b552a4b0b88a1bb8574b34445d5cc5219be349feded32fc1d2791a6c6279d61f98 WHIRLPOOL 26141cd12878bc8136ecffc1636fdcb037f342e5c27c8c557117564af9d1673af84c8c4fd10d3fdbe890bdf183791b18a210f57de9750422959a45c60390076c
35 -EBUILD webkit-gtk-2.10.7.ebuild 7954 SHA256 ace3c75363b69437e233abf9bff0c8e46db6b063135de9f10e532f9f7afdded5 SHA512 048faf1b48b3b3c337f2ef4fec480a18c808d0aedd3f7b9ce0b510c77f49453244cca210b004251f480c97ff7f0a107da6989fcea7d2c5a1299affabc3e37601 WHIRLPOOL b4f2073784c186c11a106d21c44732a57856e66fc694635bd9ceded5e982106ee88b32d05ded3f7000f01afe3872fe296861429f23df8566a756ad0d03e3b02b
36 -EBUILD webkit-gtk-2.4.9-r200.ebuild 9355 SHA256 e575d08794b0c8ec2c1282c21c6eb82bb10b8b741924e8596504ff196397ca6b SHA512 8904f1e912bbcb8e817a0fb8343440279a0ec6b72d682d9957b4043492587f40823ee0e15d549377a4974b10bd5f7bc7579c9e41d268f749856e7bb1603549dc WHIRLPOOL cefbee06f3fbed09655107bdb58abdeda4da0d048111ece027277ebd19cc65c90de1f668836b40f28bfd94a04e20177a96ea1c5b1aeaee157c4178e20f492885
37 -EBUILD webkit-gtk-2.4.9.ebuild 9834 SHA256 eaa6df05bbf906160c3864d181c7f582a54a2804a9d5400e462f56eaf54ce037 SHA512 c7436ea640c76f118ed1794fe0fc769ce10a0b57c9d92932f3da10cd57d33f085f5656b2b86e3fe3f2bd6992c9b88591f53eede9de6f61d57531f3f61eab8e2d WHIRLPOOL 1759d9515453ded2058bf1c8cae35e91ddc4882706eb7f83187a641c0217d7519fe1df18f73d6b3a76579d36cac0e2dfbade9723b0f7775c1b55eeae22240d20
38 +DIST webkitgtk-2.10.9.tar.xz 10992980 SHA256 bbb18d741780b1b7fa284beb9a97361ac57cda2e42bad2ae2fcdbf797919e969 SHA512 a8eda5381f227098e208a81c093f0b83f4996378e8f54ddfbe5c164254d7e1ff4a260c827e2521c748ca02bc5a691e8bbd0f59da0718cfe18812c3b257ec5228 WHIRLPOOL c6f36d4195bbd9f97358700ac446ad65d5a426ba7f0913d69163b2f37c1aedc623bdea3650f2ad7da009f1d234c9d54a163e9155794d8218342332b82ead76df
39 +DIST webkitgtk-2.4.10.tar.xz 9867504 SHA256 33fda4b20d7fec2d6e9399ba03ef3f6d2a733c628bd77d397880c44e4bf7c614 SHA512 09cff437dadfa6ba1b90674ef4d9db558710247559bb8c2894b54a43504428b99465aa5d35bf3323c22827b67711e8dc031d4b63361eb9906c96e2bfd8ee11a8 WHIRLPOOL af08ef45249313915003a150a56228b1edc25f870c149d4ece5783da302d307b40046a05bf3c157807465f248d083ebe549c48d13eefdf820eb51c2efe0f5f98
40 +EBUILD webkit-gtk-2.10.9.ebuild 8215 SHA256 bbed605d7e11fe85643355306d44c4ef269038e74c1fe1613fe0a2da740e0f95 SHA512 fc4affe4c157aa5c119d2b33f6a0436fa9fd41ced3020cc31eafdbe4181c27c5d51f2a5a8395ee7586d4820223af719ada02941bee8087d910e7c7fe87ed1962 WHIRLPOOL eb092102c34cf5770649bf5af05f227b67fe31d20820a9db2ce0b43a68754c7ec5e565f0c730c6a84f369437b77a814cbb79d6ba593d6f8225f8db41095a4c71
41 +EBUILD webkit-gtk-2.4.10-r200.ebuild 8475 SHA256 145d3cf546353f92325f3d98752903231867a56a6ef59ff8e0191c6e3b959afe SHA512 b1cdaf32976ee41a4acd0f877cf19ef133d979ec618d2d22f1d9d1170f3573fd3f553845a03c4f7b054657aa7f92d959974a6f8d35d150f5545903ecabcfa92f WHIRLPOOL 584c3f2b8942ddfffdff321544c253f698c002d51d0383fb837477f70c8d7196798a6bf9a909dc64bc0bf481875f998fa348e7ed40af8254ded52ec5741570a8
42 +EBUILD webkit-gtk-2.4.10.ebuild 8845 SHA256 9cdea807cc1dbe3b4c4f62b47de9b19f683fb5826546f892009aa26bb848cb9b SHA512 c615b9b07ec37a9aca81e6a4cb82cba52c24fb26cc22e5ee4f016cc951e922541d1a102e278ef6e69a56e1d62c50d72dca2ec221729a7ea58d677d2cb960930c WHIRLPOOL d099dc2555147efa2145bcad5eff2b61ade60d16b8ce3652ffaf116ad95ca12d939091b679d0b1f58600a0295b3d3deb095b6a5ab9f40fa44725778e5e6ba347
43 MISC metadata.xml 717 SHA256 0b14a37b119705ad7c50e3857d51674eaade8148fed94caf07ca2afd5282fa58 SHA512 996dbd54e6670cde58d6fca941fd6d1a11a054e42791e1b451005c2c6b5b46d14454869cbc9e4911e5b7c0119b8a04096c95ac7c20f8389ab9cd866c9947b365 WHIRLPOOL 531accd99228e552b04a9644b470db00f9c633021a438bc1895e517e848ea73ce807ddb5225df5fd3f74af19b80e86ab83ae83c8254de4a6b246dea3f7cc1803
44
45 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
46 similarity index 54%
47 rename from net-libs/webkit-gtk/files/webkit-gtk-2.10.7-remove-execinfo_h.patch
48 rename to net-libs/webkit-gtk/files/webkit-gtk-2.10.9-remove-execinfo_h.patch
49 index 07705ac..5e661d9 100644
50 --- a/net-libs/webkit-gtk/files/webkit-gtk-2.10.7-remove-execinfo_h.patch
51 +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.10.9-remove-execinfo_h.patch
52 @@ -1,34 +1,31 @@
53 -diff -Naur webkitgtk-2.10.7.orig/Source/WTF/wtf/Assertions.cpp webkitgtk-2.10.7/Source/WTF/wtf/Assertions.cpp
54 ---- webkitgtk-2.10.7.orig/Source/WTF/wtf/Assertions.cpp 2016-01-29 16:29:32.000000000 +0000
55 -+++ webkitgtk-2.10.7/Source/WTF/wtf/Assertions.cpp 2016-03-15 00:12:11.432000000 +0000
56 -@@ -71,7 +71,8 @@
57 - #if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))
58 +diff -Naur webkitgtk-2.10.9.orig/Source/WTF/wtf/Assertions.cpp webkitgtk-2.10.9/Source/WTF/wtf/Assertions.cpp
59 +--- webkitgtk-2.10.9.orig/Source/WTF/wtf/Assertions.cpp 2016-03-17 02:48:18.000000000 -0400
60 ++++ webkitgtk-2.10.9/Source/WTF/wtf/Assertions.cpp 2016-06-01 09:31:42.345411637 -0400
61 +@@ -71,7 +71,7 @@
62 + #if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))
63 #include <cxxabi.h>
64 #include <dlfcn.h>
65 -#include <execinfo.h>
66 -+// removed for musl - we need better intelligence here
67 +//#include <execinfo.h>
68 #endif
69
70 extern "C" {
71 -@@ -226,7 +227,8 @@
72 +@@ -226,7 +226,7 @@
73 void WTFGetBacktrace(void** stack, int* size)
74 {
75 - #if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))
76 + #if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))
77 - *size = backtrace(stack, *size);
78 -+// removed for musl - we need better intelligence here
79 +// *size = backtrace(stack, *size);
80 #elif OS(WINDOWS)
81 // The CaptureStackBackTrace function is available in XP, but it is not defined
82 // in the Windows Server 2003 R2 Platform SDK. So, we'll grab the function
83 -@@ -272,9 +274,10 @@
84 +@@ -272,9 +272,9 @@
85 void WTFPrintBacktrace(void** stack, int size)
86 {
87 #if USE(BACKTRACE_SYMBOLS)
88 - char** symbols = backtrace_symbols(stack, size);
89 - if (!symbols)
90 - return;
91 -+// removed for musl - we need better intelligence here
92 +// char** symbols = backtrace_symbols(stack, size);
93 +// if (!symbols)
94 +// return;
95
96 diff --git a/net-libs/webkit-gtk/webkit-gtk-2.10.7.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.10.9.ebuild
97 similarity index 95%
98 rename from net-libs/webkit-gtk/webkit-gtk-2.10.7.ebuild
99 rename to net-libs/webkit-gtk/webkit-gtk-2.10.9.ebuild
100 index 647b8dd..57248e3 100644
101 --- a/net-libs/webkit-gtk/webkit-gtk-2.10.7.ebuild
102 +++ b/net-libs/webkit-gtk/webkit-gtk-2.10.9.ebuild
103 @@ -1,4 +1,4 @@
104 -# Copyright 1999-2016 Gentoo Foundation
105 +# Copyright 1999-2015 Gentoo Foundation
106 # Distributed under the terms of the GNU General Public License v2
107 # $Id$
108
109 @@ -22,6 +22,7 @@ KEYWORDS="amd64 ~arm ~mips ~ppc x86"
110 IUSE="aqua coverage doc +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit nsplugin +opengl spell wayland +webgl X"
111 # seccomp
112
113 +# webgl needs gstreamer, bug #560612
114 REQUIRED_USE="
115 geoloc? ( introspection )
116 gles2? ( egl )
117 @@ -29,6 +30,7 @@ REQUIRED_USE="
118 nsplugin? ( X )
119 webgl? ( ^^ ( gles2 opengl ) )
120 !webgl? ( ?? ( gles2 opengl ) )
121 + webgl? ( gstreamer )
122 || ( aqua wayland X )
123 "
124
125 @@ -150,7 +152,7 @@ src_prepare() {
126
127 # musl patches
128 epatch "${FILESDIR}"/${PN}-2.4.9-remove-disallow_ctypes_h-braindead.patch
129 - epatch "${FILESDIR}"/${PN}-2.10.7-remove-execinfo_h.patch
130 + epatch "${FILESDIR}"/${PN}-2.10.9-remove-execinfo_h.patch
131
132 # https://bugs.gentoo.org/show_bug.cgi?id=564352
133 epatch "${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
134 @@ -214,6 +216,16 @@ src_configure() {
135 # should somehow let user select between them?
136 #
137 # FTL_JIT requires llvm
138 + #
139 + # opengl needs to be explicetly handled, bug #576634
140 +
141 + local opengl_enabled
142 + if use opengl || use gles2; then
143 + opengl_enabled=ON
144 + else
145 + opengl_enabled=OFF
146 + fi
147 +
148 local mycmakeargs=(
149 $(cmake-utils_use_enable aqua QUARTZ_TARGET)
150 $(cmake-utils_use_enable test API_TESTS)
151 @@ -233,6 +245,7 @@ src_configure() {
152 $(cmake-utils_use_find_package egl EGL)
153 $(cmake-utils_use_find_package opengl OpenGL)
154 $(cmake-utils_use_enable X X11_TARGET)
155 + -DENABLE_OPENGL=${opengl_enabled}
156 -DCMAKE_BUILD_TYPE=Release
157 -DPORT=GTK
158 ${ruby_interpreter}
159
160 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
161 similarity index 84%
162 rename from net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild
163 rename to net-libs/webkit-gtk/webkit-gtk-2.4.10-r200.ebuild
164 index e5480ae..32ad6ed 100644
165 --- a/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild
166 +++ b/net-libs/webkit-gtk/webkit-gtk-2.4.10-r200.ebuild
167 @@ -5,8 +5,9 @@
168 EAPI="5"
169 GCONF_DEBUG="no"
170 PYTHON_COMPAT=( python2_7 )
171 +USE_RUBY="ruby20 ruby21 ruby22 ruby23"
172
173 -inherit autotools check-reqs eutils flag-o-matic gnome2 pax-utils python-any-r1 toolchain-funcs versionator virtualx
174 +inherit autotools check-reqs eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
175
176 MY_P="webkitgtk-${PV}"
177 DESCRIPTION="Open source web browser engine"
178 @@ -15,9 +16,9 @@ SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
179
180 LICENSE="LGPL-2+ BSD"
181 SLOT="2" # no usable subslot
182 -KEYWORDS="amd64 ~arm ~mips ~ppc x86"
183 +KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
184
185 -IUSE="aqua coverage debug +egl +geoloc gles2 +gstreamer +introspection +jit libsecret +opengl spell +webgl +X"
186 +IUSE="aqua coverage debug +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit +opengl spell +webgl +X"
187 # bugs 372493, 416331
188 REQUIRED_USE="
189 geoloc? ( introspection )
190 @@ -51,11 +52,11 @@ RDEPEND="
191 egl? ( media-libs/mesa[egl] )
192 geoloc? ( >=app-misc/geoclue-2.1.5:2.0 )
193 gles2? ( media-libs/mesa[gles2] )
194 + gnome-keyring? ( app-crypt/libsecret )
195 gstreamer? (
196 >=media-libs/gstreamer-1.2:1.0
197 >=media-libs/gst-plugins-base-1.2:1.0 )
198 - introspection? ( >=dev-libs/gobject-introspection-1.32.0 )
199 - libsecret? ( app-crypt/libsecret )
200 + introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
201 opengl? ( virtual/opengl )
202 spell? ( >=app-text/enchant-0.22:= )
203 webgl? (
204 @@ -68,14 +69,8 @@ RDEPEND="
205 # Need real bison, not yacc
206 DEPEND="${RDEPEND}
207 ${PYTHON_DEPS}
208 + ${RUBY_DEPS}
209 >=dev-lang/perl-5.10
210 - || (
211 - virtual/rubygems[ruby_targets_ruby20]
212 - virtual/rubygems[ruby_targets_ruby21]
213 - virtual/rubygems[ruby_targets_ruby22]
214 - virtual/rubygems[ruby_targets_ruby23]
215 - virtual/rubygems[ruby_targets_ruby19]
216 - )
217 >=dev-libs/atk-2.8.0
218 >=dev-util/gtk-doc-am-1.10
219 >=dev-util/gperf-3.0.1
220 @@ -144,19 +139,6 @@ src_prepare() {
221 -e 's/-D_FORTIFY_SOURCE=2//g' \
222 -i Source/autotools/SetupCompilerFlags.m4 || die
223
224 - # Failing tests
225 - # * webinspector -> https://bugs.webkit.org/show_bug.cgi?id=50744
226 - # * keyevents is interactive
227 - # * mimehandling test sometimes fails under Xvfb (works fine manually), bug #???
228 - # * webdatasource test needs a network connection and intermittently fails with icedtea-web
229 - # * webplugindatabase intermittently fails with icedtea-web, bug #????
230 -# sed -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebinspector/ d' \
231 -# -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testkeyevents/ d' \
232 -# -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testmimehandling/ d' \
233 -# -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebdatasource/ d' \
234 -# -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebplugindatabase/ d' \
235 -# -i Tools/TestWebKitAPI/GNUmakefile.am || die
236 -
237 # bug #459978, upstream bug #113397
238 epatch "${FILESDIR}"/${PN}-1.11.90-gtk-docize-fix.patch
239
240 @@ -217,10 +199,8 @@ src_configure() {
241 ruby_interpreter="RUBY=$(type -P ruby22)"
242 elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
243 ruby_interpreter="RUBY=$(type -P ruby21)"
244 - elif has_version "virtual/rubygems[ruby_targets_ruby20]"; then
245 - ruby_interpreter="RUBY=$(type -P ruby20)"
246 else
247 - ruby_interpreter="RUBY=$(type -P ruby19)"
248 + ruby_interpreter="RUBY=$(type -P ruby20)"
249 fi
250
251 # TODO: Check Web Audio support
252 @@ -234,11 +214,11 @@ src_configure() {
253 $(use_enable egl) \
254 $(use_enable geoloc geolocation) \
255 $(use_enable gles2) \
256 + $(use_enable gnome-keyring credential_storage) \
257 $(use_enable gstreamer video) \
258 $(use_enable gstreamer web-audio) \
259 $(use_enable introspection) \
260 $(use_enable jit) \
261 - $(use_enable libsecret credential_storage) \
262 $(use_enable opengl glx) \
263 $(use_enable spell spellcheck) \
264 $(use_enable webgl) \
265
266 diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.10.ebuild
267 similarity index 85%
268 rename from net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild
269 rename to net-libs/webkit-gtk/webkit-gtk-2.4.10.ebuild
270 index 4e181be..05127ab 100644
271 --- a/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild
272 +++ b/net-libs/webkit-gtk/webkit-gtk-2.4.10.ebuild
273 @@ -5,8 +5,9 @@
274 EAPI="5"
275 GCONF_DEBUG="no"
276 PYTHON_COMPAT=( python2_7 )
277 +USE_RUBY="ruby20 ruby21 ruby22 ruby23"
278
279 -inherit autotools check-reqs eutils flag-o-matic gnome2 pax-utils python-any-r1 toolchain-funcs versionator virtualx
280 +inherit autotools check-reqs eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
281
282 MY_P="webkitgtk-${PV}"
283 DESCRIPTION="Open source web browser engine"
284 @@ -17,7 +18,7 @@ LICENSE="LGPL-2+ BSD"
285 SLOT="3/25" # soname version of libwebkit2gtk-3.0
286 KEYWORDS="amd64 ~arm ~mips ~ppc x86"
287
288 -IUSE="aqua coverage debug +egl +geoloc gles2 +gstreamer +introspection +jit libsecret +opengl spell wayland +webgl +X"
289 +IUSE="aqua coverage debug +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit +opengl spell wayland +webgl +X"
290 # bugs 372493, 416331
291 REQUIRED_USE="
292 geoloc? ( introspection )
293 @@ -54,11 +55,11 @@ RDEPEND="
294 egl? ( media-libs/mesa[egl] )
295 geoloc? ( >=app-misc/geoclue-2.1.5:2.0 )
296 gles2? ( media-libs/mesa[gles2] )
297 + gnome-keyring? ( app-crypt/libsecret )
298 gstreamer? (
299 >=media-libs/gstreamer-1.2:1.0
300 >=media-libs/gst-plugins-base-1.2:1.0 )
301 - introspection? ( >=dev-libs/gobject-introspection-1.32.0 )
302 - libsecret? ( app-crypt/libsecret )
303 + introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
304 opengl? ( virtual/opengl )
305 spell? ( >=app-text/enchant-0.22:= )
306 wayland? ( >=x11-libs/gtk+-3.10:3[wayland] )
307 @@ -76,14 +77,8 @@ RDEPEND="
308 # Need real bison, not yacc
309 DEPEND="${RDEPEND}
310 ${PYTHON_DEPS}
311 + ${RUBY_DEPS}
312 >=dev-lang/perl-5.10
313 - || (
314 - virtual/rubygems[ruby_targets_ruby20]
315 - virtual/rubygems[ruby_targets_ruby21]
316 - virtual/rubygems[ruby_targets_ruby22]
317 - virtual/rubygems[ruby_targets_ruby23]
318 - virtual/rubygems[ruby_targets_ruby19]
319 - )
320 >=app-accessibility/at-spi2-core-2.5.3
321 >=dev-libs/atk-2.8.0
322 >=dev-util/gtk-doc-am-1.10
323 @@ -153,19 +148,6 @@ src_prepare() {
324 -e 's/-D_FORTIFY_SOURCE=2//g' \
325 -i Source/autotools/SetupCompilerFlags.m4 || die
326
327 - # Failing tests
328 - # * webinspector -> https://bugs.webkit.org/show_bug.cgi?id=50744
329 - # * keyevents is interactive
330 - # * mimehandling test sometimes fails under Xvfb (works fine manually), bug #???
331 - # * webdatasource test needs a network connection and intermittently fails with icedtea-web
332 - # * webplugindatabase intermittently fails with icedtea-web, bug #????
333 -# sed -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebinspector/ d' \
334 -# -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testkeyevents/ d' \
335 -# -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testmimehandling/ d' \
336 -# -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebdatasource/ d' \
337 -# -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebplugindatabase/ d' \
338 -# -i Tools/TestWebKitAPI/GNUmakefile.am || die
339 -
340 # bug #459978, upstream bug #113397
341 epatch "${FILESDIR}"/${PN}-1.11.90-gtk-docize-fix.patch
342
343 @@ -230,10 +212,8 @@ src_configure() {
344 ruby_interpreter="RUBY=$(type -P ruby22)"
345 elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
346 ruby_interpreter="RUBY=$(type -P ruby21)"
347 - elif has_version "virtual/rubygems[ruby_targets_ruby20]"; then
348 - ruby_interpreter="RUBY=$(type -P ruby20)"
349 else
350 - ruby_interpreter="RUBY=$(type -P ruby19)"
351 + ruby_interpreter="RUBY=$(type -P ruby20)"
352 fi
353
354 # TODO: Check Web Audio support
355 @@ -248,11 +228,11 @@ src_configure() {
356 $(use_enable egl) \
357 $(use_enable geoloc geolocation) \
358 $(use_enable gles2) \
359 + $(use_enable gnome-keyring credential_storage) \
360 $(use_enable gstreamer video) \
361 $(use_enable gstreamer web-audio) \
362 $(use_enable introspection) \
363 $(use_enable jit) \
364 - $(use_enable libsecret credential_storage) \
365 $(use_enable opengl glx) \
366 $(use_enable spell spellcheck) \
367 $(use_enable webgl) \
Report Message
Find on MARC Find on Google Groups