summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrochner <drochner@pkgsrc.org>2003-01-10 11:15:55 +0000
committerdrochner <drochner@pkgsrc.org>2003-01-10 11:15:55 +0000
commit122d99ac3bb1c3bf6c4c19634c14a849378d1f09 (patch)
treec0a508acc91f3db9edbcf98390f41a30f6cd69ec
parent7aa6175ce8c2dca2f8f78a5628a8df8ba54fc4eb (diff)
downloadpkgsrc-122d99ac3bb1c3bf6c4c19634c14a849378d1f09.tar.gz
update to 1.2.1
KOffice 1.2.1 is a stability release, with the principal improvements over KOffice 1.2, released last September, occurring in the spreadsheet program (KSpread).
-rw-r--r--misc/koffice/Makefile11
-rw-r--r--misc/koffice/distinfo7
-rw-r--r--misc/koffice/patches/patch-aa55
3 files changed, 8 insertions, 65 deletions
diff --git a/misc/koffice/Makefile b/misc/koffice/Makefile
index 00d7dc9b168..d67e90de564 100644
--- a/misc/koffice/Makefile
+++ b/misc/koffice/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2002/12/24 06:10:16 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2003/01/10 11:15:55 drochner Exp $
-DISTNAME= koffice-1.2
-PKGREVISION= 1
+DISTNAME= koffice-1.2.1
CATEGORIES= misc kde
-MASTER_SITES= ftp://ftp.kde.org/pub/kde/stable/koffice-1.2/src/ \
- ftp://ftp.us.kde.org/pub/kde/stable/koffice-1.2/src/ \
- ftp://ftp.de.kde.org/pub/kde/stable/koffice-1.2/src/
+MASTER_SITES= ftp://ftp.kde.org/pub/kde/stable/koffice-1.2.1/src/ \
+ ftp://ftp.us.kde.org/pub/kde/stable/koffice-1.2.1/src/ \
+ ftp://ftp.de.kde.org/pub/kde/stable/koffice-1.2.1/src/
EXTRACT_SUFX= .tar.bz2
CONFLICTS+= koffice3-[0-9]*
diff --git a/misc/koffice/distinfo b/misc/koffice/distinfo
index 8e0e1b2af68..72d17e8aabd 100644
--- a/misc/koffice/distinfo
+++ b/misc/koffice/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.7 2002/10/26 14:31:12 drochner Exp $
+$NetBSD: distinfo,v 1.8 2003/01/10 11:15:55 drochner Exp $
-SHA1 (koffice-1.2.tar.bz2) = 5a959033358a27e8c6e9f02a1d0405fb1bd06b52
-Size (koffice-1.2.tar.bz2) = 9321755 bytes
-SHA1 (patch-aa) = 6be458998e9ca7648b868c4c99a9e104d4780562
+SHA1 (koffice-1.2.1.tar.bz2) = f3fd98d081205f2cd7be3fba76e4cf5b053b8e53
+Size (koffice-1.2.1.tar.bz2) = 9275595 bytes
diff --git a/misc/koffice/patches/patch-aa b/misc/koffice/patches/patch-aa
deleted file mode 100644
index bbd5f82997d..00000000000
--- a/misc/koffice/patches/patch-aa
+++ /dev/null
@@ -1,55 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2002/10/26 14:31:13 drochner Exp $
-
---- kspread/kspread_cell.cc.orig Wed Sep 4 23:52:50 2002
-+++ kspread/kspread_cell.cc Fri Oct 25 19:12:19 2002
-@@ -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();
-+ }
- }
- }
- }