diff options
author | Igor Pashev <pashev.igor@gmail.com> | 2015-03-01 19:25:13 +0300 |
---|---|---|
committer | Igor Pashev <pashev.igor@gmail.com> | 2015-03-01 19:25:13 +0300 |
commit | d6523a8adb30c22b1705035455cc094b3c081a08 (patch) | |
tree | d891f5c4abbc3879548fa397889c73e02672db33 /debian/patches/dyson-jsruntime-MemoryManager.patch | |
parent | a3d0929e99aa002d116d5efc66e943587fe8e228 (diff) | |
download | qtdeclarative-master.tar.gz |
qtdeclarative-opensource-src (5.3.2-4+dyson1) unstable; urgency=mediumHEADdyson/5.3.2-4+dyson1master
* Package for Dyson
* Removed debian/patches/dyson-jsruntime-MemoryManager.patch
* Updated debian/patches/dyson-qv4engine-getStackLimit.patch: also check if
stack is "unlimited"
Diffstat (limited to 'debian/patches/dyson-jsruntime-MemoryManager.patch')
-rw-r--r-- | debian/patches/dyson-jsruntime-MemoryManager.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/debian/patches/dyson-jsruntime-MemoryManager.patch b/debian/patches/dyson-jsruntime-MemoryManager.patch deleted file mode 100644 index bde5c3b..0000000 --- a/debian/patches/dyson-jsruntime-MemoryManager.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: qtdeclarative-opensource-src-5.2.1/src/qml/jsruntime/qv4mm.cpp -=================================================================== ---- qtdeclarative-opensource-src-5.2.1.orig/src/qml/jsruntime/qv4mm.cpp 2014-02-02 00:38:02.000000000 +0400 -+++ qtdeclarative-opensource-src-5.2.1/src/qml/jsruntime/qv4mm.cpp 2014-04-27 10:02:29.017973776 +0400 -@@ -67,6 +67,11 @@ - #include <sys/storage.h> // __tls() - #endif - -+#if OS(SOLARIS) -+#include <thread.h> -+#include <errno.h> -+#endif -+ - QT_BEGIN_NAMESPACE - - using namespace QV4; -@@ -231,6 +236,13 @@ - # if OS(DARWIN) - void *st = pthread_get_stackaddr_np(pthread_self()); - m_d->stackTop = static_cast<quintptr *>(st); -+# elif OS(SOLARIS) -+ stack_t ss; -+ int rc; -+ do { -+ rc = thr_stksegment(&ss); -+ } while ((rc != 0) && (errno == EAGAIN)); -+ m_d->stackTop = static_cast<quintptr *>(ss.ss_sp); - # else - void* stackBottom = 0; - pthread_attr_t attr; |