diff --git a/qt-x11-free-3.3.8-uic-multilib.patch b/qt-x11-free-3.3.8b-uic-multilib.patch similarity index 51% rename from qt-x11-free-3.3.8-uic-multilib.patch rename to qt-x11-free-3.3.8b-uic-multilib.patch index 53fd8eb..341cab7 100644 --- a/qt-x11-free-3.3.8-uic-multilib.patch +++ b/qt-x11-free-3.3.8b-uic-multilib.patch @@ -1,24 +1,24 @@ ---- qt-x11-free-3.3.8/tools/designer/uic/main.cpp.uic-multilib 2007-03-18 23:47:32.000000000 +0100 -+++ qt-x11-free-3.3.8/tools/designer/uic/main.cpp 2007-03-18 23:50:34.000000000 +0100 -@@ -316,8 +316,7 @@ +diff -up qt-x11-free-3.3.8b/tools/designer/uic/main.cpp.orig qt-x11-free-3.3.8b/tools/designer/uic/main.cpp +--- qt-x11-free-3.3.8b/tools/designer/uic/main.cpp.orig 2008-01-24 13:25:29.000000000 +0100 ++++ qt-x11-free-3.3.8b/tools/designer/uic/main.cpp 2008-01-24 13:28:17.000000000 +0100 +@@ -320,7 +320,7 @@ int main( int argc, char * argv[] ) out << "/****************************************************************************" << endl; out << "** Form "<< (impl? "implementation" : "interface") << " generated from reading ui file '" << fileName << "'" << endl; out << "**" << endl; - out << "** Created: " << QDateTime::currentDateTime().toString() << endl; -- out << "** by: The User Interface Compiler ($Id: qt/main.cpp 3.3.8 edited Jan 11 14:47 $)" << endl; -+ out << "** Created by: The User Interface Compiler ($Id: qt/main.cpp 3.3.8 edited Jan 11 14:47 $)" << endl; ++ out << "** Created by User Interface Compiler" << endl; out << "**" << endl; out << "** WARNING! All changes made in this file will be lost!" << endl; out << "****************************************************************************/" << endl << endl; ---- qt-x11-free-3.3.8/tools/designer/uic/embed.cpp.uic-multilib 2007-02-02 15:01:39.000000000 +0100 -+++ qt-x11-free-3.3.8/tools/designer/uic/embed.cpp 2007-03-18 23:51:36.000000000 +0100 -@@ -130,8 +130,7 @@ +diff -up qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp.orig qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp +--- qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp.orig 2008-01-24 13:28:30.000000000 +0100 ++++ qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp 2008-01-24 13:29:10.000000000 +0100 +@@ -137,7 +137,7 @@ void Uic::embed( QTextStream& out, const for ( it = images.begin(); it != images.end(); ++it ) out << "** " << *it << "\n"; out << "**\n"; - out << "** Created: " << QDateTime::currentDateTime().toString() << "\n"; -- out << "** by: The User Interface Compiler ($Id: qt/embed.cpp 3.3.8 edited Jan 11 14:47 $)\n"; -+ out << "** Created by: The User Interface Compiler ($Id: qt/embed.cpp 3.3.8 edited Jan 11 14:47 $)\n"; ++ out << "** Created by The User Interface Compiler" << "\n"; out << "**\n"; out << "** WARNING! All changes made in this file will be lost!\n"; out << "****************************************************************************/\n"; diff --git a/qt.spec b/qt.spec index c84b126..74b1406 100644 --- a/qt.spec +++ b/qt.spec @@ -28,7 +28,7 @@ Patch14: qt-x11-free-3.3.3-gl.patch Patch19: qt-3.3.3-gtkstyle.patch Patch20: qt-x11-free-3.3.5-gcc4-buildkey.patch Patch24: qt-x11-free-3.3.5-uic.patch -Patch25: qt-x11-free-3.3.8-uic-multilib.patch +Patch25: qt-x11-free-3.3.8b-uic-multilib.patch Patch26: qt-3.3.6-fontrendering-punjabi-209970.patch Patch27: qt-3.3.6-fontrendering-ml_IN-209097.patch Patch28: qt-3.3.6-fontrendering-or_IN-209098.patch