[qt5-qtbase] rebase the lowmem patch
Dan Horák
sharkcz at fedoraproject.org
Fri Apr 12 08:11:50 UTC 2013
commit 72d02f165181cc9795894c02521a0dec270b2617
Author: Dan Horák <dan at danny.cz>
Date: Fri Apr 12 10:11:40 2013 +0200
rebase the lowmem patch
qt5-qtbase.spec | 7 +++++--
qtbase-opensource-src-5.0.2-lowmem.patch | 12 ++++++++++++
2 files changed, 17 insertions(+), 2 deletions(-)
---
diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index 91a4a7c..d9b70ab 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: 2%{?dist}
+Release: 3%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
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
# 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
Patch2: qtbase-multilib_optflags.patch
@@ -478,6 +478,9 @@ popd
%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 at fedoraproject.org> 5.0.2-2
- more cmake_path love (#929227)
diff --git a/qtbase-opensource-src-5.0.2-lowmem.patch b/qtbase-opensource-src-5.0.2-lowmem.patch
new file mode 100644
index 0000000..1abae3b
--- /dev/null
+++ b/qtbase-opensource-src-5.0.2-lowmem.patch
@@ -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__)
More information about the scm-commits
mailing list