diff options
| author | markd <markd@pkgsrc.org> | 2018-01-21 21:39:40 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2018-01-21 21:39:40 +0000 |
| commit | a895eced52a88766913083c921b83a3ae34537e3 (patch) | |
| tree | b009171eef03e05ff70aae0eff984b3832f4a71c /x11 | |
| parent | af5aecadf2abea7c6700f3e2227368579e2c8ea2 (diff) | |
| download | pkgsrc-a895eced52a88766913083c921b83a3ae34537e3.tar.gz | |
qt5-qtdeclarative: Make sure we pick up gcc's builtin alloca on NetBSD
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/qt5-qtdeclarative/Makefile | 3 | ||||
| -rw-r--r-- | x11/qt5-qtdeclarative/distinfo | 3 | ||||
| -rw-r--r-- | x11/qt5-qtdeclarative/patches/patch-src_qml_jsruntime_qv4alloca__p.h | 21 |
3 files changed, 25 insertions, 2 deletions
diff --git a/x11/qt5-qtdeclarative/Makefile b/x11/qt5-qtdeclarative/Makefile index 1151b37f52d..0f4d9cabb3c 100644 --- a/x11/qt5-qtdeclarative/Makefile +++ b/x11/qt5-qtdeclarative/Makefile @@ -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 diff --git a/x11/qt5-qtdeclarative/distinfo b/x11/qt5-qtdeclarative/distinfo index 1ddf68a94cf..f5fd7683602 100644 --- a/x11/qt5-qtdeclarative/distinfo +++ b/x11/qt5-qtdeclarative/distinfo @@ -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.0.tar.xz) = 21875096 bytes 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 diff --git a/x11/qt5-qtdeclarative/patches/patch-src_qml_jsruntime_qv4alloca__p.h b/x11/qt5-qtdeclarative/patches/patch-src_qml_jsruntime_qv4alloca__p.h new file mode 100644 index 00000000000..4e6cfc43087 --- /dev/null +++ b/x11/qt5-qtdeclarative/patches/patch-src_qml_jsruntime_qv4alloca__p.h @@ -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 |