[mingw-qt] Update to 4.8.1
Erik van Pienbroek
epienbro at fedoraproject.org
Wed Mar 28 22:39:04 UTC 2012
commit 868beaf11c256638fba34b130a92f79bcd42842d
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Thu Mar 29 00:38:41 2012 +0200
Update to 4.8.1
- Update to 4.8.1
- Removed a patch which fixed a compile failure in kdelibs as
upstream has resolved the issue properly in commit 71e88dd
mingw-qt.spec | 17 +++++++----------
qt-revert-commit-5be6cf.patch | 11 -----------
sources | 1 -
3 files changed, 7 insertions(+), 22 deletions(-)
---
diff --git a/mingw-qt.spec b/mingw-qt.spec
index 9f9cca2..e8451d8 100644
--- a/mingw-qt.spec
+++ b/mingw-qt.spec
@@ -9,15 +9,12 @@
%global platform_win32 win32-g++-cross
%global platform_win64 win32-g++-cross-x64
-%global mingw_build_win32 1
-%global mingw_build_win64 1
-
# Helper macro to retrieve the name of the openssl library
%global openssl_soname %(rpm -ql mingw32-openssl | grep -Eo 'libssl.*$' | grep -Eo '[0-9]+')
Name: mingw-qt
-Version: 4.8.0
-Release: 8%{?pre}%{?dist}
+Version: 4.8.1
+Release: 1%{?pre}%{?dist}
Summary: Qt for Windows
License: GPLv3 with exceptions or LGPLv2 with exceptions
@@ -41,10 +38,6 @@ Patch10: mingw32-qt-4.8.0-no-webkit-tests.patch
# The debug build tries to link against libdbus-1d which doesn't exist
Patch15: qt-dbus-dont-link-to-dbus-1d.patch
-# Upstream commit http://qt.gitorious.org/qt/qt/commit/5be6cf0a6e306ed3a51ed5ba89317b1317544eea
-# causes a compile failure while building mingw-kdelibs. Revert the commit for now
-Patch16: qt-revert-commit-5be6cf.patch
-
# The configure script thinks that there is no IPC/shared memory support
# for this platform, while there is support. Fix the configure script
Patch17: qt-dont-perform-ipc-checks-for-win32.patch
@@ -194,7 +187,6 @@ Static version of the mingw64-qt library.
%patch10 -p1 -b .no_webkit_tests
%patch15 -p0
-%patch16 -p1
%patch17 -p0
%patch18 -p1
%patch19 -p1
@@ -1042,6 +1034,11 @@ sed -i s@'$${QT_LIBINFIX}d'@'d$${QT_LIBINFIX}'@ $RPM_BUILD_ROOT%{mingw64_datadir
%changelog
+* Wed Mar 28 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 4.8.1-1
+- Update to 4.8.1
+- Removed a patch which fixed a compile failure in kdelibs as
+ upstream has resolved the issue properly in commit 71e88dd
+
* Sat Mar 10 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 4.8.0-8
- Added win64 support
diff --git a/sources b/sources
index fd3c0a4..e69de29 100644
--- a/sources
+++ b/sources
@@ -1 +0,0 @@
-e8a5fdbeba2927c948d9f477a6abe904 qt-everywhere-opensource-src-4.8.0.tar.gz
More information about the scm-commits
mailing list