rpms
/
qt
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

4.5.1

This commit is contained in:
Than Ngo 2009-04-23 11:43:38 +00:00
parent ee2610b777
commit 6cf04333d3
7 changed files with 15 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -2,3 +2,5 @@ hi128-app-qt4-logo.png
hi48-app-qt4-logo.png
qt-x11-opensource-src-4.5.0.tar.bz2
qt-copy-patches-20090325svn.tar.bz2
qt-copy-patches-20090423svn.tar.bz2
qt-x11-opensource-src-4.5.1.tar.bz2

41
qt-x11-opensource-src-4.5.0-linguist-crash.patch
View File

@ -1,41 +0,0 @@
diff -up qt-x11-opensource-src-4.5.0/tools/linguist/shared/profileevaluator.cpp.orig qt-x11-opensource-src-4.5.0/tools/linguist/shared/profileevaluator.cpp
--- qt-x11-opensource-src-4.5.0/tools/linguist/shared/profileevaluator.cpp.orig 2009-03-16 12:50:03.000000000 +0100
+++ qt-x11-opensource-src-4.5.0/tools/linguist/shared/profileevaluator.cpp 2009-03-17 00:42:51.000000000 +0100
@@ -86,6 +86,7 @@ public:
void enterScope(bool multiLine);
void leaveScope();
void finalizeBlock();
+ void cleanup();
// implementation of AbstractProItemVisitor
bool visitBeginProBlock(ProBlock *block);
@@ -164,6 +165,15 @@ ProFileEvaluator::Private::Private(ProFi
m_contNextLine = false;
}
+void ProFileEvaluator::Private::cleanup()
+{
+ m_commentItem = 0;
+ m_block = 0;
+ m_proitem.clear();
+ m_blockstack.clear();
+ m_pendingComment.clear();
+}
+
bool ProFileEvaluator::Private::read(ProFile *pro)
{
QFile file(pro->fileName());
@@ -180,11 +190,14 @@ bool ProFileEvaluator::Private::read(Pro
while (!ts.atEnd()) {
QString line = ts.readLine();
if (!parseLine(line)) {
+ cleanup();
q->errorMessage(format(".pro parse failure."));
return false;
}
++m_lineNo;
}
+
+ cleanup();
return true;
}

11
qt-x11-opensource-src-4.5.0-lrelease.patch
View File

@ -1,11 +0,0 @@
--- qt-x11-opensource-src-4.5.0/tools/linguist/lrelease/main.cpp.orig 2009-03-24 13:42:02.000000000 +0100
+++ qt-x11-opensource-src-4.5.0/tools/linguist/lrelease/main.cpp 2009-03-24 13:47:21.000000000 +0100
@@ -102,7 +102,7 @@
if (!msg.comment().isEmpty())
qWarning("\n* Comment: %s", qPrintable(msg.comment()));
}
- ok = false;
+ //ok = false;
}
}
return ok;

12
qt-x11-opensource-src-4.5.0-rc1-ppc64.patch
View File

@ -1,12 +0,0 @@
diff -up qt-x11-opensource-src-4.5.0-rc1/src/corelib/arch/qatomic_powerpc.h.orig qt-x11-opensource-src-4.5.0-rc1/src/corelib/arch/qatomic_powerpc.h
--- qt-x11-opensource-src-4.5.0-rc1/src/corelib/arch/qatomic_powerpc.h.orig 2009-02-14 22:51:51.000000000 +0100
+++ qt-x11-opensource-src-4.5.0-rc1/src/corelib/arch/qatomic_powerpc.h 2009-02-14 22:53:03.000000000 +0100
@@ -188,7 +188,7 @@ inline bool QBasicAtomicInt::testAndSetR
"lwarx %[result]," _Q_VALUE "\n"
"xor. %[result], %[result], %[expectedValue]\n"
"bne $+12\n"
- "stwcx. %[newValue],0,%[_q_value]\n"
+ "stwcx. %[newValue]," _Q_VALUE "\n"
"bne- $-16\n"
: [result] "=&r" (result),
_Q_VALUE_MEMORY_OPERAND

11
qt-x11-opensource-src-4.5.0-rc1-qhostaddress.patch
View File

