From 81dd910f47627f636d9e646d7eb3047003571d4c Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Tue, 25 Oct 2005 13:50:39 +0000 Subject: [PATCH] update qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch --- ...odule-unified-qt3.3.5-20051012-quiet.patch | 32 ++++++++++++------- qt.spec | 7 ++-- 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch b/qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch index 9097984..5e5d977 100644 --- a/qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch +++ b/qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch @@ -85,18 +85,6 @@ diff -Nur qt-x11-free-3.3.5.orig/plugins/src/inputmethods/simple/qsimpleinputcon // match exactly commitChar( p->value ); -diff -Nur qt-x11-free-3.3.5.orig/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp qt-x11-free-3.3.5/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp ---- qt-x11-free-3.3.5.orig/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp 2005-10-13 16:09:36.000000000 +0200 -+++ qt-x11-free-3.3.5/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp 2005-10-13 16:09:31.000000000 +0200 -@@ -742,7 +742,7 @@ - - void QXIMInputContext::close( const QString &errMsg ) - { -- qDebug( errMsg ); -+ // qDebug( errMsg ); - emit deletionRequested(); - } - diff -Nur qt-x11-free-3.3.5.orig/src/kernel/qinputcontext.cpp qt-x11-free-3.3.5/src/kernel/qinputcontext.cpp --- qt-x11-free-3.3.5.orig/src/kernel/qinputcontext.cpp 2005-10-13 16:09:37.000000000 +0200 +++ qt-x11-free-3.3.5/src/kernel/qinputcontext.cpp 2005-10-13 16:09:31.000000000 +0200 @@ -124,3 +112,23 @@ diff -Nur qt-x11-free-3.3.5.orig/src/kernel/qinputcontext.cpp qt-x11-free-3.3.5/ event = new QIMComposeEvent( type, text, cursorPosition, selLength ); } +--- qt-x11-free-3.3.5/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp.quiet 2005-10-13 19:00:56.000000000 +0200 ++++ qt-x11-free-3.3.5/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp 2005-10-25 15:36:43.000000000 +0200 +@@ -356,7 +356,7 @@ + #if !defined(QT_NO_XIM) + fontsetRefCount++; + if (! qt_xim) { +- qWarning("QInputContext: no input method context available"); ++ // qWarning("QInputContext: no input method context available"); + return; + } + +@@ -742,7 +742,7 @@ + + void QXIMInputContext::close( const QString &errMsg ) + { +- qDebug( errMsg ); ++ // qDebug( errMsg ); + emit deletionRequested(); + } + diff --git a/qt.spec b/qt.spec index a7f0c2d..7ca9957 100644 --- a/qt.spec +++ b/qt.spec @@ -85,7 +85,7 @@ Summary: The shared library for the Qt GUI toolkit. Name: qt Version: %{ver} -Release: 6 +Release: 7 Epoch: 1 License: GPL/QPL Group: System Environment/Libraries @@ -711,7 +711,10 @@ rm -rf %{buildroot} %changelog -* Mon Oct 24 2005 Than Ngo 3.3.5-6 +* Tue Oct 25 2005 Than Ngo 1:3.3.5-7 +- update qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch + +* Mon Oct 24 2005 Than Ngo 1:3.3.5-6 - update qt-x11-immodule-unified-qt3.3.5-20051018.diff - remove unneeded qt-x11-immodule-unified-qt3.3.5-20051012-build.patch