Date: Sunday, June 12, 2016 @ 16:52:16
Author: arojas
Revision: 269397
Update to 5.6.1
Modified:
qt5-webkit/trunk/PKGBUILD
Deleted:
qt5-webkit/trunk/qt5-webkit-pthread.patch
--------------------------+
PKGBUILD | 14 ++++----------
qt5-webkit-pthread.patch | 32 --------------------------------
2 files changed, 4 insertions(+), 42 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-06-12 14:49:17 UTC (rev 269396)
+++ PKGBUILD 2016-06-12 14:52:16 UTC (rev 269397)
@@ -3,9 +3,9 @@
# Contributor: Andrea Scarpino <and...@archlinux.org>
pkgname=qt5-webkit
-_qtver=5.6.0
+_qtver=5.6.1
pkgver=${_qtver/-/}
-pkgrel=4
+pkgrel=1
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -16,10 +16,8 @@
conflicts=('qt')
groups=('qt' 'qt5')
_pkgfqn="${pkgname/5-/}-opensource-src-${pkgver}"
-source=("http://download.qt.io/community_releases/${pkgver%.*}/${pkgver}/qtwebkit-opensource-src-${pkgver}.tar.xz";
- qt5-webkit-pthread.patch)
-md5sums=('b68565d18db63ee4db998bb8e37608a5'
- 'f65286024f65ca87837171272fc8975d')
+source=("http://download.qt.io/community_releases/${pkgver%.*}/${pkgver}/qtwebkit-opensource-src-${pkgver}.tar.xz";)
+md5sums=('9ea7cb557375ba2fc7c62742c522d093')
prepare() {
mkdir -p build
@@ -27,10 +25,6 @@
# Hack to force python2
mkdir -p bin
ln -s /usr/bin/python2 bin/python
-
-# Fix linking to pthread
- cd ${_pkgfqn}
- patch -p1 -i ../qt5-webkit-pthread.patch
}
build() {
Deleted: qt5-webkit-pthread.patch
===================================================================
--- qt5-webkit-pthread.patch 2016-06-12 14:49:17 UTC (rev 269396)
+++ qt5-webkit-pthread.patch 2016-06-12 14:52:16 UTC (rev 269397)
@@ -1,32 +0,0 @@
-From 5f359baacdf92fabcece83f0a2b30f74c7c02a3c Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jen...@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.hausm...@theqtcompany.com>
-(cherry picked from commit 5dd4bb67cfce812fd7686e43616e2069f354a7df)
-Reviewed-by: Allan Sandfeld Jensen <allan.jen...@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
-
