Date: Thursday, March 3, 2016 @ 21:05:09 Author: arojas Revision: 260680
archrelease: copy trunk to kde-unstable-i686, kde-unstable-x86_64 Added: qt5-webkit/repos/ qt5-webkit/repos/kde-unstable-i686/ qt5-webkit/repos/kde-unstable-i686/PKGBUILD (from rev 260679, qt5-webkit/trunk/PKGBUILD) qt5-webkit/repos/kde-unstable-i686/qt5-webkit-pthread.patch (from rev 260679, qt5-webkit/trunk/qt5-webkit-pthread.patch) qt5-webkit/repos/kde-unstable-x86_64/ qt5-webkit/repos/kde-unstable-x86_64/PKGBUILD (from rev 260679, qt5-webkit/trunk/PKGBUILD) qt5-webkit/repos/kde-unstable-x86_64/qt5-webkit-pthread.patch (from rev 260679, qt5-webkit/trunk/qt5-webkit-pthread.patch) ----------------------------------------------+ kde-unstable-i686/PKGBUILD | 58 +++++++++++++++++++++++++ kde-unstable-i686/qt5-webkit-pthread.patch | 32 +++++++++++++ kde-unstable-x86_64/PKGBUILD | 58 +++++++++++++++++++++++++ kde-unstable-x86_64/qt5-webkit-pthread.patch | 32 +++++++++++++ 4 files changed, 180 insertions(+) Copied: qt5-webkit/repos/kde-unstable-i686/PKGBUILD (from rev 260679, qt5-webkit/trunk/PKGBUILD) =================================================================== --- repos/kde-unstable-i686/PKGBUILD (rev 0) +++ repos/kde-unstable-i686/PKGBUILD 2016-03-03 20:05:09 UTC (rev 260680) @@ -0,0 +1,58 @@ +# $Id: PKGBUILD 240297 2015-06-03 10:22:03Z fyan $ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> + +pkgname=qt5-webkit +_qtver=5.6.0-rc +pkgver=${_qtver/-/} +pkgrel=1 +arch=('i686' 'x86_64') +url='http://qt-project.org/' +license=('GPL3' 'LGPL' 'FDL' 'custom') +pkgdesc='Classes for a WebKit2 based implementation and a new QML API' +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" + qt5-webkit-pthread.patch) +md5sums=('f93c15d465a12c4598851ab8319be90d' + 'f65286024f65ca87837171272fc8975d' + '5dfb7c8ed8fd289d337c43c29c2984e0') + +prepare() { + mkdir -p build + +# 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 + + export PATH="${srcdir}/bin:$PATH" + qmake ../${_pkgfqn} + make +} + +package() { + cd build + make INSTALL_ROOT="$pkgdir" install + + # Drop QMAKE_PRL_BUILD_DIR because reference the build dir + find "$pkgdir/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; + + install -d "$pkgdir"/usr/share/licenses + ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname} +} Copied: qt5-webkit/repos/kde-unstable-i686/qt5-webkit-pthread.patch (from rev 260679, qt5-webkit/trunk/qt5-webkit-pthread.patch) =================================================================== --- repos/kde-unstable-i686/qt5-webkit-pthread.patch (rev 0) +++ repos/kde-unstable-i686/qt5-webkit-pthread.patch 2016-03-03 20:05:09 UTC (rev 260680) @@ -0,0 +1,32 @@ +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 + Copied: qt5-webkit/repos/kde-unstable-x86_64/PKGBUILD (from rev 260679, qt5-webkit/trunk/PKGBUILD) =================================================================== --- repos/kde-unstable-x86_64/PKGBUILD (rev 0) +++ repos/kde-unstable-x86_64/PKGBUILD 2016-03-03 20:05:09 UTC (rev 260680) @@ -0,0 +1,58 @@ +# $Id: PKGBUILD 240297 2015-06-03 10:22:03Z fyan $ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> + +pkgname=qt5-webkit +_qtver=5.6.0-rc +pkgver=${_qtver/-/} +pkgrel=1 +arch=('i686' 'x86_64') +url='http://qt-project.org/' +license=('GPL3' 'LGPL' 'FDL' 'custom') +pkgdesc='Classes for a WebKit2 based implementation and a new QML API' +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" + qt5-webkit-pthread.patch) +md5sums=('f93c15d465a12c4598851ab8319be90d' + 'f65286024f65ca87837171272fc8975d' + '5dfb7c8ed8fd289d337c43c29c2984e0') + +prepare() { + mkdir -p build + +# 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 + + export PATH="${srcdir}/bin:$PATH" + qmake ../${_pkgfqn} + make +} + +package() { + cd build + make INSTALL_ROOT="$pkgdir" install + + # Drop QMAKE_PRL_BUILD_DIR because reference the build dir + find "$pkgdir/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; + + install -d "$pkgdir"/usr/share/licenses + ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname} +} Copied: qt5-webkit/repos/kde-unstable-x86_64/qt5-webkit-pthread.patch (from rev 260679, qt5-webkit/trunk/qt5-webkit-pthread.patch) =================================================================== --- repos/kde-unstable-x86_64/qt5-webkit-pthread.patch (rev 0) +++ repos/kde-unstable-x86_64/qt5-webkit-pthread.patch 2016-03-03 20:05:09 UTC (rev 260680) @@ -0,0 +1,32 @@ +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 +