[mingw-qt: 44/65] Update to 4.7.3

epienbro epienbro at fedoraproject.org
Tue Mar 6 21:30:27 UTC 2012


commit 89c074b06a9ad9d486c5a617567ef05c0280b429
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Sun Aug 28 20:13:15 2011 +0300

    Update to 4.7.3

 .gitignore                      |    1 +
 mingw32-qt.spec                 |   17 ++++++-----------
 qt-fix-ws2_32-link.patch        |   13 -------------
 qt-libpng14-compatibility.patch |   11 -----------
 sources                         |    2 +-
 5 files changed, 8 insertions(+), 36 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ac3a782..bfec39b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /qt-everywhere-opensource-src-4.7.1.tar.gz
+/qt-everywhere-opensource-src-4.7.3.tar.gz
diff --git a/mingw32-qt.spec b/mingw32-qt.spec
index dc57f59..ea3f78e 100644
--- a/mingw32-qt.spec
+++ b/mingw32-qt.spec
@@ -10,8 +10,8 @@
 %global platform win32-g++-cross
 
 Name:           mingw32-qt
-Version:        4.7.1
-Release:        6%{?pre}%{?dist}
+Version:        4.7.3
+Release:        1%{?pre}%{?dist}
 Summary:        Qt for Windows
 
 License:        GPLv3 with exceptions or LGPLv2 with exceptions
@@ -26,13 +26,6 @@ Source2:        qplatformdefs.h
 
 Patch11:        mingw32-qt-4.6.0-no-fpu-functions.patch
 
-# Qt tries to link against libpng using '-lpng'. This doesn't work for libpng 1.4
-Patch12:        qt-libpng14-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
 Patch15:        qt-dbus-dont-link-to-dbus-1d.patch
 
@@ -75,8 +68,6 @@ Fedora Windows cross-compiler.
 %setup -q -n qt-everywhere-opensource-src-%{version}%{?pre:-%{pre}}
 
 %patch11 -p1
-%patch12 -p0
-%patch14 -p0
 %patch15 -p0
 
 # Cross-compilation qmake target.
@@ -288,6 +279,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 28 2011 Kalev Lember <kalevlember at gmail.com> - 4.7.3-1
+- Update to 4.7.3
+- Dropped upstreamed / unneeded patches
+
 * Fri Jun 03 2011 Kalev Lember <kalev at smartlink.ee> - 4.7.1-6
 - Rebuilt with mingw32-libjpeg-turbo, dropped jpeg_boolean patch (#604702)
 
diff --git a/sources b/sources
index ff10204..6aeb170 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6f88d96507c84e9fea5bf3a71ebeb6d7  qt-everywhere-opensource-src-4.7.1.tar.gz
+49b96eefb1224cc529af6fe5608654fe  qt-everywhere-opensource-src-4.7.3.tar.gz


More information about the scm-commits mailing list