[mingw-qt5-qtbase] Update to 5.3.0
Erik van Pienbroek
epienbro at fedoraproject.org
Sat May 24 18:09:16 UTC 2014
commit af531a4562c12c8547458754885939e16eb6a1fc
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Sat May 24 20:03:29 2014 +0200
Update to 5.3.0
.gitignore | 1 +
mingw-qt5-qtbase.spec | 19 ++++-------
qt5-add-angle-support.patch | 12 +++---
qt5-merge-static-and-shared-library-trees.patch | 4 +-
qt5-qmake-implib-dll-a.patch | 4 +-
qt5-rename-qtmain-to-qt5main.patch | 8 ++--
qt5-use-external-angle-library.patch | 38 +++++++++++-----------
qt5-use-system-zlib-in-host-libs.patch | 4 +-
qt5-workaround-qtbug-29426.patch | 12 -------
qtbase-opensource-src-5.2.1-QTBUG-38367.patch | 17 ----------
sources | 2 +-
11 files changed, 44 insertions(+), 77 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4059935..344686d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
/qtbase-opensource-src-5.2.0-rc1.tar.xz
/qtbase-opensource-src-5.2.0.tar.xz
/qtbase-opensource-src-5.2.1.tar.xz
+/qtbase-opensource-src-5.3.0.tar.xz
diff --git a/mingw-qt5-qtbase.spec b/mingw-qt5-qtbase.spec
index 7ee3d13..1a6bf0e 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.2.1
-Release: 3%{?pre:.%{pre}}%{?snapshot_date:.git%{snapshot_date}.%{snapshot_rev}}%{?dist}
+Version: 5.3.0
+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
@@ -43,11 +43,6 @@ Source0: http://download.qt-project.org/official_releases/qt/%{release_ve
# Patches which should be upstreamed #
######################################
-# Workaround cross-compilation issue when using a non-x86 host
-# https://bugzilla.redhat.com/show_bug.cgi?id=905863
-# https://bugreports.qt-project.org/browse/QTBUG-29426
-Patch0: qt5-workaround-qtbug-29426.patch
-
# Make sure the .pc files of the Qt5 modules are installed correctly
# This should prevent (silent) failures like:
# sed -e "s,/usr/i686-w64-mingw32/sys-root/mingw/include,/usr/i686-w64-mingw32/sys-root/mingw/include/qt5,g" -e "s,/usr/i686-w64-mingw32/sys-root/mingw/lib,/usr/i686-w64-mingw32/sys-root/mingw/lib,g" "../../../build_win32/lib/pkgconfig/Qt5AxContainer.pc" >"/home/erik/rpmbuild/BUILDROOT/mingw-qt5-qtactiveqt-5.0.1-1.fc18.x86_64/usr/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig/Qt5AxContainer.pc"
@@ -75,9 +70,6 @@ Patch3: qt5-prevent-debug-library-names-in-pkgconfig-files.patch
# Fix qmake to create implibs with .dll.a extension for MinGW
Patch4: qt5-qmake-implib-dll-a.patch
-# https://bugreports.qt-project.org/browse/QTBUG-38367
-Patch5: qtbase-opensource-src-5.2.1-QTBUG-38367.patch
-
###########################
# Fedora specific patches #
###########################
@@ -267,12 +259,10 @@ Static version of the mingw64-qt5-qtbase library.
# the RPM_BUILD_ROOT. To prevent patch backups from
# appearing in the resulting RPMs we have to avoid
# using the -b argument here while applying patches
-%patch0 -p0 -b .non_x86
%patch1 -p0 -b .pkgconfig
%patch2 -p1 -b .res
%patch3 -p1 -b .pkgconfig_debug
%patch4 -p1 -b .qmake_implib
-%patch5 -p1 -b .QTBUG-38367
%patch100 -p0
%patch101 -p0
@@ -596,6 +586,7 @@ ln -s %{mingw64_target}-qmake-qt5 $RPM_BUILD_ROOT%{_bindir}/mingw64-qmake-qt5
%{_prefix}/%{mingw32_target}/bin/qt5/qdbuscpp2xml
%{_prefix}/%{mingw32_target}/bin/qt5/qdbusxml2cpp
%{_prefix}/%{mingw32_target}/bin/qt5/qdoc
+%{_prefix}/%{mingw32_target}/bin/qt5/qlalr
%{_prefix}/%{mingw32_target}/bin/qt5/qmake
%{_prefix}/%{mingw32_target}/bin/qt5/rcc
%{_prefix}/%{mingw32_target}/bin/qt5/syncqt.pl
@@ -731,6 +722,7 @@ ln -s %{mingw64_target}-qmake-qt5 $RPM_BUILD_ROOT%{_bindir}/mingw64-qmake-qt5
%{_prefix}/%{mingw64_target}/bin/qt5/qdbuscpp2xml
%{_prefix}/%{mingw64_target}/bin/qt5/qdbusxml2cpp
%{_prefix}/%{mingw64_target}/bin/qt5/qdoc
+%{_prefix}/%{mingw64_target}/bin/qt5/qlalr
%{_prefix}/%{mingw64_target}/bin/qt5/qmake
%{_prefix}/%{mingw64_target}/bin/qt5/rcc
%{_prefix}/%{mingw64_target}/bin/qt5/syncqt.pl
@@ -765,6 +757,9 @@ ln -s %{mingw64_target}-qmake-qt5 $RPM_BUILD_ROOT%{_bindir}/mingw64-qmake-qt5
%changelog
+* Sat May 24 2014 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.3.0-1
+- Update to 5.3.0
+
* Sat May 3 2014 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.2.1-3
- Fix invalid reference to qtmain when using CMake (RHBZ #1092465)
- Fix DoS vulnerability in the GIF image handler (QTBUG-38367, RHBZ #1092837)
diff --git a/qt5-add-angle-support.patch b/qt5-add-angle-support.patch
index b0e02dc..e13817c 100644
--- a/qt5-add-angle-support.patch
+++ b/qt5-add-angle-support.patch
@@ -21,13 +21,13 @@
if [ "$CFG_SHARED" = "yes" ]; then
QT_CONFIG="$QT_CONFIG shared"
QTCONFIG_CONFIG="$QTCONFIG_CONFIG shared"
-@@ -6776,7 +6787,7 @@
- report_support " IPv6 ifname .........." "$CFG_IPV6IFNAME"
- report_support " OpenSSL .............." "$CFG_OPENSSL" yes "loading libraries at run-time" linked "linked to the libraries"
+@@ -6486,7 +6491,7 @@
report_support " NIS ...................." "$CFG_NIS"
--report_support " OpenGL ................." "$CFG_OPENGL" yes "Desktop OpenGL" es2 "OpenGL ES 2.x"
-+report_support " OpenGL ................." "$CFG_OPENGL" yes "Desktop OpenGL" es2 "OpenGL ES 2.x" angle "ANGLE"
- report_support " OpenVG ................." "$CFG_OPENVG-$CFG_OPENVG_SHIVA" yes-yes "ShivaVG" yes-no "native"
+ report_support " OpenGL / OpenVG:"
+ report_support " EGL .................." "$CFG_EGL"
+-report_support " OpenGL ..............." "$CFG_OPENGL" yes "Desktop OpenGL" es2 "OpenGL ES 2.x"
++report_support " OpenGL ..............." "$CFG_OPENGL" yes "Desktop OpenGL" es2 "OpenGL ES 2.x" angle "ANGLE"
+ report_support " OpenVG ..............." "$CFG_OPENVG-$CFG_OPENVG_SHIVA" yes-yes "ShivaVG" yes-no "native"
report_support " PCRE ..................." "$CFG_PCRE" yes "system library" qt "bundled copy"
if [ -n "$PKG_CONFIG" ]; then
--- src/plugins/platforms/windows/qwindowsglcontext.cpp.orig 2012-12-21 01:45:08.022424992 +0100
diff --git a/qt5-merge-static-and-shared-library-trees.patch b/qt5-merge-static-and-shared-library-trees.patch
index 4fc9c83..130e640 100644
--- a/qt5-merge-static-and-shared-library-trees.patch
+++ b/qt5-merge-static-and-shared-library-trees.patch
@@ -33,8 +33,8 @@
+}
--- configure.orig 2012-12-10 23:51:02.920255366 +0100
+++ configure 2012-12-10 23:55:58.101753703 +0100
-@@ -6032,6 +6032,12 @@
- QT_EDITION = $Edition
+@@ -6193,6 +6193,12 @@
+ }
QT_CONFIG += $QT_CONFIG
+contains(CONFIG, static) {
diff --git a/qt5-qmake-implib-dll-a.patch b/qt5-qmake-implib-dll-a.patch
index 07df07b..dbef279 100644
--- a/qt5-qmake-implib-dll-a.patch
+++ b/qt5-qmake-implib-dll-a.patch
@@ -9,13 +9,13 @@
}
bool MingwMakefileGenerator::findLibraries()
-@@ -274,7 +274,7 @@ void MingwMakefileGenerator::init()
+@@ -268,7 +268,7 @@
if(!project->first("DESTDIR").isEmpty())
destDir = Option::fixPathToTargetOS(project->first("DESTDIR") + Option::dir_sep, false, false);
project->values("MINGW_IMPORT_LIB").prepend(destDir + "lib" + project->first("TARGET")
- + project->first("TARGET_VERSION_EXT") + ".a");
+ + project->first("TARGET_VERSION_EXT") + ".dll.a");
- project->values("QMAKE_LFLAGS").append(QString("-Wl,--out-implib,") + project->first("MINGW_IMPORT_LIB"));
+ project->values("QMAKE_LFLAGS").append(QString("-Wl,--out-implib,") + project->first("MINGW_IMPORT_LIB"));
}
--- a/mkspecs/features/create_cmake.prf.cmake 2013-10-22 10:49:28.000000000 +0200
diff --git a/qt5-rename-qtmain-to-qt5main.patch b/qt5-rename-qtmain-to-qt5main.patch
index 3e03d13..66d3f9f 100644
--- a/qt5-rename-qtmain-to-qt5main.patch
+++ b/qt5-rename-qtmain-to-qt5main.patch
@@ -11,10 +11,10 @@
CONFIG += static
--- qtbase-opensource-src-5.2.1/mkspecs/features/create_cmake.prf.orig 2014-04-29 18:53:49.511932034 +0200
+++ qtbase-opensource-src-5.2.1/mkspecs/features/create_cmake.prf 2014-04-29 18:54:44.515819011 +0200
-@@ -196,8 +196,8 @@
+@@ -203,8 +203,8 @@
CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll
- win32-g++ {
+ mingw {
- CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqtmain$${QT_LIBINFIX}d.a
- CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqtmain$${QT_LIBINFIX}.a
+ CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}.a
@@ -24,8 +24,8 @@
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
-@@ -4,7 +4,7 @@
- win32-g++:DEFINES += QT_NEEDS_QMAIN
+@@ -6,7 +6,7 @@
+ mingw:DEFINES += QT_NEEDS_QMAIN
qt:for(entryLib, $$list($$unique(QMAKE_LIBS_QT_ENTRY))) {
- isEqual(entryLib, -lqtmain): {
diff --git a/qt5-use-external-angle-library.patch b/qt5-use-external-angle-library.patch
index 232ec98..c2097b6 100644
--- a/qt5-use-external-angle-library.patch
+++ b/qt5-use-external-angle-library.patch
@@ -1,24 +1,24 @@
---- src/src.pro.orig 2012-12-16 18:00:31.803375714 +0100
-+++ src/src.pro 2012-12-16 18:00:25.883273471 +0100
-@@ -114,10 +114,6 @@
- }
- contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
- !contains(QT_CONFIG, no-gui) {
-- win32:contains(QT_CONFIG, angle) {
+--- src/src.pro.orig 2014-05-24 16:09:01.748409623 +0200
++++ src/src.pro 2014-05-24 16:09:06.382457710 +0200
+@@ -137,10 +137,6 @@
+ SUBDIRS += src_3rdparty_harfbuzzng
+ src_gui.depends += src_3rdparty_harfbuzzng
+ }
+- win32:contains(QT_CONFIG, angle)|contains(QT_CONFIG, dynamicgl) {
- SUBDIRS += src_angle
- src_gui.depends += src_angle
- }
SUBDIRS += src_gui src_platformsupport
- contains(QT_CONFIG, opengl(es1|es2)?):SUBDIRS += src_openglextensions
+ contains(QT_CONFIG, opengl(es2)?):SUBDIRS += src_openglextensions
src_plugins.depends += src_gui src_platformsupport
--- src/gui/gui.pro.orig 2012-12-16 18:02:25.117315949 +0100
+++ src/gui/gui.pro 2012-12-16 18:01:15.778133505 +0100
-@@ -12,12 +12,6 @@
- platforms \
+@@ -15,12 +15,6 @@
+ iconengines \
imageformats
-# This is here only because the platform plugin is no module, obviously.
--win32:contains(QT_CONFIG, angle) {
+-win32:contains(QT_CONFIG, angle)|contains(QT_CONFIG, dynamicgl) {
- MODULE_AUX_INCLUDES = \
- \$\$QT_MODULE_INCLUDE_BASE/QtANGLE
-}
@@ -26,7 +26,7 @@
load(qt_module)
# Code coverage with TestCocoon
-@@ -30,6 +30,10 @@
+@@ -33,6 +27,10 @@
mac:!ios: LIBS_PRIVATE += -framework Cocoa
@@ -34,18 +34,18 @@
+ LIBS_PRIVATE += -lGLESv2
+}
+
- CONFIG += simd
+ CONFIG += simd optimize_full
include(accessible/accessible.pri)
---- src/plugins/platforms/windows/windows.pro.orig 2012-12-21 19:32:52.519838959 +0100
-+++ src/plugins/platforms/windows/windows.pro 2012-12-21 19:34:11.913226062 +0100
-@@ -13,6 +13,7 @@
- !wince*:LIBS *= -lgdi32 -luser32 -lwinspool -limm32 -lwinmm -loleaut32
+--- src/plugins/platforms/windows/windows.pri.orig 2014-05-24 15:30:11.584247983 +0200
++++ src/plugins/platforms/windows/windows.pri 2014-05-24 15:29:53.265058238 +0200
+@@ -3,6 +3,7 @@
+ !wince*:LIBS *= -luser32 -lwinspool -limm32 -lwinmm -loleaut32
- contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles2):LIBS *= -lopengl32
+ contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles2):!contains(QT_CONFIG, dynamicgl): LIBS *= -lopengl32
+contains(QT_CONFIG, angle):LIBS += -lGLESv2 -lEGL
- win32-g++*: LIBS *= -luuid
+ mingw: LIBS *= -luuid
# For the dialog helpers:
--- src/opengl/opengl.pro.orig 2012-12-21 19:30:29.916330288 +0100
+++ src/opengl/opengl.pro 2012-12-21 19:31:01.279878067 +0100
diff --git a/qt5-use-system-zlib-in-host-libs.patch b/qt5-use-system-zlib-in-host-libs.patch
index eccd9e4..d496db2 100644
--- a/qt5-use-system-zlib-in-host-libs.patch
+++ b/qt5-use-system-zlib-in-host-libs.patch
@@ -1,6 +1,6 @@
--- 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
-@@ -148,7 +148,7 @@ macx {
+@@ -147,7 +147,7 @@
*-g++*: QMAKE_CXXFLAGS += -ffunction-sections
@@ -8,4 +8,4 @@
+if(contains(QT_CONFIG, zlib)):include(../../3rdparty/zlib.pri)
else:include(../../3rdparty/zlib_dependency.pri)
- win32:LIBS += -luser32 -lole32 -ladvapi32
+ win32:LIBS += -luser32 -lole32 -ladvapi32 -lshell32
diff --git a/sources b/sources
index 4aa3a41..7b59ffd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fa005301a2000b92b61b63edc042567b qtbase-opensource-src-5.2.1.tar.xz
+4bc43a72e1b3d804171e5b52640e8d96 qtbase-opensource-src-5.3.0.tar.xz
More information about the scm-commits
mailing list