[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/, dev-qt/qtwebkit/files/

[Davide Pesavento]

commit:     6df5012422e5b2b2877819e52c1eb9457cafc80c
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu May  5 01:02:08 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu May  5 01:02:08 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6df50124

dev-qt/qtwebkit: fix linking against libpthread

Gentoo-Bug: 581282

Package-Manager: portage-2.2.28

 dev-qt/qtwebkit/files/qtwebkit-5.6.0-pthread.patch | 32 ++++++++++++++++++++++
 dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild              |  1 +
 2 files changed, 33 insertions(+)

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.6.0-pthread.patch b/dev-qt/qtwebkit/files/qtwebkit-5.6.0-pthread.patch
new file mode 100644
index 0000000..7fea802
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.6.0-pthread.patch
@@ -0,0 +1,32 @@
+From 5f359baacdf92fabcece83f0a2b30f74c7c02a3c Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen@××××××××××××.com>
+Date: Mon, 22 Feb 2016 10:57:32 +0100
+Subject: [PATCH] Fix linking with libpthread
+
+WebKit use libpthread directly but is depending on other qt modules
+causing it to be linked against, which might break unless -lpthread
+is last. Instead just add it explicitly after the static libraries.
+
+Change-Id: I2b95cff2c96373f8dce6f95052c4fccbe1982b33
+Reviewed-by: Simon Hausmann <simon.hausmann@××××××××××××.com>
+(cherry picked from commit 5dd4bb67cfce812fd7686e43616e2069f354a7df)
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@××××××××××××.com>
+---
+ Tools/qmake/mkspecs/features/default_post.prf | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Tools/qmake/mkspecs/features/default_post.prf b/Tools/qmake/mkspecs/features/default_post.prf
+index 67276b7..39bb3f7 100644
+--- a/Tools/qmake/mkspecs/features/default_post.prf
++++ b/Tools/qmake/mkspecs/features/default_post.prf
+@@ -201,6 +201,7 @@ needToLink() {
+         linkAgainstLibrary($$library, $$eval(WEBKIT.$${library_identifier}.root_source_dir))
+         LIBS += $$eval(WEBKIT.$${library_identifier}.dependent_libs)
+     }
++    posix:!darwin: LIBS += -lpthread
+ }
+ 
+ creating_module {
+-- 
+2.8.2
+

diff --git a/dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild b/dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild
index 58876f1..1ba763b 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.6.0.ebuild
@@ -67,6 +67,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-5.4.2-system-leveldb.patch"
+	"${FILESDIR}/${PN}-5.6.0-pthread.patch" # bug 581282
 )
 
 src_prepare() {