[gentoo-commits] proj/musl:master commit in: net-libs/webkit-gtk/files/, net-libs/webkit-gtk/ - gentoo-commits

From:	Aric Belsito <lluixhi@×××××.com>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] proj/musl:master commit in: net-libs/webkit-gtk/files/, net-libs/webkit-gtk/
Date:	Thu, 22 Jun 2017 14:19:51
Message-Id:	`1498141158.2b31a13628ffc61ef6eca37dc6191790b50e70b3.lluixhi@gentoo`

1

commit:     2b31a13628ffc61ef6eca37dc6191790b50e70b3

2

Author:     Aric Belsito <lluixhi <AT> gmail <DOT> com>

3

AuthorDate: Thu Jun 22 14:19:18 2017 +0000

4

Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>

5

CommitDate: Thu Jun 22 14:19:18 2017 +0000

6

URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=2b31a136

7

8

net-libs/webkit-gtk: version bump to 2.16.4

9

10

 net-libs/webkit-gtk/Manifest                       |   7 +-

11

 .../files/2.16.2-avoid-perl-ithreads.patch         | 130 ---------------------

12

 net-libs/webkit-gtk/webkit-gtk-2.16.3.ebuild       |   2 +-

13

 ...-gtk-2.16.2.ebuild => webkit-gtk-2.16.4.ebuild} |   9 +-

14

 4 files changed, 7 insertions(+), 141 deletions(-)

15

16

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest

17

index 033394e..ac00fef 100644

18

--- a/net-libs/webkit-gtk/Manifest

19

+++ b/net-libs/webkit-gtk/Manifest

20

@@ -1,5 +1,4 @@

21

 AUX 2.16.1-avoid-perl-ithreads.patch 3179 SHA256 77a3e8ad48868c23834e14b98f99131940a461f79dfeee8703f79eaad60fbf39 SHA512 86a1bcde4a2870aea66823ac90bbb1a3d2398a781994c534720e39843785f2eb4d4382a761ee024ae5420d0aeef212175128bdafda1b47b036b5c6a30e002604 WHIRLPOOL 3e1730282070c1e06dc5b8d9b0dcf60a3e4b6eb6130c43c5dfb679593bd1ad97b29ac17eb0649e03e3ca0be929213fd7a84751142bcd2e921d3dedb643ef0534

22

-AUX 2.16.2-avoid-perl-ithreads.patch 3681 SHA256 659a6f2c2df55bdd5e5cff8b8a9628f2d18c66ecf92d267b68ed7f48540a2e93 SHA512 b5b567fc198eebf2fb1d538b2692907e30adcd5583a38a00bcd7bdff906464188392fd6ac0b65d574a8d7ea90873bb4f4d8fa2d09c1cdb32013241cc401b8b15 WHIRLPOOL 47784091762aeb0570af5ea3aab75c75a9322ffdb1dbb6b9326b9bc804c17b6490c01d59b03f577968d902d39217478b91a9838ba440bf01dfb76fd7c0a014df

23

 AUX webkit-gtk-1.11.90-gtk-docize-fix.patch 426 SHA256 20d26df63afbdbf829974597bf53a9657007e9940431ffa0020f1d5fa5d22b4f SHA512 e35cc255e36742519b4f26b60d8e704eb3e0e66e8e13599cadae6fe445a3a87a2c6c65b6746c4d39f1ab11e7eb79b0f63a5fc9d5af5d7fa8907b224b852e3b32 WHIRLPOOL a91ba71b8b4fa2f1ff5de1633fa477bc1f45de37f3bbd212af1ecf4b6298c5454c199cd89f6602854978d4ae6a551316eb96c4f90c82a0c07018e94ac3025e43

24

 AUX webkit-gtk-1.6.1-darwin-quartz.patch 1516 SHA256 34ad751c33e868d85b41e06ecbd085b61a81c42bd52063bada52bc59b9e05a23 SHA512 ca8c80d06aa93c07d658ebf3433f5fdee9225616740a075f5606df87e3b90a83b2c492777a8e30255cdd4f11f889be789544ac1fc4a39056e1929a72720347ea WHIRLPOOL 558250f3cf6de4d511a26afb0aeacc04b7049b3d0499362d320c035acac20932d7c16f6ff99d83833498296e3a21b5e2bab985b1ee5fca709754b582195a0fd1

25

 AUX webkit-gtk-2.14.3-musl.patch 4111 SHA256 cc371f6dd10f489169eaa5b0ef3b197eae7a0f7d349aca86f830dd45f39473af SHA512 eb47b3c9d58bfa121acf83f2f58e819e2e2a2198c58ff926a1d3db8ee1c5ddbcbaad5c06d113cec1c20f286877823edcd52cc0caf3993a8b89a6fb5277f0a387 WHIRLPOOL 486613fe49588ed3019298eebe66a94a6e823e1719ff602dedc330222a931350a605dc64013f3a0244d661d335699a5836cf4083c93b5723a6cb457845e5ca04

26

@@ -15,11 +14,11 @@ AUX webkit-gtk-2.4.9-remove-disallow_ctypes_h-braindead.patch 733 SHA256 d447d71

