diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index d9b70ab..debc531 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -8,7 +8,7 @@ Summary: Qt5 - QtBase components Name: qt5-qtbase Version: 5.0.2 -Release: 3%{?dist} +Release: 4%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -154,11 +154,9 @@ rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'` # lowmem hacks -%ifarch %{arm} s390 -## FIXME, -O2 still injected somewhere it seems -- rex -#RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-O2|-O1|g'` +#ifarch %{arm} s390 %patch1 -p1 -b .lowmem -%endif +#endif %define platform linux-g++ %ifarch %{multilib_archs} @@ -478,6 +476,9 @@ popd %changelog +* Thu Apr 18 2013 Rex Dieter 5.0.2-4 +- respin lowmem patch to apply (unconditinally) to gcc-4.7.2 too + * Fri Apr 12 2013 Dan HorĂ¡k - 5.0.2-3 - rebase the lowmem patch diff --git a/qtbase-opensource-src-5.0.2-lowmem.patch b/qtbase-opensource-src-5.0.2-lowmem.patch index 1abae3b..f63dc78 100644 --- a/qtbase-opensource-src-5.0.2-lowmem.patch +++ b/qtbase-opensource-src-5.0.2-lowmem.patch @@ -1,12 +1,14 @@ diff -up qtbase-opensource-src-5.0.2/src/gui/painting/qdrawhelper.cpp.lowmem qtbase-opensource-src-5.0.2/src/gui/painting/qdrawhelper.cpp ---- qtbase-opensource-src-5.0.2/src/gui/painting/qdrawhelper.cpp.lowmem 2013-04-12 09:13:54.000000000 +0200 -+++ qtbase-opensource-src-5.0.2/src/gui/painting/qdrawhelper.cpp 2013-04-12 09:14:01.000000000 +0200 -@@ -45,7 +45,7 @@ +--- qtbase-opensource-src-5.0.2/src/gui/painting/qdrawhelper.cpp.lowmem 2013-04-08 19:11:09.000000000 -0500 ++++ qtbase-opensource-src-5.0.2/src/gui/painting/qdrawhelper.cpp 2013-04-18 19:34:44.600940784 -0500 +@@ -43,8 +43,8 @@ + && (__GNUC__ * 100 + __GNUC_MINOR__ * 10 + __GNUC_PATCHLEVEL__ >= 440) + // GCC 4.4 supports #pragma GCC optimize and #pragma GCC target - # if (__GNUC__ * 100 + __GNUC_MINOR__ * 10 + __GNUC_PATCHLEVEL__ < 473) - // From GCC 4.7.3 onwards, GCC optimize can result in gcc bailing out with OOM --# pragma GCC optimize "O3" -+//# pragma GCC optimize "O3" +-# if (__GNUC__ * 100 + __GNUC_MINOR__ * 10 + __GNUC_PATCHLEVEL__ < 473) +-// From GCC 4.7.3 onwards, GCC optimize can result in gcc bailing out with OOM ++# if (__GNUC__ * 100 + __GNUC_MINOR__ * 10 + __GNUC_PATCHLEVEL__ < 472) ++// From GCC 4.7.2 onwards, GCC optimize can result in gcc bailing out with OOM + # pragma GCC optimize "O3" # endif - # if defined(__i386__) && defined(__SSE2__) && !defined(__SSE2_MATH__)