rpms/qt/FC-5 qt-x11-free-3.3.6-qfontdatabase_x11.patch, NONE, 1.1 qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-post.patch, NONE, 1.1 qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-pre.patch, NONE, 1.1 .cvsignore, 1.22, 1.23 qt.spec, 1.102, 1.103 sources, 1.23, 1.24 fix-im-crash-on-exit.diff, 1.2, NONE fix-key-release-event-with-imm.diff, 1.2, NONE qt-x11-free-3.3.4-qfontdatabase_x11.patch, 1.1, NONE qt-x11-immodule-fix-inputcontext-crash.diff, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Jun 8 17:58:25 UTC 2006
Author: than
Update of /cvs/dist/rpms/qt/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv12124
Modified Files:
.cvsignore qt.spec sources
Added Files:
qt-x11-free-3.3.6-qfontdatabase_x11.patch
qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-post.patch
qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-pre.patch
Removed Files:
fix-im-crash-on-exit.diff fix-key-release-event-with-imm.diff
qt-x11-free-3.3.4-qfontdatabase_x11.patch
qt-x11-immodule-fix-inputcontext-crash.diff
Log Message:
update to 3.3.6
qt-x11-free-3.3.6-qfontdatabase_x11.patch:
qfontdatabase_x11.cpp | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE qt-x11-free-3.3.6-qfontdatabase_x11.patch ---
--- qt-x11-free-3.3.4/src/kernel/qfontdatabase_x11.cpp.mono 2004-08-05 16:42:06.000000000 +0200
+++ qt-x11-free-3.3.4/src/kernel/qfontdatabase_x11.cpp 2004-09-28 16:11:54.955374161 +0200
@@ -975,7 +981,7 @@
};
const XftDefaultFont defaults[] = {
{ "Serif", "serif", FALSE },
- { "Sans Serif", "sans-serif", FALSE },
+ { "Sans", "sans-serif", FALSE },
{ "Monospace", "monospace", TRUE },
{ 0, 0, FALSE }
};
qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-post.patch:
qlineedit.cpp | 5 +----
qtextedit.cpp | 14 +++++++++++---
2 files changed, 12 insertions(+), 7 deletions(-)
--- NEW FILE qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-post.patch ---
--- qt-x11-free-3.3.6/src/widgets/qtextedit.cpp.im 2006-03-22 12:18:30.000000000 +0100
+++ qt-x11-free-3.3.6/src/widgets/qtextedit.cpp 2006-03-22 12:42:49.000000000 +0100
@@ -1035,7 +1035,7 @@
bool drawCur = hasFocus() || viewport()->hasFocus();
if (( hasSelectedText() && !style().styleHint( QStyle::SH_BlinkCursorWhenTextSelected ) ) ||
- isReadOnly() || !cursorVisible )
+ isReadOnly() || !cursorVisible || doc->hasSelection( QTextDocument::IMSelectionText ))
drawCur = FALSE;
QColorGroup g = colorGroup();
const QColorGroup::ColorRole backRole = QPalette::backgroundRoleFromMode(backgroundMode());
@@ -1661,6 +1661,7 @@
}
}
+ updateMicroFocusHint();
repaintChanged();
// microFocusHint is required to place candidate window for Asian
@@ -2177,6 +2178,7 @@
( !style().styleHint( QStyle::SH_BlinkCursorWhenTextSelected ) &&
( d->optimMode ? optimHasSelection() : doc->hasSelection( QTextDocument::Standard, TRUE ))) ||
( visible && !hasFocus() && !viewport()->hasFocus() && !inDnD ) ||
+ doc->hasSelection( QTextDocument::IMSelectionText ) ||
isReadOnly() )
return;
@@ -2907,8 +2909,14 @@
// Asian input methods. Asian input methods need start point of IM
// selection text to place candidate window as adjacent to the
// selection text.
- if ( d->preeditStart != -1 )
- c.setIndex( d->preeditStart );
+ if ( d->preeditStart != -1 ) {
+ c.setIndex( d->preeditStart );
+ if(doc->hasSelection(QTextDocument::IMSelectionText)) {
+ int para, index;
+ doc->selectionStart(QTextDocument::IMSelectionText, para, index);
+ c.setIndex(index);
+ }
+ }
#endif
if ( hasFocus() || viewport()->hasFocus() ) {
--- qt-x11-free-3.3.6/src/widgets/qlineedit.cpp.im 2006-03-22 12:13:27.000000000 +0100
+++ qt-x11-free-3.3.6/src/widgets/qlineedit.cpp 2006-03-22 12:15:30.000000000 +0100
@@ -1840,17 +1840,14 @@
d->imend = d->imstart + e->text().length();
d->imselstart = d->imstart + e->cursorPos();
d->imselend = d->imselstart + e->selectionLength();
-#if 0
- d->cursor = e->selectionLength() ? d->imend : d->imselend;
-#else
// Cursor placement code is changed for Asian input method that
// shows candidate window. This behavior is same as Qt/E 2.3.7
// which supports Asian input methods. Asian input methods need
// start point of IM selection text to place candidate window as
// adjacent to the selection text.
d->cursor = d->imselstart;
-#endif
d->updateTextLayout();
+ d->updateMicroFocusHint();
update();
}
qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-pre.patch:
qlineedit.cpp | 3 +--
qtextedit.cpp | 14 +++-----------
2 files changed, 4 insertions(+), 13 deletions(-)
--- NEW FILE qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-pre.patch ---
--- qt-x11-free-3.3.6/src/widgets/qtextedit.cpp.im 2006-03-08 17:47:58.000000000 +0100
+++ qt-x11-free-3.3.6/src/widgets/qtextedit.cpp 2005-09-02 14:43:14.000000000 +0200
@@ -1028,7 +1028,7 @@
bool drawCur = hasFocus() || viewport()->hasFocus();
if (( hasSelectedText() && !style().styleHint( QStyle::SH_BlinkCursorWhenTextSelected ) ) ||
- isReadOnly() || !cursorVisible || doc->hasSelection( QTextDocument::IMSelectionText ))
+ isReadOnly() || !cursorVisible )
drawCur = FALSE;
QColorGroup g = colorGroup();
const QColorGroup::ColorRole backRole = QPalette::backgroundRoleFromMode(backgroundMode());
@@ -1589,7 +1589,7 @@
insert( e->text() );
// insert can trigger an imEnd event as it emits a textChanged signal, so better
// be careful
- if(d->preeditStart != -1) {
+ if(d->preeditStart != -1) {
cursor->setIndex( d->preeditStart + d->preeditLength );
QTextCursor c = *cursor;
cursor->setIndex( d->preeditStart );
@@ -1609,7 +1609,6 @@
}
}
- updateMicroFocusHint();
repaintChanged();
}
@@ -2120,7 +2119,6 @@
( !style().styleHint( QStyle::SH_BlinkCursorWhenTextSelected ) &&
( d->optimMode ? optimHasSelection() : doc->hasSelection( QTextDocument::Standard, TRUE ))) ||
( visible && !hasFocus() && !viewport()->hasFocus() && !inDnD ) ||
- doc->hasSelection( QTextDocument::IMSelectionText ) ||
isReadOnly() )
return;
@@ -2823,14 +2821,8 @@
void QTextEdit::updateMicroFocusHint()
{
QTextCursor c( *cursor );
- if ( d->preeditStart != -1 ) {
+ if ( d->preeditStart != -1 )
c.setIndex( d->preeditStart );
- if(doc->hasSelection(QTextDocument::IMSelectionText)) {
- int para, index;
- doc->selectionStart(QTextDocument::IMSelectionText, para, index);
- c.setIndex(index);
- }
- }
if ( hasFocus() || viewport()->hasFocus() ) {
int h = c.paragraph()->lineHeightOfChar( cursor->index() );
--- qt-x11-free-3.3.6/src/widgets/qlineedit.cpp.im 2006-03-08 17:47:59.000000000 +0100
+++ qt-x11-free-3.3.6/src/widgets/qlineedit.cpp 2006-03-20 11:45:08.000000000 +0100
@@ -1794,9 +1794,8 @@
d->imend = d->imstart + e->text().length();
d->imselstart = d->imstart + e->cursorPos();
d->imselend = d->imselstart + e->selectionLength();
- d->cursor = d->imstart + e->cursorPos();
+ d->cursor = e->selectionLength() ? d->imend : d->imselend;
d->updateTextLayout();
- d->updateMicroFocusHint();
update();
}
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/qt/FC-5/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore 24 Oct 2005 08:41:11 -0000 1.22
+++ .cvsignore 8 Jun 2006 17:58:23 -0000 1.23
@@ -5,3 +5,5 @@
qt-x11-free-3.3.5.tar.bz2
qt-x11-immodule-unified-qt3.3.5-20051012.diff.bz2
qt-x11-immodule-unified-qt3.3.5-20051018.diff.bz2
+qt-x11-free-3.3.6.tar.bz2
+qt-x11-immodule-unified-qt3.3.5-20060318.diff.bz2
Index: qt.spec
===================================================================
RCS file: /cvs/dist/rpms/qt/FC-5/qt.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- qt.spec 27 Feb 2006 18:52:21 -0000 1.102
+++ qt.spec 8 Jun 2006 17:58:23 -0000 1.103
@@ -8,7 +8,7 @@
%define immodule 1
-%define ver 3.3.5
+%define ver 3.3.6
%define qt_dirname qt-3.3
%define qtdir %{_libdir}/%{qt_dirname}
@@ -85,7 +85,7 @@
Summary: The shared library for the Qt GUI toolkit.
Name: qt
Version: %{ver}
-Release: 13
+Release: 0.1.fc5
Epoch: 1
License: GPL/QPL
Group: System Environment/Libraries
@@ -93,7 +93,6 @@
Url: http://www.troll.no
Source: ftp://ftp.troll.no/qt/source/qt-x11-free-%{version}.tar.bz2
Source1: qtrc
-Source2: assistant_de.qm
Patch1: qt-3.3.4-print-CJK.patch
Patch2: qt-3.0.5-nodebug.patch
@@ -102,7 +101,7 @@
Patch7: qt-x11-free-3.3.2-quiet.patch
Patch8: qt-x11-free-3.3.3-qembed.patch
Patch12: qt-uic-nostdlib.patch
-Patch13: qt-x11-free-3.3.4-qfontdatabase_x11.patch
+Patch13: qt-x11-free-3.3.6-qfontdatabase_x11.patch
Patch14: qt-x11-free-3.3.3-gl.patch
Patch19: qt-3.3.3-gtkstyle.patch
Patch20: qt-x11-free-3.3.5-gcc4-buildkey.patch
@@ -110,23 +109,19 @@
Patch24: qt-x11-free-3.3.5-uic.patch
# immodule patches
-Patch50: qt-x11-immodule-unified-qt3.3.5-20051018.diff.bz2
-Patch51: fix-key-release-event-with-imm.diff
-Patch52: fix-im-crash-on-exit.diff
-Patch53: qt-x11-immodule-fix-inputcontext-crash.diff
-Patch54: qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch
+Patch50: qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-pre.patch
+Patch51: qt-x11-immodule-unified-qt3.3.5-20060318.diff.bz2
+Patch52: qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-post.patch
+Patch53: qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch
# qt-copy patches
Patch100: 0038-dragobject-dont-prefer-unknown.patch
Patch101: 0047-fix-kmenu-width.diff
Patch102: 0048-qclipboard_hack_80072.patch
-Patch103: 0051-qtoolbar_77047.patch
-Patch104: 0056-khotkeys_input_84434.patch
+Patch103: 0056-khotkeys_input_84434.patch
# upstream patches
-Patch200: qt-x11-free-3.3.4-assistant_de.patch
-Patch201: qt-x11-free-3.3.4-fullscreen.patch
-Patch202: qt-x11-free-3.3.5-warning.patch
+Patch200: qt-x11-free-3.3.4-fullscreen.patch
Prefix: %{qtdir}
@@ -214,7 +209,8 @@
Requires: libpng-devel
Requires: libjpeg-devel
Requires: libmng-devel
-
+Requires: mesa-libGL-devel
+Requires: mesa-libGLU-devel
%package Xt
Summary: An Xt (X Toolkit) compatibility add-on for the Qt GUI toolkit.
@@ -351,30 +347,23 @@
%patch24 -p1 -b .uic
%if %{immodule}
-%patch50 -p1
-%patch51 -p0 -b .key-release-event
-%patch52 -p0 -b .im-crash-on-exit
-%patch53 -p0 -b .inputcontext-crash
-%patch54 -p1 -b .quiet
+%patch50 -p1 -b .pre
+%patch51 -p1
+%patch52 -p1 -b .post
+%patch53 -p1 -b .quiet
%endif
%patch100 -p0 -b .0038-dragobject-dont-prefer-unknown
%patch101 -p0 -b .0047-fix-kmenu-width
%patch102 -p0 -b .0048-qclipboard_hack_80072
-%patch103 -p0 -b .0051-qtoolbar_77047
-%patch104 -p0 -b .0056-khotkeys_input_84434
+%patch103 -p0 -b .0056-khotkeys_input_84434
-%patch200 -p1 -b .assistant-translation
-%patch201 -p1 -b .fullscreen
-%patch202 -p1 -b .warning
+%patch200 -p1 -b .fullscreen
# convert to UTF-8
iconv -f iso-8859-1 -t utf-8 < doc/man/man3/qdial.3qt > doc/man/man3/qdial.3qt_
mv doc/man/man3/qdial.3qt_ doc/man/man3/qdial.3qt
-# de translation
-cp %{SOURCE2} tools/assistant/
-
%build
export QTDIR=`/bin/pwd`
export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH"
@@ -389,8 +378,6 @@
sh ./make-symlinks.sh
%endif
-# OPTFLAGS="$(echo $RPM_OPT_FLAGS | sed -e 's,-O2,-O0,')"
-
# don't use rpath
perl -pi -e "s|-Wl,-rpath,| |" mkspecs/*/qmake.conf
@@ -744,8 +731,11 @@
%changelog
+* Thu Jun 08 2006 Than Ngo <than at redhat.com> 1:3.3.6-0.1.fc5
+- update to 3.3.6
+
* Mon Feb 27 2006 Than Ngo <than at redhat.com> 1:3.3.5-13
-- add set of fixes for the immodule patch, thanks to Dirk Müller
+- add set of fixes for the immodule patch, thanks to Dirk Müller
* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:3.3.5-12.2
- bump again for double-long bug on ppc(64)
@@ -1644,7 +1634,7 @@
* Fri Mar 3 2000 Bill Nottingham <notting at redhat.com>
- fix %postun script
-* Fri Feb 18 2000 Bernhard Rosenkränzer <bero at redhat.com>
+* Fri Feb 18 2000 Bernhard Rosenkr�zer <bero at redhat.com>
- beta1
- get rid of qt-ImageIO, the functionality is now in the main Qt library
- remove qt-Network, the functionality is now in the main Qt library
@@ -1670,7 +1660,7 @@
* Thu Jan 13 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- switch from glxMesa to Mesa for the GL addon
-* Wed Jan 5 2000 Bernhard Rosenkränzer <bero at redhat.com>
+* Wed Jan 5 2000 Bernhard Rosenkr�zer <bero at redhat.com>
- Fix up dependencies
- new snapshot
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/qt/FC-5/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources 24 Oct 2005 08:41:11 -0000 1.23
+++ sources 8 Jun 2006 17:58:23 -0000 1.24
@@ -1,2 +1,2 @@
-05d04688c0c0230ed54e89102d689ca4 qt-x11-free-3.3.5.tar.bz2
-2d1a6979301ee81da404f63670211416 qt-x11-immodule-unified-qt3.3.5-20051018.diff.bz2
+dc1384c03ac08af21f6fefab32d982cf qt-x11-free-3.3.6.tar.bz2
+0c07b36cd8da9f796437dd398365c204 qt-x11-immodule-unified-qt3.3.5-20060318.diff.bz2
--- fix-im-crash-on-exit.diff DELETED ---
--- fix-key-release-event-with-imm.diff DELETED ---
--- qt-x11-free-3.3.4-qfontdatabase_x11.patch DELETED ---
--- qt-x11-immodule-fix-inputcontext-crash.diff DELETED ---
More information about the fedora-cvs-commits
mailing list