[packages/qt4] - rel 8; upstream fixes for QTBUGs

[arekm]

commit 31a0326cc454ef819b95cb33680de60cba2dade3
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Thu Oct 25 15:00:39 2012 +0200

    - rel 8; upstream fixes for QTBUGs

 ...erywhere-opensource-src-4.8.3-QTBUG-27322.patch | 14 ++++++++++
 ...verywhere-opensource-src-4.8.3-QTBUG-4862.patch | 32 ++++++++++++++++++++++
 2 files changed, 46 insertions(+)
---
diff --git a/qt-everywhere-opensource-src-4.8.3-QTBUG-27322.patch b/qt-everywhere-opensource-src-4.8.3-QTBUG-27322.patch
new file mode 100644
index 0000000..764e77e
--- /dev/null
+++ b/qt-everywhere-opensource-src-4.8.3-QTBUG-27322.patch
@@ -0,0 +1,14 @@
+diff -up qt-everywhere-opensource-src-4.8.3/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp.QTBUG-27322 qt-everywhere-opensource-src-4.8.3/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp
+--- qt-everywhere-opensource-src-4.8.3/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp.QTBUG-27322	2012-10-24 09:52:55.183430410 -0500
++++ qt-everywhere-opensource-src-4.8.3/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp	2012-10-24 09:53:49.996758727 -0500
+@@ -305,8 +305,8 @@ public:
+         randomLocation += (1 << 24);
+         randomLocation <<= 21;
+ #endif
+-        m_base = mmap(reinterpret_cast<void*>(randomLocation), m_totalHeapSize, INITIAL_PROTECTION_FLAGS, MAP_PRIVATE | MAP_ANON, VM_TAG_FOR_EXECUTABLEALLOCATOR_MEMORY, 0);
+-        if (!m_base)
++        m_base = mmap(reinterpret_cast<void*>(randomLocation), m_totalHeapSize, INITIAL_PROTECTION_FLAGS, MAP_PRIVATE | MAP_ANON | MAP_NORESERVE, VM_TAG_FOR_EXECUTABLEALLOCATOR_MEMORY, 0);
++        if (m_base == MAP_FAILED)
+             CRASH();
+ 
+         // For simplicity, we keep all memory in m_freeList in a 'released' state.
diff --git a/qt-everywhere-opensource-src-4.8.3-QTBUG-4862.patch b/qt-everywhere-opensource-src-4.8.3-QTBUG-4862.patch
new file mode 100644
index 0000000..85fc71a
--- /dev/null
+++ b/qt-everywhere-opensource-src-4.8.3-QTBUG-4862.patch
@@ -0,0 +1,32 @@
+diff -up qt-everywhere-opensource-src-4.8.3/src/corelib/io/qfilesystemengine_unix.cpp.QTBUG-4862 qt-everywhere-opensource-src-4.8.3/src/corelib/io/qfilesystemengine_unix.cpp
+--- qt-everywhere-opensource-src-4.8.3/src/corelib/io/qfilesystemengine_unix.cpp.QTBUG-4862	2012-09-10 20:36:50.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.3/src/corelib/io/qfilesystemengine_unix.cpp	2012-10-22 14:16:42.672111081 -0500
+@@ -611,7 +611,26 @@ bool QFileSystemEngine::setPermissions(c
+ QString QFileSystemEngine::homePath()
+ {
+     QString home = QFile::decodeName(qgetenv("HOME"));
+-    if (home.isNull())
++    if (home.isEmpty())
++    {
++#if !defined(QT_NO_THREAD) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD)
++        int size_max = sysconf(_SC_GETPW_R_SIZE_MAX);
++        if (size_max == -1)
++            size_max = 1024;
++        QVarLengthArray<char, 1024> buf(size_max);
++#endif
++        struct passwd *pw = 0;
++        uid_t user_id = getuid();
++        pw = getpwuid(user_id);
++#if !defined(QT_NO_THREAD) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD)
++        struct passwd entry;
++        getpwuid_r(user_id, &entry, buf.data(), buf.size(), &pw);
++#else
++        pw = getpwuid(user_id);
++#endif
++        home = QFile::decodeName(QByteArray(pw->pw_dir));
++    }
++    if (home.isEmpty())
+         home = rootPath();
+     return QDir::cleanPath(home);
+ }
+diff -up qt-everywhere-opensource-src-4.8.3/src/corelib/io/qfsfileengine_unix.cpp.QTBUG-4862 qt-everywhere-opensource-src-4.8.3/src/corelib/io/qfsfileengine_unix.cpp
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/qt4.git/commitdiff/31a0326cc454ef819b95cb33680de60cba2dade3