rpms/qt
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sync from F-10/ branch

Browse Source
This commit is contained in:
Rex Dieter 2009-03-27 19:25:27 +00:00
parent 76d27aea26
commit 919bee052b
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qt-x11-opensource-src-4.5.0-gcc_hack.patch Normal file
View File

@ -0,0 +1,14 @@
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

3
qt.spec
View File

@ -40,6 +40,8 @@ Patch5: qt-all-opensource-src-4.4.0-rc1-as_IN-437440.patch
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 @@ test -x apply_patches && ./apply_patches
%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