diff --git a/.gitignore b/.gitignore index 15aa9d8..77f837b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /qtbase-opensource-src-5.0.2.tar.xz +/qtbase-opensource-src-5.1.1.tar.xz diff --git a/0341-Rename-qAbs-Function-for-timeval.patch b/0341-Rename-qAbs-Function-for-timeval.patch deleted file mode 100644 index 9cd6184..0000000 --- a/0341-Rename-qAbs-Function-for-timeval.patch +++ /dev/null @@ -1,41 +0,0 @@ -From d9ff510f02bba63dabe7a081a68296056a89ae4c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?David=20E=2E=20Narv=C3=A1ez?= -Date: Sat, 23 Feb 2013 23:14:50 -0500 -Subject: [PATCH 341/441] Rename qAbs Function for timeval - -This decouples it from qAbs which is declared as a constexpr under -certain compilation flags and enables for qtbase to be compiled with -GCC 4.8 - -Change-Id: I78e02256ffc8b460ca74ae5241e77dfac4e09ba9 -Reviewed-by: Thiago Macieira ---- - src/corelib/kernel/qtimerinfo_unix.cpp | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/src/corelib/kernel/qtimerinfo_unix.cpp b/src/corelib/kernel/qtimerinfo_unix.cpp -index 0eee425..7a29247 100644 ---- a/src/corelib/kernel/qtimerinfo_unix.cpp -+++ b/src/corelib/kernel/qtimerinfo_unix.cpp -@@ -94,8 +94,7 @@ timeval QTimerInfoList::updateCurrentTime() - - #if ((_POSIX_MONOTONIC_CLOCK-0 <= 0) && !defined(Q_OS_MAC) && !defined(Q_OS_INTEGRITY)) || defined(QT_BOOTSTRAPPED) - --template <> --timeval qAbs(const timeval &t) -+timeval qAbsTimeval(const timeval &t) - { - timeval tmp = t; - if (tmp.tv_sec < 0) { -@@ -144,7 +143,7 @@ bool QTimerInfoList::timeChanged(timeval *delta) - timeval tickGranularity; - tickGranularity.tv_sec = 0; - tickGranularity.tv_usec = msPerTick * 1000; -- return elapsedTimeTicks < ((qAbs(*delta) - tickGranularity) * 10); -+ return elapsedTimeTicks < ((qAbsTimeval(*delta) - tickGranularity) * 10); - } - - /* --- -1.8.1.4 - diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index 0984429..b6a756f 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -4,16 +4,17 @@ # support qtchooser (adds qtchooser .conf file) %define qtchooser 1 +%global qt_module qtbase Summary: Qt5 - QtBase components Name: qt5-qtbase -Version: 5.0.2 -Release: 8%{?dist} +Version: 5.1.1 +Release: 1%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions Url: http://qt-project.org/ -Source0: http://releases.qt-project.org/qt5/%{version}%{?pre:-%{pre}}/submodules/qtbase-opensource-src-%{version}.tar.xz +Source0: http://download.qt-project.org/official_releases/qt/5.1/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz # help build on some lowmem archs, e.g. drop hard-coded -O3 optimization on some files Patch1: qtbase-opensource-src-5.0.2-lowmem.patch @@ -21,18 +22,13 @@ Patch1: qtbase-opensource-src-5.0.2-lowmem.patch # support multilib optflags Patch2: qtbase-multilib_optflags.patch - # upstreamable patches # support poll # https://bugreports.qt-project.org/browse/QTBUG-27195 -patch50: qt5-poll.patch +# NEEDS REBASE +Patch50: qt5-poll.patch ##upstream patches -# https://bugzilla.redhat.com/929227 -# https://codereview.qt-project.org/52778 -# https://codereview.qt-project.org/53449 -Patch100: qtbase-opensource-src-5.0.2-cmake_path.patch -Patch1341: 0341-Rename-qAbs-Function-for-timeval.patch # macros %define _qt5 %{name} @@ -153,10 +149,7 @@ Qt5 libraries used for drawing widgets and OpenGL items. # drop backup file(s), else they get installed too, http://bugzilla.redhat.com/639463 rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags -%patch50 -p1 -b .poll - -%patch100 -p1 -b .cmake_path -%patch1341 -p1 -b .0341 +#patch50 -p1 -b .poll # drop -fexceptions from $RPM_OPT_FLAGS RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'` @@ -381,7 +374,11 @@ popd %dir %{_qt5_plugindir}/generic/ %dir %{_qt5_plugindir}/imageformats/ %dir %{_qt5_plugindir}/platforminputcontexts/ +%{_qt5_plugindir}/platforminputcontexts/libcomposeplatforminputcontextplugin.so %dir %{_qt5_plugindir}/platforms/ +%{_qt5_plugindir}/platforms/libqoffscreen.so +%dir %{_qt5_plugindir}/platformthemes/ +%{_qt5_plugindir}/platformthemes/libqgtk2.so %dir %{_qt5_plugindir}/printsupport/ %dir %{_qt5_plugindir}/sqldrivers/ %{_qt5_plugindir}/sqldrivers/libqsqlite.so @@ -441,6 +438,8 @@ popd %files static %{_qt5_libdir}/libQt5Bootstrap.*a %{_qt5_libdir}/libQt5Bootstrap.prl +%{_qt5_libdir}/libQt5OpenGLExtensions.*a +%{_qt5_libdir}/libQt5OpenGLExtensions.prl %{_qt5_libdir}/libQt5PlatformSupport.*a %{_qt5_libdir}/libQt5PlatformSupport.prl @@ -484,6 +483,9 @@ popd %changelog +* Tue Aug 27 2013 Rex Dieter 5.1.0-1 +- 5.1.1 + * Sat Aug 03 2013 Petr Pisar - 5.0.2-8 - Perl 5.18 rebuild diff --git a/qtbase-multilib_optflags.patch b/qtbase-multilib_optflags.patch index 9ebbfb0..153b07b 100644 --- a/qtbase-multilib_optflags.patch +++ b/qtbase-multilib_optflags.patch @@ -1,32 +1,32 @@ -diff -up qtbase-opensource-src-5.0.0-beta2/mkspecs/linux-g++-32/qmake.conf.multilib_optflags qtbase-opensource-src-5.0.0-beta2/mkspecs/linux-g++-32/qmake.conf ---- qtbase-opensource-src-5.0.0-beta2/mkspecs/linux-g++-32/qmake.conf.multilib_optflags 2012-11-10 13:03:34.000000000 -0600 -+++ qtbase-opensource-src-5.0.0-beta2/mkspecs/linux-g++-32/qmake.conf 2012-11-13 13:21:06.055794647 -0600 +diff -up qtbase-opensource-src-5.1.0/mkspecs/linux-g++-32/qmake.conf.multilib_optflags qtbase-opensource-src-5.1.0/mkspecs/linux-g++-32/qmake.conf +--- qtbase-opensource-src-5.1.0/mkspecs/linux-g++-32/qmake.conf.multilib_optflags 2013-08-27 10:28:26.599972122 -0500 ++++ qtbase-opensource-src-5.1.0/mkspecs/linux-g++-32/qmake.conf 2013-08-27 10:30:03.780950078 -0500 @@ -9,6 +9,8 @@ QMAKE_INCREMENTAL_STYLE = sublib - QMAKE_CFLAGS = -m32 - QMAKE_LFLAGS = -m32 + QMAKE_CFLAGS = -m32 + QMAKE_LFLAGS = -m32 +QMAKE_CFLAGS_RELEASE += -O2 + include(../common/linux.conf) include(../common/gcc-base-unix.conf) include(../common/g++-unix.conf) -diff -up qtbase-opensource-src-5.0.0-beta2/mkspecs/linux-g++-64/qmake.conf.multilib_optflags qtbase-opensource-src-5.0.0-beta2/mkspecs/linux-g++-64/qmake.conf ---- qtbase-opensource-src-5.0.0-beta2/mkspecs/linux-g++-64/qmake.conf.multilib_optflags 2012-11-10 13:03:34.000000000 -0600 -+++ qtbase-opensource-src-5.0.0-beta2/mkspecs/linux-g++-64/qmake.conf 2012-11-13 13:21:06.056794635 -0600 +diff -up qtbase-opensource-src-5.1.0/mkspecs/linux-g++-64/qmake.conf.multilib_optflags qtbase-opensource-src-5.1.0/mkspecs/linux-g++-64/qmake.conf +--- qtbase-opensource-src-5.1.0/mkspecs/linux-g++-64/qmake.conf.multilib_optflags 2013-08-27 10:28:26.600972112 -0500 ++++ qtbase-opensource-src-5.1.0/mkspecs/linux-g++-64/qmake.conf 2013-08-27 10:29:49.188103550 -0500 @@ -12,6 +12,8 @@ QMAKE_INCREMENTAL_STYLE = sublib - QMAKE_CFLAGS = -m64 - QMAKE_LFLAGS = -m64 + QMAKE_CFLAGS = -m64 + QMAKE_LFLAGS = -m64 +QMAKE_CFLAGS_RELEASE += -O2 + include(../common/linux.conf) include(../common/gcc-base-unix.conf) include(../common/g++-unix.conf) -diff -up qtbase-opensource-src-5.0.0-beta2/mkspecs/linux-g++/qmake.conf.multilib_optflags qtbase-opensource-src-5.0.0-beta2/mkspecs/linux-g++/qmake.conf ---- qtbase-opensource-src-5.0.0-beta2/mkspecs/linux-g++/qmake.conf.multilib_optflags 2012-11-10 13:03:34.000000000 -0600 -+++ qtbase-opensource-src-5.0.0-beta2/mkspecs/linux-g++/qmake.conf 2012-11-13 13:21:55.171189736 -0600 -@@ -6,6 +6,8 @@ MAKEFILE_GENERATOR = UNIX - CONFIG += incremental gdb_dwarf_index +diff -up qtbase-opensource-src-5.1.0/mkspecs/linux-g++/qmake.conf.multilib_optflags qtbase-opensource-src-5.1.0/mkspecs/linux-g++/qmake.conf +--- qtbase-opensource-src-5.1.0/mkspecs/linux-g++/qmake.conf.multilib_optflags 2013-08-27 10:28:26.601972101 -0500 ++++ qtbase-opensource-src-5.1.0/mkspecs/linux-g++/qmake.conf 2013-08-27 10:29:30.196303285 -0500 +@@ -6,6 +6,8 @@ MAKEFILE_GENERATOR = UNIX + CONFIG += incremental gdb_dwarf_index QMAKE_INCREMENTAL_STYLE = sublib +QMAKE_CFLAGS_RELEASE += -O2 diff --git a/qtbase-opensource-src-5.0.2-cmake_path.patch b/qtbase-opensource-src-5.0.2-cmake_path.patch deleted file mode 100644 index b637792..0000000 --- a/qtbase-opensource-src-5.0.2-cmake_path.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -up qtbase-opensource-src-5.0.2/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in.cmake_path qtbase-opensource-src-5.0.2/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in ---- qtbase-opensource-src-5.0.2/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in.cmake_path 2013-04-08 19:10:52.000000000 -0500 -+++ qtbase-opensource-src-5.0.2/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2013-04-10 16:48:53.643238884 -0500 -@@ -83,7 +83,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME - find_package(Qt5${_module_dep} - ${_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET} - ${_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED} -- PATHS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}\" NO_DEFAULT_PATH -+ PATHS \"${CMAKE_CURRENT_LIST_DIR}/..\" NO_DEFAULT_PATH - ) - endif() - -diff -up qtbase-opensource-src-5.0.2/src/corelib/Qt5CoreMacros.cmake.cmake_path qtbase-opensource-src-5.0.2/src/corelib/Qt5CoreMacros.cmake ---- qtbase-opensource-src-5.0.2/src/corelib/Qt5CoreMacros.cmake.cmake_path 2013-04-08 19:11:13.000000000 -0500 -+++ qtbase-opensource-src-5.0.2/src/corelib/Qt5CoreMacros.cmake 2013-04-10 17:33:28.775414587 -0500 -@@ -215,6 +215,7 @@ function(QT5_ADD_RESOURCES outfiles ) - set(${outfiles} ${${outfiles}} PARENT_SCOPE) - endfunction() - -+set(_Qt5_COMPONENT_PATH "${CMAKE_CURRENT_LIST_DIR}/..") - - if (NOT CMAKE_VERSION VERSION_LESS 2.8.9) - macro(qt5_use_modules _target _link_type) -@@ -234,7 +235,7 @@ if (NOT CMAKE_VERSION VERSION_LESS 2.8.9 - - foreach(_module ${_qt5_modules}) - if (NOT Qt5${_module}_FOUND) -- find_package(Qt5${_module} PATHS ${_qt5Core_install_prefix} NO_DEFAULT_PATH) -+ find_package(Qt5${_module} PATHS "${_Qt5_COMPONENT_PATH}" NO_DEFAULT_PATH) - if (NOT Qt5${_module}_FOUND) - message(FATAL_ERROR "Can not use \"${_module}\" module which has not yet been found.") - endif() diff --git a/sources b/sources index 4eb8da6..0c58940 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a4fec8ed03867c4ee4fe5a46001a11f0 qtbase-opensource-src-5.0.2.tar.xz +955d1e4da875f3872ef3208f21a757dd qtbase-opensource-src-5.1.1.tar.xz