net-libs/webkit-gtk: add missing patch, issue #49

Package-Manager: Portage-2.3.3, Repoman-2.3.1

2 files changed, 131 insertions, 0 deletions

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 1420587d..051e2de2 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,4 +1,5 @@
 AUX 2.16.1-avoid-perl-ithreads.patch 3179 SHA256 77a3e8ad48868c23834e14b98f99131940a461f79dfeee8703f79eaad60fbf39 SHA512 86a1bcde4a2870aea66823ac90bbb1a3d2398a781994c534720e39843785f2eb4d4382a761ee024ae5420d0aeef212175128bdafda1b47b036b5c6a30e002604 WHIRLPOOL 3e1730282070c1e06dc5b8d9b0dcf60a3e4b6eb6130c43c5dfb679593bd1ad97b29ac17eb0649e03e3ca0be929213fd7a84751142bcd2e921d3dedb643ef0534
+AUX 2.16.2-avoid-perl-ithreads.patch 3681 SHA256 659a6f2c2df55bdd5e5cff8b8a9628f2d18c66ecf92d267b68ed7f48540a2e93 SHA512 b5b567fc198eebf2fb1d538b2692907e30adcd5583a38a00bcd7bdff906464188392fd6ac0b65d574a8d7ea90873bb4f4d8fa2d09c1cdb32013241cc401b8b15 WHIRLPOOL 47784091762aeb0570af5ea3aab75c75a9322ffdb1dbb6b9326b9bc804c17b6490c01d59b03f577968d902d39217478b91a9838ba440bf01dfb76fd7c0a014df
 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
diff --git a/net-libs/webkit-gtk/files/2.16.2-avoid-perl-ithreads.patch b/net-libs/webkit-gtk/files/2.16.2-avoid-perl-ithreads.patch
new file mode 100644
index 00000000..fb49731d
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.16.2-avoid-perl-ithreads.patch
@@ -0,0 +1,130 @@
+From b9ee99577992ccb7a94840f5f7f2d77b31c4e0bd Mon Sep 17 00:00:00 2001
+From: "commit-queue@webkit.org"
+ <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
+Date: Sun, 9 Apr 2017 21:48:06 +0000
+Subject: [PATCH] generate-bindings-all.pl shouldn't use Perl threads
+ https://bugs.webkit.org/show_bug.cgi?id=170106
+
+Patch by Fujii Hironori <Hironori.Fujii@sony.com> on 2017-04-09
+Reviewed by Yusuke Suzuki.
+
+The use of interpreter-based threads in Perl is officially
+discouraged and not all Linux distributions and BSD compile Perl
+with threads support. Use fork instead of threads to run
+generate-bindings.pl in parallel.
+
+* bindings/scripts/generate-bindings-all.pl:
+(spawnGenerateBindingsIfNeeded): Added.
+(executeCommand): Removed the workaround for Cygwin Perl threads.
+(spawnCommand): Added.
+(worker): Deleted.
+
+git-svn-id: http://svn.webkit.org/repository/webkit/trunk@215166 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+---
+ .../bindings/scripts/generate-bindings-all.pl      | 63 +++++++++++-----------
+diff --git a/Source/WebCore/bindings/scripts/generate-bindings-all.pl b/Source/WebCore/bindings/scripts/generate-bindings-all.pl
+index 37b27cc..968ea11 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,18 @@ my @idlFilesToUpdate = grep &{sub {
+                 implicitDependencies($depFile));
+     needsUpdate(\@output, \@deps);
+ }}, @idlFiles;
+-my $queue = Thread::Queue->new(@idlFilesToUpdate);
+-my $abort :shared = 0;
++
++my $abort = 0;
+ my $totalCount = @idlFilesToUpdate;
+-my $currentCount :shared = 0;
++my $currentCount = 0;
+ 
+-my @threadPool = map { threads->create(\&worker) } (1 .. $numOfJobs);
+-$_->join for @threadPool;
++spawnGenerateBindingsIfNeeded() for (1 .. $numOfJobs);
++while (waitpid(-1, 0) != -1) {
++    if ($?) {
++        $abort = 1;
++    }
++    spawnGenerateBindingsIfNeeded();
++}
+ exit $abort;
+ 
+ sub needsUpdate
+@@ -157,20 +159,16 @@ sub mtime
+     return (stat $file)[9];
+ }
+ 
+-sub worker {
+-    while (my $file = $queue->dequeue_nb()) {
+-        last if $abort;
+-        eval {
+-            $currentCount++;
+-            my $basename = basename($file);
+-            printProgress("[$currentCount/$totalCount] $basename");
+-            executeCommand($perl, @args, $file) == 0 or die;
+-        };
+-        if ($@) {
+-            $abort = 1;
+-            die;
+-        }
+-    }
++sub spawnGenerateBindingsIfNeeded
++{
++    return if $abort;
++    return unless @idlFilesToUpdate;
++    my $file = shift @idlFilesToUpdate;
++    $currentCount++;
++    my $basename = basename($file);
++    printProgress("[$currentCount/$totalCount] $basename");
++    my $pid = spawnCommand($perl, @args, $file);
++    $abort = 1 unless defined $pid;
+ }
+ 
+ sub buildDirectoryCache
+@@ -196,22 +194,23 @@ sub implicitDependencies
+ 
+ sub executeCommand
+ {
+-    if ($^O eq 'cygwin') {
+-        # 'system' of Cygwin Perl doesn't seem thread-safe
+-        my $pid = fork();
+-        defined($pid) or die;
+-        if ($pid == 0) {
+-            exec(@_) or die;
+-        }
+-        waitpid($pid, 0);
+-        return $?;
+-    }
+     if ($^O eq 'MSWin32') {
+         return system(quoteCommand(@_));
+     }
+     return system(@_);
+ }
+ 
++sub spawnCommand
++{
++    my $pid = fork();
++    if ($pid == 0) {
++        @_ = quoteCommand(@_) if ($^O eq 'MSWin32');
++        exec(@_);
++        die "Cannot exec";
++    }
++    return $pid;
++}
++
+ sub quoteCommand
+ {
+     return map {
+-- 
+1.8.3.1
+