[mingw32-qt/f15] Revert unwanted changes on f15

[Kalev Lember]

commit 3dd8ae3e69e58a9a388a959f47bb977693783f31
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Sun Sep 4 18:42:10 2011 +0300

    Revert unwanted changes on f15
    
    This reverts two commits:
    
     - "Enable the float.h using code again"
       commit 2047a9ea4d4f03405cc06fdb3dab633a1d4652c0a
    
     - "Rebuilt with mingw32-libjpeg-turbo, dropped jpeg_boolean patch (#604702)"
       commit 4a919007e7bfb9f435584903ee4f48a7e4fabd58

 mingw32-qt-4.6.0-no-fpu-functions.patch |   38 +++++++++++++++++++++++++++++++
 mingw32-qt.spec                         |   13 ++++++----
 qt-libjpeg-7-compatibility.patch        |   20 ++++++++++++++++
 3 files changed, 66 insertions(+), 5 deletions(-)
---
diff --git a/mingw32-qt-4.6.0-no-fpu-functions.patch b/mingw32-qt-4.6.0-no-fpu-functions.patch
new file mode 100644
index 0000000..6087bde
--- /dev/null
+++ b/mingw32-qt-4.6.0-no-fpu-functions.patch
@@ -0,0 +1,38 @@
+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 @@
+ 
+ Q_CORE_EXPORT char *qdtoa ( double d, int mode, int ndigits, int *decpt, int *sign, char **rve, char **resultp)
+ {
++    // RWMJ: The 8087-twiddling functions just don't seem to exist
++    // in MinGW cross-compiler, so comment out that code and hope for
++    // the best ...
++#if 0
+     // 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 @@
+ #endif
+     _control87(MCW_EM, MCW_EM);
+ #endif
++#endif
+ 
+ #if defined(Q_OS_LINUX) && !defined(__UCLIBC__)
+     fenv_t envp;
+@@ -6544,6 +6549,7 @@
+ 
+     char *s = _qdtoa(d, mode, ndigits, decpt, sign, rve, resultp);
+ 
++#if 0 // RWMJ - see above.
+ #ifdef Q_OS_WIN
+     _clear87();
+ #ifndef _M_X64
+@@ -6552,6 +6558,7 @@
+     _control87(oldbits, _MCW_EM|_MCW_DN|_MCW_RC);
+ #endif //_M_X64
+ #endif //Q_OS_WIN
++#endif
+ 
+ #if defined(Q_OS_LINUX) && !defined(__UCLIBC__)
+     fesetenv(&envp);
diff --git a/mingw32-qt.spec b/mingw32-qt.spec
index 58c8672..bbc97db 100644
--- a/mingw32-qt.spec
+++ b/mingw32-qt.spec
@@ -21,6 +21,12 @@ 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
+
+# Fedora's libjpeg uses the datatype 'jpeg_boolean' instead of 'boolean'
+# to avoid a conflict with the rpcndr.h header
+Patch13:        qt-libjpeg-7-compatibility.patch
+
 # The debug build tries to link against libdbus-1d which doesn't exist
 Patch15:        qt-dbus-dont-link-to-dbus-1d.patch
 
@@ -60,6 +66,8 @@ Fedora Windows cross-compiler.
 %prep
 %setup -q -n qt-everywhere-opensource-src-%{version}%{?pre:-%{pre}}
 
+%patch11 -p1
+%patch13 -p0
 %patch15 -p0
 
 # Cross-compilation qmake target.
@@ -326,11 +334,6 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_prefix}/imports
 * Sun Aug 28 2011 Kalev Lember <kalevlember at gmail.com> - 4.7.3-1
 - Update to 4.7.3
 - Dropped upstreamed / unneeded patches
-- Enable the float.h using code again, needs new mingw32-runtime and
-  mingw32-gcc builds
-
-* Fri Jun 03 2011 Kalev Lember <kalev at smartlink.ee> - 4.7.1-6
-- Rebuilt with mingw32-libjpeg-turbo, dropped jpeg_boolean patch (#604702)
 
 * Fri Apr 22 2011 Kalev Lember <kalev at smartlink.ee> - 4.7.1-5
 - Rebuilt for pseudo-reloc version mismatch (#698827)
diff --git a/qt-libjpeg-7-compatibility.patch b/qt-libjpeg-7-compatibility.patch
new file mode 100644
index 0000000..4cea667
--- /dev/null
+++ b/qt-libjpeg-7-compatibility.patch
@@ -0,0 +1,20 @@
+--- src/gui/image/qjpeghandler.cpp.orig	2010-11-06 02:55:14.000000000 +0100
++++ src/gui/image/qjpeghandler.cpp	2010-11-12 15:30:32.534678872 +0100
+@@ -131,7 +131,7 @@
+ {
+ }
+ 
+-static boolean qt_fill_input_buffer(j_decompress_ptr cinfo)
++static jpeg_boolean qt_fill_input_buffer(j_decompress_ptr cinfo)
+ {
+     my_jpeg_source_mgr* src = (my_jpeg_source_mgr*)cinfo->src;
+     qint64 num_read = 0;
+@@ -473,7 +473,7 @@
+ {
+ }
+ 
+-static boolean qt_empty_output_buffer(j_compress_ptr cinfo)
++static jpeg_boolean qt_empty_output_buffer(j_compress_ptr cinfo)
+ {
+     my_jpeg_destination_mgr* dest = (my_jpeg_destination_mgr*)cinfo->dest;
+