new release, removed older ones (1.2_pre)

10 files changed, 175 insertions, 25 deletions

diff --git a/app-office/koffice/ChangeLog b/app-office/koffice/ChangeLog
index 145eeec4016c..c8830c1bc373 100644
--- a/app-office/koffice/ChangeLog
+++ b/app-office/koffice/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-office/koffice
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.2 2002/04/02 18:44:38 verwilst Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.3 2002/04/26 06:45:15 verwilst Exp $
+
+*koffice-1.2_beta1 (26 April 2002)
+
+  26 April 2002; Bart Verwilst <verwilst@gentoo.org> ChangeLog :
+
+  First beta released! Since i'm a kde packager now, much more
+  post-beta1 bugs have been patched, and the package is much more tested
+  than the other previous koffice releases.. Enjoy! 
 
 *koffice-1.2_pre20020402 (2 April 2002)
 
diff --git a/app-office/koffice/files/digest-koffice-1.2_beta1 b/app-office/koffice/files/digest-koffice-1.2_beta1
new file mode 100644
index 000000000000..fc0ab065e620
--- /dev/null
+++ b/app-office/koffice/files/digest-koffice-1.2_beta1
@@ -0,0 +1 @@
+MD5 1f2e53851eb2b7eec7faa52048afb07a koffice-1.2-beta1.tar.bz2 7901314
diff --git a/app-office/koffice/files/digest-koffice-1.2_pre20020411 b/app-office/koffice/files/digest-koffice-1.2_pre20020411
deleted file mode 100644
index 9893d62cbb3a..000000000000
--- a/app-office/koffice/files/digest-koffice-1.2_pre20020411
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0eb4cdc823ffbe2a8378046e43c232d0 koffice-20020411.tar.bz2 8233979
diff --git a/app-office/koffice/files/koffice-1.1-gentoo.diff b/app-office/koffice/files/koffice-1.1-gentoo.diff
deleted file mode 100644
index cbe01508c87a..000000000000
--- a/app-office/koffice/files/koffice-1.1-gentoo.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- admin/acinclude.m4.in~	Wed May 16 14:39:19 2001
-+++ admin/acinclude.m4.in	Tue May 22 04:32:31 2001
-@@ -3566,14 +3566,7 @@
-   dnl Note: this test is very weak
-   kde_python_link_found=no
-   KDE_TRY_LINK_PYTHON(normal)
--  KDE_TRY_LINK_PYTHON(m, -lm)
--  KDE_TRY_LINK_PYTHON(pthread, $LIBPTHREAD)
--  KDE_TRY_LINK_PYTHON(tcl, -ltcl)
--  KDE_TRY_LINK_PYTHON(m_and_thread, [$LIBPTHREAD -lm])
--  KDE_TRY_LINK_PYTHON(m_and_thread_and_util, [$LIBPTHREAD -lm -lutil])
--  KDE_TRY_LINK_PYTHON(m_and_thread_and_db3, [$LIBPTHREAD -lm -ldb-3 -lutil])
--  KDE_TRY_LINK_PYTHON(pthread_and_db3, [$LIBPTHREAD -ldb-3])
--  KDE_TRY_LINK_PYTHON(m_and_thread_and_db, [$LIBPTHREAD -lm -ldb -ltermcap -lutil])
-+  KDE_TRY_LINK_PYTHON(gentoo, [$LIBPTHREAD `python-config --libs`])
-   KDE_TRY_LINK_PYTHON(m_and_thread_and_db_special, [$LIBPTHREAD -lm -ldb -lutil], [],
- 	[AC_MSG_WARN([it seems, Python depends on another library.
-     Pleae use \"make LIBPYTHON='-lpython$version -lotherlib'\" to fix this
diff --git a/app-office/koffice/files/koffice-1.2_beta1-kwcanvas.diff b/app-office/koffice/files/koffice-1.2_beta1-kwcanvas.diff
new file mode 100644
index 000000000000..d94f33228311
--- /dev/null
+++ b/app-office/koffice/files/koffice-1.2_beta1-kwcanvas.diff
@@ -0,0 +1,18 @@
+--- kwcanvas.cc	2002/04/17 11:30:35	1.336
++++ kwcanvas.cc	2002/04/22 19:19:12	1.337
+@@ -1256,13 +1256,14 @@ void KWCanvas::mrCreateTable()
+ KWTableFrameSet * KWCanvas::createTable() // uses m_insRect and m_table to create the table
+ {
+     KWTableFrameSet *table = new KWTableFrameSet( m_doc, QString::null /*automatic name*/ );
++    int pageNum = static_cast<int>(m_insRect.y() / m_doc->ptPaperHeight());
+
+     // Create a set of cells with random-size frames.
+     for ( unsigned int i = 0; i < m_table.rows; i++ ) {
+         for ( unsigned int j = 0; j < m_table.cols; j++ ) {
+             KWTableFrameSet::Cell *cell = new KWTableFrameSet::Cell( table, i, j, QString::null /*automatic name*/ );
+             KWFrame *frame = new KWFrame(cell, 0, 0, 0, 0, KWFrame::RA_NO ); // pos and size will be set in setBoundingRect
+-            // Wrong page! frame->setZOrder( m_doc->maxZOrder( frame->pageNum(m_doc) ) + 1 ); // make sure it's on top
++            frame->setZOrder( m_doc->maxZOrder( pageNum ) + 1 ); // make sure it's on top
+             cell->addFrame( frame, false );
+             frame->setFrameBehavior(KWFrame::AutoExtendFrame);
+             frame->setNewFrameBehavior(KWFrame::NoFollowup);
diff --git a/app-office/koffice/files/koffice-1.2_beta1-kwdoc.diff b/app-office/koffice/files/koffice-1.2_beta1-kwdoc.diff
new file mode 100644
index 000000000000..024dd14d5307
--- /dev/null
+++ b/app-office/koffice/files/koffice-1.2_beta1-kwdoc.diff
@@ -0,0 +1,34 @@
+--- kwdoc.cc	2002/04/18 08:56:25	1.384
++++ kwdoc.cc	2002/04/22 19:02:40	1.385
+@@ -1659,22 +1659,25 @@ bool KWDocument::completeLoading( KoStor
+     processImageRequests();
+     processAnchorRequests();
+
++    // Save memory
++    m_urlIntern = QString::null;
++
+     // The fields from documentinfo.xml just got loaded -> update vars
+     recalcVariables( VT_FIELD );
+
++    // This computes the number of pages (from the frames)
++    // for the first time (and adds footers/headers etc.)
++    // It is necessary to do so BEFORE calling finalize, since updateFrames
++    // (in KWTextFrameSet) needs the number of pages.
++    recalcFrames();
++
+     // Finalize all the existing framesets
+     QPtrListIterator<KWFrameSet> fit = framesetsIterator();
+     for ( ; fit.current() ; ++fit )
+         fit.current()->finalize();
+
+-    // Save memory
+-    m_urlIntern = QString::null;
+-
+     // Fix z orders on older documents
+     fixZOrders();
+-
+-    recalcFrames(); // This computes the number of pages (from the frames)
+-                    // for the first time (and adds footers/headers etc.)
+
+     emit newContentsSize();
+     repaintAllViews( true );     // in case any view exists already
diff --git a/app-office/koffice/files/koffice-1.2_beta1-kwtableframeset.diff b/app-office/koffice/files/koffice-1.2_beta1-kwtableframeset.diff
new file mode 100644
index 000000000000..bdee402857cb
--- /dev/null
+++ b/app-office/koffice/files/koffice-1.2_beta1-kwtableframeset.diff
@@ -0,0 +1,13 @@
+--- kwtableframeset.cc	2002/04/03 06:11:15	1.191
++++ kwtableframeset.cc	2002/04/23 13:30:24
+@@ -81,7 +81,9 @@ void KWTableFrameSet::updateFrames()
+     for (unsigned int i =0; i < m_cells.count(); i++)
+     {
+         m_cells.at(i)->updateFrames();
+-        m_cells.at(i)->invalidate();
++        //This is wrong (reason for famous infinite loop bug)
++        //Do this in KWTableFrameSet::invalidate
++        //m_cells.at(i)->invalidate();
+     }
+     KWFrameSet::updateFrames();
+ }
diff --git a/app-office/koffice/files/koffice-1.2_beta1-kwtextframeset.diff b/app-office/koffice/files/koffice-1.2_beta1-kwtextframeset.diff
new file mode 100644
index 000000000000..19b26694f08c
--- /dev/null
+++ b/app-office/koffice/files/koffice-1.2_beta1-kwtextframeset.diff
@@ -0,0 +1,72 @@
+--- kwtextframeset.cc	2002/04/18 15:56:37	1.504
++++ kwtextframeset.cc	2002/04/23 13:30:25
+@@ -1558,7 +1558,7 @@ void KWTextFrameSet::slotAfterFormatting
+                     if ( wantedPosition != theFrame->top() && QMAX(theFrame->bottom()-maxFooterSize,wantedPosition)==wantedPosition )
+                     {
+                         theFrame->setTop( wantedPosition);
+-                        frameResized( theFrame );
++                        frameResized( theFrame, true );
+                     }
+                     break;
+                 }
+@@ -1594,7 +1594,7 @@ void KWTextFrameSet::slotAfterFormatting
+
+                 if(newPosition < wantedPosition && (theFrame->newFrameBehavior() == KWFrame::NoFollowup)) {
+                     if ( resized )
+-                        frameResized( theFrame );
++                        frameResized( theFrame, false );
+                     m_textobj->setLastFormattedParag( 0 );
+                     break;
+                 }
+@@ -1603,7 +1603,7 @@ void KWTextFrameSet::slotAfterFormatting
+                     // fall through to AutoCreateNewFrame
+                 } else {
+                     if ( resized )
+-                        frameResized( theFrame );
++                        frameResized( theFrame, false );
+                     break;
+                 }
+             }
+@@ -1704,7 +1704,7 @@ void KWTextFrameSet::slotAfterFormatting
+             {
+                 kdDebug() << "top= " << theFrame->top() << " setTop " << wantedPosition << endl;
+                 theFrame->setTop( wantedPosition );
+-                frameResized( theFrame );
++                frameResized( theFrame, true );
+             }
+         }
+         else
+@@ -1725,12 +1725,12 @@ void KWTextFrameSet::slotAfterFormatting
+                         kdDebug(32002) << "is table cell; only setting new minFrameHeight, recalcrows will do the rest" << endl;
+ #endif
+                         theFrame->setMinFrameHeight(wantedPosition - theFrame->top());
+-                        frameResized( theFrame );
++                        frameResized( theFrame, false );
+                     }
+                 } else {
+                     kdDebug() << "setBottom " << wantedPosition << endl;
+                     theFrame->setBottom( wantedPosition );
+-                    frameResized( theFrame );
++                    frameResized( theFrame, false );
+                 }
+             }
+         }
+@@ -1759,7 +1759,7 @@ double KWTextFrameSet::footerHeaderSizeM
+     return tmp;
+ }
+
+-void KWTextFrameSet::frameResized( KWFrame *theFrame )
++void KWTextFrameSet::frameResized( KWFrame *theFrame, bool invalidateLayout )
+ {
+     //kdDebug() << "KWTextFrameSet::frameResized " << theFrame << endl;
+     if ( theFrame->frameSet()->frameSetInfo() != KWFrameSet::FI_BODY )
+@@ -1777,7 +1777,8 @@ void KWTextFrameSet::frameResized( KWFra
+     // Warning, can't call layout() (frameChanged calls it)
+     // from here, since it calls formatMore() !
+     m_doc->updateAllFrames();
+-    m_doc->invalidate();
++    if ( invalidateLayout )
++        m_doc->invalidate();
+     theFrame->updateRulerHandles();
+
+     // Can't call this directly, we might be in a paint event already
diff --git a/app-office/koffice/files/koffice-1.2_beta1-kwtextframeset.h.diff b/app-office/koffice/files/koffice-1.2_beta1-kwtextframeset.h.diff
new file mode 100644
index 000000000000..57575af1a7b7
--- /dev/null
+++ b/app-office/koffice/files/koffice-1.2_beta1-kwtextframeset.h.diff
@@ -0,0 +1,11 @@
+--- kwtextframeset.h	2002/04/06 08:30:41	1.174
++++ kwtextframeset.h	2002/04/23 13:30:25
+@@ -237,7 +237,7 @@ protected slots:
+ protected:
+     void getMargins( int yp, int h, int* marginLeft, int* marginRight, int* breakBegin, int* breakEnd, int paragLeftMargin = 0 );
+     bool checkVerticalBreak( int & yp, int & h, KoTextParag * parag, bool linesTogether, int breakBegin, int breakEnd );
+-    void frameResized( KWFrame *theFrame );
++    void frameResized( KWFrame *theFrame, bool invalidateLayout );
+     double footerHeaderSizeMax( KWFrame *theFrame );
+     QDomElement saveInternal( QDomElement &parentElem, bool saveFrames, bool saveAnchorsFramesets );
+
diff --git a/app-office/koffice/koffice-1.2_pre20020411.ebuild b/app-office/koffice/koffice-1.2_beta1.ebuild
index c680bb3594cf..acb726e78ebd 100644
--- a/app-office/koffice/koffice-1.2_pre20020411.ebuild
+++ b/app-office/koffice/koffice-1.2_beta1.ebuild
@@ -1,22 +1,34 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
 # Author Bart Verwilst <verwilst@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.2_pre20020411.ebuild,v 1.2 2002/04/13 16:43:42 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.2_beta1.ebuild,v 1.1 2002/04/26 06:45:15 verwilst Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
 need-kde 3
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/koffice-1.2-beta1"
 DESCRIPTION="KDE Office Set"
 HOMEPAGE="http://www.koffice.org/"
 
-SRC_URI="http://www.ibiblio.org/gentoo/distfiles/koffice-20020411.tar.bz2"
+SRC_URI="http://www.gentoo.org/~verwilst/koffice-1.2-beta1.tar.bz2"
 
 DEPEND="$DEPEND
-	>=dev-lang/python-2.0-r5"
+	>=dev-lang/python-2.2"
 
 
+src_unpack() {
+
+	unpack koffice-1.2-beta1.tar.bz2
+	cd ${S}/kword
+	patch -p0 < ${FILESDIR}/${P}-kwdoc.diff
+	patch -p0 < ${FILESDIR}/${P}-kwcanvas.diff
+	patch -p0 < ${FILESDIR}/${P}-kwtableframeset.diff
+	patch -p0 < ${FILESDIR}/${P}-kwtextframeset.diff
+	patch -p0 < ${FILESDIR}/${P}-kwtextframeset.h.diff
+
+}
+
 src_compile() {
 
     export LIBPYTHON="`python-config --libs`"