27

 AUX webkit-gtk-2.4.9-remove-execinfo_h.patch 1374 SHA256 9a6cea9456c7d38b280be1d4f29417e3d4ebd619e183535368175c473485c2dd SHA512 f4a0647530f29bed5fdbf0fcec5d52c6064a13c00715fb6fb490490dee29dac87bb2b1d9ab35ce2bf7b9eb2da262cf5bb07b7c84f82f84cfab784a61f163811e WHIRLPOOL f18be67ef26051ebe271481c3444761c604a40fcda9679f3778cccbc3513f8501a6c3ea9b43fa1b3c3eaa04ca08585e62d8b3a27185358dc69c612ef8eab8364

28

 AUX webkit-gtk-2.8.5-fix-alpha-build.patch 914 SHA256 aa6617505fe9342153ba9442ea109d880ca6c3315777c57ab599f67515e2a9f7 SHA512 c3599c21dbcc709cf1bbc56eafdff8f8d30d65732fff73e601a828b397523d9a0cec96a4e7940ad1b4b3d9b4711f6d5f2935dcd34cac9adec63b73401638fd5e WHIRLPOOL 68a39ccf49e7719393f14cd5d53497148527bd697b010378bdec4cdefb21c5fc7ce5081ce10b412c61390a82e45fa44d9d34aa7f223c51ad15eb1d0288ccbe60

29

 AUX webkit-gtk-2.8.5-fix-ia64-build.patch 663 SHA256 d076739707de117fbc9aebc684c4a43024e1673e4c30fdfa3be529331f0c1f78 SHA512 ce8dbe7f2bacfc6d1ad70d39d80447ab90e6daf63bc1dc4a49c406255f76eff090f79e6076ebc349d69193b72a821fa6591692cf74a28e529f8db95cf86358fc WHIRLPOOL adf8e11ee3060bcba606cf17673d06d9c98034a71f6a7406832fabf461c4697abcd0c3d4cdb8d8298caf221c797e0732a9f865d761fcf05753a1dfd96dfd3d82

30

-DIST webkitgtk-2.16.2.tar.xz 14650116 SHA256 5ef689a202eb2b71141efbe8b7b53288adced90790f9f08df6e0a2ec1809f252 SHA512 0bd16f663dffd41d713a53e2186576c4a7c42e7f872605a1688c80e8b55408b5f96f1274a1fe24624b4974240e901df5b11d1ff27a03fa2d9950575f1260abc8 WHIRLPOOL 7268820bdee088eb639e4453c683e8f6b13e7cc7093f8d4148b3911aa7ea7807291ca443b18c885de4a9a838cd80ba9247f728d1cd8106b373b4c568a918a16b

31

 DIST webkitgtk-2.16.3.tar.xz 14652068 SHA256 204e9131da0101b9bc8765716e70a897121af04b964d9827cd9f20816a77b512 SHA512 551367551ed1bceaf9c70269f229e97972706820c6ae2d4444bc6d8b0992d6de34a156f9c245813c1f1701ce54f5476a44512590acfa6cfd6e67663d94caa91e WHIRLPOOL bac846be9d5f7b0a4c08b201d338bed6b84e65bdb105f2689350e02e0f0011944f5e23961e9411f712040c26a5313ef9bb4e30dda2cb19216c8e8d665ab0550f

32

+DIST webkitgtk-2.16.4.tar.xz 14655288 SHA256 f9aba4338319bd539785345144e28c8027dc8cb526b2e443e0c8f2c0239f5128 SHA512 9643b40f5425cb6c13daf39cbe66db7103e588c8a6a1822709d1b2d24ddf73662c139337327a403c25678cec96df7e5ccf186c14aca162b6f32b5bc31310709c WHIRLPOOL ac6300646017eaa8d68b4628b3df6cb4b82c6fdf7472c07e6cdba0e0bd55cc1ad8d15e779d528c89477363292586be0e48d01c977dad9dd05269f37c415a4fa5

33

 DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3

34

-EBUILD webkit-gtk-2.16.2.ebuild 8624 SHA256 0fd702ede15ed9c8cb8347165e47205b6b8e4ad7e691c8fb72d855a58fa4b478 SHA512 5995ad1de87d70c407df973e74517b6a5470f39e8375093dbc314c265c571d67d61b6cb3131a472c1283cf6c46d264af7b1193b26f3560f66214b77d4f5e7f5e WHIRLPOOL 0cd7592d0a6580a47a4114bad2fe6c3928f4d003b11135359ea358efd3659c72dda0ea09f7ddc833ad88b01e2798279b2ab9c86b38c05f5041c79ade152b2975

35

-EBUILD webkit-gtk-2.16.3.ebuild 8413 SHA256 1954528b7bf4396f4feb68d0c1f85c0627f8688d7a5d48afe9e5f6544d9eee89 SHA512 0d60cbce59e5334393265d5e78c12dd90c1572e2e8b63c6f4b357399685269e45252983ea2b67db49422ac868e16e14542c887614516065aeb85a7ea5e4379ec WHIRLPOOL afaf95ad1a750a146a9c57715ff030b0456666a952d3a6ae0eb80636d7292ed194f862bf5098e1bcde85a81de0f01ae551166a80e4b6272bc6cfa82b3124e1f6

36

+EBUILD webkit-gtk-2.16.3.ebuild 8411 SHA256 43301cb113faf868828e3ffa859e19182fb1b6dd98ad7aed073c3072471b41de SHA512 4ee9dfb6a8247ec5da15f7fc8aa31ba0ebc444f13b5ea8f6dfd2724b8e946a0de39a153219252f0916542dffb0a6c3a2796645dd6d2f88fe20bf4a3459a537ba WHIRLPOOL 0e362d2971c0dec2c5745008aeff5b306ac1af0ef8b48dde12a47a9bba35a49c830e252743bc1dd87c9338d7469aec53ad67bb56a40064a7d37c1b868373cebb

