From 56c49c3c3919751759728b56072656f2c948dd83 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 27 Mar 2009 19:25:27 +0000 Subject: [PATCH] sync from F-10/ branch --- qt-x11-opensource-src-4.5.0-gcc_hack.patch | 14 ++++++++++++++ qt.spec | 3 +++ 2 files changed, 17 insertions(+) create mode 100644 qt-x11-opensource-src-4.5.0-gcc_hack.patch diff --git a/qt-x11-opensource-src-4.5.0-gcc_hack.patch b/qt-x11-opensource-src-4.5.0-gcc_hack.patch new file mode 100644 index 0000000..89e7149 --- /dev/null +++ b/qt-x11-opensource-src-4.5.0-gcc_hack.patch @@ -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 *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 diff --git a/qt.spec b/qt.spec index a82e662..fe2b332 100644 --- a/qt.spec +++ b/qt.spec @@ -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