[pkgsrc/trunk]: pkgsrc/x11/qt5-qtdeclarative qt5-qtdeclarative: Limit C11 _St...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/67d385178d39
branches:  trunk
changeset: 311025:67d385178d39
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Mon Jul 30 15:24:45 2018 +0000

description:
qt5-qtdeclarative: Limit C11 _Static_assert to C code.

diffstat:

 x11/qt5-qtdeclarative/distinfo                                       |   3 +-
 x11/qt5-qtdeclarative/patches/patch-src_3rdparty_masm_wtf_Compiler.h |  15 ++++++++++
 2 files changed, 17 insertions(+), 1 deletions(-)

diffs (34 lines):

diff -r ab0d40e1e7ba -r 67d385178d39 x11/qt5-qtdeclarative/distinfo
--- a/x11/qt5-qtdeclarative/distinfo    Mon Jul 30 13:38:08 2018 +0000
+++ b/x11/qt5-qtdeclarative/distinfo    Mon Jul 30 15:24:45 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2018/06/22 06:29:20 adam Exp $
+$NetBSD: distinfo,v 1.10 2018/07/30 15:24:45 jperkin Exp $
 
 SHA1 (qtdeclarative-everywhere-src-5.11.1.tar.xz) = 3bb4d97b8b2f40a6e6e21aa4d77a165007ee9af4
 RMD160 (qtdeclarative-everywhere-src-5.11.1.tar.xz) = bb7dc3b6b40a67a9f981ff1eed6ba6cf719cc214
@@ -7,4 +7,5 @@
 SHA1 (patch-examples_quick_customitems_painteditem_painteditem.pro) = a3881ee92daae30130fa665c8686f2e1572ecc1a
 SHA1 (patch-src_3rdparty_masm_assembler_ARMAssembler.h) = fbcbe9e0fd3514d95f54a858223b20bb34f52bb2
 SHA1 (patch-src_3rdparty_masm_assembler_ARMv7Assembler.h) = 505b2a585a7ed98e63403a3cc44d839a4f80c01d
+SHA1 (patch-src_3rdparty_masm_wtf_Compiler.h) = 8d7e318e0148eea0f262ec13463bc15bd03478dc
 SHA1 (patch-src_qml_jsruntime_qv4alloca__p.h) = 1035da974789f897bb7071284fae21c979844f62
diff -r ab0d40e1e7ba -r 67d385178d39 x11/qt5-qtdeclarative/patches/patch-src_3rdparty_masm_wtf_Compiler.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/qt5-qtdeclarative/patches/patch-src_3rdparty_masm_wtf_Compiler.h      Mon Jul 30 15:24:45 2018 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_3rdparty_masm_wtf_Compiler.h,v 1.1 2018/07/30 15:24:45 jperkin Exp $
+
+Limit C11 _Static_assert to C code.
+
+--- src/3rdparty/masm/wtf/Compiler.h.orig      2018-06-15 11:30:15.000000000 +0000
++++ src/3rdparty/masm/wtf/Compiler.h
+@@ -134,7 +134,7 @@
+ #if GCC_VERSION_AT_LEAST(4, 8, 0)
+ #pragma GCC diagnostic ignored "-Wunused-local-typedefs"
+ #endif
+-#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
++#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L && !defined(__cplusplus)
+ /* C11 support */
+ #define WTF_COMPILER_SUPPORTS_C_STATIC_ASSERT 1
+ #endif