[arch-commits] Commit in qt5-webkit/trunk (PKGBUILD qt5-webkit-pthread.patch)

[Antonio Rojas]

    Date: Thursday, March 3, 2016 @ 21:02:45
  Author: arojas
Revision: 260679

Fix build

Added:
  qt5-webkit/trunk/qt5-webkit-pthread.patch
Modified:
  qt5-webkit/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |   22 ++++++++++++++++------
 qt5-webkit-pthread.patch |   32 ++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-03-03 18:54:46 UTC (rev 260678)
+++ PKGBUILD	2016-03-03 20:02:45 UTC (rev 260679)
@@ -10,14 +10,17 @@
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
 pkgdesc='Classes for a WebKit2 based implementation and a new QML API'
-depends=('qt5-base' 'libwebp' 'libxslt' 'libxcomposite' 'gst-plugins-base')
-makedepends=('qt5-declarative' 'leveldb' 'ruby' 'gperf' 'python2')
-optdepends=('qt5-declarative: QML bindings' 'gst-plugins-good: Webm codec support')
+depends=('qt5-declarative' 'libwebp' 'libxslt' 'libxcomposite' 'gst-plugins-base')
+makedepends=('ruby' 'gperf' 'python2')
+optdepends=('gst-plugins-good: Webm codec support')
 conflicts=('qt')
 groups=('qt' 'qt5')
 _pkgfqn="${pkgname/5-/}-opensource-src-5.6.0"
-source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-md5sums=('f93c15d465a12c4598851ab8319be90d')
+source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
+        qt5-webkit-pthread.patch)
+md5sums=('f93c15d465a12c4598851ab8319be90d'
+         'f65286024f65ca87837171272fc8975d'
+         '5dfb7c8ed8fd289d337c43c29c2984e0')
 
 prepare() {
   mkdir -p build
@@ -25,10 +28,17 @@
 # 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
+
+# Generate headers
+  syncqt.pl-qt5 -version 5.6.0 Source/sync.profile
 }
 
 build() {
-  cd build
+  cd build  
 
   export PATH="${srcdir}/bin:$PATH"
   qmake ../${_pkgfqn}

Added: qt5-webkit-pthread.patch
===================================================================
--- qt5-webkit-pthread.patch	                        (rev 0)
+++ qt5-webkit-pthread.patch	2016-03-03 20:02:45 UTC (rev 260679)
@@ -0,0 +1,32 @@
+From 5f359baacdf92fabcece83f0a2b30f74c7c02a3c Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen at 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 at theqtcompany.com>
+(cherry picked from commit 5dd4bb67cfce812fd7686e43616e2069f354a7df)
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen at 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
+