[arch-commits] Commit in qt5-webengine/trunk (2 files)

2016-12-14 Thread Antonio Rojas 
Date: Wednesday, December 14, 2016 @ 17:33:42
  Author: arojas
Revision: 283306

Drop old patches

Deleted:
  qt5-webengine/trunk/qt5-webengine-fno-delete-null-pointer-checks-2.patch
  qt5-webengine/trunk/qt5-webengine-fno-delete-null-pointer-checks.patch

--+
 qt5-webengine-fno-delete-null-pointer-checks-2.patch |   50 -
 qt5-webengine-fno-delete-null-pointer-checks.patch   |   27 -
 2 files changed, 77 deletions(-)

Deleted: qt5-webengine-fno-delete-null-pointer-checks-2.patch
===
--- qt5-webengine-fno-delete-null-pointer-checks-2.patch2016-12-14 
17:12:23 UTC (rev 283305)
+++ qt5-webengine-fno-delete-null-pointer-checks-2.patch2016-12-14 
17:33:42 UTC (rev 283306)
@@ -1,50 +0,0 @@
-From ba36da6c1f59da7687f6924cc558105dcd1c44dc Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen 
-Date: Fri, 10 Jun 2016 13:26:22 +0200
-Subject: [PATCH] Use -fno-delete-null-pointer-checks with gcc 6
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-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.
-
-This patch only enables it for v8, and requires it to be activated
-by qtwebengine.
-
-Change-Id: I9da15ecf85719f211ba921a620e9d195eff26178
-Task-number: QTBUG-53956
-Reviewed-by: Michael Brüning 

- chromium/v8/build/toolchain.gypi | 7 +++
- 1 file changed, 7 insertions(+)
-
-diff --git a/chromium/v8/build/toolchain.gypi 
b/chromium/v8/build/toolchain.gypi
-index 8a26cc2..2dd4a50 100644
 a/chromium/v8/build/toolchain.gypi
-+++ b/chromium/v8/build/toolchain.gypi
-@@ -72,6 +72,10 @@
- # Some versions of GCC 4.5 seem to need -fno-strict-aliasing.
- 'v8_no_strict_aliasing%': 0,
- 
-+# V8 needs support for illegal null this pointers, and must disable
-+# optimizations in GCC 6 that relies on correct behavior.
-+'v8_no_delete_null_pointer_checks%': 0,
-+
- # Chrome needs this definition unconditionally. For standalone V8 builds,
- # it's handled in build/standalone.gypi.
- 'want_separate_host_toolset%': 1,
-@@ -1066,6 +1070,9 @@
-   [ 'v8_no_strict_aliasing==1', {
- 'cflags': [ '-fno-strict-aliasing' ],
-   }],
-+  [ 'v8_no_delete_null_pointer_checks==1', {
-+'cflags_cc': [ '-fno-delete-null-pointer-checks' ],
-+  }],
- ],  # conditions
-   }],
-   ['OS=="solaris"', {
--- 
-2.8.3
-

Deleted: qt5-webengine-fno-delete-null-pointer-checks.patch
===
--- qt5-webengine-fno-delete-null-pointer-checks.patch  2016-12-14 17:12:23 UTC 
(rev 283305)
+++ qt5-webengine-fno-delete-null-pointer-checks.patch  2016-12-14 17:33:42 UTC 
(rev 283306)
@@ -1,27 +0,0 @@
-From 5133f095bea2d147e86b99eacaa48363d08db35b Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen 
-Date: Fri, 10 Jun 2016 14:46:24 +0200
-Subject: [PATCH] Enable -fno_delete_null_pointer_checks on V8 for G++ 6
-
-Detect g++ 6 and disable null pointer check optimizations on v8.
-
-Change-Id: I5064823af3784786d455ce86592b5e65c1020f21
-Task-number: QTBUG-53956

-
-diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
-index 8854a4b..b579e2a 100644
 a/src/core/config/linux.pri
-+++ b/src/core/config/linux.pri
-@@ -29,6 +29,8 @@ use?(nss) {
- use_openssl_certs=1
- }
- 
-+gcc:!clang: greaterThan(QT_GCC_MAJOR_VERSION, 5): GYP_CONFIG += 
v8_no_delete_null_pointer_checks=1
-+
- contains(QT_CONFIG, system-zlib): use?(system_minizip): GYP_CONFIG += 
use_system_zlib=1
- contains(QT_CONFIG, system-png): GYP_CONFIG += use_system_libpng=1
- contains(QT_CONFIG, system-jpeg): GYP_CONFIG += use_system_libjpeg=1
--- 
-2.8.3
-

[arch-commits] Commit in qt5-webengine/trunk (2 files)

2016-06-09 Thread Antonio Rojas 
Date: Friday, June 10, 2016 @ 01:03:31
  Author: arojas
Revision: 269249

Add workaround for v8 segfaults with GCC 6

Added:
  qt5-webengine/trunk/qt5-webengine-fno-delete-null-pointer-checks.patch
Modified:
  qt5-webengine/trunk/PKGBUILD

+
 PKGBUILD   |   12 +++-
 qt5-webengine-fno-delete-null-pointer-checks.patch |   49 +++
 2 files changed, 58 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-06-09 22:53:30 UTC (rev 269248)
+++ PKGBUILD2016-06-09 23:03:31 UTC (rev 269249)
@@ -5,7 +5,7 @@
 pkgname=qt5-webengine
 _qtver=5.6.1
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -16,8 +16,10 @@
 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')
+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
@@ -25,6 +27,10 @@
   # 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() {

Added: qt5-webengine-fno-delete-null-pointer-checks.patch
===
--- qt5-webengine-fno-delete-null-pointer-checks.patch  
(rev 0)
+++ qt5-webengine-fno-delete-null-pointer-checks.patch  2016-06-09 23:03:31 UTC 
(rev 269249)
@@ -0,0 +1,49 @@
+From 5f69ea6f29371f0d03c23ff0ec81b63b7e5dca23 Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen 
+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
+