diff options
| author | fhajny <fhajny@pkgsrc.org> | 2016-01-28 16:58:18 +0000 |
|---|---|---|
| committer | fhajny <fhajny@pkgsrc.org> | 2016-01-28 16:58:18 +0000 |
| commit | 53af9d5f3c983c82eaff4f246779bd74d20e15b5 (patch) | |
| tree | 3a7f7f2705549ba592c1e4b27f54c381140315bb | |
| parent | fdacfde7fb04b7bc96c0b0f82fe031a929b6c2a6 (diff) | |
| download | pkgsrc-53af9d5f3c983c82eaff4f246779bd74d20e15b5.tar.gz | |
Fix incorrect patch file. Fixes build on SunOS.
| -rw-r--r-- | x11/qt5-qtdeclarative/distinfo | 4 | ||||
| -rw-r--r-- | x11/qt5-qtdeclarative/patches/patch-src_qml_jsruntime_qv4engine.cpp | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/x11/qt5-qtdeclarative/distinfo b/x11/qt5-qtdeclarative/distinfo index d76d7d978b4..9be38ab8db7 100644 --- a/x11/qt5-qtdeclarative/distinfo +++ b/x11/qt5-qtdeclarative/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2015/10/26 19:03:59 adam Exp $ +$NetBSD: distinfo,v 1.4 2016/01/28 16:58:18 fhajny Exp $ SHA1 (qtdeclarative-opensource-src-5.5.1.tar.xz) = 57206b9ffe0485bfd35c0aad85737fb4a7b77c8b RMD160 (qtdeclarative-opensource-src-5.5.1.tar.xz) = 1d8939c42f4b510443365479ffe8bc525e0faac6 @@ -8,5 +8,5 @@ SHA1 (patch-examples_quick_customitems_painteditem_painteditem.pro) = a3881ee92d SHA1 (patch-src_3rdparty_masm_assembler_ARMAssembler.h) = fbcbe9e0fd3514d95f54a858223b20bb34f52bb2 SHA1 (patch-src_3rdparty_masm_assembler_ARMv7Assembler.h) = 505b2a585a7ed98e63403a3cc44d839a4f80c01d SHA1 (patch-src_3rdparty_masm_wtf_MathExtras.h) = 4b86cfe54867a376ea6267e53566e457b577de7b -SHA1 (patch-src_qml_jsruntime_qv4engine.cpp) = 6ee219c0606a2d8e0134cf07891e712800278e18 +SHA1 (patch-src_qml_jsruntime_qv4engine.cpp) = d103b01f06b2b73768d9bff430d5359615d8ed3e SHA1 (patch-src_qmldevtools_qmldevtools.pro) = 600955fcc1e0dfabe83ada9761a9a6f7e847b8a0 diff --git a/x11/qt5-qtdeclarative/patches/patch-src_qml_jsruntime_qv4engine.cpp b/x11/qt5-qtdeclarative/patches/patch-src_qml_jsruntime_qv4engine.cpp index 03f1587b066..28a2d3c738d 100644 --- a/x11/qt5-qtdeclarative/patches/patch-src_qml_jsruntime_qv4engine.cpp +++ b/x11/qt5-qtdeclarative/patches/patch-src_qml_jsruntime_qv4engine.cpp @@ -1,16 +1,18 @@ -$NetBSD: patch-src_qml_jsruntime_qv4engine.cpp,v 1.2 2015/10/26 19:03:59 adam Exp $ +$NetBSD: patch-src_qml_jsruntime_qv4engine.cpp,v 1.3 2016/01/28 16:58:18 fhajny Exp $ Get stack address/size on SunOS. ---- src/qml/jsruntime/qv4engine.cpp.orig 2015-06-29 20:12:38.000000000 +0000 +--- src/qml/jsruntime/qv4engine.cpp.orig 2015-10-13 04:37:50.000000000 +0000 +++ src/qml/jsruntime/qv4engine.cpp -@@ -136,13 +136,19 @@ quintptr getStackLimit() +@@ -139,13 +139,21 @@ quintptr getStackLimit() #if HAVE(PTHREAD_NP_H) && OS(FREEBSD) // on FreeBSD pthread_attr_init() must be called otherwise getting the attrs crashes if (pthread_attr_init(&attr) == 0 && pthread_attr_get_np(pthread_self(), &attr) == 0) { -#else +#elif !OS(SOLARIS) if (pthread_getattr_np(pthread_self(), &attr) == 0) { ++#else ++ if (true) { #endif void *stackBottom = Q_NULLPTR; size_t stackSize = 0; |