CVS commit: pkgsrc/x11/qt5-qtdeclarative

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Jul 30 15:24:45 UTC 2018

Modified Files:
        pkgsrc/x11/qt5-qtdeclarative: distinfo
Added Files:
        pkgsrc/x11/qt5-qtdeclarative/patches:
            patch-src_3rdparty_masm_wtf_Compiler.h

Log Message:
qt5-qtdeclarative: Limit C11 _Static_assert to C code.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/qt5-qtdeclarative/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/qt5-qtdeclarative/patches/patch-src_3rdparty_masm_wtf_Compiler.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/qt5-qtdeclarative/distinfo
diff -u pkgsrc/x11/qt5-qtdeclarative/distinfo:1.9 pkgsrc/x11/qt5-qtdeclarative/distinfo:1.10
--- pkgsrc/x11/qt5-qtdeclarative/distinfo:1.9   Fri Jun 22 06:29:20 2018
+++ pkgsrc/x11/qt5-qtdeclarative/distinfo       Mon Jul 30 15:24:45 2018
@@ -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 @@ Size (qtdeclarative-everywhere-src-5.11.
 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

Added files:

Index: pkgsrc/x11/qt5-qtdeclarative/patches/patch-src_3rdparty_masm_wtf_Compiler.h
diff -u /dev/null pkgsrc/x11/qt5-qtdeclarative/patches/patch-src_3rdparty_masm_wtf_Compiler.h:1.1
--- /dev/null   Mon Jul 30 15:24:45 2018
+++ pkgsrc/x11/qt5-qtdeclarative/patches/patch-src_3rdparty_masm_wtf_Compiler.h Mon Jul 30 15:24:45 2018
@@ -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