[mingw-qt] Update to 4.8.4

[Erik van Pienbroek]

commit d96bcb4df173eb4b2cc40878887d4652fcad3ac9
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sun Dec 9 18:38:30 2012 +0100

    Update to 4.8.4

 .gitignore                                       |    1 +
 mingw-qt.spec                                    |   16 ++++----
 qt-4.8.4-fix-sse-suppport-build-regression.patch |   11 ++++++
 qt-commit-0f5f7c.patch                           |   31 ----------------
 qt-commit-57069f.patch                           |   41 ----------------------
 qt-merge-static-and-shared-library-trees.patch   |    2 +-
 sources                                          |    2 +-
 7 files changed, 22 insertions(+), 82 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5805805..8b05847 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /qt-everywhere-opensource-src-4.8.1.tar.gz
 /qt-everywhere-opensource-src-4.8.2.tar.gz
 /qt-everywhere-opensource-src-4.8.3.tar.gz
+/qt-everywhere-opensource-src-4.8.4.tar.gz
diff --git a/mingw-qt.spec b/mingw-qt.spec
index 9ec223a..8c047fe 100644
--- a/mingw-qt.spec
+++ b/mingw-qt.spec
@@ -13,8 +13,8 @@
 %global openssl_soname %(rpm -ql mingw32-openssl | grep -Eo 'libssl.*$' | grep -Eo '[0-9]+')
 
 Name:           mingw-qt
-Version:        4.8.3
-Release:        3%{?pre}%{?dist}
+Version:        4.8.4
+Release:        1%{?pre}%{?dist}
 Summary:        Qt for Windows
 
 License:        GPLv3 with exceptions or LGPLv2 with exceptions
@@ -68,10 +68,8 @@ 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 and 0f5f7c
-# Fixes build regression in Qt 4.8.3
-Patch25:        qt-commit-57069f.patch
-Patch26:        qt-commit-0f5f7c.patch
+# Fix build regression regarding SSSE3 support
+Patch25:        qt-4.8.4-fix-sse-suppport-build-regression.patch
 
 BuildRequires:  mingw32-filesystem >= 95
 BuildRequires:  mingw32-gcc
@@ -211,8 +209,7 @@ Static version of the mingw64-qt library.
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1 -b .linguist_qtmake-qt4
-%patch25 -p1
-%patch26 -p1
+%patch25 -p0 -b .ssse3
 
 # Patch 19 (openssl) needs an additional change
 # qt loads openssl libraries (ssleay32, libeay32)  at runtime, but they are called libssl-OPENSSL_SONAME
@@ -1074,6 +1071,9 @@ sed -i s@'$${QT_LIBINFIX}d'@'d$${QT_LIBINFIX}'@ $RPM_BUILD_ROOT%{mingw64_datadir
 
 
 %changelog
+* Thu Nov 29 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 4.8.4-1
+- Update to 4.8.4
+
 * Sun Nov  4 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 4.8.3-3
 - Don't automatically strip debugging symbols from binaries created using qmake
   as we've got RPM wrapper strips to automatically split off debugging symbols
diff --git a/qt-4.8.4-fix-sse-suppport-build-regression.patch b/qt-4.8.4-fix-sse-suppport-build-regression.patch
new file mode 100644
index 0000000..ecadb82
--- /dev/null
+++ b/qt-4.8.4-fix-sse-suppport-build-regression.patch
@@ -0,0 +1,11 @@
+--- src/gui/gui.pro.orig	2012-12-09 18:18:57.962442233 +0100
++++ src/gui/gui.pro	2012-12-09 18:20:44.086202991 +0100
+@@ -80,7 +80,7 @@
+     DEFINES += QT_NO_DIRECTWRITE
+ }
+ 
+-contains(QMAKE_MAC_XARCH, no) {
++mac:contains(QMAKE_MAC_XARCH, no) {
+     DEFINES += QT_NO_MAC_XARCH
+ } else {
+     win32-g++*|!win32:!win32-icc*:!macx-icc* {
diff --git a/qt-merge-static-and-shared-library-trees.patch b/qt-merge-static-and-shared-library-trees.patch
index 9f04fad..c30681a 100644
--- a/qt-merge-static-and-shared-library-trees.patch
+++ b/qt-merge-static-and-shared-library-trees.patch
@@ -108,7 +108,7 @@
 +}
  
  #versioning
- QT_VERSION = 4.8.3
+ QT_VERSION = 4.8.4
 --- usr/i686-w64-mingw32/sys-root/mingw/share/qt4/mkspecs/features/win32/default_post.prf.orig	2011-12-26 02:29:56.365208473 +0100
 +++ usr/i686-w64-mingw32/sys-root/mingw/share/qt4/mkspecs/features/win32/default_post.prf	2011-12-26 02:31:03.650208601 +0100
 @@ -6,6 +6,10 @@
diff --git a/sources b/sources
index 958d3ae..a5bf5bf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a663b6c875f8d7caa8ac9c30e4a4ec3b  qt-everywhere-opensource-src-4.8.3.tar.gz
+89c5ecba180cae74c66260ac732dc5cb  qt-everywhere-opensource-src-4.8.4.tar.gz