[arch-commits] Commit in qt5-webkit/repos (8 files)
Antonio Rojas
arojas at archlinux.org
Sat Apr 9 08:46:23 UTC 2016
Date: Saturday, April 9, 2016 @ 10:46:23
Author: arojas
Revision: 264247
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
qt5-webkit/repos/testing-i686/PKGBUILD
(from rev 264246, qt5-webkit/trunk/PKGBUILD)
qt5-webkit/repos/testing-i686/qt5-webkit-pthread.patch
(from rev 264246, qt5-webkit/trunk/qt5-webkit-pthread.patch)
qt5-webkit/repos/testing-x86_64/PKGBUILD
(from rev 264246, qt5-webkit/trunk/PKGBUILD)
qt5-webkit/repos/testing-x86_64/qt5-webkit-pthread.patch
(from rev 264246, qt5-webkit/trunk/qt5-webkit-pthread.patch)
Deleted:
qt5-webkit/repos/testing-i686/PKGBUILD
qt5-webkit/repos/testing-i686/qt5-webkit-pthread.patch
qt5-webkit/repos/testing-x86_64/PKGBUILD
qt5-webkit/repos/testing-x86_64/qt5-webkit-pthread.patch
-----------------------------------------+
/PKGBUILD | 108 ++++++++++++++++++++++++++++++
/qt5-webkit-pthread.patch | 64 +++++++++++++++++
testing-i686/PKGBUILD | 57 ---------------
testing-i686/qt5-webkit-pthread.patch | 32 --------
testing-x86_64/PKGBUILD | 57 ---------------
testing-x86_64/qt5-webkit-pthread.patch | 32 --------
6 files changed, 172 insertions(+), 178 deletions(-)
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2016-04-09 08:45:18 UTC (rev 264246)
+++ testing-i686/PKGBUILD 2016-04-09 08:46:23 UTC (rev 264247)
@@ -1,57 +0,0 @@
-# $Id: PKGBUILD 240297 2015-06-03 10:22:03Z fyan $
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=qt5-webkit
-_qtver=5.6.0
-pkgver=${_qtver/-/}
-pkgrel=3
-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-location' 'qt5-sensors' 'qt5-webchannel' '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-${pkgver}"
-source=("http://download.qt.io/community_releases/${pkgver%.*}/${pkgver}/qtwebkit-opensource-src-${pkgver}.tar.xz"
- qt5-webkit-pthread.patch)
-md5sums=('eba1382587add1c9b1293a532e7dd161'
- 'f65286024f65ca87837171272fc8975d')
-
-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/testing-i686/PKGBUILD (from rev 264246, qt5-webkit/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2016-04-09 08:46:23 UTC (rev 264247)
@@ -0,0 +1,54 @@
+# $Id: PKGBUILD 240297 2015-06-03 10:22:03Z fyan $
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=qt5-webkit
+_qtver=5.6.0
+pkgver=${_qtver/-/}
+pkgrel=4
+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-location' 'qt5-sensors' 'qt5-webchannel' '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-${pkgver}"
+source=("http://download.qt.io/community_releases/${pkgver%.*}/${pkgver}/qtwebkit-opensource-src-${pkgver}.tar.xz"
+ qt5-webkit-pthread.patch)
+md5sums=('b68565d18db63ee4db998bb8e37608a5'
+ 'f65286024f65ca87837171272fc8975d')
+
+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
+}
+
+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}
+}
Deleted: testing-i686/qt5-webkit-pthread.patch
===================================================================
--- testing-i686/qt5-webkit-pthread.patch 2016-04-09 08:45:18 UTC (rev 264246)
+++ testing-i686/qt5-webkit-pthread.patch 2016-04-09 08:46:23 UTC (rev 264247)
@@ -1,32 +0,0 @@
-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
-
Copied: qt5-webkit/repos/testing-i686/qt5-webkit-pthread.patch (from rev 264246, qt5-webkit/trunk/qt5-webkit-pthread.patch)
===================================================================
--- testing-i686/qt5-webkit-pthread.patch (rev 0)
+++ testing-i686/qt5-webkit-pthread.patch 2016-04-09 08:46:23 UTC (rev 264247)
@@ -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
+
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2016-04-09 08:45:18 UTC (rev 264246)
+++ testing-x86_64/PKGBUILD 2016-04-09 08:46:23 UTC (rev 264247)
@@ -1,57 +0,0 @@
-# $Id: PKGBUILD 240297 2015-06-03 10:22:03Z fyan $
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=qt5-webkit
-_qtver=5.6.0
-pkgver=${_qtver/-/}
-pkgrel=3
-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-location' 'qt5-sensors' 'qt5-webchannel' '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-${pkgver}"
-source=("http://download.qt.io/community_releases/${pkgver%.*}/${pkgver}/qtwebkit-opensource-src-${pkgver}.tar.xz"
- qt5-webkit-pthread.patch)
-md5sums=('eba1382587add1c9b1293a532e7dd161'
- 'f65286024f65ca87837171272fc8975d')
-
-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/testing-x86_64/PKGBUILD (from rev 264246, qt5-webkit/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2016-04-09 08:46:23 UTC (rev 264247)
@@ -0,0 +1,54 @@
+# $Id: PKGBUILD 240297 2015-06-03 10:22:03Z fyan $
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=qt5-webkit
+_qtver=5.6.0
+pkgver=${_qtver/-/}
+pkgrel=4
+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-location' 'qt5-sensors' 'qt5-webchannel' '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-${pkgver}"
+source=("http://download.qt.io/community_releases/${pkgver%.*}/${pkgver}/qtwebkit-opensource-src-${pkgver}.tar.xz"
+ qt5-webkit-pthread.patch)
+md5sums=('b68565d18db63ee4db998bb8e37608a5'
+ 'f65286024f65ca87837171272fc8975d')
+
+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
+}
+
+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}
+}
Deleted: testing-x86_64/qt5-webkit-pthread.patch
===================================================================
--- testing-x86_64/qt5-webkit-pthread.patch 2016-04-09 08:45:18 UTC (rev 264246)
+++ testing-x86_64/qt5-webkit-pthread.patch 2016-04-09 08:46:23 UTC (rev 264247)
@@ -1,32 +0,0 @@
-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
-
Copied: qt5-webkit/repos/testing-x86_64/qt5-webkit-pthread.patch (from rev 264246, qt5-webkit/trunk/qt5-webkit-pthread.patch)
===================================================================
--- testing-x86_64/qt5-webkit-pthread.patch (rev 0)
+++ testing-x86_64/qt5-webkit-pthread.patch 2016-04-09 08:46:23 UTC (rev 264247)
@@ -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
+
More information about the arch-commits
mailing list