summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2015-08-24 20:40:38 -0400
committerAlexandre Rostovtsev <tetromino@gentoo.org>2015-08-24 20:45:11 -0400
commitd61bddfcbf92439482ea8ebbbfebf39a9c6552d6 (patch)
treeef60a9ecdb068475ea65b418e164066d926d6d37 /net-libs/webkit-gtk
parentmetadata: Ignore symlinks as well as directories (diff)
downloadgentoo-d61bddfcbf92439482ea8ebbbfebf39a9c6552d6.tar.gz
gentoo-d61bddfcbf92439482ea8ebbbfebf39a9c6552d6.tar.bz2
gentoo-d61bddfcbf92439482ea8ebbbfebf39a9c6552d6.zip
net-libs/webkit-gtk: fix build with -j1
Reported-by: dolphinling Gentoo-Bug: 556680 Upstream-Bug-url: https://bugs.webkit.org/show_bug.cgi?id=148379 Package-Manager: portage-2.2.20.1
Diffstat (limited to 'net-libs/webkit-gtk')
-rw-r--r--net-libs/webkit-gtk/files/webkit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch22
-rw-r--r--net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild3
2 files changed, 25 insertions, 0 deletions
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch
new file mode 100644
index 000000000000..79b57ae9d823
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch
@@ -0,0 +1,22 @@
+2015-08-24 Alexandre Rostovtsev <tetromino@gentoo.org>
+
+ webkit2gtkinjectedbundle requires forwarding headers
+ https://bugs.webkit.org/show_bug.cgi?id=148379
+
+ Fixes GTK build with -j1
+
+ * PlatformGTK.cmake:
+
+Index: Source/WebKit2/PlatformGTK.cmake
+===================================================================
+--- Source/WebKit2/PlatformGTK.cmake (revision 188859)
++++ Source/WebKit2/PlatformGTK.cmake (working copy)
+@@ -860,7 +860,7 @@ include_directories(
+ )
+
+ add_library(webkit2gtkinjectedbundle MODULE "${WEBKIT2_DIR}/WebProcess/gtk/WebGtkInjectedBundleMain.cpp")
+-add_dependencies(webkit2gtkinjectedbundle GObjectDOMBindings)
++add_dependencies(webkit2gtkinjectedbundle GObjectDOMBindings WebKit2-forwarding-headers)
+ add_webkit2_prefix_header(webkit2gtkinjectedbundle)
+
+ # Add ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} to LD_LIBRARY_PATH
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild
index b0a62133f713..18ae36ab6a0b 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild
@@ -141,6 +141,9 @@ src_prepare() {
# https://bugs.webkit.org/show_bug.cgi?id=129542
epatch "${FILESDIR}"/${PN}-2.8.1-ia64-malloc.patch
+ # https://bugs.webkit.org/show_bug.cgi?id=148379
+ epatch "${FILESDIR}"/${PN}-2.8.5-webkit2gtkinjectedbundle-j1.patch
+
gnome2_src_prepare
}