rpms/qt5-qtbase
6
0
Fork 0
Code Issues Pull Requests Releases Activity

rebase the lowmem patch

Browse Source
This commit is contained in:
Dan Horák 2013-04-12 10:11:40 +02:00
parent 5de87083a9
commit 72d02f1651
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qt5-qtbase.spec
View File

@ -8,7 +8,7 @@
Summary: Qt5 - QtBase components Summary: Qt5 - QtBase components
Name: qt5-qtbase Name: qt5-qtbase
Version: 5.0.2 Version: 5.0.2
Release: 2%{?dist} Release: 3%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions License: LGPLv2 with exceptions or GPLv3 with exceptions
@ -16,7 +16,7 @@ Url: http://qt-project.org/
Source0: http://releases.qt-project.org/qt5/%{version}%{?pre:-%{pre}}/submodules/qtbase-opensource-src-%{version}.tar.xz Source0: http://releases.qt-project.org/qt5/%{version}%{?pre:-%{pre}}/submodules/qtbase-opensource-src-%{version}.tar.xz
# help build on some lowmem archs, e.g. drop hard-coded -O3 optimization on some files # help build on some lowmem archs, e.g. drop hard-coded -O3 optimization on some files
Patch1: qtbase-opensource-src-5.0.1-lowmem.patch Patch1: qtbase-opensource-src-5.0.2-lowmem.patch
# support multilib optflags # support multilib optflags
Patch2: qtbase-multilib_optflags.patch Patch2: qtbase-multilib_optflags.patch
@ -478,6 +478,9 @@ popd
%changelog %changelog
* Fri Apr 12 2013 Dan Horák <dan[at]danny.cz> - 5.0.2-3
- rebase the lowmem patch
* Wed Apr 10 2013 Rex Dieter <rdieter@fedoraproject.org> 5.0.2-2 * Wed Apr 10 2013 Rex Dieter <rdieter@fedoraproject.org> 5.0.2-2
- more cmake_path love (#929227) - more cmake_path love (#929227)

12
qtbase-opensource-src-5.0.2-lowmem.patch Normal file
View File

@ -0,0 +1,12 @@
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 @@
# 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"
# endif
# if defined(__i386__) && defined(__SSE2__) && !defined(__SSE2_MATH__)