@ -1,11 +0,0 @@
diff -up qt-x11-opensource-src-4.5.0-rc1/src/network/kernel/qhostaddress.h.qhostaddress qt-x11-opensource-src-4.5.0-rc1/src/network/kernel/qhostaddress.h
--- qt-x11-opensource-src-4.5.0-rc1/src/network/kernel/qhostaddress.h.qhostaddress 2009-02-04 10:05:29.000000000 -0600
+++ qt-x11-opensource-src-4.5.0-rc1/src/network/kernel/qhostaddress.h 2009-02-22 13:32:08.000000000 -0600
@@ -37,6 +37,7 @@
#ifndef QHOSTADDRESS_H
#define QHOSTADDRESS_H
+#include <QtCore/qpair.h>
#include <QtCore/qstring.h>
#include <QtNetwork/qabstractsocket.h>

22
qt.spec
View File

@ -11,8 +11,8 @@ Epoch: 1
%else
Name: qt4
%endif
Version: 4.5.0
Release: 14%{?dist}
Version: 4.5.1
Release: 1%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@ -37,9 +37,6 @@ Source5: qconfig-multilib.h
Patch2: qt-x11-opensource-src-4.2.2-multilib-optflags.patch
Patch3: qt-x11-opensource-src-4.2.2-multilib-QMAKEPATH.patch
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
# qt fails to build on ia64: http://bugzilla.redhat.com/492174
@ -49,7 +46,6 @@ Patch15: qt-x11-opensource-src-4.5.0-disable_ft_lcdfilter.patch
## upstreamable bits
# http://bugzilla.redhat.com/485677
Patch50: qt-x11-opensource-src-4.5.0-rc1-qhostaddress.patch
Patch51: qt-x11-opensource-src-4.5.0-qdoc3.patch
Patch52: qt-4.5-sparc64.patch
# fix invalid inline assembly in qatomic_{i386,x86_64}.h (de)ref implementations
@ -58,7 +54,7 @@ Patch52: qt-4.5-sparc64.patch
Patch53: qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch
## qt-copy patches
%define qt_copy 20090325
%define qt_copy 20090423
Source1: qt-copy-patches-svn_checkout.sh
%{?qt_copy:Source2: qt-copy-patches-%{qt_copy}svn.tar.bz2}
%{?qt_copy:Provides: qt-copy = %{qt_copy}}
@ -312,6 +308,10 @@ Qt libraries which are used for drawing widgets and OpenGL items.
%if 0%{?qt_copy}
echo "0250" >> patches/DISABLED
echo "0245" >> patches/DISABLED
echo "0275" >> patches/DISABLED
echo "0276" >> patches/DISABLED
echo "0278" >> patches/DISABLED
test -x apply_patches && ./apply_patches
%endif
@ -322,13 +322,9 @@ test -x apply_patches && ./apply_patches
%patch3 -p1 -b .multilib-QMAKEPATH
%endif
%patch5 -p1 -b .bz#437440-as_IN-437440
%patch10 -p1 -b .ppc64
%patch11 -p1 -b .linguist-crash
%patch12 -p1 -b .lrelease
%patch13 -p1 -b .gcc_hack
%patch14 -p1 -b .ia64_boilerplate
%patch15 -p1 -b .disable_ft_lcdfilter
%patch50 -p1 -b .qhostaddress
%patch51 -p1 -b .qdoc3
%patch52 -p1 -b .sparc64
%patch53 -p1 -b .qatomic-inline-asm
@ -376,6 +372,7 @@ fi
# build shared, threaded (default) libraries
./configure -v \
-confirm-license \
-opensource \
-optimized-qmake \
-prefix %{_qt4_prefix} \
-bindir %{_qt4_bindir} \
@ -812,6 +809,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
%changelog
* Thu Apr 23 2009 Than Ngo <than@redhat.com> - 4.5.1-1
- 4.5.1
* Tue Apr 14 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.5.0-14
- fix vrgb/vgbr corruption, disable QT_USE_FREETYPE_LCDFILTER (#490377)

4
sources
View File

@ -1,4 +1,4 @@
d9f511e4b51983b4e10eb58b320416d5 hi128-app-qt4-logo.png
6dcc0672ff9e60a6b83f95c5f42bec5b hi48-app-qt4-logo.png
55e8c74a89e1bc128a5a6f1ff6b8b5ba qt-x11-opensource-src-4.5.0.tar.bz2
74cac34a16b483ddc0a90204a0af8314 qt-copy-patches-20090325svn.tar.bz2
e658d26376d678bd45a877ca47e42b7a qt-copy-patches-20090423svn.tar.bz2
afc43e566341cf3e5ed0bcb974f0c3b2 qt-x11-opensource-src-4.5.1.tar.bz2