[arch-commits] Commit in qt5-webengine/repos (6 files)
Antonio Rojas
arojas at archlinux.org
Thu Jun 9 23:04:16 UTC 2016
Date: Friday, June 10, 2016 @ 01:04:16
Author: arojas
Revision: 269250
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
qt5-webengine/repos/testing-i686/PKGBUILD
(from rev 269249, qt5-webengine/trunk/PKGBUILD)
qt5-webengine/repos/testing-i686/qt5-webengine-fno-delete-null-pointer-checks.patch
(from rev 269249, qt5-webengine/trunk/qt5-webengine-fno-delete-null-pointer-checks.patch)
qt5-webengine/repos/testing-x86_64/PKGBUILD
(from rev 269249, qt5-webengine/trunk/PKGBUILD)
qt5-webengine/repos/testing-x86_64/qt5-webengine-fno-delete-null-pointer-checks.patch
(from rev 269249, qt5-webengine/trunk/qt5-webengine-fno-delete-null-pointer-checks.patch)
Deleted:
qt5-webengine/repos/testing-i686/PKGBUILD
qt5-webengine/repos/testing-x86_64/PKGBUILD
-------------------------------------------------------------------+
/PKGBUILD | 108 ++++++++++
testing-i686/PKGBUILD | 48 ----
testing-i686/qt5-webengine-fno-delete-null-pointer-checks.patch | 49 ++++
testing-x86_64/PKGBUILD | 48 ----
testing-x86_64/qt5-webengine-fno-delete-null-pointer-checks.patch | 49 ++++
5 files changed, 206 insertions(+), 96 deletions(-)
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2016-06-09 23:03:31 UTC (rev 269249)
+++ testing-i686/PKGBUILD 2016-06-09 23:04:16 UTC (rev 269250)
@@ -1,48 +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-webengine
-_qtver=5.6.1
-pkgver=${_qtver/-/}
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://qt-project.org/'
-license=('GPL3' 'LGPL' 'FDL' 'custom')
-pkgdesc='Provides support for web applications using the Chromium browser project'
-depends=('qt5-webchannel' 'qt5-location' 'libxcomposite' 'libxrandr' 'libxtst' 'libxcursor' 'libpulse' 'pciutils' 'libxss' 'libvpx' 'opus'
- 'libevent' 'libsrtp' 'jsoncpp' 'libwebp' 'snappy' 'nss' 'libxml2' 'libxslt') # minizip
-makedepends=('python2' 'git' 'gperf')
-conflicts=('qt')
-groups=('qt' 'qt5')
-_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-md5sums=('35f168743638b07157e20af0586f39a2')
-
-prepare() {
- mkdir -p build
-
- # Hack to force using python2
- mkdir -p bin
- ln -s /usr/bin/python2 bin/python
-}
-
-build() {
- cd build
-
- export PATH="$srcdir/bin:$PATH"
- qmake WEBENGINE_CONFIG+=use_proprietary_codecs ../${_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-webengine/repos/testing-i686/PKGBUILD (from rev 269249, qt5-webengine/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2016-06-09 23:04:16 UTC (rev 269250)
@@ -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-webengine
+_qtver=5.6.1
+pkgver=${_qtver/-/}
+pkgrel=2
+arch=('i686' 'x86_64')
+url='http://qt-project.org/'
+license=('GPL3' 'LGPL' 'FDL' 'custom')
+pkgdesc='Provides support for web applications using the Chromium browser project'
+depends=('qt5-webchannel' 'qt5-location' 'libxcomposite' 'libxrandr' 'libxtst' 'libxcursor' 'libpulse' 'pciutils' 'libxss' 'libvpx' 'opus'
+ 'libevent' 'libsrtp' 'jsoncpp' 'libwebp' 'snappy' 'nss' 'libxml2' 'libxslt') # minizip
+makedepends=('python2' 'git' 'gperf')
+conflicts=('qt')
+groups=('qt' 'qt5')
+_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
+source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
+ qt5-webengine-fno-delete-null-pointer-checks.patch)
+md5sums=('35f168743638b07157e20af0586f39a2'
+ '5c4e4eb61165985330e018d79906d012')
+
+prepare() {
+ mkdir -p build
+
+ # Hack to force using python2
+ mkdir -p bin
+ ln -s /usr/bin/python2 bin/python
+
+ cd ${_pkgfqn}/src/3rdparty
+ # Workaround for v8 segfaults with GCC 6
+ patch -p1 -i "$srcdir"/qt5-webengine-fno-delete-null-pointer-checks.patch
+}
+
+build() {
+ cd build
+
+ export PATH="$srcdir/bin:$PATH"
+ qmake WEBENGINE_CONFIG+=use_proprietary_codecs ../${_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-webengine/repos/testing-i686/qt5-webengine-fno-delete-null-pointer-checks.patch (from rev 269249, qt5-webengine/trunk/qt5-webengine-fno-delete-null-pointer-checks.patch)
===================================================================
--- testing-i686/qt5-webengine-fno-delete-null-pointer-checks.patch (rev 0)
+++ testing-i686/qt5-webengine-fno-delete-null-pointer-checks.patch 2016-06-09 23:04:16 UTC (rev 269250)
@@ -0,0 +1,49 @@
+From 5f69ea6f29371f0d03c23ff0ec81b63b7e5dca23 Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen at theqtcompany.com>
+Date: Thu, 9 Jun 2016 13:18:36 +0200
+Subject: [PATCH] Use -fno-delete-null-pointer-checks with gcc 6
+
+V8 is not safe for removing null pointer checks. Until it is, we need
+to disable optimizations in GCC that assume it is not doing something
+wrong.
+
+Task-number: QTBUG-53956
+Change-Id: Ieae1a44a36ddd481656497414275b134bbbc9da3
+---
+ chromium/build/common.gypi | 20 ++++++++++++++++++++
+ 1 file changed, 20 insertions(+)
+
+diff --git a/chromium/build/common.gypi b/chromium/build/common.gypi
+index 272a42f..209ffe0 100644
+--- a/chromium/build/common.gypi
++++ b/chromium/build/common.gypi
+@@ -4729,6 +4729,26 @@
+ }],
+ ],
+ }],
++ ['gcc_version>=60 and clang==0', {
++ 'target_conditions': [
++ ['_toolset=="target"', {
++ 'cflags_cc': [
++ # V8 needs this, see https://bugs.chromium.org/p/v8/issues/detail?id=3782
++ '-fno-delete-null-pointer-checks',
++ ],
++ }],
++ ],
++ }],
++ ['host_gcc_version>=60 and clang==0 and host_clang==0', {
++ 'target_conditions': [
++ ['_toolset=="host"', {
++ 'cflags_cc': [
++ # V8 needs this, see https://bugs.chromium.org/p/v8/issues/detail?id=3782
++ '-fno-delete-null-pointer-checks',
++ ],
++ }],
++ ],
++ }],
+ ],
+ },
+ }],
+--
+2.8.3
+
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2016-06-09 23:03:31 UTC (rev 269249)
+++ testing-x86_64/PKGBUILD 2016-06-09 23:04:16 UTC (rev 269250)
@@ -1,48 +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-webengine
-_qtver=5.6.1
-pkgver=${_qtver/-/}
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://qt-project.org/'
-license=('GPL3' 'LGPL' 'FDL' 'custom')
-pkgdesc='Provides support for web applications using the Chromium browser project'
-depends=('qt5-webchannel' 'qt5-location' 'libxcomposite' 'libxrandr' 'libxtst' 'libxcursor' 'libpulse' 'pciutils' 'libxss' 'libvpx' 'opus'
- 'libevent' 'libsrtp' 'jsoncpp' 'libwebp' 'snappy' 'nss' 'libxml2' 'libxslt') # minizip
-makedepends=('python2' 'git' 'gperf')
-conflicts=('qt')
-groups=('qt' 'qt5')
-_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-md5sums=('35f168743638b07157e20af0586f39a2')
-
-prepare() {
- mkdir -p build
-
- # Hack to force using python2
- mkdir -p bin
- ln -s /usr/bin/python2 bin/python
-}
-
-build() {
- cd build
-
- export PATH="$srcdir/bin:$PATH"
- qmake WEBENGINE_CONFIG+=use_proprietary_codecs ../${_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-webengine/repos/testing-x86_64/PKGBUILD (from rev 269249, qt5-webengine/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2016-06-09 23:04:16 UTC (rev 269250)
@@ -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-webengine
+_qtver=5.6.1
+pkgver=${_qtver/-/}
+pkgrel=2
+arch=('i686' 'x86_64')
+url='http://qt-project.org/'
+license=('GPL3' 'LGPL' 'FDL' 'custom')
+pkgdesc='Provides support for web applications using the Chromium browser project'
+depends=('qt5-webchannel' 'qt5-location' 'libxcomposite' 'libxrandr' 'libxtst' 'libxcursor' 'libpulse' 'pciutils' 'libxss' 'libvpx' 'opus'
+ 'libevent' 'libsrtp' 'jsoncpp' 'libwebp' 'snappy' 'nss' 'libxml2' 'libxslt') # minizip
+makedepends=('python2' 'git' 'gperf')
+conflicts=('qt')
+groups=('qt' 'qt5')
+_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
+source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
+ qt5-webengine-fno-delete-null-pointer-checks.patch)
+md5sums=('35f168743638b07157e20af0586f39a2'
+ '5c4e4eb61165985330e018d79906d012')
+
+prepare() {
+ mkdir -p build
+
+ # Hack to force using python2
+ mkdir -p bin
+ ln -s /usr/bin/python2 bin/python
+
+ cd ${_pkgfqn}/src/3rdparty
+ # Workaround for v8 segfaults with GCC 6
+ patch -p1 -i "$srcdir"/qt5-webengine-fno-delete-null-pointer-checks.patch
+}
+
+build() {
+ cd build
+
+ export PATH="$srcdir/bin:$PATH"
+ qmake WEBENGINE_CONFIG+=use_proprietary_codecs ../${_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-webengine/repos/testing-x86_64/qt5-webengine-fno-delete-null-pointer-checks.patch (from rev 269249, qt5-webengine/trunk/qt5-webengine-fno-delete-null-pointer-checks.patch)
===================================================================
--- testing-x86_64/qt5-webengine-fno-delete-null-pointer-checks.patch (rev 0)
+++ testing-x86_64/qt5-webengine-fno-delete-null-pointer-checks.patch 2016-06-09 23:04:16 UTC (rev 269250)
@@ -0,0 +1,49 @@
+From 5f69ea6f29371f0d03c23ff0ec81b63b7e5dca23 Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen at theqtcompany.com>
+Date: Thu, 9 Jun 2016 13:18:36 +0200
+Subject: [PATCH] Use -fno-delete-null-pointer-checks with gcc 6
+
+V8 is not safe for removing null pointer checks. Until it is, we need
+to disable optimizations in GCC that assume it is not doing something
+wrong.
+
+Task-number: QTBUG-53956
+Change-Id: Ieae1a44a36ddd481656497414275b134bbbc9da3
+---
+ chromium/build/common.gypi | 20 ++++++++++++++++++++
+ 1 file changed, 20 insertions(+)
+
+diff --git a/chromium/build/common.gypi b/chromium/build/common.gypi
+index 272a42f..209ffe0 100644
+--- a/chromium/build/common.gypi
++++ b/chromium/build/common.gypi
+@@ -4729,6 +4729,26 @@
+ }],
+ ],
+ }],
++ ['gcc_version>=60 and clang==0', {
++ 'target_conditions': [
++ ['_toolset=="target"', {
++ 'cflags_cc': [
++ # V8 needs this, see https://bugs.chromium.org/p/v8/issues/detail?id=3782
++ '-fno-delete-null-pointer-checks',
++ ],
++ }],
++ ],
++ }],
++ ['host_gcc_version>=60 and clang==0 and host_clang==0', {
++ 'target_conditions': [
++ ['_toolset=="host"', {
++ 'cflags_cc': [
++ # V8 needs this, see https://bugs.chromium.org/p/v8/issues/detail?id=3782
++ '-fno-delete-null-pointer-checks',
++ ],
++ }],
++ ],
++ }],
+ ],
+ },
+ }],
+--
+2.8.3
+
More information about the arch-commits
mailing list