auto-import qt-3.3.2-4 from qt-3.3.2-4.src.rpm

This commit is contained in:
cvsdist 2004-09-09 11:17:36 +00:00
parent abe04e4451
commit 840efed161
2 changed files with 25 additions and 5 deletions

View File

@ -0,0 +1,14 @@
--- qt-x11-free-3.3.2/src/kernel/qpixmap_x11.cpp.orig 2004-05-10 13:54:03.592289052 +0200
+++ qt-x11-free-3.3.2/src/kernel/qpixmap_x11.cpp 2004-05-10 13:56:10.165560473 +0200
@@ -288,8 +288,9 @@
{
#if defined(QT_CHECK_STATE)
if ( qApp->type() == QApplication::Tty ) {
- qWarning( "QPixmap: Cannot create a QPixmap when no GUI "
- "is being used" );
+// qWarning( "QPixmap: Cannot create a QPixmap when no GUI "
+// "is being used" );
+ ;
}
#endif

16
qt.spec
View File

@ -76,7 +76,7 @@
Summary: The shared library for the Qt GUI toolkit.
Name: qt
Version: %{ver}
Release: 2
Release: 4
Epoch: 1
License: GPL/QPL
Group: System Environment/Libraries
@ -92,9 +92,9 @@ Patch3: qt-3.1.0-makefile.patch
Patch4: qt-x11-free-3.3.1-mono.patch
Patch5: qt-x11-free-3.3.0-strip.patch
Patch6: qt-x11-free-3.3.0-freetype.patch
Patch7: qt-x11-free-3.3.2-quiet.patch
Patch10: qt-x11-free-3.3.1-lib64.patch
Patch12: qt-x11-free-3.3.1-qfontengine.patch
Patch13: qt-x11-free-3.3.1-unknownscriptfix.patch
Patch11: qt-x11-free-3.3.2-misc.patch
Prereq: /sbin/ldconfig
Prereq: fileutils
@ -275,9 +275,9 @@ for the Qt toolkit.
%patch4 -p1 -b .mono
%patch5 -p1
%patch6 -p1 -b .ft217
%patch7 -p1 -b .quiet
%patch10 -p1 -b .lib64
%patch12 -p1 -b .qfontengine
%patch13 -p1 -b .unknownscript
%patch11 -p1 -b .misc
%build
export QTDIR=`/bin/pwd`
@ -765,6 +765,12 @@ fi
%endif
%changelog
* Wed May 12 2004 Than Ngo <than@redhat.com> 1:3.3.2-4
- backport some qt patches, Symbol font works again
* Mon May 10 2004 Than Ngo <than@redhat.com> 1:3.3.2-3
- fixed annoying warning
* Tue May 04 2004 Than Ngo <than@redhat.com> 1:3.3.2-2
- fix broken symlink at qt document, bug #121652