commit: ee25164dd1c756aaefa32d81f2bc8bb0ed816f8d
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Sun Apr 9 02:45:19 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Sun Apr 9 02:45:19 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=ee25164d
net-libs/webkit-gtk: version bump to 2.16.1
Remove $Id$s
net-libs/webkit-gtk/Manifest | 9 ++-
.../files/2.16.1-avoid-perl-ithreads.patch | 88 ++++++++++++++++++++++
net-libs/webkit-gtk/webkit-gtk-2.14.5.ebuild | 1 -
...-gtk-2.14.5.ebuild => webkit-gtk-2.16.1.ebuild} | 22 +++---
net-libs/webkit-gtk/webkit-gtk-2.4.11-r1.ebuild | 1 -
net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild | 1 -
6 files changed, 106 insertions(+), 16 deletions(-)
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 13f5a77..1282801 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1,4 @@
+AUX 2.16.1-avoid-perl-ithreads.patch 3179 SHA256
77a3e8ad48868c23834e14b98f99131940a461f79dfeee8703f79eaad60fbf39 SHA512
86a1bcde4a2870aea66823ac90bbb1a3d2398a781994c534720e39843785f2eb4d4382a761ee024ae5420d0aeef212175128bdafda1b47b036b5c6a30e002604
WHIRLPOOL
3e1730282070c1e06dc5b8d9b0dcf60a3e4b6eb6130c43c5dfb679593bd1ad97b29ac17eb0649e03e3ca0be929213fd7a84751142bcd2e921d3dedb643ef0534
AUX webkit-gtk-1.11.90-gtk-docize-fix.patch 426 SHA256
20d26df63afbdbf829974597bf53a9657007e9940431ffa0020f1d5fa5d22b4f SHA512
e35cc255e36742519b4f26b60d8e704eb3e0e66e8e13599cadae6fe445a3a87a2c6c65b6746c4d39f1ab11e7eb79b0f63a5fc9d5af5d7fa8907b224b852e3b32
WHIRLPOOL
a91ba71b8b4fa2f1ff5de1633fa477bc1f45de37f3bbd212af1ecf4b6298c5454c199cd89f6602854978d4ae6a551316eb96c4f90c82a0c07018e94ac3025e43
AUX webkit-gtk-1.6.1-darwin-quartz.patch 1516 SHA256
34ad751c33e868d85b41e06ecbd085b61a81c42bd52063bada52bc59b9e05a23 SHA512
ca8c80d06aa93c07d658ebf3433f5fdee9225616740a075f5606df87e3b90a83b2c492777a8e30255cdd4f11f889be789544ac1fc4a39056e1929a72720347ea
WHIRLPOOL
558250f3cf6de4d511a26afb0aeacc04b7049b3d0499362d320c035acac20932d7c16f6ff99d83833498296e3a21b5e2bab985b1ee5fca709754b582195a0fd1
AUX webkit-gtk-2.14.3-musl.patch 4111 SHA256
cc371f6dd10f489169eaa5b0ef3b197eae7a0f7d349aca86f830dd45f39473af SHA512
eb47b3c9d58bfa121acf83f2f58e819e2e2a2198c58ff926a1d3db8ee1c5ddbcbaad5c06d113cec1c20f286877823edcd52cc0caf3993a8b89a6fb5277f0a387
WHIRLPOOL
486613fe49588ed3019298eebe66a94a6e823e1719ff602dedc330222a931350a605dc64013f3a0244d661d335699a5836cf4083c93b5723a6cb457845e5ca04
@@ -15,8 +16,10 @@ AUX webkit-gtk-2.8.5-fix-alpha-build.patch 914 SHA256
aa6617505fe9342153ba9442ea
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 880 SHA256
411a4238c2e863b60744287ad645f1e3e0cddd33e895f4dfb1e1c5cfd9f48765 SHA512
7150400387f5edd3a647359ef1d864634c25d0a7dad043c1b0734fb44d133f59bbc0ce065e59bc3abab0082272ac54c1b40752e06041e5e36c11f502a9734a62
WHIRLPOOL
470ea2f6228878ddae55cec72b667f14f56d5f7017ea1cce123dcc5da41dd3fd589214b722e5a85bd81f2a14445a759c55366826b82e3801d8e40ef2ba9c6826
DIST webkitgtk-2.14.5.tar.xz 13956352 SHA256
3ca8f1c33a9b43d6c753dcac1c0788656930e06382b10fdf5c2805ea8f96369f SHA512
3351d9b05458434835fa2db050c34906649c3b1222d7936d123306634a46e35e8cc3aa1bb7512b103af1996fce722254692826b6f695e32ae176032dc8c94e1c
WHIRLPOOL
011745e5e1f8926b28b34ac797480b3c79ccfcf09d844d076d8cf3087959013f39f359d7a7ef06a8e95ca7e04d28284ff4901e483180d2a41b4b05568b658e74
+DIST webkitgtk-2.16.1.tar.xz 14675996 SHA256
eb92383232328ce655b703c64370ed3795662479719ad1b4a869ed46769d2945 SHA512
4b8de15644d0d0f9814c674020cbbab8628347915b8010977dbe2365ce276ea05b3bf86171400ae8eb5bfdebbadcfabd1efce34a177b5c82aa765bd3351e7010
WHIRLPOOL
c9deacbd229804aaaba88f9fcabdcde1a460430bb60258dfc8d7393723401d7e74d645ba8bf2dcf60e87c30739e45558b747911a4671a8950efe271cb7b86586
DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256
588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512
2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb
WHIRLPOOL
de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3
-EBUILD webkit-gtk-2.14.5.ebuild 8501 SHA256
3cb5b835d6be0cd513eafdbdb4b1144e16ad72007c93a193d33a6e32ba103788 SHA512
d352da2fdb7030ae8929ba12b1f1078c2bc9342f7dd0007ad57d146e8a0f4ba842324c241584e7437e937c52d1803fe3a4e1928815f417bb24bca7ea8dafa991
WHIRLPOOL
99eda952c97bed8ec2c64d0f0070e4010106a03a3694efa49498ce79e17a320b2e06f3d69b53ec1baedd7c446498df91abe1206a1354d614583865ba5bd38371
-EBUILD webkit-gtk-2.4.11-r1.ebuild 9123 SHA256
6fc62f471fe028d8e0a2fe0a130dc53833f62c49ab7136dbc446dd290b4b71ce SHA512
5e12f7febbd297859e6d9fa709efbdfe440b5d7900d70ee1e81479313bfabd5583b6c1a68d912748df02af2d1f430fac63382ecb92a9986cbb9841602294b5c8
WHIRLPOOL
f9d46ac0776142733ee7d2fe5907acaa265198f6bc1334e74c8c6f7fecece8545de9f620d15d00b7f8aa3225e0d325ace4af58360145d3f9f8bd20a4ed74a067
-EBUILD webkit-gtk-2.4.11-r200.ebuild 8530 SHA256
e579be98b8fba274c974019ac867e2a2fdefba5d4b7e4419c324f1eae74b7a5d SHA512
dbf7e7e1dffc157be18602e0e1bda57297f30c5a1f00862736067d6fee8573c1711f027bab07a698a1cd382a6f6d825327deed7274930a098f416e77c8d05371
WHIRLPOOL
ec612bb5db541cdd866227f09281f63dbf9e157eb485c8ce8e87f9664ef3213750958f0ba13f3a87cfe641b3c6f1972ea15a9955d2293e101cf8b466dea10aad
+EBUILD webkit-gtk-2.14.5.ebuild 8494 SHA256
19383e3c9173e9c5696fb5156e77a5a98214ff6f3f8a96a71cf230f9512723ee SHA512
c0fdf4057ed187ee7717cb57ffd1c235fe6074b5ab0a18c1e86e07674c7e82512a3a6409980e69a1adfa24f00f57e3ce2bcf2d3ae04e3dbee3e64bbf7089f610
WHIRLPOOL
fde9cff6fc10b64740349bcd27a1bba994d411fad55ab3c6f4b8d2bc99663625af4488b05d628b80d17caebe3ff2d439829895f4f8b0a787c49005bf995c8b51
+EBUILD webkit-gtk-2.16.1.ebuild 8541 SHA256
deccaa186fa287f0c4d1fd8da1aba577dc3aac39a624de642ce8d4edb43425b8 SHA512
af95977486cc2d756aa61a7845990df2e463b6735ea49da19906ad9e6f2f8bb8ffeadefcc6baa2b7175922ecf2cc1a1669cd43f63a3fe1415c71635d5e5d82a9
WHIRLPOOL
3e11ba466cb8aaf8107445524e28bb905c7112684179b3b4385834b86467c766f87011cfdefa7e69c53a6a8a22186147d5b1f414ed898785fbe185fdbf8faa3d
+EBUILD webkit-gtk-2.4.11-r1.ebuild 9116 SHA256
cb634f504420a7b9c685f6e0b7def916e44c0671a31628ed5086da7b960013c9 SHA512
e4796fa71dbfbe6bfc996e51a5d1a5eae8d6ad35736c55ca3d8a705f09833f19bf9d61d643ca8de3d14eb25264e2d1de1778c58ba904c7db044bbfbd6da7bd73
WHIRLPOOL
b62d76a261fc01f59cfaa9907585918b4ba9e5d059d5ac8e4a32fbb454ae41854e920c9e237236d775881fd097a6eca765e29e3551b2e4e87146ff666faf1f50
+EBUILD webkit-gtk-2.4.11-r200.ebuild 8523 SHA256
0877a84ecd95a782324353b5f4d97de900826bdb68e92c5ffca780bed050948e SHA512
faec9fa216387bcbb070f645a7ef1534880239c4ded5ce4a384c8e7b477e44f48905e5d0e87e2748d9296ce53c7770e72451cd142e7c09e2e908f570716d44db
WHIRLPOOL
30480cc629d706ce423ec5e709abb4075da678ba9445155ef8e960a3d4a823955914446c4259e49474c32c67d964dfb8ae12644557be3653bcf18a025aa39f9a
MISC metadata.xml 697 SHA256
4f096b51e01f6f74430bbca04ba292bcc015631d57417deb91a995fe943203a6 SHA512
64bebe1fd72f81707b462bdf3630404e71a87d1807519c86ed5eff393a324e30a32c489f0c7d86d3b6dc2b3855758452e95ae98fb4d0c27555947b35b28907d9
WHIRLPOOL
17cce501d17ac9a29c142462737d223b087bf80b18284fb346de62e9c9f9f23e02efa6a30ec63780ee48d0b2c21a34af9fdc6fd7f72ac152fb272085214adea1
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
new file mode 100644
index 0000000..506696f
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.16.1-avoid-perl-ithreads.patch
@@ -0,0 +1,88 @@
+From 1ac17bea2273df0dfec21897b00efb8351648e1b Mon Sep 17 00:00:00 2001
+From: Kent Fredric <ken...@gentoo.org>
+Date: Sun, 9 Apr 2017 04:10:52 +1200
+Subject: Remove need for threaded perl at expense of being single-threaded
+
+This could theoretically be implemented with forks, but I opted not
+to because its too hard, and the platform specifics are too messy.
+
+This could theoretically also have support for automatic detection
+as to which strategy to use based on OS/availability, but the
+implementation details of that are too much for my pateience today.
+
+In an ideal world, this file would support:
+
+1. Single threaded builds for spartans
+2. Forked builds for people who are on linux but don't want to rebuild
+ their perl just to have threads ( which produce negligible benefit
+ and measurable performance penalties to all code )
+3. Threaded builds for people who are on windows where forks may not
+ be entirely sane.
+
+But #1 is good enough atm.
+
+This is important for Gentoo, because end users decide on their own
+choices with regards to threading support for perl, and threading
+support is off by default due to the performance issues mentioned in #2
+in conjunction with the fact that "threads" is officially discouraged
+by Perl Upstream.
+
+And as Gentoo users have to have a system Perl to compile WebkitGTK,
+this means installing WebkitGTK requires rebuilding their system Perl
+with threads.
+
+And this *also* means that all packages presently compiled against Perl
+become broken, because non-threaded perl and threaded perl are not ABI
+compatible with each other, and this can scale into hundreds of
+packages and significant transient breakage.
+
+This ends up in practice being *far* *worse* in terms of time wasted
+than the mediocre time inefficiency created by needing a single
+threaded build.
+---
+ Source/WebCore/bindings/scripts/generate-bindings-all.pl | 15 +++++----------
+ 1 file changed, 5 insertions(+), 10 deletions(-)
+
+diff --git a/Source/WebCore/bindings/scripts/generate-bindings-all.pl
b/Source/WebCore/bindings/scripts/generate-bindings-all.pl
+index 37b27cc74..b3a378df0 100755
+--- a/Source/WebCore/bindings/scripts/generate-bindings-all.pl
++++ b/Source/WebCore/bindings/scripts/generate-bindings-all.pl
+@@ -32,9 +32,6 @@ use File::Basename;
+ use File::Spec;
+ use File::Find;
+ use Getopt::Long;
+-use threads;
+-use threads::shared;
+-use Thread::Queue;
+
+ my $perl = $^X;
+ my $scriptDir = $FindBin::Bin;
+@@ -121,13 +118,11 @@ my @idlFilesToUpdate = grep &{sub {
+ implicitDependencies($depFile));
+ needsUpdate(\@output, \@deps);
+ }}, @idlFiles;
+-my $queue = Thread::Queue->new(@idlFilesToUpdate);
+-my $abort :shared = 0;
+-my $totalCount = @idlFilesToUpdate;
+-my $currentCount :shared = 0;
+
+-my @threadPool = map { threads->create(\&worker) } (1 .. $numOfJobs);
+-$_->join for @threadPool;
++my $abort = 0;
++my $totalCount = @idlFilesToUpdate;
++my $currentCount = 0;
++worker();
+ exit $abort;
+
+ sub needsUpdate
+@@ -158,7 +153,7 @@ sub mtime
+ }
+
+ sub worker {
+- while (my $file = $queue->dequeue_nb()) {
++ while (my $file = shift @idlFilesToUpdate) {
+ last if $abort;
+ eval {
+ $currentCount++;
+--
+2.12.2
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.14.5.ebuild
b/net-libs/webkit-gtk/webkit-gtk-2.14.5.ebuild
index db6d382..5c2a3bf 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.14.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.14.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
CMAKE_MAKEFILE_GENERATOR="ninja"
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.14.5.ebuild
b/net-libs/webkit-gtk/webkit-gtk-2.16.1.ebuild
similarity index 94%
copy from net-libs/webkit-gtk/webkit-gtk-2.14.5.ebuild
copy to net-libs/webkit-gtk/webkit-gtk-2.16.1.ebuild
index db6d382..44c59aa 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.14.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.16.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
CMAKE_MAKEFILE_GENERATOR="ninja"
@@ -16,7 +15,7 @@ SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz";
LICENSE="LGPL-2+ BSD"
SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer
+introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
@@ -49,10 +48,10 @@ RDEPEND="
>=dev-libs/libxslt-1.1.7
>=media-libs/fontconfig-2.8:1.0
>=media-libs/freetype-2.4.2:2
- >=media-libs/harfbuzz-0.9.18:=[icu(+)]
+ >=media-libs/harfbuzz-1.3.3:=[icu(+)]
>=media-libs/libpng-1.4:0=
media-libs/libwebp:=
- >=net-libs/gnutls-3
+ dev-libs/libgcrypt:0=
>=net-libs/libsoup-2.42:2.4[introspection?]
>=x11-libs/cairo-1.10.2:=
>=x11-libs/gtk+-3.14:3[introspection?]
@@ -65,8 +64,8 @@ RDEPEND="
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
+ >=media-libs/gstreamer-1.2.3:1.0
+ >=media-libs/gst-plugins-base-1.2.3:1.0
>=media-libs/gst-plugins-bad-1.8:1.0[opengl?] )
introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
libnotify? ( x11-libs/libnotify )
@@ -99,11 +98,14 @@ DEPEND="${RDEPEND}
>=dev-util/gtk-doc-am-1.10
>=dev-util/gperf-3.0.1
>=sys-devel/bison-2.4.3
- >=sys-devel/flex-2.5.34
|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
sys-devel/gettext
virtual/pkgconfig
+ dev-lang/perl
+ virtual/perl-Data-Dumper
+ virtual/perl-Carp
+
doc? ( >=dev-util/gtk-doc-1.10 )
geolocation? ( dev-util/gdbus-codegen )
introspection? ( jit? ( sys-apps/paxctl ) )
@@ -126,8 +128,8 @@ PATCHES=(
# https://bugs.webkit.org/show_bug.cgi?id=167283
"${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
- # https://bugs.webkit.org/show_bug.cgi?id=148379
- "${FILESDIR}"/${PN}-2.8.5-webkit2gtkinjectedbundle-j1.patch
+ # Avoid perl[ithreads] build time requirement as that would be very
very messy
+ "${FILESDIR}"/${PV}-avoid-perl-ithreads.patch
# musl and jit
"${FILESDIR}"/${PN}-2.14.3-musl.patch
@@ -238,12 +240,12 @@ src_configure() {
-DENABLE_GEOLOCATION=$(usex geolocation)
$(cmake-utils_use_find_package gles2 OpenGLES2)
-DENABLE_GLES2=$(usex gles2)
- -DENABLE_CREDENTIAL_STORAGE=$(usex gnome-keyring)
-DENABLE_VIDEO=$(usex gstreamer)
-DENABLE_WEB_AUDIO=$(usex gstreamer)
-DENABLE_INTROSPECTION=$(usex introspection)
-DENABLE_JIT=$(usex jit)
-DUSE_LIBNOTIFY=$(usex libnotify)
+ -DUSE_LIBSECRET=$(usex gnome-keyring)
-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
-DENABLE_SPELLCHECK=$(usex spell)
-DENABLE_WAYLAND_TARGET=$(usex wayland)
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.11-r1.ebuild
b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r1.ebuild
index 3184cc7..d58f0ee 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.11-r1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
PYTHON_COMPAT=( python2_7 )
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild
b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild
index abb40d8..d7c85fd 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
PYTHON_COMPAT=( python2_7 )