37

+EBUILD webkit-gtk-2.16.4.ebuild 8474 SHA256 6ff88a8e31f0bf694a9dbe35cfdaf387fc30e25ae2764fc467ac4b2eb63ffa04 SHA512 c629a41bc6f3295849ea7827ffd0dd87a42f726a75ed0b1229a26ad28146317f7b5773076e9dfe1755fb249d2d855c38b5b7694720c3e0f84a9aef9711144998 WHIRLPOOL 5ba7603fe8a89287f10b9dce628bf7ab8caf649af1c6cb2bc5aae8c3d585cf7e6be0a4c13b41c516f22031d6e2a3abfc695bce6279ac9fb0b376ac8a89b106a8

38

 EBUILD webkit-gtk-2.4.11-r1.ebuild 9116 SHA256 cb634f504420a7b9c685f6e0b7def916e44c0671a31628ed5086da7b960013c9 SHA512 e4796fa71dbfbe6bfc996e51a5d1a5eae8d6ad35736c55ca3d8a705f09833f19bf9d61d643ca8de3d14eb25264e2d1de1778c58ba904c7db044bbfbd6da7bd73 WHIRLPOOL b62d76a261fc01f59cfaa9907585918b4ba9e5d059d5ac8e4a32fbb454ae41854e920c9e237236d775881fd097a6eca765e29e3551b2e4e87146ff666faf1f50

39

 EBUILD webkit-gtk-2.4.11-r200.ebuild 8523 SHA256 0877a84ecd95a782324353b5f4d97de900826bdb68e92c5ffca780bed050948e SHA512 faec9fa216387bcbb070f645a7ef1534880239c4ded5ce4a384c8e7b477e44f48905e5d0e87e2748d9296ce53c7770e72451cd142e7c09e2e908f570716d44db WHIRLPOOL 30480cc629d706ce423ec5e709abb4075da678ba9445155ef8e960a3d4a823955914446c4259e49474c32c67d964dfb8ae12644557be3653bcf18a025aa39f9a

40

 MISC metadata.xml 697 SHA256 4f096b51e01f6f74430bbca04ba292bcc015631d57417deb91a995fe943203a6 SHA512 64bebe1fd72f81707b462bdf3630404e71a87d1807519c86ed5eff393a324e30a32c489f0c7d86d3b6dc2b3855758452e95ae98fb4d0c27555947b35b28907d9 WHIRLPOOL 17cce501d17ac9a29c142462737d223b087bf80b18284fb346de62e9c9f9f23e02efa6a30ec63780ee48d0b2c21a34af9fdc6fd7f72ac152fb272085214adea1

41

42

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

43

deleted file mode 100644

44

index fb49731..0000000

45

--- a/net-libs/webkit-gtk/files/2.16.2-avoid-perl-ithreads.patch

46

+++ /dev/null

47

@@ -1,130 +0,0 @@

48

-From b9ee99577992ccb7a94840f5f7f2d77b31c4e0bd Mon Sep 17 00:00:00 2001

49

-From: "commit-queue@××××××.org"

50

- <commit-queue@××××××.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>

51

-Date: Sun, 9 Apr 2017 21:48:06 +0000

52

-Subject: [PATCH] generate-bindings-all.pl shouldn't use Perl threads

53

- https://bugs.webkit.org/show_bug.cgi?id=170106

54

-

55

-Patch by Fujii Hironori <Hironori.Fujii@××××.com> on 2017-04-09

56

-Reviewed by Yusuke Suzuki.

57

-

58

-The use of interpreter-based threads in Perl is officially

59

-discouraged and not all Linux distributions and BSD compile Perl

60

-with threads support. Use fork instead of threads to run

61

-generate-bindings.pl in parallel.

62

-

63

-* bindings/scripts/generate-bindings-all.pl:

64

-(spawnGenerateBindingsIfNeeded): Added.

65

-(executeCommand): Removed the workaround for Cygwin Perl threads.

66

-(spawnCommand): Added.

67

-(worker): Deleted.

68

-

69

-git-svn-id: http://svn.webkit.org/repository/webkit/trunk@215166 268f45cc-cd09-0410-ab3c-d52691b4dbfc

70

----

71

- .../bindings/scripts/generate-bindings-all.pl      | 63 +++++++++++-----------

72

-diff --git a/Source/WebCore/bindings/scripts/generate-bindings-all.pl b/Source/WebCore/bindings/scripts/generate-bindings-all.pl

73

-index 37b27cc..968ea11 100755

74

---- a/Source/WebCore/bindings/scripts/generate-bindings-all.pl

75

-+++ b/Source/WebCore/bindings/scripts/generate-bindings-all.pl

76

-@@ -32,9 +32,6 @@ use File::Basename;

77

- use File::Spec;

78

- use File::Find;

79

- use Getopt::Long;

80

--use threads;

81

--use threads::shared;

82

--use Thread::Queue;

83

-

84

- my $perl = $^X;

85

- my $scriptDir = $FindBin::Bin;

86

-@@ -121,13 +118,18 @@ my @idlFilesToUpdate = grep &{sub {

87

-                 implicitDependencies($depFile));

88

-     needsUpdate(\@output, \@deps);

89

- }}, @idlFiles;

90

--my $queue = Thread::Queue->new(@idlFilesToUpdate);

