rpms/qt/devel qt-x11-opensource-src-4.5.0-rc1-misc.patch, NONE, 1.1 qt-x11-opensource-src-4.5.0-rc1-ppc64.patch, NONE, 1.1 .cvsignore, 1.46, 1.47 qt.spec, 1.227, 1.228 sources, 1.47, 1.48 qt-x11-opensource-src-4.4.3-im.patch, 1.1, NONE

Sat Feb 14 23:43:31 UTC 2009

Author: than

Update of /cvs/extras/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12622

Modified Files:
	.cvsignore qt.spec sources 
Added Files:
	qt-x11-opensource-src-4.5.0-rc1-misc.patch 
	qt-x11-opensource-src-4.5.0-rc1-ppc64.patch 
Removed Files:
	qt-x11-opensource-src-4.4.3-im.patch 
Log Message:
4.5.0-rc1


qt-x11-opensource-src-4.5.0-rc1-misc.patch:

--- NEW FILE qt-x11-opensource-src-4.5.0-rc1-misc.patch ---
diff -up qt-x11-opensource-src-4.5.0-rc1/src/testlib/qtestcase.cpp.orig qt-x11-opensource-src-4.5.0-rc1/src/testlib/qtestcase.cpp
--- qt-x11-opensource-src-4.5.0-rc1/src/testlib/qtestcase.cpp.orig	2009-02-11 13:14:12.000000000 +0100
+++ qt-x11-opensource-src-4.5.0-rc1/src/testlib/qtestcase.cpp	2009-02-11 13:20:37.000000000 +0100
@@ -1486,6 +1486,7 @@ int QTest::qExec(QObject *testObject, in
 #else
 
 #ifdef QTESTLIB_USE_VALGRIND
+    int callgrindChildExitCode;
     if (QBenchmarkGlobalData::current->mode() == QBenchmarkGlobalData::CallgrindParentProcess)
         return callgrindChildExitCode;
 #endif

qt-x11-opensource-src-4.5.0-rc1-ppc64.patch:

--- NEW FILE qt-x11-opensource-src-4.5.0-rc1-ppc64.patch ---
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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	5 Feb 2009 19:36:47 -0000	1.46
+++ .cvsignore	14 Feb 2009 23:42:59 -0000	1.47
@@ -2,3 +2,4 @@
 hi48-app-qt4-logo.png
 qt-x11-opensource-src-4.4.3.tar.bz2
 qt-copy-patches-20090205svn.tar.bz2
+qt-x11-opensource-src-4.5.0-rc1.tar.bz2


Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -r1.227 -r1.228
--- qt.spec	5 Feb 2009 19:36:47 -0000	1.227
+++ qt.spec	14 Feb 2009 23:43:00 -0000	1.228
@@ -1,5 +1,5 @@
-
 # Fedora Review: http://bugzilla.redhat.com/188180
+%define pre -rc1
 
 Summary: Qt toolkit
 %if 0%{?fedora} > 8
@@ -8,14 +8,14 @@
 %else
 Name:    qt4
 %endif
-Version: 4.4.3
-Release: 16%{?dist}
+Version: 4.5.0
+Release: 0.rc1.0%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 with exceptions or GPLv2 with exceptions
 Group: System Environment/Libraries
 Url: http://www.trolltech.com/products/qt/
-Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-%{version}.tar.bz2
+Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-%{version}%{?pre}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if "%{name}" != "qt4"
@@ -37,10 +37,11 @@
 # under GNOME, default to QGtkStyle if available
 # (otherwise fall back to QCleanlooksStyle)
 Patch9: qt-x11-opensource-src-4.4.0-qgtkstyle.patch
-Patch10: qt-x11-opensource-src-4.4.3-im.patch
+patch11: qt-x11-opensource-src-4.5.0-rc1-misc.patch
+Patch12: qt-x11-opensource-src-4.5.0-rc1-ppc64.patch
 
 ## qt-copy patches
-%define qt_copy 20090205
+#define qt_copy 20090205
 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}}
@@ -270,7 +271,7 @@
 %prep
 %setup -q -n qt-x11-opensource-src-%{version}%{?pre} %{?qt_copy:-a 2}
 
-%if 0%{?qt_copy:1}
+%if 0%{?qt_copy}
 echo "0242" >> patches/DISABLED
 echo "0250" >> patches/DISABLED
 echo "0251" >> patches/DISABLED
@@ -286,7 +287,8 @@
 %endif
 %patch5 -p1 -b .bz#437440-as_IN-437440
 %patch9 -p1 -b .qgtkstyle
-%patch10 -p1 -b .im
+%patch11 -p1 -b .misc
+%patch12 -p1 -b .ppc64
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
@@ -361,7 +363,7 @@
   -system-libjpeg \
   -system-libtiff \
   -system-zlib \
-  -tablet \
+  -xinput \
   -xcursor \
   -xfixes \
   -xinerama \
@@ -382,7 +384,6 @@
 
 make %{?_smp_mflags}
 
-
 %install
 rm -rf %{buildroot}
 
@@ -604,6 +605,7 @@
 %{_qt4_libdir}/libQtTest.so.*
 %{_qt4_libdir}/libQtXml.so.*
 %{_qt4_libdir}/libQtXmlPatterns.so.*
+%{_qt4_libdir}/libQtScriptTools.so.*
 %dir %{_qt4_plugindir}
 %dir %{_qt4_plugindir}/sqldrivers/
 %{_qt4_plugindir}/sqldrivers/libqsqlite*
@@ -638,6 +640,7 @@
 
 %files devel
 %defattr(-,root,root,-)
+%{_qt4_bindir}/lconvert
 %{_qt4_bindir}/lrelease*
 %{_qt4_bindir}/lupdate*
 %{_qt4_bindir}/moc*
@@ -655,6 +658,7 @@
 %{_qt4_bindir}/qhelpgenerator
 %{_qt4_bindir}/xmlpatterns
 %if "%{_qt4_bindir}" != "%{_bindir}"
+%{_bindir}/lconvert
 %{_bindir}/lrelease*
 %{_bindir}/lupdate*
 %{_bindir}/pixeltool*
@@ -735,6 +739,9 @@
 
 
 %changelog
+* Wed Feb 11 2009 Than Ngo <than at redhat.com> - 4.5.0-0.rc1.0
+- 4.5.0 rc1
+
 * Thu Feb 05 2009 Rex Dieter <rdieter at fedoraproject.org> 4.4.3-16
 - track branches/qt-copy/4.4, and backout previous trunk(qt45) ones
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	5 Feb 2009 19:36:47 -0000	1.47
+++ sources	14 Feb 2009 23:43:00 -0000	1.48
@@ -1,4 +1,3 @@
 d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
 6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
-00e00c6324d342a7b0d8653112b4f08c  qt-x11-opensource-src-4.4.3.tar.bz2
-91aabde62e4b4884e686aac6b7b671f1  qt-copy-patches-20090205svn.tar.bz2
+8eee2774c846fa904e98934d7da6414f  qt-x11-opensource-src-4.5.0-rc1.tar.bz2


--- qt-x11-opensource-src-4.4.3-im.patch DELETED ---


