rpms/koffice/devel kde-libtool.patch, NONE, 1.1 koffice-1.2.94-fPIC.patch, NONE, 1.1 koffice-1.3-menu.patch, NONE, 1.1 koffice-1.3.1-rpath.patch, NONE, 1.1 koffice-1.3.5-immodule.patch, NONE, 1.1 koffice.spec, NONE, 1.1 koshell.png, NONE, 1.1 post-1.3.5-koffice.diff, NONE, 1.1 subdirs-koffice, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Than Ngo (than)
fedora-extras-commits at redhat.com
Wed Jul 20 09:21:52 UTC 2005
Author: than
Update of /cvs/extras/rpms/koffice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1789/devel
Modified Files:
.cvsignore sources
Added Files:
kde-libtool.patch koffice-1.2.94-fPIC.patch
koffice-1.3-menu.patch koffice-1.3.1-rpath.patch
koffice-1.3.5-immodule.patch koffice.spec koshell.png
post-1.3.5-koffice.diff subdirs-koffice
Log Message:
auto-import koffice-1.3.5-3 on branch devel from koffice-1.3.5-3.src.rpm
kde-libtool.patch:
--- NEW FILE kde-libtool.patch ---
--- kdelibs-3.1/admin/ltmain.sh.orig 2003-02-20 17:52:07.000000000 -0500
+++ kdelibs-3.1/admin/ltmain.sh 2003-02-20 18:30:32.000000000 -0500
@@ -4459,6 +4459,14 @@
case $host,$output,$installed,$module,$dlname in
*cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
esac
+ newdeplib=""
+ for j in $dependency_libs ; do
+ if echo $j | grep "gcc-lib" >& /dev/null ; then
+ continue
+ fi
+ newdeplib="$newdeplib $j"
+ done
+ dependency_libs="$newdeplib"
$echo > $output "\
# $outputname - a libtool library file
# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
koffice-1.2.94-fPIC.patch:
--- NEW FILE koffice-1.2.94-fPIC.patch ---
--- koffice-1.2.94/lib/kotext/kohyphen/Makefile.am.orig 2003-11-26 08:35:33.000000000 -0500
+++ koffice-1.2.94/lib/kotext/kohyphen/Makefile.am 2003-11-26 09:39:42.000000000 -0500
@@ -1,5 +1,6 @@
INCLUDES = $(KOFFICECORE_INCLUDES) $(KOFFICEUI_INCLUDES) $(all_includes)
KDE_CXXFLAGS = $(USE_EXCEPTIONS)
+DEFS = -DHAVE_CONFIG_H -fPIC
METASOURCES = AUTO
--- koffice-1.2.94/filters/kword/pdf/xpdf/goo/Makefile.am.orig 2003-11-26 11:29:36.000000000 -0500
+++ koffice-1.2.94/filters/kword/pdf/xpdf/goo/Makefile.am 2003-11-26 11:31:19.000000000 -0500
@@ -1,6 +1,8 @@
INCLUDES= -I$(srcdir)
+DEFS = -DHAVE_CONFIG_H -fPIC
+
noinst_LTLIBRARIES = libgoo.la
libgoo_la_SOURCES = GHash.cc GList.cc GString.cc gmempp.cc gfile.cc \
--- koffice-1.2.94/karbon/render/xrgbrender/Makefile.am.orig 2003-11-26 10:44:03.000000000 -0500
+++ koffice-1.2.94/karbon/render/xrgbrender/Makefile.am 2003-11-26 10:45:40.000000000 -0500
@@ -1,5 +1,7 @@
INCLUDES = $(all_includes)
+DEFS = -DHAVE_CONFIG_H -fPIC
+
noinst_LTLIBRARIES = libkarbonxrgbrender.la
libkarbonxrgbrender_la_SOURCES = gdk-pixbuf-xlib.c gdk-pixbuf-xlib-render.c gdk-pixbuf-xlib-drawable.c gdk-pixbuf-xlibrgb.c
--- koffice-1.2.94/karbon/render/Makefile.am.orig 2003-11-26 10:29:42.000000000 -0500
+++ koffice-1.2.94/karbon/render/Makefile.am 2003-11-26 10:29:59.000000000 -0500
@@ -1,5 +1,7 @@
SUBDIRS = xrgbrender
+DEFS = -DHAVE_CONFIG_H -fPIC
+
INCLUDES = $(KOFFICE_INCLUDES) $(KOPAINTER_INCLUDES) \
-I$(srcdir)/.. \
-I$(srcdir)/xrgbrender \
koffice-1.3-menu.patch:
--- NEW FILE koffice-1.3-menu.patch ---
--- koffice-1.3/kformula/kformula.desktop.orig 2004-05-03 16:32:04.976158569 +0200
+++ koffice-1.3/kformula/kformula.desktop 2004-05-03 16:31:46.370430290 +0200
@@ -73,4 +73,4 @@
X-KDE-NativeMimeType=application/x-kformula
X-DCOP-ServiceType=Multi
DocPath=kformula/index.html
-Categories=Qt;KDE;Office
+Categories=Qt;KDE;Office;X-KDE-More;
--- koffice-1.3/kword/kword.desktop.orig 2004-05-03 16:46:47.181776614 +0200
+++ koffice-1.3/kword/kword.desktop 2004-05-03 16:46:55.406212995 +0200
@@ -69,4 +69,4 @@
DocPath=kword/index.html
X-KDE-StartupNotify=true
X-DCOP-ServiceType=Multi
-Categories=Qt;KDE;Office
+Categories=Qt;KDE;Office;X-KDE-More;
--- koffice-1.3/kivio/kiviopart/kivio.desktop.orig 2004-05-03 16:32:53.579836094 +0200
+++ koffice-1.3/kivio/kiviopart/kivio.desktop 2004-05-03 16:33:15.257354087 +0200
@@ -50,4 +50,4 @@
X-KDE-NativeMimeType=application/x-kivio
DocPath=kivio/index.html
X-DCOP-ServiceType=Multi
-Categories=Qt;KDE;Office
+Categories=Qt;KDE;Office;X-KDE-More;
--- koffice-1.3/koshell/koshell.desktop.orig 2004-05-03 16:33:25.095681446 +0200
+++ koffice-1.3/koshell/koshell.desktop 2004-05-03 16:33:36.724886332 +0200
@@ -107,4 +107,4 @@
Icon=koshell
X-KDE-StartupNotify=true
X-DCOP-ServiceType=Multi
-Categories=Qt;KDE;Office
+Categories=Qt;KDE;Office;X-KDE-More;
--- koffice-1.3/kchart/kchart.desktop.orig 2004-05-03 16:31:05.656212886 +0200
+++ koffice-1.3/kchart/kchart.desktop 2004-05-03 16:31:31.039478120 +0200
@@ -65,4 +65,4 @@
X-KDE-NativeMimeType=application/x-kchart
X-KDE-StartupNotify=true
X-DCOP-ServiceType=Multi
-Categories=Qt;KDE;Office
+Categories=Qt;KDE;Office;X-KDE-More;
--- koffice-1.3/kpresenter/kpresenter.desktop.orig 2004-05-03 16:33:56.384542092 +0200
+++ koffice-1.3/kpresenter/kpresenter.desktop 2004-05-03 16:34:04.554983410 +0200
@@ -72,4 +72,4 @@
X-DCOP-ServiceType=multi
DocPath=kpresenter/index.html
X-KDE-StartupNotify=true
-Categories=Qt;KDE;Office
+Categories=Qt;KDE;Office;X-KDE-More;
--- koffice-1.3/kugar/kudesigner/kudesigner.desktop.orig 2004-05-03 16:35:59.449125628 +0200
+++ koffice-1.3/kugar/kudesigner/kudesigner.desktop 2004-05-03 16:45:51.727576563 +0200
@@ -3,7 +3,7 @@
Encoding=UTF-8
Type=Application
Exec=kudesigner %u
-Icon=kudesigner
+Icon=kugar
DocPath=kugar/index.html
Terminal=0
Name=Kugar Designer
@@ -117,5 +117,4 @@
X-KDE-NativeMimeType=application/x-kudesigner
X-KDE-Library=libkudesignerpart
ServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart
-
-Categories=Qt;KDE;Office
+Categories=Qt;KDE;Office;X-KDE-More;
--- koffice-1.3/kugar/part/kugar.desktop.orig 2004-05-03 16:46:26.080222642 +0200
+++ koffice-1.3/kugar/part/kugar.desktop 2004-05-03 16:46:35.746560246 +0200
@@ -62,4 +62,4 @@
ServiceTypes=KOfficePart,KParts/ReadOnlyPart,Browser/View
X-KDE-Library=libkugarpart
X-KDE-NativeMimeType=application/x-vnd.kde.kugar.mixed
-Categories=Qt;KDE;Office
+Categories=Qt;KDE;Office;X-KDE-More;
--- koffice-1.3/kspread/kspread.desktop.orig 2004-05-03 16:34:13.401378491 +0200
+++ koffice-1.3/kspread/kspread.desktop 2004-05-03 16:34:20.582887406 +0200
@@ -67,4 +67,4 @@
X-DCOP-ServiceType=multi
DocPath=kspread/index.html
X-KDE-StartupNotify=true
-Categories=Qt;KDE;Office
+Categories=Qt;KDE;Office;X-KDE-More;
--- koffice-1.3/karbon/data/karbon.desktop.orig 2004-05-03 16:30:25.152980683 +0200
+++ koffice-1.3/karbon/data/karbon.desktop 2004-05-03 16:30:46.361531438 +0200
@@ -57,4 +57,4 @@
Icon=karbon
ServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart
X-KDE-NativeMimeType=application/x-karbon
-Categories=Qt;KDE;Office
+Categories=Qt;KDE;Office;X-KDE-More;
--- koffice-1.3.1/tools/kthesaurus/KThesaurus.desktop.menu 2004-05-01 13:10:32.000000000 +0200
+++ koffice-1.3.1/tools/kthesaurus/KThesaurus.desktop 2004-05-13 16:14:49.935630742 +0200
@@ -51,4 +51,6 @@
GenericName[zh_CN]=相关å•è¯
GenericName[zh_TW]=相關單å—
X-KDE-StartupNotify=true
-Categories=Qt;KDE;Office
+Categories=Qt;KDE;Office;X-KDE-More;
+NoDisplay=true
+OnlyShowIn=KDE;
koffice-1.3.1-rpath.patch:
--- NEW FILE koffice-1.3.1-rpath.patch ---
--- koffice-1.3.1/filters/xsltfilter/configure.in.in.orig 2004-05-13 15:56:37.102877830 +0200
+++ koffice-1.3.1/filters/xsltfilter/configure.in.in 2004-05-13 16:08:01.800868541 +0200
@@ -55,7 +55,7 @@
fi
if test ! "$USE_RPATH" = "yes"; then
- LIBXLST_RPATH=
+ LIBXSLT_RPATH=
LIBXML_RPATH=
fi
koffice-1.3.5-immodule.patch:
--- NEW FILE koffice-1.3.5-immodule.patch ---
--- koffice-1.3.5/kword/kwtextframeset.cc.orig 2005-02-12 12:31:57.000000000 +0100
+++ koffice-1.3.5/kword/kwtextframeset.cc 2005-02-12 12:59:47.814137014 +0100
@@ -3225,6 +3225,21 @@
textView()->handleKeyReleaseEvent( e );
}
+void KWTextFrameSetEdit::imStartEvent( QIMEvent* e )
+{
+ textView()->handleImStartEvent( e );
+}
+
+void KWTextFrameSetEdit::imComposeEvent( QIMEvent* e )
+{
+ textView()->handleImComposeEvent( e );
+}
+
+void KWTextFrameSetEdit::imEndEvent( QIMEvent* e )
+{
+ textView()->handleImEndEvent( e );
+}
+
void KWTextFrameSetEdit::mousePressEvent( QMouseEvent *e, const QPoint &, const KoPoint & dPoint )
{
if ( dPoint.x() < 0 || dPoint.y() < 0 )
--- koffice-1.3.5/kword/kwtextframeset.h.orig 2005-02-12 12:32:08.000000000 +0100
+++ koffice-1.3.5/kword/kwtextframeset.h 2005-02-11 17:37:05.000000000 +0100
@@ -360,6 +360,9 @@
// Events forwarded by the canvas (when being in "edit" mode)
virtual void keyPressEvent( QKeyEvent * );
virtual void keyReleaseEvent( QKeyEvent * );
+ virtual void imStartEvent( QIMEvent * );
+ virtual void imComposeEvent( QIMEvent * );
+ virtual void imEndEvent( QIMEvent * );
virtual void mousePressEvent( QMouseEvent *, const QPoint &, const KoPoint & );
virtual void mouseMoveEvent( QMouseEvent *, const QPoint &, const KoPoint & ); // only called if button is pressed
virtual void mouseReleaseEvent( QMouseEvent *, const QPoint &, const KoPoint & );
--- koffice-1.3.5/kword/kwcanvas.cc.orig 2005-02-12 12:32:28.000000000 +0100
+++ koffice-1.3.5/kword/kwcanvas.cc 2005-02-11 23:27:42.000000000 +0100
@@ -101,6 +101,7 @@
viewport()->setFocusProxy( this );
viewport()->setFocusPolicy( WheelFocus );
setFocus();
+ setInputMethodEnabled( true );
viewport()->installEventFilter( this );
installEventFilter( this );
KCursor::setAutoHideCursor( this, true, true );
@@ -2573,6 +2574,24 @@
}
}
break;
+ case QEvent::IMStart:
+ {
+ QIMEvent * imev = static_cast<QIMEvent *>(e);
+ m_currentFrameSetEdit->imStartEvent( imev );
+ }
+ break;
+ case QEvent::IMCompose:
+ {
+ QIMEvent * imev = static_cast<QIMEvent *>(e);
+ m_currentFrameSetEdit->imComposeEvent( imev );
+ }
+ break;
+ case QEvent::IMEnd:
+ {
+ QIMEvent * imev = static_cast<QIMEvent *>(e);
+ m_currentFrameSetEdit->imEndEvent( imev );
+ }
+ break;
default:
break;
}
--- koffice-1.3.5/kword/kwframe.h.orig 2005-02-12 12:32:45.000000000 +0100
+++ koffice-1.3.5/kword/kwframe.h 2005-02-11 23:09:46.000000000 +0100
@@ -369,6 +369,9 @@
// Events forwarded by the canvas (when being in "edit" mode)
virtual void keyPressEvent( QKeyEvent * ) {}
virtual void keyReleaseEvent( QKeyEvent * ) {}
+ virtual void imStartEvent( QIMEvent * ) {}
+ virtual void imComposeEvent( QIMEvent * ) {}
+ virtual void imEndEvent( QIMEvent * ) {}
virtual void mousePressEvent( QMouseEvent *, const QPoint &, const KoPoint & ) {}
virtual void mouseMoveEvent( QMouseEvent *, const QPoint &, const KoPoint & ) {} // only called if button is pressed
virtual void mouseReleaseEvent( QMouseEvent *, const QPoint &, const KoPoint & ) {}
--- koffice-1.3.5/kspread/kspread_canvas.h.orig 2005-02-12 12:33:03.000000000 +0100
+++ koffice-1.3.5/kspread/kspread_canvas.h 2005-02-11 18:48:17.000000000 +0100
@@ -512,6 +512,8 @@
void processOtherKey(QKeyEvent *event);
bool processControlArrowKey(QKeyEvent *event);
+ void processIMEvent( QIMEvent * event );
+
void updateChooseRect(const QPoint &newMarker, const QPoint &newAnchor);
/**
--- koffice-1.3.5/kspread/kspread_canvas.cc.orig 2005-02-12 12:33:18.000000000 +0100
+++ koffice-1.3.5/kspread/kspread_canvas.cc 2005-02-12 14:49:49.950569130 +0100
@@ -338,6 +338,7 @@
installEventFilter( this );
(void)new KSpreadToolTip( this );
setAcceptDrops( true );
+ setInputMethodEnabled( true ); // ensure using the InputMethod
}
KSpreadCanvas::~KSpreadCanvas()
@@ -363,6 +364,15 @@
keyPressEvent ( keyev );
return true;
}
+ break;
+ }
+ case QEvent::IMStart:
+ case QEvent::IMCompose:
+ case QEvent::IMEnd:
+ {
+ QIMEvent * imev = static_cast<QIMEvent *>(e);
+ processIMEvent( imev );
+ break;
}
default:
break;
@@ -2423,6 +2433,31 @@
cell->setCellText( util_dateFormat(m_pDoc->locale(), date, KSpreadCell::ShortDate) );
}
+void KSpreadCanvas::processIMEvent( QIMEvent * event )
+{
+ m_pDoc->emitBeginOperation( false );
+ if ( !m_pEditor && !m_bChoose )
+ {
+ // Switch to editing mode
+ createEditor( CellEditor );
+ m_pEditor->handleIMEvent( event );
+ }
+
+ QPoint cursor;
+
+ if ( m_bChoose )
+ {
+ cursor = selectionInfo()->getChooseCursor();
+ /* if the cursor is unset, pretend we're starting at the regular cursor */
+ if (cursor.x() == 0 || cursor.y() == 0)
+ cursor = selectionInfo()->cursorPosition();
+ }
+ else
+ cursor = selectionInfo()->cursorPosition();
+
+ m_pDoc->emitEndOperation( QRect( cursor, cursor ) );
+}
+
bool KSpreadCanvas::formatKeyPress( QKeyEvent * _ev )
{
if (!(_ev->state() & ControlButton ))
--- koffice-1.3.5/kspread/kspread_editors.cc.orig 2005-02-12 12:33:32.000000000 +0100
+++ koffice-1.3.5/kspread/kspread_editors.cc 2005-02-11 18:48:17.000000000 +0100
@@ -249,7 +249,13 @@
return;
}
- // Send the key event to the QLineEdit
+ // Send the key event to the KLineEdit
+ QApplication::sendEvent( m_pEdit, _ev );
+}
+
+void KSpreadTextEditor::handleIMEvent( QIMEvent * _ev )
+{
+ // send the IM event to the KLineEdit
QApplication::sendEvent( m_pEdit, _ev );
}
@@ -288,7 +294,7 @@
bool KSpreadTextEditor::eventFilter( QObject* o, QEvent* e )
{
- // Only interested in QLineEdit
+ // Only interested in KLineEdit
if ( o != m_pEdit )
return FALSE;
if ( e->type() == QEvent::FocusOut )
--- koffice-1.3.5/kspread/kspread_editors.h.orig 2005-02-12 12:34:13.000000000 +0100
+++ koffice-1.3.5/kspread/kspread_editors.h 2005-02-11 18:48:17.000000000 +0100
@@ -19,6 +19,7 @@
KSpreadCell* cell()const { return m_pCell; }
virtual void handleKeyPressEvent( QKeyEvent* _ev ) = 0;
+ virtual void handleIMEvent( QIMEvent * _ev ) = 0;
virtual void setEditorFont(QFont const & font, bool updateSize) = 0;
virtual QString text() const = 0;
virtual void setText(QString text) = 0;
@@ -44,6 +45,7 @@
~KSpreadTextEditor();
virtual void handleKeyPressEvent( QKeyEvent* _ev );
+ virtual void handleIMEvent( QIMEvent * _ev );
virtual void setEditorFont(QFont const & font, bool updateSize);
virtual QString text() const;
virtual void setText(QString text);
--- koffice-1.3.5/lib/kotext/kotextview.h.orig 2005-02-12 12:34:27.043854371 +0100
+++ koffice-1.3.5/lib/kotext/kotextview.h 2005-02-11 18:48:17.000000000 +0100
@@ -109,6 +109,9 @@
void focusOutEvent();
void handleKeyPressEvent( QKeyEvent * e );
void handleKeyReleaseEvent( QKeyEvent * e );
+ void handleImStartEvent( QIMEvent * e );
+ void handleImComposeEvent( QIMEvent * e );
+ void handleImEndEvent( QIMEvent * e );
// iPoint is in Layout Unit pixels
// return true if we add new parag with "insert direct cursor"
bool handleMousePressEvent( QMouseEvent* e, const QPoint& iPoint, bool canStartDrag = true, bool insertDirectCursor = false );
--- koffice-1.3.5/lib/kotext/korichtext.cpp.orig 2005-02-12 12:34:40.760827475 +0100
+++ koffice-1.3.5/lib/kotext/korichtext.cpp 2005-02-11 22:31:15.000000000 +0100
@@ -1339,7 +1339,7 @@
m_pageBreakEnabled = false;
//minw = 0;
align = Qt::AlignAuto;
- nSelections = 1;
+ nSelections = 2;
addMargs = FALSE;
#if 0
@@ -1380,6 +1380,7 @@
selectionColors[ Standard ] = QApplication::palette().color( QPalette::Active, QColorGroup::Highlight );
selectionText[ Standard ] = TRUE;
+ selectionText[ InputMethodPreedit ] = FALSE;
commandHistory = new KoTextDocCommandHistory( 100 );
tStopWidth = formatCollection()->defaultFormat()->width( 'x' ) * 8;
}
--- koffice-1.3.5/lib/kotext/kotextdocument.h.orig 2005-02-12 12:34:55.299679135 +0100
+++ koffice-1.3.5/lib/kotext/kotextdocument.h 2005-02-11 18:48:17.000000000 +0100
@@ -49,6 +49,7 @@
public:
enum SelectionIds {
Standard = 0,
+ InputMethodPreedit = 1,
Temp = 32000 // This selection must not be drawn, it's used e.g. by undo/redo to
// remove multiple lines with removeSelectedText()
};
--- koffice-1.3.5/lib/kotext/kotextobject.cc.orig 2005-02-12 12:35:12.340161140 +0100
+++ koffice-1.3.5/lib/kotext/kotextobject.cc 2005-02-11 18:48:17.000000000 +0100
@@ -635,6 +635,7 @@
textdoc->setSelectionEnd( KoTextDocument::Temp, cursor );
//kdDebug(32500) << "KoTextObject::insert setting format " << currentFormat << endl;
textdoc->setFormat( KoTextDocument::Temp, currentFormat, KoTextFormat::Format );
+ textdoc->setFormat( KoTextDocument::InputMethodPreedit, currentFormat, KoTextFormat::Format );
textdoc->removeSelection( KoTextDocument::Temp );
// Speed optimization: if we only type a char, and it doesn't
@@ -1396,7 +1397,7 @@
emit ensureCursorVisible();
emit updateUI( true );
emit showCursor();
- if(selectionId==KoTextDocument::Standard)
+ if(selectionId==KoTextDocument::Standard || selectionId==KoTextDocument::InputMethodPreedit)
selectionChangedNotify();
if ( createUndoRedo)
undoRedoInfo.clear();
--- koffice-1.3.5/lib/kotext/kotextparag.cc.orig 2005-02-12 12:35:21.975737334 +0100
+++ koffice-1.3.5/lib/kotext/kotextparag.cc 2005-02-11 18:48:17.000000000 +0100
@@ -772,17 +772,38 @@
for ( int j = 0; j < nSels; ++j ) {
if ( start >= selectionStarts[ j ] && start < selectionEnds[ j ] ) {
inSelection = true;
- if ( j == KoTextDocument::Standard )
- painter.fillRect( startX_pix, lastY_pix, bw_pix, h_pix, cg.color( QColorGroup::Highlight ) );
- else
- painter.fillRect( startX_pix, lastY_pix, bw_pix, h_pix, doc ? doc->selectionColor( j ) : cg.color( QColorGroup::Highlight ) );
- break;
+ switch (j) {
+ case KoTextDocument::Standard:
+ painter.fillRect( startX_pix, lastY_pix, bw_pix, h_pix, cg.color( QColorGroup::Highlight ) );
+ break;
+ case KoTextDocument::InputMethodPreedit:
+ // no highlight
+ break;
+ default:
+ painter.fillRect( startX_pix, lastY_pix, bw_pix, h_pix, doc ? doc->selectionColor( j ) : cg.color( QColorGroup::Highlight ) );
+ break;
+ }
}
}
if ( !inSelection )
drawSelections = false; // save time in drawParagStringInternal
}
+ // Draw InputMethod Preedit Underline
+ const int nSels = doc ? doc->numSelections() : 1;
+ for ( int j = 0; j < nSels; j++ ) {
+ if ( start >= selectionStarts[ j ] && start < selectionEnds[ j ] ) {
+ if ( j == KoTextDocument::InputMethodPreedit ) {
+ QColor textColor( format->color() );
+ painter.setPen( QPen( textColor ) );
+
+ QPoint p1( startX_pix, lastY_pix + h_pix - 1 );
+ QPoint p2( startX_pix + bw_pix, lastY_pix + h_pix - 1 );
+ painter.drawLine( p1, p2 );
+ }
+ }
+ }
+
if ( draw_len > 0 )
{
int draw_startX_pix = zh->layoutUnitToPixelX( draw_startX ) /* + at( rightToLeft ? start+draw_len-1 : start )->pixelxadj*/;
--- koffice-1.3.5/lib/kotext/kotextview.cc.orig 2005-02-12 12:35:35.814692414 +0100
+++ koffice-1.3.5/lib/kotext/kotextview.cc 2005-02-12 12:54:56.637162921 +0100
@@ -391,6 +391,60 @@
}
}
+void KoTextView::handleImStartEvent( QIMEvent * e )
+{
+ // nothing to do
+ ;
+}
+
+void KoTextView::handleImComposeEvent( QIMEvent * e )
+{
+ // remove old preedit
+ if ( textDocument()->hasSelection( KoTextDocument::Standard ) )
+ textDocument()->removeSelection( KoTextDocument::Standard );
+ if ( textDocument()->hasSelection( KoTextDocument::InputMethodPreedit ) )
+ textDocument()->removeSelectedText( KoTextDocument::InputMethodPreedit, m_cursor );
+
+ // insert preedit
+ int preeditStartIdx = m_cursor->index();
+ textDocument()->setSelectionStart( KoTextDocument::InputMethodPreedit, m_cursor );
+ textObject()->insert( m_cursor, m_currentFormat, e->text(), false, true, i18n("Insert Text"),
+ CustomItemsMap(),
+ KoTextDocument::Standard,
+ false /* NOT REPAINT CURSOR! */);
+ textDocument()->setSelectionEnd( KoTextDocument::InputMethodPreedit, m_cursor );
+
+ // selection
+ int preeditSelStart = preeditStartIdx + e->cursorPos();
+ int preeditSelEnd = preeditSelStart + e->selectionLength();
+ m_cursor->setIndex( preeditSelStart );
+ textDocument()->setSelectionStart( KoTextDocument::Standard, m_cursor );
+ m_cursor->setIndex( preeditSelEnd );
+ textDocument()->setSelectionEnd( KoTextDocument::Standard, m_cursor );
+
+ // set cursor pos
+ m_cursor->setIndex( preeditSelStart );
+
+ textObject()->emitUpdateUI( true );
+ textObject()->emitShowCursor();
+ textObject()->selectionChangedNotify();
+}
+
+void KoTextView::handleImEndEvent( QIMEvent * e )
+{
+ // remove old preedit
+ if ( textDocument()->hasSelection( KoTextDocument::Standard ) )
+ textDocument()->removeSelection( KoTextDocument::Standard );
+ if ( textDocument()->hasSelection( KoTextDocument::InputMethodPreedit ) )
+ textDocument()->removeSelectedText( KoTextDocument::InputMethodPreedit, m_cursor );
+
+ insertText( e->text() );
+
+ textObject()->emitUpdateUI( true );
+ textObject()->emitShowCursor();
+ textObject()->selectionChangedNotify();
+}
+
void KoTextView::completion()
{
doCompletion(m_cursor, m_cursor->parag(),
--- koffice-1.3.5/kpresenter/kprcanvas.cc.orig 2005-02-12 12:35:50.000000000 +0100
+++ koffice-1.3.5/kpresenter/kprcanvas.cc 2005-02-12 14:48:38.848075625 +0100
@@ -151,6 +151,7 @@
setFocusPolicy( QWidget::StrongFocus );
setFocus();
setKeyCompression( true );
+ setInputMethodEnabled( true ); // ensure using the InputMethod
installEventFilter( this );
KCursor::setAutoHideCursor( this, true, true );
m_zoomBeforePresentation=100;
@@ -2381,6 +2382,35 @@
}
}
+void KPrCanvas::imStartEvent( QIMEvent * e )
+{
+ if ( editNum && m_currentTextObjectView )
+ {
+ if ( !m_currentTextObjectView->kpTextObject()->isProtectContent() )
+ m_currentTextObjectView->imStartEvent( e );
+ else
+ KMessageBox::information(this, i18n("Read-only content cannot be changed. No modifications will be accepted."));
+ }
+}
+
+void KPrCanvas::imComposeEvent( QIMEvent * e )
+{
+ if ( editNum && m_currentTextObjectView )
+ {
+ if ( !m_currentTextObjectView->kpTextObject()->isProtectContent() )
+ m_currentTextObjectView->imComposeEvent( e );
+ }
+}
+
+void KPrCanvas::imEndEvent( QIMEvent * e )
+{
+ if ( editNum && m_currentTextObjectView )
+ {
+ if ( !m_currentTextObjectView->kpTextObject()->isProtectContent() )
+ m_currentTextObjectView->imEndEvent( e );
+ }
+}
+
void KPrCanvas::resizeEvent( QResizeEvent *e )
{
if ( editMode )
--- koffice-1.3.5/kpresenter/kprcanvas.h.orig 2005-02-12 12:36:04.000000000 +0100
+++ koffice-1.3.5/kpresenter/kprcanvas.h 2005-02-11 18:48:17.000000000 +0100
@@ -455,6 +455,9 @@
virtual void dropEvent( QDropEvent *e );
virtual void keyPressEvent( QKeyEvent *e );
virtual void keyReleaseEvent( QKeyEvent *e );
+ virtual void imStartEvent( QIMEvent * e );
+ virtual void imComposeEvent( QIMEvent * e );
+ virtual void imEndEvent( QIMEvent * e );
void eraseEmptySpace( QPainter * painter, const QRegion & emptySpaceRegion, const QBrush & brush ) const;
--- koffice-1.3.5/kpresenter/kptextobject.h.orig 2005-02-12 12:36:19.000000000 +0100
+++ koffice-1.3.5/kpresenter/kptextobject.h 2005-02-11 18:48:17.000000000 +0100
@@ -223,8 +223,10 @@
void keyPressEvent( QKeyEvent * );
void keyReleaseEvent( QKeyEvent * );
+ void imStartEvent( QIMEvent * );
+ void imComposeEvent( QIMEvent * );
+ void imEndEvent( QIMEvent * );
void mousePressEvent( QMouseEvent *, const QPoint &);
-
void mouseMoveEvent( QMouseEvent *, const QPoint & );
void mouseReleaseEvent( QMouseEvent *, const QPoint & );
void mouseDoubleClickEvent( QMouseEvent *, const QPoint &);
--- koffice-1.3.5/kpresenter/kptextobject.cc.orig 2005-02-12 12:36:32.000000000 +0100
+++ koffice-1.3.5/kpresenter/kptextobject.cc 2005-02-11 18:48:17.000000000 +0100
@@ -1919,6 +1919,21 @@
handleKeyReleaseEvent(e);
}
+void KPTextView::imStartEvent( QIMEvent *e )
+{
+ handleImStartEvent(e);
+}
+
+void KPTextView::imComposeEvent( QIMEvent *e )
+{
+ handleImComposeEvent(e);
+}
+
+void KPTextView::imEndEvent( QIMEvent *e )
+{
+ handleImEndEvent(e);
+}
+
void KPTextView::clearSelection()
{
if ( textDocument()->hasSelection( KoTextDocument::Standard ) )
--- NEW FILE koffice.spec ---
%define debug 0
%define final 0
%define qt_version 3.3.3
%define kde_version 3.3.0
%define redhatify 1
%define libtool 1
%define buildall 0
Name: koffice
Version: 1.3.5
Release: 3
Epoch: 4
URL: http://koffice.kde.org/
Summary: A set of office applications for KDE.
Group: User Interface/Desktops
License: GPL
BuildRoot: %{_tmppath}/%{name}-buildroot
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
Source1: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-i18n-%{version}.tar.bz2
Source2: koshell.png
Source3: subdirs-koffice
Patch0: kde-libtool.patch
Patch1: koffice-1.2.94-fPIC.patch
Patch2: koffice-1.3-menu.patch
Patch3: koffice-1.3.1-rpath.patch
Patch4: koffice-1.3.5-immodule.patch
# security fixes
# kpdf Buffer Overflow Vulnerability, CAN-2005-0064
Patch100: post-1.3.5-koffice.diff
Prereq: kdelibs >= 6:%{kde_version}
Obsoletes: killustrator
Obsoletes: kivio
Requires(post,postun): /sbin/ldconfig
Requires: kdelibs >= 6:%{kde_version}
Requires: kdebase >= 6:%{kde_version}
BuildRequires: kdelibs-devel >= %{kde_version}
BuildRequires: kdebase-devel >= %{kde_version}
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
BuildRequires: glibc-devel
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: libstdc++-devel
BuildRequires: qt-devel >= %{qt_version}
BuildRequires: perl
%package devel
Summary: Development files for KOffice
Group: Development/Libraries
Requires: qt-devel >= 1:%{qt_version}
Requires: %{name} = %{epoch}:%{version}-%{release}
%package i18n
Summary: Internationalization support for koffice
Group: User Interface/Desktops
Requires: %{name} = %{epoch}:%{version}-%{release}
%description
The koffice package contains the KOffice office-type applications for
the K Desktop Environment (KDE) GUI desktop. KOffice contains KWord, a
word processor; KSpread, a spreadsheet; KPresenter, for presentations;
and KChart, a diagram generator.
%description devel
Development files for KOffice. Install koffice-devel if you want to develop
or compile plugins for KOffice.
%description i18n
Koffice is an Open Source, community-developed, multi-platform office
productivity suite. This package provides Internationalization support
for Koffice.
%prep
%setup -q
%patch0 -p1 -b .libtool
%patch1 -p1 -b .fPIC
%patch2 -p1 -b .menu
%patch3 -p1 -b .rpath
%patch4 -p1 -b .im
%patch100 -p1 -b .CAN-2005-0064
# Workaround for legacy auto* tools
%if %{libtool}
make -f admin/Makefile.common cvs
%endif
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
FLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DNO_DEBUG -DNDEBUG"
export KDEDIR=%{_prefix}
export CFLAGS="$FLAGS"
export CXXFLAGS="$FLAGS"
# koffice
%configure \
%if %{final}
--enable-final \
%endif
--disable-rpath \
--with-qt-libraries=$QTDIR/lib \
--with-extra-libs=%{_libdir} \
--includedir=%{_includedir}/kde
make %{?_smp_mflags}
# koffice-i18n
tar jxf %{SOURCE1}
pushd %{name}-i18n-%{version}
%if ! %{buildall}
rm -rf ar bg bs eo eu fa lt ms mt se sr sq ta th ven vi xh zu
cp %{SOURCE3} subdirs
%endif
%if %{libtool}
make -f admin/Makefile.common cvs
%endif
%configure
make %{?_smp_mflags}
popd
%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
make DESTDIR=$RPM_BUILD_ROOT -C %{name}-i18n-%{version} install
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/
# Replace absolute symlinks with relative ones
pushd $RPM_BUILD_ROOT%{_docdir}/HTML
for lang in *; do
if [ -d $lang ]; then
pushd $lang
for i in *; do
if [ -d $i -a -L $i/common ]; then
rm -f $i/common
ln -sf ../common $i
fi
done
popd
fi
done
popd
# conflict with kde-i18n
rm -f $RPM_BUILD_ROOT%{_datadir}/locale/*/LC_MESSAGES/kdgantt*
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root)
%doc %{_docdir}/HTML/en/*
%{_bindir}/*
%{_libdir}/*.so.??*
%{_libdir}/*.so
%{_libdir}/*.la
%{_libdir}/kde3/*
%{_datadir}/applnk/Office
%{_datadir}/apps/*
%{_datadir}/icons/*/*/*/*
%{_datadir}/services/*
%{_datadir}/servicetypes/*
%{_datadir}/templates
%files devel
%defattr(-,root,root)
%{_libdir}/*.so.?
%{_includedir}/kde/*
%files i18n
%defattr(-,root,root)
%{_datadir}/apps/koffice/autocorrect
%lang(af) %{_datadir}/locale/af/LC_MESSAGES/*
%if %{buildall}
%lang(ar) %{_datadir}/locale/ar/LC_MESSAGES/*
%lang(bs) %{_datadir}/locale/bs/LC_MESSAGES/*
%lang(bg) %{_datadir}/locale/bg/LC_MESSAGES/*
%endif
%lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/*
%lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/*
%lang(da) %{_datadir}/locale/da/LC_MESSAGES/*
%lang(da) %doc %{_docdir}/HTML/da/*
%lang(de) %{_datadir}/locale/de/LC_MESSAGES/*
%lang(de) %doc %{_docdir}/HTML/de/*
%lang(el) %{_datadir}/locale/el/LC_MESSAGES/*
%lang(en_GB) %{_datadir}/locale/en_GB/LC_MESSAGES/*
%lang(en_GB) %doc %{_docdir}/HTML/en_GB/*
%if %{buildall}
%lang(eo) %{_datadir}/locale/eo/LC_MESSAGES/*
%endif
%lang(es) %{_datadir}/locale/es/LC_MESSAGES/*
%lang(es) %doc %{_docdir}/HTML/es/*
%lang(et) %{_datadir}/locale/et/LC_MESSAGES/*
%lang(et) %doc %{_docdir}/HTML/et/*
%if %{buildall}
%lang(fa) %{_datadir}/locale/fa/LC_MESSAGES/*
%endif
%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/*
%lang(fr) %doc %{_docdir}/HTML/fr/*
%lang(he) %{_datadir}/locale/he/LC_MESSAGES/*
%lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/*
%lang(it) %{_datadir}/locale/it/LC_MESSAGES/*
%lang(it) %doc %{_docdir}/HTML/it/*
%lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/*
%if %{buildall}
%lang(lo) %{_datadir}/locale/lo/LC_MESSAGES/*
%lang(lt) %{_datadir}/locale/lt/LC_MESSAGES/*
%lang(lv) %{_datadir}/locale/lv/LC_MESSAGES/*
%lang(ms) %{_datadir}/locale/ms/LC_MESSAGES/*
%lang(mt) %{_datadir}/locale/mt/LC_MESSAGES/*
%endif
%lang(nb) %{_datadir}/locale/nb/LC_MESSAGES/*
%lang(nl) %{_datadir}/locale/nl/LC_MESSAGES/*
%lang(nn) %{_datadir}/locale/nn/LC_MESSAGES/*
%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/*
%lang(pl) %doc %{_docdir}/HTML/pl/*
%lang(pt) %{_datadir}/locale/pt/LC_MESSAGES/*
%lang(pt) %doc %{_docdir}/HTML/pt/*
%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/*
%lang(pt_BR) %doc %{_docdir}/HTML/pt_BR/*
%lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/*
%lang(ru) %doc %{_docdir}/HTML/ru/*
%if %{buildall}
%lang(se) %{_datadir}/locale/se/LC_MESSAGES/*
%endif
%lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/*
%lang(sk) %doc %{_docdir}/HTML/sk/*
%lang(sl) %{_datadir}/locale/sl/LC_MESSAGES/*
%lang(sl) %doc %{_docdir}/HTML/sl/*
%if %{buildall}
%lang(sq) %{_datadir}/locale/sq/LC_MESSAGES/*
%lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/*
%endif
%lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/*
%lang(sv) %doc %{_docdir}/HTML/sv/*
%if %{buildall}
%lang(th) %{_datadir}/locale/th/LC_MESSAGES/*
%endif
%lang(tr) %{_datadir}/locale/tr/LC_MESSAGES/*
%if %{buildall}
%lang(ven) %{_datadir}/locale/ven/LC_MESSAGES/*
%endif
%if %{buildall}
%lang(vi) %{_datadir}/locale/vi/LC_MESSAGES/*
%endif
%if %{buildall}
%lang(xh) %{_datadir}/locale/xh/LC_MESSAGES/*
%lang(xh) %doc %{_docdir}/HTML/xh/*
%endif
%lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/*
%lang(zh_TW) %{_datadir}/locale/zh_TW/LC_MESSAGES/*
%if %{buildall}
%lang(zu) %{_datadir}/locale/zu/LC_MESSAGES/*
%endif
%changelog
* Sat Feb 12 2005 Than Ngo <than at redhat.com> 4:1.3.5-3
- backport from CVS for working with qt-immodule
* Sat Jan 22 2005 Than Ngo <than at redhat.com> 4:1.3.5-2
- Apply patch to fix CAN-2005-0064
* Wed Nov 24 2004 Than Ngo <than at redhat.com> 4:1.3.5-1
- 1.3.5
* Thu Nov 11 2004 Than Ngo <than at redhat.com> 4:1.3.4-3
- rebuilt
* Sun Oct 31 2004 Than Ngo <than at redhat.com> 4:1.3.4-2
- apply better pdf fix
* Wed Oct 27 2004 Than Ngo <than at redhat.com> 4:1.3.4-1
- update to 1.3.4
* Wed Sep 15 2004 Than Ngo <than at redhat.com> 4:1.3.3-1
- update to 1.3.3
* Tue Jul 13 2004 Than Ngo <than at redhat.com> 4:1.3.2-2
- rebuild
* Thu Jul 01 2004 Than Ngo <than at redhat.com> 4:1.3.2-1
- update to 1.3.2
* Mon Jun 21 2004 Than Ngo <than at redhat.com> 4:1.3.1-5
- fix build problem with gcc-3.4
* Fri Jun 18 2004 Than Ngo <than at redhat.com> 4:1.3.1-4
- rebuilt
* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Thu May 13 2004 Than Ngo <than at redhat.com> 1.3.1-2
- get rid of rpath
* Tue May 04 2004 Than Ngo <than at redhat.com> 1.3.1-1
- update to 1.3.1
* Mon May 03 2004 Than Ngo <than at redhat.com> 1.3-6
- cleanup GNOME/KDE menu, add X-KDE-More in Categories
- add some fixes from CVS stable branch
* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Wed Feb 25 2004 Than Ngo <than at redhat.com> 4:1.3-5
- add patch files from CVS
* Sat Feb 14 2004 Than Ngo <than at redhat.com> 4:1.3-4
- rebuilt against qt 3.3.0
* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Mon Jan 26 2004 Tim Powers <timp at redhat.com> 4:1.3-2
- rebuild to pick up new ImageMagick deps
* Mon Jan 19 2004 Than Ngo <than at redhat.com> 4:1.3-1
- 1.3 release
* Tue Jan 13 2004 Than Ngo <than at redhat.com> 4:1.2.95-3
- fixed conflict problem with kde-i18n
* Fri Jan 09 2004 Than Ngo <than at redhat.com> 4:1.2.95-2
- add missing zh_CN
* Thu Jan 08 2004 Than Ngo <than at redhat.com> 4:1.2.95-1
- 1.3 rc2
* Wed Nov 26 2003 Than Ngo <than at redhat.com> 4:1.2.94-0.3
- koffice-i18n as subpackage
- fixed fPIC problem on x86_64
* Sat Nov 15 2003 Than Ngo <than at redhat.com> 4:1.2.94-0.2
- get rid of koffice-i18n, make koffice-i18n as separate rpm
* Thu Nov 13 2003 Than Ngo <than at redhat.com> 4:1.2.94-0.1
- 1.3 rc1
- cleanup
* Tue Oct 21 2003 Than Ngo <than at redhat.com> 4:1.2.1-15
- rebuild
* Fri Aug 29 2003 Than Ngo <than at redhat.com> 4:1.2.1-14
- fix build problem with gcc 3.3
* Tue Jul 8 2003 Than Ngo <than at redhat.com> 1.2.1-13
- fixed a bug, which caused koffices apps crash
in Gnome Desktop (bug #76232,#84678,#86479,#80926,#92044)
* Thu Jun 26 2003 Than Ngo <than at redhat.com> 1.2.1-12
- add patch for checking vsnprintf (Sysoltsev Slawa), bug #89142
* Wed Jun 25 2003 Than Ngo <than at redhat.com> 1.2.1-11
- rebuilt
* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Wed Jun 4 2003 Than Ngo <than at redhat.com> 1.2.1-9
- fix build with gcc 3.3
* Mon Mar 24 2003 Than Ngo <than at redhat.com> 1.2.1-8
- rebuild against kde 3.1.1
* Mon Feb 24 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Mon Feb 24 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Mon Feb 24 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Thu Feb 20 2003 Than Ngo <than at redhat.com> 1.2.1-4
- get rid of gcc path from dependency_libs
- add requires kdebase, #84678
* Thu Feb 13 2003 Than Ngo <than at redhat.com> 1.2.1-3
- rebuild against new arts
* Mon Jan 27 2003 Than Ngo <than at redhat.com> 1.2.1-2
- fix #81300
- add a patch file, it fixes a crash when closing the "Insert Special Character" dialog,
and a crash when updating the Table Of Contents
- cleanup specfile
* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt
* Wed Dec 11 2002 Than Ngo <than at redhat.com> 1.2.1-1
- cleanup specfile
- remove a patch file, which is in upstream
- dangling symlinks (bug #78089)
- fPIC issue
* Sun Nov 10 2002 Than Ngo <than at redhat.com> 1.2-2
- fix some build problem
* Mon Oct 14 2002 Than Ngo <than at redhat.com> 1.2-1
- 1.2
* Mon Aug 12 2002 Than Ngo <than at redhat.com> 1.2-0.rc1.3
- Add missing desktop files for servicetype
* Fri Aug 9 2002 Than Ngo <than at redhat.com> 1.2-0.rc1.2
- add desktopfix patch file from Harald Hoyer
- desktop file issues
* Tue Aug 7 2002 Bernhard Rosenkraenzer <bero at redhat.com> 1.2-0.rc1.1
- rc1
* Tue Jul 23 2002 Tim Powers <timp at redhat.com> 1.2-0.beta2.3
- build using gcc-3.2-0.1
* Tue Jul 09 2002 Than Ngo <than at redhat.com> 1.2-0.beta2.2
- use desktop-file-install
* Tue Apr 16 2002 Bernhard Rosenkraenzer <bero at redhat.com> 1.1.1-5
- Change sonames
* Thu Mar 28 2002 Than Ngo <than at redhat.com> 1.1.1-4
- fix conflicts with kdelibs and kde-i18n
* Wed Mar 27 2002 Bernhard Rosenkraenzer <bero at redhat.com> 1.1.1-3
- Revert to 1.1.1 branch, 1.2/2.0 won't be out in time.
* Wed Jan 9 2002 Bernhard Rosenkraenzer <bero at redhat.com> 1.1.1-2
- Rename kra*** to kopaint
* Fri Dec 14 2001 Bernhard Rosenkraenzer <bero at redhat.com> 1.1.1-1
- 1.1.1
* Wed Aug 29 2001 Bernhard Rosenkraenzer <bero at redhat.com> 1.1-5
- Rebuild with new kdelibs
* Mon Aug 27 2001 Bernhard Rosenkraenzer <bero at redhat.com> 1.1-4
- Merge koffice-i18n into the package
* Thu Aug 23 2001 Bernhard Rosenkraenzer <bero at redhat.com> 1.1-3
- Add missing defattr to -devel (#52292)
- Remove dupes from kdeartwork-locolor (Part of #51589)
* Tue Aug 21 2001 Bernhard Rosenkraenzer <bero at redhat.com> 1.1-2
- Replace koshell icon (#51439)
- Move include files to the correct directory (/usr/include/kde rather than
/usr/include)
- restore -devel package (it was lost in 1.1-1 for some reason)
- Don't own standard directories
* Tue Aug 14 2001 Bernhard Rosenkraenzer <bero at redhat.com> 1.1-1
- 1.1 final
- Add icon for koshell (#51439)
* Wed Jul 25 2001 Bernhard Rosenkraenzer <bero at redhat.com> 1.1-0.cvs20010725.1
- Increase Epoch
* Tue Jul 24 2001 Bernhard Rosenkraenzer <bero at redhat.com> 1.1-0.cvs20010724.1
- Don't build kivio on ia64 ATM (compiler bug)
* Tue Feb 20 2001 Than Ngo <than at redhat.com>
- update 2.1
- fix dangling symlinks
* Fri Feb 2 2001 Bernhard Rosenkraenzer <bero at redhat.com>
- Add ldconfig in %%post and %%postun, replace absolute symlinks
with relative symlinks (#24878)
* Mon Jan 22 2001 Bernhard Rosenkraenzer <bero at redhat.com>
- Update
* Thu Jan 11 2001 Bernhard Rosenkraenzer <bero at redhat.com>
- Update
- Don't build on sparc and ia64 (Bug #23809)
* Sun Dec 3 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- 2.0.1
* Fri Nov 3 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- Update to KDE_2_0_BRANCH
* Mon Oct 16 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- 2.0 final
* Tue Oct 3 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- 2.0
* Mon Oct 2 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- new CVS
- fix compilation
* Thu Aug 24 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- kill dupes from kdelibs
* Thu Aug 24 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- 1.93
* Sun Aug 6 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- update (fixed compilation with gcc 2.96 in CVS)
- work around compiler bugs on alpha
* Fri Aug 4 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- new snapshot
- move to /usr/lib/kde2
* Thu Jul 27 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- rebuild
* Tue Jul 25 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- new snapshot
* Sun Jul 23 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- new snapshot, new Qt
* Thu Jul 13 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- Don't hardcode Qt version
- obsolete killustrator (powertools 6.x)
- SMPify
* Tue Jul 11 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- use gcc 2.96
- new snapshot
* Mon Jul 3 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- use kernelcc
- new snapshot
* Tue Jun 20 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- new snapshot
- ExcludeArch ia64
* Sat Mar 18 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- new snapshot
- move it to /usr, where it belongs
* Sat Oct 23 1999 Bernhard Rosenkraenzer <bero at redhat.de>
- Initial RPM
post-1.3.5-koffice.diff:
--- NEW FILE post-1.3.5-koffice.diff ---
Index: koffice/filters/kword/pdf/xpdf/xpdf/XRef.cc
===================================================================
RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/XRef.cc,v
retrieving revision 1.6
retrieving revision 1.8
diff -u -p -r1.6 -r1.8
--- koffice/filters/kword/pdf/xpdf/xpdf/XRef.cc 30 Oct 2004 16:35:33 -0000 1.6
+++ koffice/filters/kword/pdf/xpdf/xpdf/XRef.cc 20 Jan 2005 17:36:38 -0000 1.8
@@ -501,6 +501,12 @@ GBool XRef::checkEncrypted(GString *owne
} else {
keyLength = 5;
}
+ if (keyLength < 1) {
+ keyLength = 1;
+ }
+ if (keyLength > 16) {
+ keyLength = 16;
+ }
permFlags = permissions.getInt();
if (encVersion >= 1 && encVersion <= 2 &&
encRevision >= 2 && encRevision <= 3) {
--- NEW FILE subdirs-koffice ---
af
ca
cs
da
de
el
en_GB
es
et
fr
he
hu
it
ja
nl
nb
nn
pl
pt
pt_BR
ru
sk
sl
sv
tr
zh_CN
zh_TW
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 20 Jul 2005 09:18:46 -0000 1.1
+++ .cvsignore 20 Jul 2005 09:21:50 -0000 1.2
@@ -0,0 +1,2 @@
+koffice-1.3.5.tar.bz2
+koffice-i18n-1.3.5.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 20 Jul 2005 09:18:46 -0000 1.1
+++ sources 20 Jul 2005 09:21:50 -0000 1.2
@@ -0,0 +1,2 @@
+dbc7e76c86647709a3e74f57c0fcf7f5 koffice-1.3.5.tar.bz2
+7a4af78be2a9e09a148717079f44a7a7 koffice-i18n-1.3.5.tar.bz2
More information about the fedora-extras-commits
mailing list