[mingw-qt5-qtbase] Update to 5.0.2
Erik van Pienbroek
epienbro at fedoraproject.org
Tue Apr 30 20:31:47 UTC 2013
commit c78398216c1049316930d641e0321264bb112a20
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Tue Apr 30 22:29:08 2013 +0200
Update to 5.0.2
.gitignore | 1 +
mingw-qt5-qtbase.spec | 18 ++++++++++----
qt5-dwrite-compile-fix.patch | 30 +++++++++++++++++++++++
qt5-merge-static-and-shared-library-trees.patch | 17 -------------
qt5-workaround-pkgconfig-install-issue.patch | 18 +++++++-------
qt5-workaround-qtbug-29426.patch | 9 ++++---
sources | 2 +-
7 files changed, 59 insertions(+), 36 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8a480d7..0c53aef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/qtbase-opensource-src-5.0.0.tar.xz
/qtbase-opensource-src-5.0.1.tar.xz
+/qtbase-opensource-src-5.0.2.tar.xz
diff --git a/mingw-qt5-qtbase.spec b/mingw-qt5-qtbase.spec
index 022097f..2fea106 100644
--- a/mingw-qt5-qtbase.spec
+++ b/mingw-qt5-qtbase.spec
@@ -19,8 +19,8 @@
%endif
Name: mingw-qt5-qtbase
-Version: 5.0.1
-Release: 4%{?pre:.%{pre}}%{?snapshot_date:.git%{snapshot_date}.%{snapshot_rev}}%{?dist}
+Version: 5.0.2
+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
@@ -32,7 +32,7 @@ URL: http://www.qtsoftware.com/
# wget http://qt.gitorious.org/qt/qtbase/archive-tarball/%{snapshot_rev} -O qt5-qtbase-%{snapshot_rev}.tar.gz
Source0: qt5-qtbase-%{snapshot_rev}.tar.gz
%else
-Source0: http://releases.qt-project.org/qt5/%{version}/submodules_tar/qtbase-opensource-src-%{version}%{?pre:-%{pre}}.tar.xz
+Source0: http://releases.qt-project.org/qt5/%{version}/submodules/qtbase-opensource-src-%{version}%{?pre:-%{pre}}.tar.xz
%endif
# Special cross-compilation qmake target.
@@ -81,6 +81,10 @@ Patch14: qt5-prevent-conflict-with-interface-keyword.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=858080
Patch15: qt5-workaround-pkgconfig-install-issue.patch
+# Fix compilation of the DirectWrite specific code
+# Commit 9a89d614f26262fcb6895d1dab93519d732ba011
+Patch16: qt5-dwrite-compile-fix.patch
+
BuildRequires: mingw32-filesystem >= 95
BuildRequires: mingw32-gcc
BuildRequires: mingw32-gcc-c++
@@ -219,6 +223,7 @@ Static version of the mingw64-qt5-qtbase library.
%patch13 -p0 -b .non_x86
%patch14 -p0 -b .interface
%patch15 -p0 -b .pkgconfig
+%patch16 -p1 -b .dwrite
# Cross-compilation qmake target.
mkdir mkspecs/%{platform_win32}
@@ -362,8 +367,8 @@ mv $RPM_BUILD_ROOT%{mingw32_libdir}/libQt5Bootstrap.a $RPM_BUILD_ROOT%{_prefix}/
mv $RPM_BUILD_ROOT%{mingw64_libdir}/libQt5Bootstrap.a $RPM_BUILD_ROOT%{_prefix}/%{mingw64_target}/lib/
# Make sure other qmake projects can find the Qt5Bootstrap library
-sed -i s@'QT.bootstrap.libs ='@'QT.bootstrap.libs = %{_prefix}/%{mingw32_target}/lib'@ $RPM_BUILD_ROOT%{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_bootstrap.pri
-sed -i s@'QT.bootstrap.libs ='@'QT.bootstrap.libs = %{_prefix}/%{mingw64_target}/lib'@ $RPM_BUILD_ROOT%{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_bootstrap.pri
+sed -i s@'$$QT_MODULE_LIB_BASE'@'%{_prefix}/%{mingw32_target}/lib'@ $RPM_BUILD_ROOT%{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_bootstrap.pri
+sed -i s@'$$QT_MODULE_LIB_BASE'@'%{_prefix}/%{mingw64_target}/lib'@ $RPM_BUILD_ROOT%{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_bootstrap.pri
# The mingw gcc compiler assumes that %%{_prefix}/%%{mingw32_target}/lib and
# %%{prefix}/%%{mingw64_target}/lib are paths which need to be searched
@@ -688,6 +693,9 @@ sed -i s@'#QT_TOOL'@'QT_TOOL'@ $RPM_BUILD_ROOT%{mingw64_datadir}/qt5/mkspecs/%{p
%changelog
+* Sat Apr 13 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.0.2-1
+- Update to 5.0.2
+
* Thu Mar 28 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.0.1-4
- Have the -qmake packages require mingw{32,64}-qt5-qttools-lrelease
and update the reference to it in the mkspecs profiles
diff --git a/qt5-dwrite-compile-fix.patch b/qt5-dwrite-compile-fix.patch
new file mode 100644
index 0000000..d6b9217
--- /dev/null
+++ b/qt5-dwrite-compile-fix.patch
@@ -0,0 +1,30 @@
+From 9a89d614f26262fcb6895d1dab93519d732ba011 Mon Sep 17 00:00:00 2001
+From: Friedemann Kleint <Friedemann.Kleint at digia.com>
+Date: Wed, 17 Apr 2013 13:21:24 +0200
+Subject: [PATCH] Windows: Fix compile with -directwrite.
+
+Task-number: QTBUG-30643
+
+Change-Id: I3a2a0e767a92bc2ff9d7d241dfad6771034e6ad4
+Reviewed-by: Oliver Wolff <oliver.wolff at digia.com>
+Reviewed-by: Joerg Bornemann <joerg.bornemann at digia.com>
+---
+ .../platforms/windows/qwindowsfontdatabase.cpp | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/plugins/platforms/windows/qwindowsfontdatabase.cpp b/src/plugins/platforms/windows/qwindowsfontdatabase.cpp
+index 5fa954c..7fedc27 100644
+--- a/src/plugins/platforms/windows/qwindowsfontdatabase.cpp
++++ b/src/plugins/platforms/windows/qwindowsfontdatabase.cpp
+@@ -1173,7 +1173,7 @@ QFontEngine *QWindowsFontDatabase::fontEngine(const QByteArray &fontData, qreal
+ fontFile->Release();
+
+ fontEngine = new QWindowsFontEngineDirectWrite(directWriteFontFace, pixelSize,
+- m_fontEngineData);
++ sharedFontData());
+
+ // Get font family from font data
+ fontEngine->fontDef.family = font.familyName();
+--
+1.7.1
+
diff --git a/qt5-merge-static-and-shared-library-trees.patch b/qt5-merge-static-and-shared-library-trees.patch
index d371007..c078b9f 100644
--- a/qt5-merge-static-and-shared-library-trees.patch
+++ b/qt5-merge-static-and-shared-library-trees.patch
@@ -50,23 +50,6 @@
}
}
CONFIG(release, debug|release):DEFINES += QT_NO_DEBUG
---- mkspecs/features/qt_module.prf.orig 2012-12-10 21:52:11.952972639 +0100
-+++ mkspecs/features/qt_module.prf 2012-12-10 21:53:48.245650527 +0100
-@@ -46,12 +46,10 @@
- } else {
- module_privdep =
- }
-- static: \
-- module_build_type = "QT.$${MODULE}.module_config = staticlib"
-- else:mac:contains(QT_CONFIG, qt_framework): \
-+ mac:contains(QT_CONFIG, qt_framework): \
- module_build_type = "QT.$${MODULE}.module_config = lib_bundle"
- else: \
-- module_build_type =
-+ module_build_type = "contains(CONFIG, static):QT.$${MODULE}.module_config = staticlib"
- !isEmpty(MODULE_CONFIG): \
- module_config = "QT.$${MODULE}.CONFIG = $$MODULE_CONFIG"
- else: \
--- configure.orig 2012-12-10 23:51:02.920255366 +0100
+++ configure 2012-12-10 23:55:58.101753703 +0100
@@ -6032,6 +6032,12 @@
diff --git a/qt5-workaround-pkgconfig-install-issue.patch b/qt5-workaround-pkgconfig-install-issue.patch
index bae1156..61367a2 100644
--- a/qt5-workaround-pkgconfig-install-issue.patch
+++ b/qt5-workaround-pkgconfig-install-issue.patch
@@ -1,14 +1,14 @@
--- qmake/generators/makefile.cpp.pkgconfig 2013-01-29 20:03:12.000000000 +0100
+++ qmake/generators/makefile.cpp 2013-03-26 19:18:07.480722316 +0100
-@@ -3108,7 +3108,7 @@
+@@ -3102,7 +3102,7 @@
}
QString
-MakefileGenerator::pkgConfigFileName(bool fixify)
+MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
{
- QString ret = var("TARGET");
- int slsh = ret.lastIndexOf(Option::dir_sep);
+ QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString();
+ if (ret.isEmpty()) {
@@ -3130,7 +3130,11 @@
if(fixify) {
if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR"))
@@ -35,12 +35,12 @@
--- qmake/generators/win32/winmakefile.cpp.orig 2013-03-26 19:05:13.398183953 +0100
+++ qmake/generators/win32/winmakefile.cpp 2013-03-26 19:15:02.800490466 +0100
-@@ -856,7 +856,7 @@
- if (!match.isEmpty() /*&& match != replace*/)
- ret += " -e \"s," + match + "," + replace + ",g\"";
- }
-- ret += " \"" + pkgConfigFileName(true) + "\" >\"" + dst_pc + "\"";
-+ ret += " \"" + pkgConfigFileName(true, true) + "\" >\"" + dst_pc + "\"";
+@@ -851,7 +851,7 @@
}
+ if(!ret.isEmpty())
+ ret += "\n\t";
+- ret += installMetaFile(ProKey("QMAKE_PKGCONFIG_INSTALL_REPLACE"), pkgConfigFileName(true), dst_pc);
++ ret += installMetaFile(ProKey("QMAKE_PKGCONFIG_INSTALL_REPLACE"), pkgConfigFileName(true, true), dst_pc);
if(!uninst.isEmpty())
uninst.append("\n\t");
+ uninst.append("-$(DEL_FILE) \"" + dst_pc + "\"");
diff --git a/qt5-workaround-qtbug-29426.patch b/qt5-workaround-qtbug-29426.patch
index 4b8824c..0422571 100644
--- a/qt5-workaround-qtbug-29426.patch
+++ b/qt5-workaround-qtbug-29426.patch
@@ -1,11 +1,12 @@
--- src/corelib/tools/qsimd_p.h.orig 2013-02-07 20:31:43.010726116 +0100
+++ src/corelib/tools/qsimd_p.h 2013-02-07 20:35:14.324371318 +0100
-@@ -141,7 +141,7 @@
- #endif
+@@ -142,7 +142,8 @@
// other x86 intrinsics
--#if defined(QT_COMPILER_SUPPORTS_AVX) && defined(Q_CC_GNU)
-+#if defined(QT_COMPILER_SUPPORTS_AVX) && defined(Q_CC_GNU) && (defined(__i386__) || defined(__x86_64__))
+ #if defined(QT_COMPILER_SUPPORTS_AVX) && defined(Q_CC_GNU) && \
+- (!defined(Q_CC_INTEL)|| __INTEL_COMPILER >= 1310 || (__GNUC__ * 100 + __GNUC_MINOR__ < 407))
++ (!defined(Q_CC_INTEL)|| __INTEL_COMPILER >= 1310 || (__GNUC__ * 100 + __GNUC_MINOR__ < 407)) && \
++ (defined(__i386__) || defined(__x86_64__))
#define QT_COMPILER_SUPPORTS_X86INTRIN
#include <x86intrin.h>
#endif
diff --git a/sources b/sources
index c06f11c..4eb8da6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-720e5061d75913dfa97bf8bef4a443df qtbase-opensource-src-5.0.1.tar.xz
+a4fec8ed03867c4ee4fe5a46001a11f0 qtbase-opensource-src-5.0.2.tar.xz
More information about the scm-commits
mailing list