summaryrefslogtreecommitdiffstats
path: root/deps/qt5-webkit/patches/qt5-webkit.pthread.patch
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2016-04-20 11:13:38 +0200
committer Eric Hameleers <alien@slackware.com>2016-04-20 11:13:38 +0200
commit312a476890ae830b91ceda3773f9a858110e7586 (patch)
treebb81ce4a7fb30ee0d2635d5f35d2606812ca5099 /deps/qt5-webkit/patches/qt5-webkit.pthread.patch
parent9678ae4f1e6973793b583aa600abd01097fb077b (diff)
downloadktown-312a476890ae830b91ceda3773f9a858110e7586.tar.gz
ktown-312a476890ae830b91ceda3773f9a858110e7586.tar.xz
Refresh the 'deps' for upcoming KDE 5_16.04.
New packages: - deps/ninja (needed for easier compilation of qt5-webkit) - deps/qt5-webkit (sources have been split off qt5)
Diffstat (limited to 'deps/qt5-webkit/patches/qt5-webkit.pthread.patch')
-rw-r--r--deps/qt5-webkit/patches/qt5-webkit.pthread.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/deps/qt5-webkit/patches/qt5-webkit.pthread.patch b/deps/qt5-webkit/patches/qt5-webkit.pthread.patch
new file mode 100644
index 0000000..53d5439
--- /dev/null
+++ b/deps/qt5-webkit/patches/qt5-webkit.pthread.patch
@@ -0,0 +1,32 @@
+From 5f359baacdf92fabcece83f0a2b30f74c7c02a3c Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.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@theqtcompany.com>
+(cherry picked from commit 5dd4bb67cfce812fd7686e43616e2069f354a7df)
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.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.7.1
+