rpms/qt/devel qt-x11-opensource-src-4.5.0-gcc_hack.patch, NONE, 1.1 qt.spec, 1.256, 1.257

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29228

Modified Files:
	qt.spec 
Added Files:
	qt-x11-opensource-src-4.5.0-gcc_hack.patch 
Log Message:
sync from F-10/ branch


qt-x11-opensource-src-4.5.0-gcc_hack.patch:

--- NEW FILE qt-x11-opensource-src-4.5.0-gcc_hack.patch ---
diff -up qt-x11-opensource-src-4.5.0/src/corelib/tools/qstring.cpp.gcc_hack qt-x11-opensource-src-4.5.0/src/corelib/tools/qstring.cpp
--- qt-x11-opensource-src-4.5.0/src/corelib/tools/qstring.cpp.gcc_hack	2009-02-25 15:09:22.000000000 -0600
+++ qt-x11-opensource-src-4.5.0/src/corelib/tools/qstring.cpp	2009-03-27 11:56:51.000000000 -0500
@@ -102,8 +102,8 @@ static QHash<void *, QByteArray> *asciiC
 // internal
 int qFindString(const QChar *haystack, int haystackLen, int from,
     const QChar *needle, int needleLen, Qt::CaseSensitivity cs);
-int qFindStringBoyerMoore(const QChar *haystack, int haystackLen, int from,
-    const QChar *needle, int needleLen, Qt::CaseSensitivity cs);
+//int qFindStringBoyerMoore(const QChar *haystack, int haystackLen, int from,
+//    const QChar *needle, int needleLen, Qt::CaseSensitivity cs);
 
 
 // Unicode case-insensitive comparison


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -r1.256 -r1.257
--- qt.spec	25 Mar 2009 18:34:14 -0000	1.256
+++ qt.spec	27 Mar 2009 19:25:27 -0000	1.257
@@ -40,6 +40,8 @@
 Patch10: qt-x11-opensource-src-4.5.0-rc1-ppc64.patch
 Patch11: qt-x11-opensource-src-4.5.0-linguist-crash.patch 
 Patch12: qt-x11-opensource-src-4.5.0-lrelease.patch
+# hack around gcc/ppc crasher, http://bugzilla.redhat.com/492185
+Patch13: qt-x11-opensource-src-4.5.0-gcc_hack.patch
 
 ## upstreamable bits
 # http://bugzilla.redhat.com/485677
@@ -315,6 +317,7 @@
 %patch10 -p1 -b .ppc64
 %patch11 -p1 -b .linguist-crash
 %patch12 -p1 -b .lrelease
+%patch13 -p1 -b .gcc_hack
 %patch50 -p1 -b .qhostaddress
 %patch51 -p1 -b .qdoc3
 %patch52 -p1 -b .sparc64