Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc6.git;a=commitdiff;h=ea4a0753503041ad2bf3f85ca524c6e2709df6bb

commit ea4a0753503041ad2bf3f85ca524c6e2709df6bb
Author: crazy <cr...@frugalware.org>
Date:   Thu Sep 22 13:57:15 2016 +0200

qt5-webengine-5.7.0-3-x86_64
* added some patches for gcc6 .. lets hope this fixes qupzilla

diff --git a/source/xlib/qt5-webengine/FrugalBuild 
b/source/xlib/qt5-webengine/FrugalBuild
index 350deb6..3ea4257 100644
--- a/source/xlib/qt5-webengine/FrugalBuild
+++ b/source/xlib/qt5-webengine/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=qt5-webengine
pkgver=5.7.0
-pkgrel=2
+pkgrel=3
depends=('qt5-declarative>=5.7.0-2' 'qt5-webchannel>=5.7.0-2' 
'qt5-location>=5.7.0-2' 'libxcomposite>=0.4.4-3' \
'libxrandr>=1.5.0-5' 'nss>=3.26' 'libxtst>=1.2.2-3' 'libxscrnsaver>=1.2.2-3' 
'zlib>=1.2.8-8' 'libwebp>=0.5.1-2' \
'libxml2>=2.9.4-3' 'libevent>=2.0.22-4' 'jsoncpp>=1.7.5' 'opus>=1.1.3-2' 
'libvpx>=1.6.0-2' 'snappy>=1.1.3-4' \
@@ -11,12 +11,14 @@ depends=('qt5-declarative>=5.7.0-2' 
'qt5-webchannel>=5.7.0-2' 'qt5-location>=5.7
makedepends=('git' 're2c>=0.16-2' 'x11-protos')
Finclude qt5
archs=('x86_64' 'i686')
-source+=(libjpeg.patch)
+source+=(libjpeg.patch QTBUG-53956.patch QTBUG-53956-2.patch)
replaces=('libqt5webengine')
conflicts=("${replaces[@]}")
provides=("${replaces[@]}")
sha1sums=('bff07a36115d0a3f44e396c738ce9579ef2cec5b' \
-          'fc40f2d0b97dfec78b3ca4a125dee8edbbd4da0a')
+          'fc40f2d0b97dfec78b3ca4a125dee8edbbd4da0a' \
+          '1decf0237dfc3ff8135ce8f9c104cffa8b25bf36' \
+          'bb06b2d20078107dc55f2ba7f26bf6c4081a8f88')

build()
{
diff --git a/source/xlib/qt5-webengine/QTBUG-53956-2.patch 
b/source/xlib/qt5-webengine/QTBUG-53956-2.patch
new file mode 100644
index 0000000..435a5da
--- /dev/null
+++ b/source/xlib/qt5-webengine/QTBUG-53956-2.patch
@@ -0,0 +1,49 @@
+From ba36da6c1f59da7687f6924cc558105dcd1c44dc Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jen...@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.brun...@qt.io>
+---
+ chromium/v8/build/toolchain.gypi | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/3rdparty/chromium/v8/build/toolchain.gypi 
b/src/3rdparty/chromium/v8/build/toolchain.gypi
+index 8a26cc2..2dd4a50 100644
+--- a/src/3rdparty/chromium/v8/build/toolchain.gypi
++++ b/src/3rdparty/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
diff --git a/source/xlib/qt5-webengine/QTBUG-53956.patch 
b/source/xlib/qt5-webengine/QTBUG-53956.patch
new file mode 100644
index 0000000..79cd234
--- /dev/null
+++ b/source/xlib/qt5-webengine/QTBUG-53956.patch
@@ -0,0 +1,26 @@
+From 5133f095bea2d147e86b99eacaa48363d08db35b Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jen...@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
\ No newline at end of file
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to