[mingw-qt5-qtbase] Update to 5.2.0 RC1
Erik van Pienbroek
epienbro at fedoraproject.org
Fri Nov 29 12:00:14 UTC 2013
commit 4bc679e5986f60fdeda9194bfcb29f62d5657d75
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Fri Nov 29 12:59:07 2013 +0100
Update to 5.2.0 RC1
.gitignore | 1 +
mingw-qt5-qtbase.spec | 11 +++----
qt5-add-angle-support.patch | 8 ++--
qt5-fix-cmake-support.patch | 13 --------
qt5-merge-static-and-shared-library-trees.patch | 36 +++++++++++-----------
qt5-mingw-w64-trunk-compatibility.patch | 13 --------
sources | 2 +-
7 files changed, 29 insertions(+), 55 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 36d5880..204c25f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/qtbase-opensource-src-5.1.0.tar.xz
/qtbase-opensource-src-5.1.1.tar.xz
/qtbase-opensource-src-5.2.0-beta1.tar.xz
+/qtbase-opensource-src-5.2.0-rc1.tar.xz
diff --git a/mingw-qt5-qtbase.spec b/mingw-qt5-qtbase.spec
index dbedb70..edf9292 100644
--- a/mingw-qt5-qtbase.spec
+++ b/mingw-qt5-qtbase.spec
@@ -4,7 +4,7 @@
# contains both native as well as cross compiled binaries
%global __debug_install_post %%{mingw_debug_install_post}; %{_rpmconfigdir}/find-debuginfo.sh %{?_missing_build_ids_terminate_build:--strict-build-id} %{?_find_debuginfo_opts} "%{_builddir}/%%{?buildsubdir}" %{nil}
-%global pre beta1
+%global pre rc1
#%%global snapshot_date 20121110
#%%global snapshot_rev d725239c
@@ -23,7 +23,7 @@
Name: mingw-qt5-qtbase
Version: 5.2.0
-Release: 0.3%{?pre:.%{pre}}%{?snapshot_date:.git%{snapshot_date}.%{snapshot_rev}}%{?dist}
+Release: 0.4%{?pre:.%{pre}}%{?snapshot_date:.git%{snapshot_date}.%{snapshot_rev}}%{?dist}
Summary: Qt5 for Windows - QtBase component
License: GPLv3 with exceptions or LGPLv2 with exceptions
@@ -101,9 +101,6 @@ Patch19: qt5-dont-build-host-libs-static.patch
# want to avoid conflicts with the native qt5 packages
Patch20: qt5-enable-rpath-for-host-tools.patch
-# Another mingw-w64 FTBFS fix
-Patch23: qt5-mingw-w64-trunk-compatibility.patch
-
BuildRequires: mingw32-filesystem >= 95
BuildRequires: mingw32-gcc
BuildRequires: mingw32-gcc-c++
@@ -248,7 +245,6 @@ Static version of the mingw64-qt5-qtbase library.
%patch18 -p1 -b .pcre
%patch19 -p0 -b .bootstrap_shared
%patch20 -p1 -b .rpath_tools
-%patch23 -p1 -b .ftbfs2
# Cross-compilation qmake target.
mkdir mkspecs/%{platform_win32}
@@ -728,6 +724,9 @@ sed -i s@'#QT_TOOL'@'QT_TOOL'@ $RPM_BUILD_ROOT%{mingw64_datadir}/qt5/mkspecs/%{p
%changelog
+* Fri Nov 29 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.2.0-0.4.rc1
+- Update to 5.2.0 RC 1
+
* Wed Nov 27 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.2.0-0.3.beta1
- Try harder to fix detection of the uic tool when using CMake
diff --git a/qt5-add-angle-support.patch b/qt5-add-angle-support.patch
index 6c300b7..b0e02dc 100644
--- a/qt5-add-angle-support.patch
+++ b/qt5-add-angle-support.patch
@@ -9,7 +9,7 @@
elif compileTest unix/opengles2 "OpenGL ES 2.x"; then
CFG_OPENGL=es2
else
-@@ -5327,6 +5327,11 @@
+@@ -5921,6 +5921,11 @@
QT_CONFIG="$QT_CONFIG opengles2"
fi
@@ -18,9 +18,9 @@
+ QT_CONFIG="$QT_CONFIG opengles2 egl angle"
+fi
+
- # build up the variables for output
- if [ "$CFG_DEBUG" = "yes" ]; then
- QMAKE_OUTDIR="${QMAKE_OUTDIR}debug"
+ 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"
diff --git a/qt5-fix-cmake-support.patch b/qt5-fix-cmake-support.patch
index 06351a5..3e9b21d 100644
--- a/qt5-fix-cmake-support.patch
+++ b/qt5-fix-cmake-support.patch
@@ -92,19 +92,6 @@
CMAKE_QT_OPENGL_IMPLEMENTATION = GLESv2
} else {
---- mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in.orig 2013-10-23 19:46:04.914943417 +0200
-+++ mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2013-10-23 19:46:43.979307047 +0200
-@@ -185,7 +185,9 @@
- list(APPEND Qt5$${CMAKE_MODULE_NAME}_EXECUTABLE_COMPILE_FLAGS ${Qt5${_module_dep}_EXECUTABLE_COMPILE_FLAGS})
- endforeach()
- list(REMOVE_DUPLICATES Qt5$${CMAKE_MODULE_NAME}_INCLUDE_DIRS)
-- list(REMOVE_DUPLICATES Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS)
-+ if (Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS)
-+ list(REMOVE_DUPLICATES Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS)
-+ endif()
- list(REMOVE_DUPLICATES Qt5$${CMAKE_MODULE_NAME}_DEFINITIONS)
- list(REMOVE_DUPLICATES Qt5$${CMAKE_MODULE_NAME}_COMPILE_DEFINITIONS)
- if (Qt5$${CMAKE_MODULE_NAME}_EXECUTABLE_COMPILE_FLAGS)
--- mkspecs/features/create_cmake.prf.cmake 2013-10-22 10:49:28.000000000 +0200
+++ mkspecs/features/create_cmake.prf 2013-10-23 21:38:02.959762089 +0200
@@ -195,7 +195,7 @@
diff --git a/qt5-merge-static-and-shared-library-trees.patch b/qt5-merge-static-and-shared-library-trees.patch
index c078b9f..5b3d5be 100644
--- a/qt5-merge-static-and-shared-library-trees.patch
+++ b/qt5-merge-static-and-shared-library-trees.patch
@@ -2,26 +2,26 @@
+++ mkspecs/features/qt_functions.prf 2012-09-05 23:32:40.030869399 +0200
@@ -134,6 +134,21 @@
}
- $$3 += $$LINKAGE
- }
+
+ $$2 += $$LINKAGE
+
-+ win32:CONFIG(static) {
-+ isEqual(MODULE_NAME, Qt5Core) {
-+ $$3 += $$QMAKE_LIBS_CORE
-+ } else:isEqual(MODULE_NAME, Qt5Widgets) {
-+ $$3 += $$QMAKE_LIBS_WIDGETS
-+ } else:isEqual(MODULE_NAME, Qt5Gui) {
-+ $$3 += $$QMAKE_LIBS_GUI
-+ } else:isEqual(MODULE_NAME, Qt5Network) {
-+ $$3 += $$QMAKE_LIBS_NETWORK
-+ } else:isEqual(MODULE_NAME, Qt5OpenGL) {
-+ $$3 += $$QMAKE_LIBS_OPENGL
++ win32:CONFIG(static) {
++ isEqual(MODULE_NAME, Qt5Core) {
++ $$2 += $$QMAKE_LIBS_CORE
++ } else:isEqual(MODULE_NAME, Qt5Widgets) {
++ $$2 += $$QMAKE_LIBS_WIDGETS
++ } else:isEqual(MODULE_NAME, Qt5Gui) {
++ $$2 += $$QMAKE_LIBS_GUI
++ } else:isEqual(MODULE_NAME, Qt5Network) {
++ $$2 += $$QMAKE_LIBS_NETWORK
++ } else:isEqual(MODULE_NAME, Qt5OpenGL) {
++ $$2 += $$QMAKE_LIBS_OPENGL
++ }
+ }
-+ }
+
- export($$3)
- export(INCLUDEPATH)
- export(QMAKE_FRAMEWORKPATH)
+ export($$2)
+
+ !isEmpty(QMAKE_LSB) {
--- mkspecs/features/default_post.prf.orig 2012-09-05 23:28:56.827501401 +0200
+++ mkspecs/features/default_post.prf 2012-09-05 23:29:31.617923080 +0200
@@ -47,3 +50,7 @@
@@ -57,7 +57,7 @@
QT_CONFIG += $QT_CONFIG
+contains(CONFIG, static) {
-+ QT_CONFIG += static jpeg
++ QT_CONFIG += static jpeg gif
+ QT_CONFIG -= shared
+ QT_DEFINES += QT_STATIC
+}
diff --git a/sources b/sources
index db6d1e8..ab6862d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bc69a0f4614c85c54ccc8239f57768bb qtbase-opensource-src-5.2.0-beta1.tar.xz
+a86dc4cc3aa6443f1ca4b35f826ec240 qtbase-opensource-src-5.2.0-rc1.tar.xz
More information about the scm-commits
mailing list