[mingw-qt5-qtbase] Update to 5.3.1

[Erik van Pienbroek]

commit 7b0b701196847c4b3eabb223f4eb2e1b424164c6
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sat Jul 5 14:27:29 2014 +0200

    Update to 5.3.1

 .gitignore                             |    1 +
 mingw-qt5-qtbase.spec                  |    7 +++++--
 qt5-enable-rpath-for-host-tools.patch  |    4 ++--
 qt5-rename-qtmain-to-qt5main.patch     |    8 ++++----
 qt5-use-system-zlib-in-host-libs.patch |    6 +++---
 sources                                |    2 +-
 6 files changed, 16 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 344686d..5c395b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /qtbase-opensource-src-5.2.0.tar.xz
 /qtbase-opensource-src-5.2.1.tar.xz
 /qtbase-opensource-src-5.3.0.tar.xz
+/qtbase-opensource-src-5.3.1.tar.xz
diff --git a/mingw-qt5-qtbase.spec b/mingw-qt5-qtbase.spec
index d5b6c2d..99de6a9 100644
--- a/mingw-qt5-qtbase.spec
+++ b/mingw-qt5-qtbase.spec
@@ -19,8 +19,8 @@
 %global release_version %(echo %{version} | awk -F. '{print $1"."$2}')
 
 Name:           mingw-qt5-qtbase
-Version:        5.3.0
-Release:        2%{?pre:.%{pre}}%{?snapshot_date:.git%{snapshot_date}.%{snapshot_rev}}%{?dist}
+Version:        5.3.1
+Release:        1%{?pre:.%{pre}}%{?snapshot_date:.git%{snapshot_date}.%{snapshot_rev}}%{?dist}
 Summary:        Qt5 for Windows - QtBase component
 
 License:        GPLv3 with exceptions or LGPLv2 with exceptions
@@ -757,6 +757,9 @@ ln -s %{mingw64_target}-qmake-qt5 $RPM_BUILD_ROOT%{_bindir}/mingw64-qmake-qt5
 
 
 %changelog
+* Sat Jul  5 2014 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.3.1-1
+- Update to 5.3.1
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.3.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/qt5-enable-rpath-for-host-tools.patch b/qt5-enable-rpath-for-host-tools.patch
index d403434..55aaf44 100644
--- a/qt5-enable-rpath-for-host-tools.patch
+++ b/qt5-enable-rpath-for-host-tools.patch
@@ -1,7 +1,7 @@
 --- qtbase-opensource-src-5.1.0/mkspecs/features/qt_app.prf.orig	2013-08-01 01:21:52.461910182 +0200
 +++ qtbase-opensource-src-5.1.0/mkspecs/features/qt_app.prf	2013-08-01 01:22:46.777801052 +0200
-@@ -17,6 +17,7 @@
- isEmpty(QMAKE_INFO_PLIST): CONFIG -= app_bundle
+@@ -20,6 +20,7 @@
+ QMAKE_LFLAGS += $$QMAKE_LFLAGS_GCSECTIONS
  
  host_build: QT -= gui   # no host tool will ever use gui
 +host_build: QT_CONFIG += rpath
diff --git a/qt5-rename-qtmain-to-qt5main.patch b/qt5-rename-qtmain-to-qt5main.patch
index 66d3f9f..57c35da 100644
--- a/qt5-rename-qtmain-to-qt5main.patch
+++ b/qt5-rename-qtmain-to-qt5main.patch
@@ -22,14 +22,14 @@
  
          !isEmpty(CMAKE_STATIC_TYPE) {
              CMAKE_STATIC_WINDOWS_BUILD = "true"
---- qtbase-opensource-src-5.2.1/mkspecs/features/win32/windows.prf.orig	2014-04-29 18:55:41.518739891 +0200
-+++ qtbase-opensource-src-5.2.1/mkspecs/features/win32/windows.prf	2014-04-29 18:55:47.692839722 +0200
+--- qtbase-opensource-src-5.3.1/mkspecs/features/win32/windows.prf.qtmain	2014-07-05 14:18:23.211155781 +0200
++++ qtbase-opensource-src-5.3.1/mkspecs/features/win32/windows.prf	2014-07-05 14:18:46.045390147 +0200
 @@ -6,7 +6,7 @@
      mingw:DEFINES += QT_NEEDS_QMAIN
  
      qt:for(entryLib, $$list($$unique(QMAKE_LIBS_QT_ENTRY))) {
 -        isEqual(entryLib, -lqtmain): {
 +        isEqual(entryLib, -lqt5main): {
+             !contains(QMAKE_DEFAULT_LIBDIRS, $$QT.core.libs): \
+                 QMAKE_LIBS += -L$$QT.core.libs
              CONFIG(debug, debug|release): QMAKE_LIBS += $${entryLib}$${QT_LIBINFIX}d
-             else: QMAKE_LIBS += $${entryLib}$${QT_LIBINFIX}
-         } else {
diff --git a/qt5-use-system-zlib-in-host-libs.patch b/qt5-use-system-zlib-in-host-libs.patch
index d496db2..a504651 100644
--- a/qt5-use-system-zlib-in-host-libs.patch
+++ b/qt5-use-system-zlib-in-host-libs.patch
@@ -1,8 +1,8 @@
 --- a/src/tools/bootstrap/bootstrap.pro	2014-01-01 13:22:42.367935800 -0600
 +++ b/src/tools/bootstrap/bootstrap.pro	2014-01-02 23:38:20.707687700 -0600
-@@ -147,7 +147,7 @@
- 
- *-g++*: QMAKE_CXXFLAGS += -ffunction-sections
+@@ -145,7 +145,7 @@
+         ../../corelib/io/qstandardpaths_win.cpp
+ }
  
 -if(contains(QT_CONFIG, zlib)|cross_compile):include(../../3rdparty/zlib.pri)
 +if(contains(QT_CONFIG, zlib)):include(../../3rdparty/zlib.pri)
diff --git a/sources b/sources
index 7b59ffd..a2714dc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4bc43a72e1b3d804171e5b52640e8d96  qtbase-opensource-src-5.3.0.tar.xz
+572c9953847d391f2d33b420bbcdca46  qtbase-opensource-src-5.3.1.tar.xz