[qt] workaround memory exhaustion during linking of libQtWebKit on s390

Dan Horák sharkcz at fedoraproject.org
Fri Mar 11 18:51:06 UTC 2011


commit 5a4b823ab4b8402b9e8e48a1517264f82b6f75e0
Author: Dan Horák <dan at danny.cz>
Date:   Fri Mar 11 19:51:01 2011 +0100

    workaround memory exhaustion during linking of libQtWebKit on s390

 qt.spec |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/qt.spec b/qt.spec
index aaeaeb2..f3135ba 100644
--- a/qt.spec
+++ b/qt.spec
@@ -18,7 +18,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.7.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) and ASL 2.0 and BSD and FTL and MIT
@@ -150,7 +150,12 @@ Source31: hi48-app-qt4-logo.png
 %define phonon_version 4.3.80
 %define phonon_version_major 4.3
 %define phonon_release 1
+%ifarch s390
+# workaround memory exhaustion during linking of libQtWebKit on s390
+%define webkit -webkit
+%else
 %define webkit -webkit-debug
+%endif
 %define gtkstyle -gtkstyle
 %define dbus -dbus-linked
 
@@ -1189,6 +1194,9 @@ fi
 
 
 %changelog
+* Fri Mar 11 2011 Dan Horák <dan[at]danny.cz> 1:4.7.2-3
+- workaround memory exhaustion during linking of libQtWebKit on s390
+
 * Mon Mar 07 2011 Jaroslav Reznik <jreznik at redhat.com> 1:4.7.2-2
 - Fix QNetworkConfigurationManager crash due to null private pointer (#682656)
 


More information about the scm-commits mailing list