diff options
Diffstat (limited to 'package/qt5/qt5webkit')
| -rw-r--r-- | package/qt5/qt5webkit/0004-Fix-linking-with-libpthread.patch | 34 | ||||
| -rw-r--r-- | package/qt5/qt5webkit/qt5webkit.hash | 2 | ||||
| -rw-r--r-- | package/qt5/qt5webkit/qt5webkit.mk | 2 |
3 files changed, 2 insertions, 36 deletions
diff --git a/package/qt5/qt5webkit/0004-Fix-linking-with-libpthread.patch b/package/qt5/qt5webkit/0004-Fix-linking-with-libpthread.patch deleted file mode 100644 index b7b6791ab7..0000000000 --- a/package/qt5/qt5webkit/0004-Fix-linking-with-libpthread.patch +++ /dev/null @@ -1,34 +0,0 @@ -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 - diff --git a/package/qt5/qt5webkit/qt5webkit.hash b/package/qt5/qt5webkit/qt5webkit.hash index d2ac7bbcc3..8122cabb6d 100644 --- a/package/qt5/qt5webkit/qt5webkit.hash +++ b/package/qt5/qt5webkit/qt5webkit.hash @@ -1,2 +1,2 @@ # locally computed -sha256 1c79843ef32313312290d4fe0b87256a9129dc44d62b01789a692981edf4d8ab qt5webkit-d2ff5a085572b1ee24dcb42ae107063f3142d14e.tar.gz +sha256 e4339ee069e2817fc5bf7c2c2d9fa680874da4ba56f34afdad2b4795803cbdf1 qt5webkit-b889f460280ad98c89ede179bd3b9ce9cb02002b.tar.gz diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk index 629e40a3ec..e6e8fe319f 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5WEBKIT_VERSION = d2ff5a085572b1ee24dcb42ae107063f3142d14e +QT5WEBKIT_VERSION = b889f460280ad98c89ede179bd3b9ce9cb02002b # Using GitHub since it supports downloading tarballs from random commits. # The http://code.qt.io/cgit/qt/qtwebkit.git/ repo doesn't allow to do so. QT5WEBKIT_SITE = $(call github,qtproject,qtwebkit,$(QT5WEBKIT_VERSION)) |
