Mon Jul 30 15:24:45 2018 UTC ()
qt5-qtdeclarative: Limit C11 _Static_assert to C code.


(jperkin)
diff -r1.9 -r1.10 pkgsrc/x11/qt5-qtdeclarative/distinfo
diff -r0 -r1.1 pkgsrc/x11/qt5-qtdeclarative/patches/patch-src_3rdparty_masm_wtf_Compiler.h
cvs diff -r1.9 -r1.10 pkgsrc/x11/qt5-qtdeclarative/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtdeclarative/distinfo 2018/06/22 06:29:20 1.9
+++ pkgsrc/x11/qt5-qtdeclarative/distinfo 2018/07/30 15:24:45 1.10
@@ -1,10 +1,11 @@ @@ -1,10 +1,11 @@
1$NetBSD: distinfo,v 1.9 2018/06/22 06:29:20 adam Exp $ 1$NetBSD: distinfo,v 1.10 2018/07/30 15:24:45 jperkin Exp $
2 2
3SHA1 (qtdeclarative-everywhere-src-5.11.1.tar.xz) = 3bb4d97b8b2f40a6e6e21aa4d77a165007ee9af4 3SHA1 (qtdeclarative-everywhere-src-5.11.1.tar.xz) = 3bb4d97b8b2f40a6e6e21aa4d77a165007ee9af4
4RMD160 (qtdeclarative-everywhere-src-5.11.1.tar.xz) = bb7dc3b6b40a67a9f981ff1eed6ba6cf719cc214 4RMD160 (qtdeclarative-everywhere-src-5.11.1.tar.xz) = bb7dc3b6b40a67a9f981ff1eed6ba6cf719cc214
5SHA512 (qtdeclarative-everywhere-src-5.11.1.tar.xz) = d4252f58fcc811273b1a51f80167bca19f744d70c47362b631bbb7875473a808402d64b26475e2f5ff1813d8b8cc66b81cac1b8a4b5e36f7ca1fdbb15666f053 5SHA512 (qtdeclarative-everywhere-src-5.11.1.tar.xz) = d4252f58fcc811273b1a51f80167bca19f744d70c47362b631bbb7875473a808402d64b26475e2f5ff1813d8b8cc66b81cac1b8a4b5e36f7ca1fdbb15666f053
6Size (qtdeclarative-everywhere-src-5.11.1.tar.xz) = 22203488 bytes 6Size (qtdeclarative-everywhere-src-5.11.1.tar.xz) = 22203488 bytes
7SHA1 (patch-examples_quick_customitems_painteditem_painteditem.pro) = a3881ee92daae30130fa665c8686f2e1572ecc1a 7SHA1 (patch-examples_quick_customitems_painteditem_painteditem.pro) = a3881ee92daae30130fa665c8686f2e1572ecc1a
8SHA1 (patch-src_3rdparty_masm_assembler_ARMAssembler.h) = fbcbe9e0fd3514d95f54a858223b20bb34f52bb2 8SHA1 (patch-src_3rdparty_masm_assembler_ARMAssembler.h) = fbcbe9e0fd3514d95f54a858223b20bb34f52bb2
9SHA1 (patch-src_3rdparty_masm_assembler_ARMv7Assembler.h) = 505b2a585a7ed98e63403a3cc44d839a4f80c01d 9SHA1 (patch-src_3rdparty_masm_assembler_ARMv7Assembler.h) = 505b2a585a7ed98e63403a3cc44d839a4f80c01d
 10SHA1 (patch-src_3rdparty_masm_wtf_Compiler.h) = 8d7e318e0148eea0f262ec13463bc15bd03478dc
10SHA1 (patch-src_qml_jsruntime_qv4alloca__p.h) = 1035da974789f897bb7071284fae21c979844f62 11SHA1 (patch-src_qml_jsruntime_qv4alloca__p.h) = 1035da974789f897bb7071284fae21c979844f62
File Added: pkgsrc/x11/qt5-qtdeclarative/patches/patch-src_3rdparty_masm_wtf_Compiler.h
$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