[mingw-qt: 37/65] Update to 4.7.1

[epienbro]

commit 72e981dc4f15bb1dcb435158aae9de9501f6393a
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Fri Nov 12 17:32:36 2010 +0100

    Update to 4.7.1
    
    - Update to 4.7.1
    - Use the name 'win32-g++-cross' instead of 'win32-g++-fedora-cross' as
      mkspecs platform name as was decided on the mailing list. The previous
      rename was invalid

 mingw32-qt.spec                  |   13 ++++++++++---
 qt-libjpeg-7-compatibility.patch |   10 +++++-----
 2 files changed, 15 insertions(+), 8 deletions(-)
---
diff --git a/mingw32-qt.spec b/mingw32-qt.spec
index 7a7dd01..3bb484f 100644
--- a/mingw32-qt.spec
+++ b/mingw32-qt.spec
@@ -7,11 +7,11 @@
 
 #global pre rc1
 
-%global platform win32-g++-fedora-cross
+%global platform win32-g++-cross
 
 Name:           mingw32-qt
-Version:        4.7.0
-Release:        2%{?pre}%{?dist}
+Version:        4.7.1
+Release:        1%{?pre}%{?dist}
 Summary:        Qt for Windows
 
 License:        GPLv3 with exceptions or LGPLv2 with exceptions
@@ -34,6 +34,7 @@ Patch12:        qt-libpng14-compatibility.patch
 Patch13:        qt-libjpeg-7-compatibility.patch
 
 # One of the examples tries to link with 'Ws2_32'. As Linux is case sensitive this won't work
+# http://bugreports.qt.nokia.com/browse/QTBUG-14484
 Patch14:        qt-fix-ws2_32-link.patch
 
 # The debug build tries to link against libdbus-1d which doesn't exist
@@ -285,6 +286,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Nov 12 2010 Erik van Pienbroek <epienbro at fedoraproject.org> - 4.7.1-1
+- Update to 4.7.1
+- Use the name 'win32-g++-cross' instead of 'win32-g++-fedora-cross' as
+  mkspecs platform name as was decided on the mailing list. The previous
+  rename was invalid
+
 * Mon Oct 11 2010 Erik van Pienbroek <epienbro at fedoraproject.org> - 4.7.0-2
 - Use a more proper build method than the old hacky one
 - Link against the mingw32 packages mingw32-zlib, mingw32-iconv, 
diff --git a/qt-libjpeg-7-compatibility.patch b/qt-libjpeg-7-compatibility.patch
index 4e88883..4cea667 100644
--- a/qt-libjpeg-7-compatibility.patch
+++ b/qt-libjpeg-7-compatibility.patch
@@ -1,6 +1,6 @@
---- src/gui/image/qjpeghandler.cpp.orig	2010-10-08 20:27:26.265243275 +0200
-+++ src/gui/image/qjpeghandler.cpp	2010-10-08 20:28:09.792477659 +0200
-@@ -117,7 +117,7 @@
+--- 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 @@
  {
  }
  
@@ -8,8 +8,8 @@
 +static jpeg_boolean qt_fill_input_buffer(j_decompress_ptr cinfo)
  {
      my_jpeg_source_mgr* src = (my_jpeg_source_mgr*)cinfo->src;
-     if (src->memDevice) {
-@@ -466,7 +466,7 @@
+     qint64 num_read = 0;
+@@ -473,7 +473,7 @@
  {
  }