From b497f348d8395f385f59ee938d7ff4a0df4bd10a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 25 Jun 2010 19:12:03 +0000 Subject: [PATCH] - avoid timestamps in uic-generated files to be multilib-friendly --- ...nsource-src-4.7.0-beta1-uic_multilib.patch | 36 +++++++++++++++++++ qt.spec | 8 ++++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 qt-everywhere-opensource-src-4.7.0-beta1-uic_multilib.patch diff --git a/qt-everywhere-opensource-src-4.7.0-beta1-uic_multilib.patch b/qt-everywhere-opensource-src-4.7.0-beta1-uic_multilib.patch new file mode 100644 index 0000000..09670c1 --- /dev/null +++ b/qt-everywhere-opensource-src-4.7.0-beta1-uic_multilib.patch @@ -0,0 +1,36 @@ +diff -up qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic3/embed.cpp.uic_multilib qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic3/embed.cpp +--- qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic3/embed.cpp.uic_multilib 2010-05-03 19:43:25.000000000 -0500 ++++ qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic3/embed.cpp 2010-06-25 14:11:21.815474310 -0500 +@@ -152,7 +152,7 @@ void Ui3Reader::embed(const char *projec + for ( it = images.begin(); it != images.end(); ++it ) + out << "** " << *it << "\n"; + out << "**\n"; +- out << "** Created: " << QDateTime::currentDateTime().toString() << "\n"; ++ out << "** Created: " << "\n"; + out << "** by: The User Interface Compiler for Qt version " << QT_VERSION_STR << "\n"; + out << "**\n"; + out << "** WARNING! All changes made in this file will be lost!\n"; +diff -up qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic3/uic.cpp.uic_multilib qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic3/uic.cpp +--- qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic3/uic.cpp.uic_multilib 2010-05-03 19:43:25.000000000 -0500 ++++ qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic3/uic.cpp 2010-06-25 14:11:32.910460623 -0500 +@@ -146,7 +146,7 @@ void Uic::writeCopyrightHeader(DomUI *ui + out << "/********************************************************************************\n"; + out << "** Form generated from reading UI file '" << QFileInfo(opt.inputFile).fileName() << "'\n"; + out << "**\n"; +- out << "** Created: " << QDateTime::currentDateTime().toString() << "\n"; ++ out << "** Created: " << "\n"; + out << "** " << QString::fromLatin1("by: Qt User Interface Compiler version %1\n").arg(QLatin1String(QT_VERSION_STR)); + out << "**\n"; + out << "** WARNING! All changes made in this file will be lost when recompiling UI file!\n"; +diff -up qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic/uic.cpp.uic_multilib qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic/uic.cpp +--- qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic/uic.cpp.uic_multilib 2010-05-03 19:43:25.000000000 -0500 ++++ qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic/uic.cpp 2010-06-25 14:10:45.360711498 -0500 +@@ -139,7 +139,7 @@ void Uic::writeCopyrightHeader(DomUI *ui + out << "/********************************************************************************\n"; + out << "** Form generated from reading UI file '" << QFileInfo(opt.inputFile).fileName() << "'\n"; + out << "**\n"; +- out << "** Created: " << QDateTime::currentDateTime().toString() << "\n"; ++ out << "** Created: " << "\n"; + out << "** " << QString::fromLatin1("by: Qt User Interface Compiler version %1\n").arg(QLatin1String(QT_VERSION_STR)); + out << "**\n"; + out << "** WARNING! All changes made in this file will be lost when recompiling UI file!\n"; diff --git a/qt.spec b/qt.spec index e39546f..d1146d3 100644 --- a/qt.spec +++ b/qt.spec @@ -13,7 +13,7 @@ Summary: Qt toolkit Name: qt Epoch: 1 Version: 4.6.3 -Release: 4%{?dist} +Release: 5%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -34,6 +34,7 @@ Source5: qconfig-multilib.h # multilib hacks Patch2: qt-x11-opensource-src-4.2.2-multilib-optflags.patch Patch3: qt-x11-opensource-src-4.2.2-multilib-QMAKEPATH.patch +Patch4: qt-everywhere-opensource-src-4.7.0-beta1-uic_multilib.patch Patch5: qt-all-opensource-src-4.4.0-rc1-as_IN-437440.patch # hack around gcc/ppc crasher, http://bugzilla.redhat.com/492185 Patch13: qt-x11-opensource-src-4.5.0-gcc_hack.patch @@ -423,6 +424,8 @@ Qt libraries used for drawing widgets and OpenGL items. %if "%{_qt4_datadir}" != "%{_qt4_prefix}" %patch3 -p1 -b .multilib-QMAKEPATH %endif +%patch4 -p1 -b .uic_multilib + %patch5 -p1 -b .bz#437440-as_IN-437440 %patch13 -p1 -b .gcc_hack %patch15 -p1 -b .enable_ft_lcdfilter @@ -1062,6 +1065,9 @@ fi %changelog +* Fri Jun 20 2010 Rex Dieter 4.6.3-5 +- avoid timestamps in uic-generated files to be multilib-friendly + * Fri Jun 18 2010 Rex Dieter - 4.6.3-4 - QtWebKit does not search correct plugin path(s) (#568860) - QtWebKit browsers crash with flash-plugin (rh#605677,webkit#40567)