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

[Antonio Rojas]

    Date: Saturday, June 11, 2016 @ 08:55:18
  Author: arojas
Revision: 269320

Fix v8 sefgaults for real

Added:
  qt5-webengine/kde-unstable/qt5-webengine-fno-delete-null-pointer-checks-2.patch
Modified:
  qt5-webengine/kde-unstable/PKGBUILD

------------------------------------------------------+
 PKGBUILD                                             |    9 ++-
 qt5-webengine-fno-delete-null-pointer-checks-2.patch |   50 +++++++++++++++++
 2 files changed, 56 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-06-11 06:16:31 UTC (rev 269319)
+++ PKGBUILD	2016-06-11 06:55:18 UTC (rev 269320)
@@ -5,7 +5,7 @@
 pkgname=qt5-webengine
 _qtver=5.7.0-rc
 pkgver=${_qtver/-/}
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -16,11 +16,12 @@
 groups=('qt' 'qt5')
 _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
 source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz" qt5-webengine-nss.patch
-        qt5-webengine-fno-delete-null-pointer-checks.patch)
+        qt5-webengine-fno-delete-null-pointer-checks.patch qt5-webengine-fno-delete-null-pointer-checks-2.patch)
 
 md5sums=('cb0e6ee6fc580e651f536b5250777d0a'
          '2a1610b34204102938a24154a52e5571'
-         '5671a16fef65152928789bffd1f7cf24')
+         '5671a16fef65152928789bffd1f7cf24'
+         '8145ce05fb86e762f012ca1b56f718fe')
 
 prepare() {
   mkdir -p build
@@ -35,6 +36,8 @@
 
   # Workaround for v8 segfaults with GCC 6
   patch -p1 -i "$srcdir"/qt5-webengine-fno-delete-null-pointer-checks.patch
+  cd src/3rdparty
+  patch -p1 -i "$srcdir"/qt5-webengine-fno-delete-null-pointer-checks-2.patch
 }
 
 build() {

Added: qt5-webengine-fno-delete-null-pointer-checks-2.patch
===================================================================
--- qt5-webengine-fno-delete-null-pointer-checks-2.patch	                        (rev 0)
+++ qt5-webengine-fno-delete-null-pointer-checks-2.patch	2016-06-11 06:55:18 UTC (rev 269320)
@@ -0,0 +1,50 @@
+From ba36da6c1f59da7687f6924cc558105dcd1c44dc Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen at theqtcompany.com>
+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 <michael.bruning at qt.io>
+---
+ 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
+