[mingw32-qt/f15] Rebased the no-fpu-functions patch

[Kalev Lember]

commit 4a5c6a3e5fd072dd4ff6ac90a21b9f937e800c30
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Sun Sep 4 16:26:59 2011 +0300

    Rebased the no-fpu-functions patch

 ...atch => mingw32-qt-4.7.4-no-fpu-functions.patch |   18 +++++++++---------
 mingw32-qt.spec                                    |    2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/mingw32-qt-4.6.0-no-fpu-functions.patch b/mingw32-qt-4.7.4-no-fpu-functions.patch
similarity index 52%
rename from mingw32-qt-4.6.0-no-fpu-functions.patch
rename to mingw32-qt-4.7.4-no-fpu-functions.patch
index 6087bde..b1e8ddb 100644
--- a/mingw32-qt-4.6.0-no-fpu-functions.patch
+++ b/mingw32-qt-4.7.4-no-fpu-functions.patch
@@ -1,7 +1,7 @@
-diff -ur qt-everywhere-opensource-src-4.6.0.orig/src/corelib/tools/qlocale.cpp qt-everywhere-opensource-src-4.6.0/src/corelib/tools/qlocale.cpp
---- qt-everywhere-opensource-src-4.6.0.orig/src/corelib/tools/qlocale.cpp	2008-09-27 10:00:55.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.0/src/corelib/tools/qlocale.cpp	2009-02-02 11:39:40.000000000 +0000
-@@ -6522,6 +6522,10 @@
+diff -up qt-everywhere-opensource-src-4.7.4/src/corelib/tools/qlocale.cpp.float qt-everywhere-opensource-src-4.7.4/src/corelib/tools/qlocale.cpp
+--- qt-everywhere-opensource-src-4.7.4/src/corelib/tools/qlocale.cpp.float	2011-08-23 15:02:27.000000000 +0300
++++ qt-everywhere-opensource-src-4.7.4/src/corelib/tools/qlocale.cpp	2011-09-04 16:24:58.061705359 +0300
+@@ -6620,6 +6620,10 @@ static int quorem(Bigint *b, Bigint *S)
  
  Q_CORE_EXPORT char *qdtoa ( double d, int mode, int ndigits, int *decpt, int *sign, char **rve, char **resultp)
  {
@@ -12,15 +12,15 @@ diff -ur qt-everywhere-opensource-src-4.6.0.orig/src/corelib/tools/qlocale.cpp q
      // Some values of the floating-point control word can cause _qdtoa to crash with an underflow.
      // We set a safe value here.
  #ifdef Q_OS_WIN
-@@ -6536,6 +6540,7 @@
+@@ -6634,6 +6638,7 @@ Q_CORE_EXPORT char *qdtoa ( double d, in
  #endif
      _control87(MCW_EM, MCW_EM);
  #endif
 +#endif
  
- #if defined(Q_OS_LINUX) && !defined(__UCLIBC__)
+ #if defined(__GLIBC__) && !defined(__UCLIBC__)
      fenv_t envp;
-@@ -6544,6 +6549,7 @@
+@@ -6642,6 +6647,7 @@ Q_CORE_EXPORT char *qdtoa ( double d, in
  
      char *s = _qdtoa(d, mode, ndigits, decpt, sign, rve, resultp);
  
@@ -28,11 +28,11 @@ diff -ur qt-everywhere-opensource-src-4.6.0.orig/src/corelib/tools/qlocale.cpp q
  #ifdef Q_OS_WIN
      _clear87();
  #ifndef _M_X64
-@@ -6552,6 +6558,7 @@
+@@ -6650,6 +6656,7 @@ Q_CORE_EXPORT char *qdtoa ( double d, in
      _control87(oldbits, _MCW_EM|_MCW_DN|_MCW_RC);
  #endif //_M_X64
  #endif //Q_OS_WIN
 +#endif
  
- #if defined(Q_OS_LINUX) && !defined(__UCLIBC__)
+ #if defined(__GLIBC__) && !defined(__UCLIBC__)
      fesetenv(&envp);
diff --git a/mingw32-qt.spec b/mingw32-qt.spec
index 7637f64..3069a13 100644
--- a/mingw32-qt.spec
+++ b/mingw32-qt.spec
@@ -21,7 +21,7 @@ Source0:        http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-%
 Source1:        qmake.conf
 Source2:        qplatformdefs.h
 
-Patch11:        mingw32-qt-4.6.0-no-fpu-functions.patch
+Patch11:        mingw32-qt-4.7.4-no-fpu-functions.patch
 
 # Fedora's libjpeg uses the datatype 'jpeg_boolean' instead of 'boolean'
 # to avoid a conflict with the rpcndr.h header