From 50c6387332b94a4850ea57a116cd4a22e8adda8e Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Mar 18 2007 23:22:25 +0000 Subject: 3.3.8 --- diff --git a/.cvsignore b/.cvsignore index ee36286..282415d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -5,3 +5,4 @@ qt-x11-free-3.3.4.tar.bz2 qt-x11-free-3.3.5.tar.bz2 qt-x11-immodule-unified-qt3.3.5-20051012.diff.bz2 qt-x11-immodule-unified-qt3.3.5-20051018.diff.bz2 +qt-x11-immodule-unified-qt3.3.7-20061229.diff.bz2 diff --git a/qt-x11-free-3.3.8-uic-multilib.patch b/qt-x11-free-3.3.8-uic-multilib.patch new file mode 100644 index 0000000..53fd8eb --- /dev/null +++ b/qt-x11-free-3.3.8-uic-multilib.patch @@ -0,0 +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 @@ + 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 << "**" << 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 @@ + 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 << "**\n"; + out << "** WARNING! All changes made in this file will be lost!\n"; + out << "****************************************************************************/\n"; diff --git a/qt.spec b/qt.spec index 65ddc68..ccb5deb 100644 --- a/qt.spec +++ b/qt.spec @@ -1,7 +1,7 @@ Summary: The shared library for the Qt GUI toolkit. Name: qt -Version: 3.3.7 -Release: 2%{?dist} +Version: 3.3.8 +Release: 1%{?dist} Epoch: 1 License: GPL/QPL Group: System Environment/Libraries @@ -28,12 +28,11 @@ 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.7-uic-multilib.patch +Patch25: qt-x11-free-3.3.8-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 Patch29: qt-3.3.6-fontrendering-as_IN-209972.patch -Patch30: qt-3.3.6-fontrendering-bn_IN-209975.patch Patch31: qt-3.3.6-fontrendering-te_IN-211259.patch Patch32: qt-3.3.6-fontrendering-214371.patch Patch33: qt-3.3.6-fontrendering-#214570.patch @@ -42,7 +41,7 @@ Patch35: qt-3.3.6-fontrendering-ml_IN-217657.patch # immodule patches Patch50: qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-pre.patch -Patch51: qt-x11-immodule-unified-qt3.3.5-20060318.diff.bz2 +Patch51: qt-x11-immodule-unified-qt3.3.7-20061229.diff.bz2 Patch52: qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-post.patch Patch53: qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch Patch54: qt-x11-free-3.3.6-fix-key-release-event-with-imm.diff @@ -266,7 +265,6 @@ for the Qt toolkit. %patch27 -p1 -b .fontrendering-ml_IN-bz#209097 %patch28 -p1 -b .fontrendering-or_IN-bz#209098 %patch29 -p1 -b .fontrendering-as_IN-bz#209972 -%patch30 -p1 -b .fontrendering-bn_IN-bz#209975 %patch31 -p1 -b .fontrendering-te_IN-bz#211259 %patch32 -p1 -b .fontrendering-bz#214371 %patch33 -p1 -b .fontrendering-#214570 @@ -559,6 +557,9 @@ rm -rf %{buildroot} %changelog +* Mon Mar 19 2007 Than Ngo 1:3.3.8-1 +- update to 3.3.8 + * Wed Dec 06 2006 Than Ngo - 1:3.3.7-2.fc7 - Resolves: bz#214371, bn_IN font rendering - Resolves: bz#217657, ml_IN issue with cursor position diff --git a/sources b/sources index af2e6f8..642e202 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -0c07b36cd8da9f796437dd398365c204 qt-x11-immodule-unified-qt3.3.5-20060318.diff.bz2 655e21cf6a7e66daf8ec6ceda81aae1e qt-x11-free-3.3.7.tar.bz2 +91adfea39f17a64b86497bce32782cf3 qt-x11-immodule-unified-qt3.3.7-20061229.diff.bz2