public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Alexandre Rostovtsev" <tetromino@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/
Date: Tue, 25 Aug 2015 00:45:45 +0000 (UTC)	[thread overview]
Message-ID: <1440463511.d61bddfcbf92439482ea8ebbbfebf39a9c6552d6.tetromino@gentoo> (raw)

commit:     d61bddfcbf92439482ea8ebbbfebf39a9c6552d6
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 25 00:40:38 2015 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Tue Aug 25 00:45:11 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d61bddfc

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

 ...kit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch | 22 ++++++++++++++++++++++
 net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild        |  3 +++
 2 files changed, 25 insertions(+)

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 0000000..79b57ae
--- /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 b0a6213..18ae36a 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
 }
 


             reply	other threads:[~2015-08-25  0:45 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-25  0:45 Alexandre Rostovtsev [this message]
  -- strict thread matches above, loose matches on Subject: below --
2016-08-27 20:20 [gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/ Sergei Trofimovich
2017-04-17  8:10 Mart Raudsepp
2017-10-29 22:11 Mart Raudsepp
2018-07-25 16:47 Mart Raudsepp
2019-10-29 22:22 Andreas Sturmlechner
2019-11-23 19:28 Matt Turner
2020-01-19 18:49 Mart Raudsepp
2020-01-31 19:19 Mart Raudsepp
2020-07-11 13:34 Mart Raudsepp
2020-07-19  6:00 Mart Raudsepp
2020-07-29 14:09 Mart Raudsepp
2020-11-27 20:54 Mart Raudsepp
2021-05-12 22:00 Matt Turner
2021-05-31  2:00 Matt Turner
2022-01-02 22:46 Mart Raudsepp
2022-01-05 16:22 Mart Raudsepp
2022-01-18 21:39 Mart Raudsepp
2022-05-13 12:27 Matt Turner
2022-08-02 20:17 Matt Turner
2023-01-30  4:01 Sam James
2023-04-22  3:08 Matt Turner
2023-04-25 21:38 Matt Turner
2023-07-16 14:38 Matt Turner
2023-08-09 18:07 Matt Turner
2024-02-23 19:07 Sam James
2024-04-20 11:42 Mart Raudsepp
2024-06-25 16:45 Jakov Smolić
2024-10-09 15:09 Michael Orlitzky
2024-12-06 11:18 Sam James

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1440463511.d61bddfcbf92439482ea8ebbbfebf39a9c6552d6.tetromino@gentoo \
    --to=tetromino@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox