summaryrefslogtreecommitdiffstats
path: root/package/qt5/qt5webkit/0004-Fix-linking-with-libpthread.patch
diff options
context:
space:
mode:
authorGary Bisson <gary.bisson@boundarydevices.com>2016-04-13 15:40:35 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-04-18 22:51:00 +0200
commite8dbdbd1002236962e73cad0da0a5ed1ab037cdf (patch)
tree43fa7399d982ed0218003d09b379685db7039dc3 /package/qt5/qt5webkit/0004-Fix-linking-with-libpthread.patch
parent1a9a9d15e670b0ab93da06e036384514ac69b642 (diff)
downloadbuildroot-e8dbdbd1002236962e73cad0da0a5ed1ab037cdf.tar.gz
buildroot-e8dbdbd1002236962e73cad0da0a5ed1ab037cdf.zip
qt5webkit: restore package
Although this package has been removed from the official release packages since Qt5.6.0, it is still available for users to build it from source. This is useful for platforms without GPU since its successor (QtWebEngine) requires OpenGL support. The package now matches the community-based meta-qt5 Yocto layer, using the exact same revision of the qtwebkit source from github: https://github.com/meta-qt5/meta-qt5/commit/e434995a Here is the project source tree: https://github.com/qtproject/qtwebkit All the patches have been pulled from Yocto as well. Since we are now using the source from the git repository, we need to create an empty .git/ folder to force the headers re-generation. https://github.com/meta-qt5/meta-qt5/blob/jethro/recipes-qt/qt5/qt5.inc#L33 Note that GPLv3 license option has been added with this release. Reviewed-by: Julien Corjon <corjon.j@ecagroup.com> Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com> [Thomas: fix license to be LGPLv2.1+, not LGPLv2+.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/qt5/qt5webkit/0004-Fix-linking-with-libpthread.patch')
-rw-r--r--package/qt5/qt5webkit/0004-Fix-linking-with-libpthread.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/package/qt5/qt5webkit/0004-Fix-linking-with-libpthread.patch b/package/qt5/qt5webkit/0004-Fix-linking-with-libpthread.patch
new file mode 100644
index 0000000000..b7b6791ab7
--- /dev/null
+++ b/package/qt5/qt5webkit/0004-Fix-linking-with-libpthread.patch
@@ -0,0 +1,34 @@
+From 5dd4bb67cfce812fd7686e43616e2069f354a7df 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.
+
+Upstream-Status: Backport from 5.7 branch
+
+Change-Id: I2b95cff2c96373f8dce6f95052c4fccbe1982b33
+Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
+Signed-off-by: Jonathan Liu <net147@gmail.com>
+Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.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
+
OpenPOWER on IntegriCloud