From 312a476890ae830b91ceda3773f9a858110e7586 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Wed, 20 Apr 2016 11:13:38 +0200 Subject: 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) --- deps/qt5-webkit/patches/qt5-webkit.pthread.patch | 32 ++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 deps/qt5-webkit/patches/qt5-webkit.pthread.patch (limited to 'deps/qt5-webkit/patches/qt5-webkit.pthread.patch') 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 +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 +(cherry picked from commit 5dd4bb67cfce812fd7686e43616e2069f354a7df) +Reviewed-by: Allan Sandfeld Jensen +--- + 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 + -- cgit v1.2.3