CVS commit: pkgsrc/x11/qt5-qtdeclarative

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Sun Jan 21 21:39:41 UTC 2018

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

Log Message:
qt5-qtdeclarative: Make sure we pick up gcc's builtin alloca on NetBSD


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/x11/qt5-qtdeclarative/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/qt5-qtdeclarative/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/qt5-qtdeclarative/patches/patch-src_qml_jsruntime_qv4alloca__p.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/Makefile
diff -u pkgsrc/x11/qt5-qtdeclarative/Makefile:1.24 pkgsrc/x11/qt5-qtdeclarative/Makefile:1.25
--- pkgsrc/x11/qt5-qtdeclarative/Makefile:1.24  Wed Jan 17 19:30:47 2018
+++ pkgsrc/x11/qt5-qtdeclarative/Makefile       Sun Jan 21 21:39:40 2018
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2018/01/17 19:30:47 markd Exp $
+# $NetBSD: Makefile,v 1.25 2018/01/21 21:39:40 markd Exp $
 
 DISTNAME=      qtdeclarative-everywhere-src-${QTVERSION}
 PKGNAME=       qt5-qtdeclarative-${QTVERSION}
+PKGREVISION=   1
 COMMENT=       Qt5 module for declarative framework
 
 BUILD_TARGET=          sub-tools

Index: pkgsrc/x11/qt5-qtdeclarative/distinfo
diff -u pkgsrc/x11/qt5-qtdeclarative/distinfo:1.5 pkgsrc/x11/qt5-qtdeclarative/distinfo:1.6
--- pkgsrc/x11/qt5-qtdeclarative/distinfo:1.5   Wed Jan 17 19:30:47 2018
+++ pkgsrc/x11/qt5-qtdeclarative/distinfo       Sun Jan 21 21:39:40 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2018/01/17 19:30:47 markd Exp $
+$NetBSD: distinfo,v 1.6 2018/01/21 21:39:40 markd Exp $
 
 SHA1 (qtdeclarative-everywhere-src-5.10.0.tar.xz) = bdfa91e5ec2d959f6fcdc0af757b18d10b55fd87
 RMD160 (qtdeclarative-everywhere-src-5.10.0.tar.xz) = 31620cce613a92d6933c827bd4759443cacb5a39
@@ -7,3 +7,4 @@ Size (qtdeclarative-everywhere-src-5.10.
 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_qml_jsruntime_qv4alloca__p.h) = 1035da974789f897bb7071284fae21c979844f62

Added files:

Index: pkgsrc/x11/qt5-qtdeclarative/patches/patch-src_qml_jsruntime_qv4alloca__p.h
diff -u /dev/null pkgsrc/x11/qt5-qtdeclarative/patches/patch-src_qml_jsruntime_qv4alloca__p.h:1.1
--- /dev/null   Sun Jan 21 21:39:41 2018
+++ pkgsrc/x11/qt5-qtdeclarative/patches/patch-src_qml_jsruntime_qv4alloca__p.h Sun Jan 21 21:39:41 2018
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_qml_jsruntime_qv4alloca__p.h,v 1.1 2018/01/21 21:39:41 markd Exp $
+
+Make sure we pick up gcc's builtin alloca on NetBSD
+
+--- src/qml/jsruntime/qv4alloca_p.h.orig       2017-11-30 15:10:22.000000000 +0000
++++ src/qml/jsruntime/qv4alloca_p.h
+@@ -78,9 +78,13 @@
+ #define Q_ALLOCA_DECLARE(type, name) \
+     type *name = 0
+ 
++#if defined(__GNUC__)
++#define Q_ALLOCA_ASSIGN(type, name, size) \
++    name = static_cast<type*>(__builtin_alloca(size))
++#else
+ #define Q_ALLOCA_ASSIGN(type, name, size) \
+     name = static_cast<type*>(alloca(size))
+-
++#endif
+ #else
+ QT_BEGIN_NAMESPACE
+ class Qt_AllocaWrapper