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

[Antonio Rojas]

    Date: Friday, June 10, 2016 @ 22:43:10
  Author: arojas
Revision: 269313

Fix v8 segfaults with GCC 6

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

----------------------------------------------------+
 PKGBUILD                                           |   17 ++++++-----
 qt5-webengine-fno-delete-null-pointer-checks.patch |   27 +++++++++++++++++++
 2 files changed, 36 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-06-10 17:29:36 UTC (rev 269312)
+++ PKGBUILD	2016-06-10 20:43:10 UTC (rev 269313)
@@ -5,7 +5,7 @@
 pkgname=qt5-webengine
 _qtver=5.7.0-rc
 pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -15,9 +15,12 @@
 makedepends=('python2' 'git' 'gperf')
 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)
+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)
+
 md5sums=('cb0e6ee6fc580e651f536b5250777d0a'
-         '2a1610b34204102938a24154a52e5571')
+         '2a1610b34204102938a24154a52e5571'
+         '5671a16fef65152928789bffd1f7cf24')
 
 prepare() {
   mkdir -p build
@@ -29,16 +32,14 @@
   # Fix opening some websites with recent NSS https://github.com/QupZilla/qupzilla/issues/1870 (KaOSx patch)
   cd ${_pkgfqn}
   patch -p1 -i ../qt5-webengine-nss.patch
+
+  # Workaround for v8 segfaults with GCC 6
+  patch -p1 -i "$srcdir"/qt5-webengine-fno-delete-null-pointer-checks.patch
 }
 
 build() {
   cd build
 
-  # Work around bug in v8 in which GCC 6 optimizes away null pointer checks
-  # https://bugs.chromium.org/p/v8/issues/detail?id=3782
-  # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69234
-  CFLAGS+=' -fno-delete-null-pointer-checks'
-
   export PATH="$srcdir/bin:$PATH"
   qmake WEBENGINE_CONFIG+=use_proprietary_codecs ../${_pkgfqn}
   make

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-10 20:43:10 UTC (rev 269313)
@@ -0,0 +1,27 @@
+From 5133f095bea2d147e86b99eacaa48363d08db35b Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen at theqtcompany.com>
+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
+