qt5-webkit: update to 5.6.1
This commit is contained in:
parent
f3f1bf0843
commit
8660957a77
|
@ -1,32 +0,0 @@
|
|||
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(+)
|
||||
|
||||
index 67276b7..39bb3f7 100644
|
||||
--- Tools/qmake/mkspecs/features/default_post.prf
|
||||
+++ 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
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'qt5-webkit'
|
||||
pkgname=qt5-webkit
|
||||
version=5.6.0
|
||||
revision=3
|
||||
version=5.6.1
|
||||
revision=1
|
||||
build_style=qmake
|
||||
wrksrc=qtwebkit-opensource-src-${version}
|
||||
hostmakedepends="bison flex gperf perl python ruby pkg-config gst-plugins-good qt5-qmake"
|
||||
|
@ -14,7 +14,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
|||
license="GPL-3, LGPL-2.1"
|
||||
homepage="http://qt.io"
|
||||
distfiles="http://download.qt.io/community_releases/${version%.*}/${version}/qtwebkit-opensource-src-${version}.tar.xz"
|
||||
checksum=9ca72373841f3a868a7bcc696956cdb0ad7f5e678c693659f6f0b919fdd16dfe
|
||||
checksum=f5cfbfa5fad2b65a9be907d426f99694b86a04c3bb5a8814b21bd0ade4c672aa
|
||||
|
||||
pre_configure() {
|
||||
# Generate headers
|
||||
|
|
Loading…
Reference in New Issue