Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/
Date: Wed, 25 Jul 2018 16:47:37
Message-Id: 1532537230.71cd81faf5448ecbc668a24bc9dec7663551bd19.leio@gentoo
1 commit: 71cd81faf5448ecbc668a24bc9dec7663551bd19
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jul 25 16:25:26 2018 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Wed Jul 25 16:47:10 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71cd81fa
7
8 net-libs/webkit-gtk: fix non-parallel builds
9
10 Parallel builds might have failed too before this patch, but had to
11 be very "lucky".
12
13 Closes: https://bugs.gentoo.org/662002
14 Package-Manager: Portage-2.3.43, Repoman-2.3.10
15
16 net-libs/webkit-gtk/files/2.20.3-jsc-build-fixes.patch | 14 ++++++++++++++
17 net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild | 1 +
18 2 files changed, 15 insertions(+)
19
20 diff --git a/net-libs/webkit-gtk/files/2.20.3-jsc-build-fixes.patch b/net-libs/webkit-gtk/files/2.20.3-jsc-build-fixes.patch
21 new file mode 100644
22 index 00000000000..32ff3a52844
23 --- /dev/null
24 +++ b/net-libs/webkit-gtk/files/2.20.3-jsc-build-fixes.patch
25 @@ -0,0 +1,14 @@
26 +https://bugs.gentoo.org/662002
27 +https://bugs.webkit.org/show_bug.cgi?id=183788
28 +https://trac.webkit.org/changeset/229282/webkit
29 +
30 +Index: /trunk/Source/JavaScriptCore/CMakeLists.txt
31 +===================================================================
32 +--- a/Source/JavaScriptCore/CMakeLists.txt (revision 229281)
33 ++++ b/Source/JavaScriptCore/CMakeLists.txt (revision 229282)
34 +@@ -248,4 +248,5 @@
35 + )
36 + target_link_libraries(LLIntOffsetsExtractor WTF)
37 ++add_dependencies(LLIntOffsetsExtractor JavaScriptCoreForwardingHeaders)
38 +
39 + # The build system will execute asm.rb every time LLIntOffsetsExtractor's mtime is newer than
40
41 diff --git a/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
42 index 69dc6b1f2ca..50b4f8c388c 100644
43 --- a/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
44 +++ b/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
45 @@ -147,6 +147,7 @@ pkg_setup() {
46 }
47
48 src_prepare() {
49 + eapply "${FILESDIR}"/${PV}-jsc-build-fixes.patch
50 cmake-utils_src_prepare
51 gnome2_src_prepare
52 }