new revision - fix bug #11058 - add a patch that fixes a bug in kspread

4 files changed, 99 insertions, 1 deletions

diff --git a/app-office/koffice/ChangeLog b/app-office/koffice/ChangeLog
index 57d79119a366..2b56f5bfad4b 100644
--- a/app-office/koffice/ChangeLog
+++ b/app-office/koffice/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/koffice
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.14 2002/11/24 05:04:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.15 2002/11/24 20:14:22 danarmak Exp $
+
+*koffice-1.2-r2 (24 Nov 2002)
+
+  24 Nov 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Fix bug #11058: add a patch that fixes a grave bug in kspread.
 
 *koffice-1.2-r1 (24 Nov 2002)
 
diff --git a/app-office/koffice/files/digest-koffice-1.2-r2 b/app-office/koffice/files/digest-koffice-1.2-r2
new file mode 100644
index 000000000000..e4febdfaf1c9
--- /dev/null
+++ b/app-office/koffice/files/digest-koffice-1.2-r2
@@ -0,0 +1 @@
+MD5 34cb13104bc1d4f0916b0dda6dec7ee0 koffice-1.2.tar.bz2 9321755
diff --git a/app-office/koffice/files/koffice-1.2-kspread_cell.diff b/app-office/koffice/files/koffice-1.2-kspread_cell.diff
new file mode 100644
index 000000000000..4e05a17d3c1a
--- /dev/null
+++ b/app-office/koffice/files/koffice-1.2-kspread_cell.diff
@@ -0,0 +1,58 @@
+Index: kspread_cell.cc
+===================================================================
+RCS file: /home/kde/koffice/kspread/kspread_cell.cc,v
+retrieving revision 1.447.2.1
+diff -u -r1.447.2.1 kspread_cell.cc
+--- kspread/kspread_cell.cc	2002/09/04 06:59:13	1.447.2.1
++++ kspread/kspread_cell.cc	2002/10/21 18:31:51
+@@ -1931,20 +1931,40 @@
+        while already drawing the obscuring cell -- don't want to cause an
+        infinite loop
+     */
+-    // Determine the dimension of the cell.
++
++    /*
++      Store the obscuringCells list in a list of QPoint(column, row)
++      This avoids crashes during the iteration through obscuringCells,
++      when the cells may get non valid or the list itself gets changed
++      during a call of obscuringCell->paintCell (this happens e.g. when
++      there is an updateDepend)
++    */
++    QValueList<QPoint> listPoints;
+     QValueList<KSpreadCell*>::iterator it = m_ObscuringCells.begin();
+     QValueList<KSpreadCell*>::iterator end = m_ObscuringCells.end();
+-    for ( ; it != end; ++it ) {
++    for ( ; it != end; ++it )
++    {
+       KSpreadCell *obscuringCell = *it;
+-      QPoint obscuringCellRef( obscuringCell->column(), obscuringCell->row() );
+-      double x = m_pTable->dblColumnPos( obscuringCell->column() );
+-      double y = m_pTable->dblRowPos( obscuringCell->row() );
+-      QPair<double,double> corner = qMakePair( x, y );
+-      painter.save();
++      listPoints.append( QPoint( obscuringCell->column(), obscuringCell->row() ) );
++    }
++
++    QValueList<QPoint>::iterator it1 = listPoints.begin();
++    QValueList<QPoint>::iterator end1 = listPoints.end();
++    for ( ; it1 != end1; ++it1 )
++    {
++      QPoint obscuringCellRef = *it1;
++      KSpreadCell *obscuringCell = m_pTable->cellAt( obscuringCellRef.x(), obscuringCellRef.y() );
++      if( obscuringCell != 0 )
++      {
++        double x = m_pTable->dblColumnPos( obscuringCellRef.x() );
++        double y = m_pTable->dblRowPos( obscuringCellRef.y() );
++        QPair<double,double> corner = qMakePair( x, y );
++        painter.save();
+
+-      obscuringCell->paintCell( rect, painter, view,
+-                                corner, obscuringCellRef );
+-      painter.restore();
++        obscuringCell->paintCell( rect, painter, view,
++                                  corner, obscuringCellRef );
++        painter.restore();
++      }
+     }
+   }
+ }
diff --git a/app-office/koffice/koffice-1.2-r2.ebuild b/app-office/koffice/koffice-1.2-r2.ebuild
new file mode 100644
index 000000000000..23845c1592d1
--- /dev/null
+++ b/app-office/koffice/koffice-1.2-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.2-r2.ebuild,v 1.1 2002/11/24 20:14:22 danarmak Exp $
+inherit kde-base flag-o-matic
+
+filter-flags "-fomit-frame-pointer"
+
+need-kde 3
+
+DESCRIPTION="A free, integrated office suite for KDE, the K Desktop Environment."
+HOMEPAGE="http://www.koffice.org/"
+LICENSE="GPL-2 LGPL-2"
+SRC_URI="mirror://kde/stable/$P/src/$P.tar.bz2"
+
+KEYWORDS="x86 ppc"
+
+DEPEND="$DEPEND
+	>=dev-lang/python-2.2.1
+	>=media-libs/libart_lgpl-2.3.9
+	>=media-gfx/imagemagick-5.4.5"
+
+export LIBPYTHON="`python-config --libs`"
+export LIBPYTHON="${LIBPYTHON//-L \/usr\/lib\/python2.2\/config}"
+
+need-automake 1.5
+need-autoconf 2.5
+
+set_enable_final
+
+# 1st patch: fix bug #7893 - kde bug #47146.
+# 2nd patch: fix bug #11058
+# patches are from koffice cvs - stable tree
+PATCHES="$FILESDIR/$P-connectortool.diff $FILESDIR/$P-kspread_cell.diff"