diff --git a/.cvsignore b/.cvsignore index dc8e242..14da5dd 100644 --- a/.cvsignore +++ b/.cvsignore @@ -2,3 +2,4 @@ hi128-app-qt4-logo.png 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 diff --git a/qt-x11-opensource-src-4.4.3-im.patch b/qt-x11-opensource-src-4.4.3-im.patch deleted file mode 100644 index e75d2bb..0000000 --- a/qt-x11-opensource-src-4.4.3-im.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -up qt-x11-opensource-src-4.4.3/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.cpp.orig qt-x11-opensource-src-4.4.3/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.cpp ---- qt-x11-opensource-src-4.4.3/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.cpp.orig 2008-11-06 14:19:08.000000000 +0100 -+++ qt-x11-opensource-src-4.4.3/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.cpp 2008-11-06 14:18:34.000000000 +0100 -@@ -69,12 +69,15 @@ QMultiInputContext::QMultiInputContext() - if (keys.at(i).contains(QLatin1String("imsw"))) - keys.removeAt(i); - -+ m_keys = keys; -+ - QString def = QLatin1String(getenv("QT_IM_MODULE")); - if (def.isEmpty()) { -- QSettings settings; -- def = settings.value(QLatin1String("/qt/DefaultInputMethod"), QLatin1String("xim")).toString(); -+ QSettings settings(QSettings::UserScope, QLatin1String("Trolltech")); -+ settings.beginGroup(QLatin1String("Qt")); -+ def = settings.value(QLatin1String("DefaultInputMethod"), QLatin1String("xim")).toString(); - } -- current = keys.indexOf(def); -+ current = m_keys.indexOf(def); - if (current < 0) - current = 0; - -@@ -83,13 +86,16 @@ QMultiInputContext::QMultiInputContext() - separator->setSeparator(true); - - QActionGroup *group = new QActionGroup(this); -- for (int i = 0; i < keys.size(); ++i) { -- slaves.append(QInputContextFactory::create(keys.at(i), this)); -- QAction *a = menu->addAction(slaves.at(i)->identifierName()); -+ for (int i = 0; i < m_keys.size(); ++i) { -+ //slaves.append(QInputContextFactory::create(keys.at(i), this)); -+ slaves.append(NULL); -+ QAction *a = menu->addAction(m_keys.at(i)); - a->setCheckable(true); - group->addAction(a); -- if (i == current) -+ if (i == current) { -+ slaves.replace(current, QInputContextFactory::create(m_keys.at(i), this)); - a->setChecked(true); -+ } - } - connect(group, SIGNAL(triggered(QAction*)), this, SLOT(changeSlave(QAction*))); - -@@ -181,8 +187,10 @@ QList QMultiInputContext::act - - void QMultiInputContext::changeSlave(QAction *a) - { -- for (int i = 0; i < slaves.size(); ++i) { -- if (slaves.at(i)->identifierName() == a->text()) { -+ for (int i = 0; i < m_keys.size(); ++i) { -+ if (m_keys.at(i) == a->text()) { -+ if (NULL == slaves.at(i)) -+ slaves.replace(i, QInputContextFactory::create(m_keys.at(i), this)); - current = i; - return; - } -diff -up qt-x11-opensource-src-4.4.3/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.h.orig qt-x11-opensource-src-4.4.3/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.h ---- qt-x11-opensource-src-4.4.3/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.h.orig 2008-09-27 10:58:48.000000000 +0200 -+++ qt-x11-opensource-src-4.4.3/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.h 2008-11-06 14:19:53.000000000 +0100 -@@ -103,6 +103,7 @@ private: - QList slaves; - QMenu *menu; - QAction *separator; -+ QStringList m_keys; - }; - - #endif // Q_NO_IM diff --git a/qt-x11-opensource-src-4.5.0-rc1-misc.patch b/qt-x11-opensource-src-4.5.0-rc1-misc.patch new file mode 100644 index 0000000..af06680 --- /dev/null +++ b/qt-x11-opensource-src-4.5.0-rc1-misc.patch @@ -0,0 +1,11 @@ +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 diff --git a/qt-x11-opensource-src-4.5.0-rc1-ppc64.patch b/qt-x11-opensource-src-4.5.0-rc1-ppc64.patch new file mode 100644 index 0000000..f566626 --- /dev/null +++ b/qt-x11-opensource-src-4.5.0-rc1-ppc64.patch @@ -0,0 +1,12 @@ +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 diff --git a/qt.spec b/qt.spec index cc0d2b8..53e24cf 100644 --- a/qt.spec +++ b/qt.spec @@ -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 @@ Epoch: 1 %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 @@ Patch5: qt-all-opensource-src-4.4.0-rc1-as_IN-437440.patch # 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 @@ Qt libraries which are used for drawing widgets and OpenGL items. %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 @@ test -x apply_patches && ./apply_patches %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 @@ fi -system-libjpeg \ -system-libtiff \ -system-zlib \ - -tablet \ + -xinput \ -xcursor \ -xfixes \ -xinerama \ @@ -382,7 +384,6 @@ fi make %{?_smp_mflags} - %install rm -rf %{buildroot} @@ -604,6 +605,7 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: %{_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 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: %files devel %defattr(-,root,root,-) +%{_qt4_bindir}/lconvert %{_qt4_bindir}/lrelease* %{_qt4_bindir}/lupdate* %{_qt4_bindir}/moc* @@ -655,6 +658,7 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: %{_qt4_bindir}/qhelpgenerator %{_qt4_bindir}/xmlpatterns %if "%{_qt4_bindir}" != "%{_bindir}" +%{_bindir}/lconvert %{_bindir}/lrelease* %{_bindir}/lupdate* %{_bindir}/pixeltool* @@ -735,6 +739,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: %changelog +* Wed Feb 11 2009 Than Ngo - 4.5.0-0.rc1.0 +- 4.5.0 rc1 + * Thu Feb 05 2009 Rex Dieter 4.4.3-16 - track branches/qt-copy/4.4, and backout previous trunk(qt45) ones diff --git a/sources b/sources index fa452ab..0bf9fd6 100644 --- a/sources +++ b/sources @@ -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