91

--my $abort :shared = 0;

92

-+

93

-+my $abort = 0;

94

- my $totalCount = @idlFilesToUpdate;

95

--my $currentCount :shared = 0;

96

-+my $currentCount = 0;

97

-

98

--my @threadPool = map { threads->create(\&worker) } (1 .. $numOfJobs);

99

--$_->join for @threadPool;

100

-+spawnGenerateBindingsIfNeeded() for (1 .. $numOfJobs);

101

-+while (waitpid(-1, 0) != -1) {

102

-+    if ($?) {

103

-+        $abort = 1;

104

-+    }

105

-+    spawnGenerateBindingsIfNeeded();

106

-+}

107

- exit $abort;

108

-

109

- sub needsUpdate

110

-@@ -157,20 +159,16 @@ sub mtime

111

-     return (stat $file)[9];

112

- }

113

-

114

--sub worker {

115

--    while (my $file = $queue->dequeue_nb()) {

116

--        last if $abort;

117

--        eval {

118

--            $currentCount++;

119

--            my $basename = basename($file);

120

--            printProgress("[$currentCount/$totalCount] $basename");

121

--            executeCommand($perl, @args, $file) == 0 or die;

122

--        };

123

--        if ($@) {

124

--            $abort = 1;

125

--            die;

126

--        }

127

--    }

128

-+sub spawnGenerateBindingsIfNeeded

129

-+{

130

-+    return if $abort;

131

-+    return unless @idlFilesToUpdate;

132

-+    my $file = shift @idlFilesToUpdate;

133

-+    $currentCount++;

134

-+    my $basename = basename($file);

135

-+    printProgress("[$currentCount/$totalCount] $basename");

136

-+    my $pid = spawnCommand($perl, @args, $file);

137

-+    $abort = 1 unless defined $pid;

138

- }

139

-

140

- sub buildDirectoryCache

141

-@@ -196,22 +194,23 @@ sub implicitDependencies

142

-

143

- sub executeCommand

144

- {

145

--    if ($^O eq 'cygwin') {

146

--        # 'system' of Cygwin Perl doesn't seem thread-safe

147

--        my $pid = fork();

148

--        defined($pid) or die;

149

--        if ($pid == 0) {

150

--            exec(@_) or die;

151

--        }

152

--        waitpid($pid, 0);

153

--        return $?;

154

--    }

155

-     if ($^O eq 'MSWin32') {

156

-         return system(quoteCommand(@_));

157

-     }

158

-     return system(@_);

159

- }

160

-

161

-+sub spawnCommand

162

-+{

163

-+    my $pid = fork();

164

-+    if ($pid == 0) {

165

-+        @_ = quoteCommand(@_) if ($^O eq 'MSWin32');

166

-+        exec(@_);

167

-+        die "Cannot exec";

168

-+    }

169

-+    return $pid;

170

-+}

171

-+

172

- sub quoteCommand

173

- {

174

-     return map {

175

---

176

-1.8.3.1

177

-

178

179

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.16.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.16.3.ebuild

180

index dd1608d..8b5d6ca 100644

181

--- a/net-libs/webkit-gtk/webkit-gtk-2.16.3.ebuild

182

+++ b/net-libs/webkit-gtk/webkit-gtk-2.16.3.ebuild

183

@@ -15,7 +15,7 @@ SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"

184

185

 LICENSE="LGPL-2+ BSD"

186

 SLOT="4/37" # soname version of libwebkit2gtk-4.0

187

-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"

188

+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"

189

190

 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"

191

192

193

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.16.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.16.4.ebuild

194

similarity index 95%

195

rename from net-libs/webkit-gtk/webkit-gtk-2.16.2.ebuild

196

rename to net-libs/webkit-gtk/webkit-gtk-2.16.4.ebuild

197

index 10b83d2..499af06 100644

198

--- a/net-libs/webkit-gtk/webkit-gtk-2.16.2.ebuild

199

+++ b/net-libs/webkit-gtk/webkit-gtk-2.16.4.ebuild

200

@@ -15,7 +15,7 @@ SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"

201

202

 LICENSE="LGPL-2+ BSD"

203

 SLOT="4/37" # soname version of libwebkit2gtk-4.0

204

-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"

205

+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"

206

207

 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"

208

209

@@ -39,6 +39,7 @@ RESTRICT="test"

210

 # use sqlite, svg by default

211

 # Aqua support in gtk3 is untested

212

 # Dependencies found at Source/cmake/OptionsGTK.cmake

213

+# Various compile-time optionals for gtk+-3.22.0 - ensure it

214

 RDEPEND="

215

 	dev-db/sqlite:3=

216

 	>=dev-libs/glib-2.36:2

217

@@ -54,7 +55,7 @@ RDEPEND="

218

 	dev-libs/libgcrypt:0=

219

 	>=net-libs/libsoup-2.42:2.4[introspection?]

220

 	>=x11-libs/cairo-1.10.2:=

221

-	>=x11-libs/gtk+-3.14:3[introspection?]

222

+	>=x11-libs/gtk+-3.22:3[introspection?]

223

 	>=x11-libs/pango-1.30.0

224

 	virtual/jpeg:0=

225

226

@@ -128,10 +129,6 @@ PATCHES=(

227

 	# https://bugs.webkit.org/show_bug.cgi?id=167283

228

 	"${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch

229

230

-	# Avoid perl[ithreads] build time requirement as that would be very very messy

231

-	# https://bugs.webkit.org/show_bug.cgi?id=170106 (should get backported for 2.16.3)

232

-	"${FILESDIR}"/${PV}-avoid-perl-ithreads.patch

233

-

234

 	# musl and jit

235

 	"${FILESDIR}"/${PN}-2.14.3-musl.patch

236

)

1	commit: 2b31a13628ffc61ef6eca37dc6191790b50e70b3
2	Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
3	AuthorDate: Thu Jun 22 14:19:18 2017 +0000
4	Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
5	CommitDate: Thu Jun 22 14:19:18 2017 +0000
6	URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=2b31a136
7
8	net-libs/webkit-gtk: version bump to 2.16.4
9
10	net-libs/webkit-gtk/Manifest \| 7 +-
11	.../files/2.16.2-avoid-perl-ithreads.patch \| 130 ---------------------
12	net-libs/webkit-gtk/webkit-gtk-2.16.3.ebuild \| 2 +-
13	...-gtk-2.16.2.ebuild => webkit-gtk-2.16.4.ebuild} \| 9 +-
14	4 files changed, 7 insertions(+), 141 deletions(-)
15
16	diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
17	index 033394e..ac00fef 100644
18	--- a/net-libs/webkit-gtk/Manifest
19	+++ b/net-libs/webkit-gtk/Manifest
20	@@ -1,5 +1,4 @@
21	AUX 2.16.1-avoid-perl-ithreads.patch 3179 SHA256 77a3e8ad48868c23834e14b98f99131940a461f79dfeee8703f79eaad60fbf39 SHA512 86a1bcde4a2870aea66823ac90bbb1a3d2398a781994c534720e39843785f2eb4d4382a761ee024ae5420d0aeef212175128bdafda1b47b036b5c6a30e002604 WHIRLPOOL 3e1730282070c1e06dc5b8d9b0dcf60a3e4b6eb6130c43c5dfb679593bd1ad97b29ac17eb0649e03e3ca0be929213fd7a84751142bcd2e921d3dedb643ef0534
22	-AUX 2.16.2-avoid-perl-ithreads.patch 3681 SHA256 659a6f2c2df55bdd5e5cff8b8a9628f2d18c66ecf92d267b68ed7f48540a2e93 SHA512 b5b567fc198eebf2fb1d538b2692907e30adcd5583a38a00bcd7bdff906464188392fd6ac0b65d574a8d7ea90873bb4f4d8fa2d09c1cdb32013241cc401b8b15 WHIRLPOOL 47784091762aeb0570af5ea3aab75c75a9322ffdb1dbb6b9326b9bc804c17b6490c01d59b03f577968d902d39217478b91a9838ba440bf01dfb76fd7c0a014df
23	AUX webkit-gtk-1.11.90-gtk-docize-fix.patch 426 SHA256 20d26df63afbdbf829974597bf53a9657007e9940431ffa0020f1d5fa5d22b4f SHA512 e35cc255e36742519b4f26b60d8e704eb3e0e66e8e13599cadae6fe445a3a87a2c6c65b6746c4d39f1ab11e7eb79b0f63a5fc9d5af5d7fa8907b224b852e3b32 WHIRLPOOL a91ba71b8b4fa2f1ff5de1633fa477bc1f45de37f3bbd212af1ecf4b6298c5454c199cd89f6602854978d4ae6a551316eb96c4f90c82a0c07018e94ac3025e43
24	AUX webkit-gtk-1.6.1-darwin-quartz.patch 1516 SHA256 34ad751c33e868d85b41e06ecbd085b61a81c42bd52063bada52bc59b9e05a23 SHA512 ca8c80d06aa93c07d658ebf3433f5fdee9225616740a075f5606df87e3b90a83b2c492777a8e30255cdd4f11f889be789544ac1fc4a39056e1929a72720347ea WHIRLPOOL 558250f3cf6de4d511a26afb0aeacc04b7049b3d0499362d320c035acac20932d7c16f6ff99d83833498296e3a21b5e2bab985b1ee5fca709754b582195a0fd1
25	AUX webkit-gtk-2.14.3-musl.patch 4111 SHA256 cc371f6dd10f489169eaa5b0ef3b197eae7a0f7d349aca86f830dd45f39473af SHA512 eb47b3c9d58bfa121acf83f2f58e819e2e2a2198c58ff926a1d3db8ee1c5ddbcbaad5c06d113cec1c20f286877823edcd52cc0caf3993a8b89a6fb5277f0a387 WHIRLPOOL 486613fe49588ed3019298eebe66a94a6e823e1719ff602dedc330222a931350a605dc64013f3a0244d661d335699a5836cf4083c93b5723a6cb457845e5ca04
26	@@ -15,11 +14,11 @@ AUX webkit-gtk-2.4.9-remove-disallow_ctypes_h-braindead.patch 733 SHA256 d447d71
27	AUX webkit-gtk-2.4.9-remove-execinfo_h.patch 1374 SHA256 9a6cea9456c7d38b280be1d4f29417e3d4ebd619e183535368175c473485c2dd SHA512 f4a0647530f29bed5fdbf0fcec5d52c6064a13c00715fb6fb490490dee29dac87bb2b1d9ab35ce2bf7b9eb2da262cf5bb07b7c84f82f84cfab784a61f163811e WHIRLPOOL f18be67ef26051ebe271481c3444761c604a40fcda9679f3778cccbc3513f8501a6c3ea9b43fa1b3c3eaa04ca08585e62d8b3a27185358dc69c612ef8eab8364
28	AUX webkit-gtk-2.8.5-fix-alpha-build.patch 914 SHA256 aa6617505fe9342153ba9442ea109d880ca6c3315777c57ab599f67515e2a9f7 SHA512 c3599c21dbcc709cf1bbc56eafdff8f8d30d65732fff73e601a828b397523d9a0cec96a4e7940ad1b4b3d9b4711f6d5f2935dcd34cac9adec63b73401638fd5e WHIRLPOOL 68a39ccf49e7719393f14cd5d53497148527bd697b010378bdec4cdefb21c5fc7ce5081ce10b412c61390a82e45fa44d9d34aa7f223c51ad15eb1d0288ccbe60
29	AUX webkit-gtk-2.8.5-fix-ia64-build.patch 663 SHA256 d076739707de117fbc9aebc684c4a43024e1673e4c30fdfa3be529331f0c1f78 SHA512 ce8dbe7f2bacfc6d1ad70d39d80447ab90e6daf63bc1dc4a49c406255f76eff090f79e6076ebc349d69193b72a821fa6591692cf74a28e529f8db95cf86358fc WHIRLPOOL adf8e11ee3060bcba606cf17673d06d9c98034a71f6a7406832fabf461c4697abcd0c3d4cdb8d8298caf221c797e0732a9f865d761fcf05753a1dfd96dfd3d82
30	-DIST webkitgtk-2.16.2.tar.xz 14650116 SHA256 5ef689a202eb2b71141efbe8b7b53288adced90790f9f08df6e0a2ec1809f252 SHA512 0bd16f663dffd41d713a53e2186576c4a7c42e7f872605a1688c80e8b55408b5f96f1274a1fe24624b4974240e901df5b11d1ff27a03fa2d9950575f1260abc8 WHIRLPOOL 7268820bdee088eb639e4453c683e8f6b13e7cc7093f8d4148b3911aa7ea7807291ca443b18c885de4a9a838cd80ba9247f728d1cd8106b373b4c568a918a16b
31	DIST webkitgtk-2.16.3.tar.xz 14652068 SHA256 204e9131da0101b9bc8765716e70a897121af04b964d9827cd9f20816a77b512 SHA512 551367551ed1bceaf9c70269f229e97972706820c6ae2d4444bc6d8b0992d6de34a156f9c245813c1f1701ce54f5476a44512590acfa6cfd6e67663d94caa91e WHIRLPOOL bac846be9d5f7b0a4c08b201d338bed6b84e65bdb105f2689350e02e0f0011944f5e23961e9411f712040c26a5313ef9bb4e30dda2cb19216c8e8d665ab0550f
32	+DIST webkitgtk-2.16.4.tar.xz 14655288 SHA256 f9aba4338319bd539785345144e28c8027dc8cb526b2e443e0c8f2c0239f5128 SHA512 9643b40f5425cb6c13daf39cbe66db7103e588c8a6a1822709d1b2d24ddf73662c139337327a403c25678cec96df7e5ccf186c14aca162b6f32b5bc31310709c WHIRLPOOL ac6300646017eaa8d68b4628b3df6cb4b82c6fdf7472c07e6cdba0e0bd55cc1ad8d15e779d528c89477363292586be0e48d01c977dad9dd05269f37c415a4fa5
33	DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3
34	-EBUILD webkit-gtk-2.16.2.ebuild 8624 SHA256 0fd702ede15ed9c8cb8347165e47205b6b8e4ad7e691c8fb72d855a58fa4b478 SHA512 5995ad1de87d70c407df973e74517b6a5470f39e8375093dbc314c265c571d67d61b6cb3131a472c1283cf6c46d264af7b1193b26f3560f66214b77d4f5e7f5e WHIRLPOOL 0cd7592d0a6580a47a4114bad2fe6c3928f4d003b11135359ea358efd3659c72dda0ea09f7ddc833ad88b01e2798279b2ab9c86b38c05f5041c79ade152b2975
35	-EBUILD webkit-gtk-2.16.3.ebuild 8413 SHA256 1954528b7bf4396f4feb68d0c1f85c0627f8688d7a5d48afe9e5f6544d9eee89 SHA512 0d60cbce59e5334393265d5e78c12dd90c1572e2e8b63c6f4b357399685269e45252983ea2b67db49422ac868e16e14542c887614516065aeb85a7ea5e4379ec WHIRLPOOL afaf95ad1a750a146a9c57715ff030b0456666a952d3a6ae0eb80636d7292ed194f862bf5098e1bcde85a81de0f01ae551166a80e4b6272bc6cfa82b3124e1f6
36	+EBUILD webkit-gtk-2.16.3.ebuild 8411 SHA256 43301cb113faf868828e3ffa859e19182fb1b6dd98ad7aed073c3072471b41de SHA512 4ee9dfb6a8247ec5da15f7fc8aa31ba0ebc444f13b5ea8f6dfd2724b8e946a0de39a153219252f0916542dffb0a6c3a2796645dd6d2f88fe20bf4a3459a537ba WHIRLPOOL 0e362d2971c0dec2c5745008aeff5b306ac1af0ef8b48dde12a47a9bba35a49c830e252743bc1dd87c9338d7469aec53ad67bb56a40064a7d37c1b868373cebb
37	+EBUILD webkit-gtk-2.16.4.ebuild 8474 SHA256 6ff88a8e31f0bf694a9dbe35cfdaf387fc30e25ae2764fc467ac4b2eb63ffa04 SHA512 c629a41bc6f3295849ea7827ffd0dd87a42f726a75ed0b1229a26ad28146317f7b5773076e9dfe1755fb249d2d855c38b5b7694720c3e0f84a9aef9711144998 WHIRLPOOL 5ba7603fe8a89287f10b9dce628bf7ab8caf649af1c6cb2bc5aae8c3d585cf7e6be0a4c13b41c516f22031d6e2a3abfc695bce6279ac9fb0b376ac8a89b106a8
38	EBUILD webkit-gtk-2.4.11-r1.ebuild 9116 SHA256 cb634f504420a7b9c685f6e0b7def916e44c0671a31628ed5086da7b960013c9 SHA512 e4796fa71dbfbe6bfc996e51a5d1a5eae8d6ad35736c55ca3d8a705f09833f19bf9d61d643ca8de3d14eb25264e2d1de1778c58ba904c7db044bbfbd6da7bd73 WHIRLPOOL b62d76a261fc01f59cfaa9907585918b4ba9e5d059d5ac8e4a32fbb454ae41854e920c9e237236d775881fd097a6eca765e29e3551b2e4e87146ff666faf1f50
39	EBUILD webkit-gtk-2.4.11-r200.ebuild 8523 SHA256 0877a84ecd95a782324353b5f4d97de900826bdb68e92c5ffca780bed050948e SHA512 faec9fa216387bcbb070f645a7ef1534880239c4ded5ce4a384c8e7b477e44f48905e5d0e87e2748d9296ce53c7770e72451cd142e7c09e2e908f570716d44db WHIRLPOOL 30480cc629d706ce423ec5e709abb4075da678ba9445155ef8e960a3d4a823955914446c4259e49474c32c67d964dfb8ae12644557be3653bcf18a025aa39f9a
40	MISC metadata.xml 697 SHA256 4f096b51e01f6f74430bbca04ba292bcc015631d57417deb91a995fe943203a6 SHA512 64bebe1fd72f81707b462bdf3630404e71a87d1807519c86ed5eff393a324e30a32c489f0c7d86d3b6dc2b3855758452e95ae98fb4d0c27555947b35b28907d9 WHIRLPOOL 17cce501d17ac9a29c142462737d223b087bf80b18284fb346de62e9c9f9f23e02efa6a30ec63780ee48d0b2c21a34af9fdc6fd7f72ac152fb272085214adea1
41
42	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
43	deleted file mode 100644
44	index fb49731..0000000
45	--- a/net-libs/webkit-gtk/files/2.16.2-avoid-perl-ithreads.patch
46	+++ /dev/null
47	@@ -1,130 +0,0 @@
48	-From b9ee99577992ccb7a94840f5f7f2d77b31c4e0bd Mon Sep 17 00:00:00 2001
49	-From: "commit-queue@××××××.org"
50	- <commit-queue@××××××.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
51	-Date: Sun, 9 Apr 2017 21:48:06 +0000
52	-Subject: [PATCH] generate-bindings-all.pl shouldn't use Perl threads
53	- https://bugs.webkit.org/show_bug.cgi?id=170106
54	-
55	-Patch by Fujii Hironori <Hironori.Fujii@××××.com> on 2017-04-09
56	-Reviewed by Yusuke Suzuki.
57	-
58	-The use of interpreter-based threads in Perl is officially
59	-discouraged and not all Linux distributions and BSD compile Perl
60	-with threads support. Use fork instead of threads to run
61	-generate-bindings.pl in parallel.
62	-
63	-* bindings/scripts/generate-bindings-all.pl:
64	-(spawnGenerateBindingsIfNeeded): Added.
65	-(executeCommand): Removed the workaround for Cygwin Perl threads.
66	-(spawnCommand): Added.
67	-(worker): Deleted.
68	-
69	-git-svn-id: http://svn.webkit.org/repository/webkit/trunk@215166 268f45cc-cd09-0410-ab3c-d52691b4dbfc
70	----
71	- .../bindings/scripts/generate-bindings-all.pl \| 63 +++++++++++-----------
72	-diff --git a/Source/WebCore/bindings/scripts/generate-bindings-all.pl b/Source/WebCore/bindings/scripts/generate-bindings-all.pl
73	-index 37b27cc..968ea11 100755
74	---- a/Source/WebCore/bindings/scripts/generate-bindings-all.pl
75	-+++ b/Source/WebCore/bindings/scripts/generate-bindings-all.pl
76	-@@ -32,9 +32,6 @@ use File::Basename;
77	- use File::Spec;
78	- use File::Find;
79	- use Getopt::Long;
80	--use threads;
81	--use threads::shared;
82	--use Thread::Queue;
83	-
84	- my $perl = $^X;
85	- my $scriptDir = $FindBin::Bin;
86	-@@ -121,13 +118,18 @@ my @idlFilesToUpdate = grep &{sub {
87	- implicitDependencies($depFile));
88	- needsUpdate(\@output, \@deps);
89	- }}, @idlFiles;
90	--my $queue = Thread::Queue->new(@idlFilesToUpdate);
91	--my $abort :shared = 0;
92	-+
93	-+my $abort = 0;
94	- my $totalCount = @idlFilesToUpdate;
95	--my $currentCount :shared = 0;
96	-+my $currentCount = 0;
97	-
98	--my @threadPool = map { threads->create(\&worker) } (1 .. $numOfJobs);
99	--$_->join for @threadPool;
100	-+spawnGenerateBindingsIfNeeded() for (1 .. $numOfJobs);
101	-+while (waitpid(-1, 0) != -1) {
102	-+ if ($?) {
103	-+ $abort = 1;
104	-+ }
105	-+ spawnGenerateBindingsIfNeeded();
106	-+}
107	- exit $abort;
108	-
109	- sub needsUpdate
110	-@@ -157,20 +159,16 @@ sub mtime
111	- return (stat $file)[9];
112	- }
113	-
114	--sub worker {
115	-- while (my $file = $queue->dequeue_nb()) {
116	-- last if $abort;
117	-- eval {
118	-- $currentCount++;
119	-- my $basename = basename($file);
120	-- printProgress("[$currentCount/$totalCount] $basename");
121	-- executeCommand($perl, @args, $file) == 0 or die;
122	-- };
123	-- if ($@) {
124	-- $abort = 1;
125	-- die;
126	-- }
127	-- }
128	-+sub spawnGenerateBindingsIfNeeded
129	-+{
130	-+ return if $abort;
131	-+ return unless @idlFilesToUpdate;
132	-+ my $file = shift @idlFilesToUpdate;
133	-+ $currentCount++;
134	-+ my $basename = basename($file);
135	-+ printProgress("[$currentCount/$totalCount] $basename");
136	-+ my $pid = spawnCommand($perl, @args, $file);
137	-+ $abort = 1 unless defined $pid;
138	- }
139	-
140	- sub buildDirectoryCache
141	-@@ -196,22 +194,23 @@ sub implicitDependencies
142	-
143	- sub executeCommand
144	- {
145	-- if ($^O eq 'cygwin') {
146	-- # 'system' of Cygwin Perl doesn't seem thread-safe
147	-- my $pid = fork();
148	-- defined($pid) or die;
149	-- if ($pid == 0) {
150	-- exec(@_) or die;
151	-- }
152	-- waitpid($pid, 0);
153	-- return $?;
154	-- }
155	- if ($^O eq 'MSWin32') {
156	- return system(quoteCommand(@_));
157	- }
158	- return system(@_);
159	- }
160	-
161	-+sub spawnCommand
162	-+{
163	-+ my $pid = fork();
164	-+ if ($pid == 0) {
165	-+ @_ = quoteCommand(@_) if ($^O eq 'MSWin32');
166	-+ exec(@_);
167	-+ die "Cannot exec";
168	-+ }
169	-+ return $pid;
170	-+}
171	-+
172	- sub quoteCommand
173	- {
174	- return map {
175	---
176	-1.8.3.1
177	-
178
179	diff --git a/net-libs/webkit-gtk/webkit-gtk-2.16.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.16.3.ebuild
180	index dd1608d..8b5d6ca 100644
181	--- a/net-libs/webkit-gtk/webkit-gtk-2.16.3.ebuild
182	+++ b/net-libs/webkit-gtk/webkit-gtk-2.16.3.ebuild
183	@@ -15,7 +15,7 @@ SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
184
185	LICENSE="LGPL-2+ BSD"
186	SLOT="4/37" # soname version of libwebkit2gtk-4.0
187	-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
188	+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
189
190	IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
191
192
193	diff --git a/net-libs/webkit-gtk/webkit-gtk-2.16.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.16.4.ebuild
194	similarity index 95%
195	rename from net-libs/webkit-gtk/webkit-gtk-2.16.2.ebuild
196	rename to net-libs/webkit-gtk/webkit-gtk-2.16.4.ebuild
197	index 10b83d2..499af06 100644
198	--- a/net-libs/webkit-gtk/webkit-gtk-2.16.2.ebuild
199	+++ b/net-libs/webkit-gtk/webkit-gtk-2.16.4.ebuild
200	@@ -15,7 +15,7 @@ SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
201
202	LICENSE="LGPL-2+ BSD"
203	SLOT="4/37" # soname version of libwebkit2gtk-4.0
204	-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
205	+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
206
207	IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
208
209	@@ -39,6 +39,7 @@ RESTRICT="test"
210	# use sqlite, svg by default
211	# Aqua support in gtk3 is untested
212	# Dependencies found at Source/cmake/OptionsGTK.cmake
213	+# Various compile-time optionals for gtk+-3.22.0 - ensure it
214	RDEPEND="
215	dev-db/sqlite:3=
216	>=dev-libs/glib-2.36:2
217	@@ -54,7 +55,7 @@ RDEPEND="
218	dev-libs/libgcrypt:0=
219	>=net-libs/libsoup-2.42:2.4[introspection?]
220	>=x11-libs/cairo-1.10.2:=
221	- >=x11-libs/gtk+-3.14:3[introspection?]
222	+ >=x11-libs/gtk+-3.22:3[introspection?]
223	>=x11-libs/pango-1.30.0
224	virtual/jpeg:0=
225
226	@@ -128,10 +129,6 @@ PATCHES=(
227	# https://bugs.webkit.org/show_bug.cgi?id=167283
228	"${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
229
230	- # Avoid perl[ithreads] build time requirement as that would be very very messy
231	- # https://bugs.webkit.org/show_bug.cgi?id=170106 (should get backported for 2.16.3)
232	- "${FILESDIR}"/${PV}-avoid-perl-ithreads.patch
233	-
234	# musl and jit
235	"${FILESDIR}"/${PN}-2.14.3-musl.patch
236	)

Gentoo Archives: gentoo-commits