[mingw-qt] Backported another upstream commit which resolves a build failure

[Erik van Pienbroek]

commit 99ed015e9966a3096594d939531f213d049dbbdc
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sat Sep 15 01:54:57 2012 +0200

    Backported another upstream commit which resolves a build failure

 mingw-qt.spec          |    4 +++-
 qt-commit-0f5f7c.patch |   31 +++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletions(-)
---
diff --git a/mingw-qt.spec b/mingw-qt.spec
index 917bee6..91f94de 100644
--- a/mingw-qt.spec
+++ b/mingw-qt.spec
@@ -68,9 +68,10 @@ Patch23:        qt-4.8.1-fix-activeqt-compilation.patch
 # lrelease-qt4 tries to run qmake not qmake-qt4 (http://bugzilla.redhat.com/820767)
 Patch24:        qt-everywhere-opensource-src-4.8.1-linguist_qmake-qt4.patch
 
-# Upstream commit 57069f
+# Upstream commit 57069f and 0f5f7c
 # Fixes build regression in Qt 4.8.3
 Patch25:        qt-commit-57069f.patch
+Patch26:        qt-commit-0f5f7c.patch
 
 BuildRequires:  mingw32-filesystem >= 95
 BuildRequires:  mingw32-gcc
@@ -203,6 +204,7 @@ Static version of the mingw64-qt library.
 %patch23 -p1
 %patch24 -p1 -b .linguist_qtmake-qt4
 %patch25 -p1
+%patch26 -p1
 
 # Patch 19 (openssl) needs an additional change
 # qt loads openssl libraries (ssleay32, libeay32)  at runtime, but they are called libssl-OPENSSL_SONAME
diff --git a/qt-commit-0f5f7c.patch b/qt-commit-0f5f7c.patch
new file mode 100644
index 0000000..daec2f2
--- /dev/null
+++ b/qt-commit-0f5f7c.patch
@@ -0,0 +1,31 @@
+From 0f5f7c22677e8681ff2af393d01cadd590fe250f Mon Sep 17 00:00:00 2001
+From: Jonathan Liu <net147 at gmail.com>
+Date: Fri, 14 Sep 2012 08:54:25 +1000
+Subject: [PATCH] Fix MinGW-w64 compilation
+
+ENABLE_EXECUTABLE_ALLOCATOR_FIXED requires sys/mman.h which is not
+available with MinGW-w64.
+
+Change-Id: I6e76ce0c570e5819657debf813f0e80cef907dd4
+(cherry picked from commit 02c37f59839b7bb36b231560893fa3bccbecc065)
+Reviewed-by: Simon Hausmann <simon.hausmann at nokia.com>
+---
+ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
+index d930ed7..e95ac7f 100644
+--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
++++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
+@@ -1019,7 +1019,7 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */
+ /* Pick which allocator to use; we only need an executable allocator if the assembler is compiled in.
+    On x86-64 we use a single fixed mmap, on other platforms we mmap on demand. */
+ #if ENABLE(ASSEMBLER)
+-#if CPU(X86_64)
++#if CPU(X86_64) && !COMPILER(MINGW64)
+ #define ENABLE_EXECUTABLE_ALLOCATOR_FIXED 1
+ #else
+ #define ENABLE_EXECUTABLE_ALLOCATOR_DEMAND 1
+-- 
+1.7.10
+