summaryrefslogtreecommitdiff
path: root/misc/koffice/patches
diff options
context:
space:
mode:
authorjlam <jlam>2001-11-13 21:23:43 +0000
committerjlam <jlam>2001-11-13 21:23:43 +0000
commit0e61e3a3acd093520d11d9067722bc6d1962c755 (patch)
treee3972be42409bbc4ed91fc6a4109d007bf7f8d20 /misc/koffice/patches
parent5526320491bba6d43b226986accf049727c2464a (diff)
downloadpkgsrc-0e61e3a3acd093520d11d9067722bc6d1962c755.tar.gz
Update koffice to 1.1. Package update was provided in pkg/14425 by Mark
Davies <mark@mcs.vuw.ac.nz> with changes by me. Pkgsrc-related changes include: * Strongly buildlinkifying. * Using qt2-designer-kde for a uic that understands KDE2 widgets. * Fixing sources to compile with egcs-1.1.2's much-less-than-compliant C++ compiler. Given the rapid development between the 1.0 and 1.1 releases, plus the scope of the applications in the suite, it's difficult to summarize the changes. The major change is that KIllustrator is now named Kontour for trademark reasons. Aside from that, basically everything is more featureful and more stable, plus there are more import/export filters for other application suites.
Diffstat (limited to 'misc/koffice/patches')
-rw-r--r--misc/koffice/patches/patch-aa75
-rw-r--r--misc/koffice/patches/patch-ab118
-rw-r--r--misc/koffice/patches/patch-ac24
-rw-r--r--misc/koffice/patches/patch-ad57
-rw-r--r--misc/koffice/patches/patch-ae54
-rw-r--r--misc/koffice/patches/patch-af29
-rw-r--r--misc/koffice/patches/patch-ag80
-rw-r--r--misc/koffice/patches/patch-ah26
-rw-r--r--misc/koffice/patches/patch-ai13
-rw-r--r--misc/koffice/patches/patch-aj13
-rw-r--r--misc/koffice/patches/patch-ak13
-rw-r--r--misc/koffice/patches/patch-al12
-rw-r--r--misc/koffice/patches/patch-am13
-rw-r--r--misc/koffice/patches/patch-an12
14 files changed, 260 insertions, 279 deletions
diff --git a/misc/koffice/patches/patch-aa b/misc/koffice/patches/patch-aa
index 5155172e1a1..6c7ee0259ec 100644
--- a/misc/koffice/patches/patch-aa
+++ b/misc/koffice/patches/patch-aa
@@ -1,13 +1,68 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/03/30 00:25:20 hubertf Exp $
+$NetBSD: patch-aa,v 1.2 2001/11/13 21:23:43 jlam Exp $
---- kchart/engine.h.orig Sat Oct 14 16:30:40 2000
-+++ kchart/engine.h
-@@ -13,7 +13,7 @@
+--- filters/kspread/qpro/libqpro/qpro/formula.h.orig Fri May 25 17:47:33 2001
++++ filters/kspread/qpro/libqpro/qpro/formula.h
+@@ -53,50 +53,37 @@
+ char* formula();
- #include <qfont.h>
- #include <qcolor.h>
--#include <values.h>
-+#include <limits.h>
- #include <kchart_part.h>
- class KChartParameters;
+- static void binaryOperand(QpFormula& pThis, const char* pOper)
+- {pThis.binaryOperandReal(pOper);}
++ static void binaryOperand(QpFormula& pThis, const char* pOper);
+
+- static void floatFunc(QpFormula& pThis, const char* pFunc)
+- {pThis.floatFuncReal(pFunc);}
++ static void floatFunc(QpFormula& pThis, const char* pFunc);
+
+ void formulaStart(const char* pFirstChar);
+
+- static void absKludge(QpFormula& pThis, const char* pFunc)
+- {pThis.absKludgeReal(pFunc);}
++ static void absKludge(QpFormula& pThis, const char* pFunc);
+
+- static void func0(QpFormula& pThis, const char* pFunc)
+- {pThis.func0Real(pFunc);}
++ static void func0(QpFormula& pThis, const char* pFunc);
+
+- static void func1(QpFormula& pThis, const char* pFunc)
+- {pThis.func1Real(pFunc);}
++ static void func1(QpFormula& pThis, const char* pFunc);
+
+- static void func2(QpFormula& pThis, const char* pFunc)
+- {pThis.func2Real(pFunc);}
++ static void func2(QpFormula& pThis, const char* pFunc);
+
+- static void func3(QpFormula& pThis, const char* pFunc)
+- {pThis.func3Real(pFunc);}
++ static void func3(QpFormula& pThis, const char* pFunc);
+
+- static void func4(QpFormula& pThis, const char* pFunc)
+- {pThis.func4Real(pFunc);}
++ static void func4(QpFormula& pThis, const char* pFunc);
+
+- static void funcV(QpFormula& pThis, const char* pFunc)
+- {pThis.funcVReal(pFunc);}
++ static void funcV(QpFormula& pThis, const char* pFunc);
+
+- static void intFunc(QpFormula& pThis, const char* pFunc)
+- {pThis.intFuncReal(pFunc);}
++ static void intFunc(QpFormula& pThis, const char* pFunc);
+
+ void dropLeadingAt(int pBool=-1);
+
+- static void ref(QpFormula& pThis, const char* pFunc)
+- {pThis.refReal(pFunc);}
++ static void ref(QpFormula& pThis, const char* pFunc);
+
+ void replaceFunc(QpFormulaConv* pFuncEntry);
+
+- static void stringFunc(QpFormula& pThis, const char* pFunc)
+- {pThis.stringFuncReal(pFunc);}
++ static void stringFunc(QpFormula& pThis, const char* pFunc);
+
+- static void unaryOperand(QpFormula& pThis, const char* pOper)
+- {pThis.unaryOperandReal(pOper);}
++ static void unaryOperand(QpFormula& pThis, const char* pOper);
+
+ protected:
+ char* cArgSeparator;
diff --git a/misc/koffice/patches/patch-ab b/misc/koffice/patches/patch-ab
index 50552e22454..cb41b171be7 100644
--- a/misc/koffice/patches/patch-ab
+++ b/misc/koffice/patches/patch-ab
@@ -1,33 +1,89 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/03/30 00:25:20 hubertf Exp $
+$NetBSD: patch-ab,v 1.2 2001/11/13 21:23:43 jlam Exp $
---- kchart/enginedraw.cc.orig Sat Aug 26 10:53:37 2000
-+++ kchart/enginedraw.cc
-@@ -73,7 +73,7 @@
- // %d, %d, %d,\nshadow color 0 = %d, %d, %d,\ncolor 1 = %d, %d, %d,\nshadow color 1 = %d, %d, %d", clr[0].red(), clr[0].green(), clr[0].blue(), clrshd[0].red(), clrshd[0].green(), clrshd[0].blue(), clr[1].red(), clr[1].green(), clr[1].blue(), clrshd[1].red(), clrshd[1].green(), clrshd[1].blue() );
+--- filters/kspread/qpro/libqpro/src/formula.cc.orig Wed Jun 27 04:43:31 2001
++++ filters/kspread/qpro/libqpro/src/formula.cc
+@@ -320,6 +320,84 @@
+ }
- #define F(x,i) (int)( (float)((x)-x1)*slope[i]+(float)y1[i] )
-- float depth_slope = xdepth==0? MAXFLOAT: (float)ydepth/(float)xdepth;
-+ float depth_slope = xdepth==0? FLT_MAX: (float)ydepth/(float)xdepth;
- float *slope = new float[num_sets];
- int *lnclr = new int[num_sets];
- int *shclr = new int[num_sets];
-@@ -85,7 +85,7 @@
- for( i=0; i<num_sets; ++i ) {
- // lnclr[i] = clr[i];
- // shclr[i] = clrshd[i];
-- slope[i] = x2==x1? MAXFLOAT: (float)(y2[i]-y1[i])/(float)(x2-x1);
-+ slope[i] = x2==x1? FLT_MAX: (float)(y2[i]-y1[i])/(float)(x2-x1);
- }
-
- for( x=x1+1; x<=x2; ++x ) {
-@@ -146,8 +146,8 @@
-
- if( xdepth || ydepth )
- {
-- float line_slope = x2==x1? MAXFLOAT: (float)-(y2-y1) / (float)(x2-x1);
-- float depth_slope = xdepth==0? MAXFLOAT: (float)ydepth/(float)xdepth;
-+ float line_slope = x2==x1? FLT_MAX: (float)-(y2-y1) / (float)(x2-x1);
-+ float depth_slope = xdepth==0? FLT_MAX: (float)ydepth/(float)xdepth;
- y_intercept = (y1 > y0 && y2 < y0) || // line crosses y0
- (y1 < y0 && y2 > y0)?
- (int)((1.0/ABS(line_slope))*(float)(ABS(y1-y0)))+x1:0; // never
+ void
++QpFormula::binaryOperand(QpFormula& pThis, const char* pOper)
++{
++ pThis.binaryOperandReal(pOper);
++}
++
++void
++QpFormula::floatFunc(QpFormula& pThis, const char* pFunc)
++{
++ pThis.floatFuncReal(pFunc);
++}
++
++void
++QpFormula::absKludge(QpFormula& pThis, const char* pFunc)
++{
++ pThis.absKludgeReal(pFunc);
++}
++
++void
++QpFormula::func0(QpFormula& pThis, const char* pFunc)
++{
++ pThis.func0Real(pFunc);
++}
++
++void
++QpFormula::func1(QpFormula& pThis, const char* pFunc)
++{
++ pThis.func1Real(pFunc);
++}
++
++void
++QpFormula::func2(QpFormula& pThis, const char* pFunc)
++{
++ pThis.func2Real(pFunc);
++}
++
++void
++QpFormula::func3(QpFormula& pThis, const char* pFunc)
++{
++ pThis.func3Real(pFunc);
++}
++
++void
++QpFormula::func4(QpFormula& pThis, const char* pFunc)
++{
++ pThis.func4Real(pFunc);
++}
++
++void
++QpFormula::funcV(QpFormula& pThis, const char* pFunc)
++{
++ pThis.funcVReal(pFunc);
++}
++
++void
++QpFormula::intFunc(QpFormula& pThis, const char* pFunc)
++{
++ pThis.intFuncReal(pFunc);
++}
++
++void
++QpFormula::ref(QpFormula& pThis, const char* pFunc)
++{
++ pThis.refReal(pFunc);
++}
++
++void
++QpFormula::stringFunc(QpFormula& pThis, const char* pFunc)
++{
++ pThis.stringFuncReal(pFunc);
++}
++
++void
++QpFormula::unaryOperand(QpFormula& pThis, const char* pOper)
++{
++ pThis.unaryOperandReal(pOper);
++}
++
++void
+ QpFormula::argSeparator(const char* pArg)
+ {
+ delete [] cArgSeparator;
diff --git a/misc/koffice/patches/patch-ac b/misc/koffice/patches/patch-ac
index 2d977db26b4..9e13d4672ef 100644
--- a/misc/koffice/patches/patch-ac
+++ b/misc/koffice/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/03/30 00:25:20 hubertf Exp $
+$NetBSD: patch-ac,v 1.2 2001/11/13 21:23:43 jlam Exp $
---- kchart/enginepie.cc.orig Fri Oct 13 15:08:28 2000
-+++ kchart/enginepie.cc
-@@ -701,7 +701,7 @@
-
- if( !params->legend[i].isNull() )
- {
-- QRect br = QFontMetrics( params->labelFont() ).boundingRect( 0, 0, MAXINT, MAXINT, slice_angle[i][0] <= M_PI ?
-+ QRect br = QFontMetrics( params->labelFont() ).boundingRect( 0, 0, INT_MAX, INT_MAX, slice_angle[i][0] <= M_PI ?
- Qt::AlignLeft : Qt::AlignRight, params->legend[i] );
- p->setPen( LineColor);
- p->setFont( params->labelFont() );
+--- kchart/kdchart/KDChartData.h.orig Mon Jun 25 10:44:29 2001
++++ kchart/kdchart/KDChartData.h
+@@ -27,7 +27,7 @@
+
+ #include <qstring.h>
+ #include <qdatetime.h>
+-#ifdef unix
++#if !defined(__FreeBSD__) && !defined(__NetBSD__)
+ #include <values.h>
+ #else
+ #include <float.h>
diff --git a/misc/koffice/patches/patch-ad b/misc/koffice/patches/patch-ad
index b7365801281..952432e8d00 100644
--- a/misc/koffice/patches/patch-ad
+++ b/misc/koffice/patches/patch-ad
@@ -1,37 +1,22 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/03/30 00:25:20 hubertf Exp $
+$NetBSD: patch-ad,v 1.2 2001/11/13 21:23:43 jlam Exp $
---- kchart/kchartEngine2.cc.orig Sat Jul 22 16:13:49 2000
-+++ kchart/kchartEngine2.cc
-@@ -48,8 +48,8 @@
- p->setPen( AnnoteColor );
- p->drawLine( x2,PY(highest)-2,x2-annote_hgt/2, PY(highest)-2-annote_hgt/2 );
- p->setFont( params->annotationFont() );
-- QRect br = QFontMetrics( params->annotationFont() ).boundingRect( 0, 0, MAXINT,
-- MAXINT,
-+ QRect br = QFontMetrics( params->annotationFont() ).boundingRect( 0, 0, INT_MAX,
-+ INT_MAX,
- Qt::AlignRight,
- params->annotation->note );
- p->drawText( x2-annote_hgt/2-1-annote_len - 1,
-@@ -63,8 +63,8 @@
- p->drawLine( x2, PY(highest)-2,x2+annote_hgt/2, PY(highest)-2-annote_hgt/2 );
- p->setFont( params->annotationFont() );
- QRect br = QFontMetrics( params->annotationFont() ).boundingRect( 0, 0,
-- MAXINT,
-- MAXINT,
-+ INT_MAX,
-+ INT_MAX,
- Qt::AlignLeft,
- params->annotation->note );
- p->drawText( x2+annote_hgt/2+1 + 1,
-@@ -85,8 +85,8 @@
- p->setFont( params->titleFont() );
- p->setPen( titlecolor );
- QRect br = QFontMetrics( params->titleFont() ).boundingRect( 0, 0,
-- MAXINT,
-- MAXINT,
-+ INT_MAX,
-+ INT_MAX,
- Qt::AlignCenter,
- params->title );
- p->drawText( imagewidth/2 - tlen*params->titleFontWidth()/2, // x
+--- kchart/kdchart/KDChartTable.h.orig Tue Aug 14 00:20:06 2001
++++ kchart/kdchart/KDChartTable.h
+@@ -40,9 +40,17 @@
+ #define MINDOUBLE DBL_MIN
+ #define std
+ #else
++#if !defined(__FreeBSD__) && !defined(__NetBSD__)
+ #include <values.h>
++#endif
+ #include <limits.h>
+ #include <math.h>
++#ifdef DBL_MAX
++#define MAXDOUBLE DBL_MAX
++#endif
++#ifdef DBL_MIN
++#define MINDOUBLE DBL_MIN
++#endif
+ #endif
+
+ #if defined SUN7 || ( defined HP11_aCC && defined HP1100 )
diff --git a/misc/koffice/patches/patch-ae b/misc/koffice/patches/patch-ae
index 6275ccc852d..90cb8537ce6 100644
--- a/misc/koffice/patches/patch-ae
+++ b/misc/koffice/patches/patch-ae
@@ -1,43 +1,13 @@
-$NetBSD: patch-ae,v 1.1.1.1 2001/03/30 00:25:20 hubertf Exp $
+$NetBSD: patch-ae,v 1.2 2001/11/13 21:23:43 jlam Exp $
---- kchart/kchartEngine_ComputeSize.cc.orig Thu Aug 31 20:15:42 2000
-+++ kchart/kchartEngine_ComputeSize.cc
-@@ -60,7 +60,7 @@
-
- if( params->xaxis && params->hasxlabel )
- {
-- int biggest = -MAXINT;
-+ int biggest = -INT_MAX;
- unsigned int len = 0;
- for( int i=0; i<num_points; ++i )
- {
-@@ -130,7 +130,7 @@
- // params->requested_yinterval = 1.0;
-
- /* gotta go through the above loop to catch the 'tweeners :-| */
-- ylbl_interval = params->requested_yinterval != -MAXDOUBLE &&
-+ ylbl_interval = params->requested_yinterval != -DBL_MAX &&
- params->requested_yinterval > ypoints[jumpout_value-1] ?
- params->requested_yinterval:
- ypoints[jumpout_value-1];
-@@ -180,7 +180,7 @@
- } while( tmp_highest <= highest); // BL.
-
- ylabel_wth = longest_ylblen * params->yAxisFontWidth();
-- highest = params->requested_ymax==-MAXDOUBLE? tmp_highest:
-+ highest = params->requested_ymax==-DBL_MAX? tmp_highest:
- QMAX( params->requested_ymax, highest );
-
- if( params->do_vol() ) {
-@@ -381,9 +381,9 @@
- else if( lowest > 0.0 )// negs should be drawn from 0
- lowest = 0.0;
-
-- if( params->requested_ymin != -MAXDOUBLE && params->requested_ymin < lowest )
-+ if( params->requested_ymin != -DBL_MAX && params->requested_ymin < lowest )
- lowest = params->requested_ymin;
-- if( params->requested_ymax != -MAXDOUBLE && params->requested_ymax > highest )
-+ if( params->requested_ymax != -DBL_MAX && params->requested_ymax > highest )
- highest = params->requested_ymax;
-
- kdDebug(35001) << "done requested_* computation" << endl;
+--- kchart/kdchart/Makefile.in.orig Thu Aug 23 00:49:07 2001
++++ kchart/kdchart/Makefile.in
+@@ -95,7 +95,7 @@
+ JAVAH = @JAVAH@
+ JVMLIBS = @JVMLIBS@
+ KDECONFIG = @KDECONFIG@
+-KDE_CXXFLAGS = @KDE_CXXFLAGS@
++KDE_CXXFLAGS = @KDE_CXXFLAGS@ $(OPTIMIZATION_BUG_CXXFLAGS)
+ KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
+ KDE_INCLUDES = @KDE_INCLUDES@
+ KDE_LDFLAGS = @KDE_LDFLAGS@
diff --git a/misc/koffice/patches/patch-af b/misc/koffice/patches/patch-af
index 7b3a3a6306c..b44fef4cce0 100644
--- a/misc/koffice/patches/patch-af
+++ b/misc/koffice/patches/patch-af
@@ -1,22 +1,13 @@
-$NetBSD: patch-af,v 1.1.1.1 2001/03/30 00:25:20 hubertf Exp $
+$NetBSD: patch-af,v 1.2 2001/11/13 21:23:43 jlam Exp $
---- kchart/kchartEngine_Grids.cc.orig Thu Aug 31 20:15:42 2000
-+++ kchart/kchartEngine_Grids.cc
-@@ -374,7 +374,7 @@
- return;
+--- kformula/pics/Makefile.in.orig Thu Aug 23 00:49:07 2001
++++ kformula/pics/Makefile.in
+@@ -222,7 +222,7 @@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
- /* each xlbl + avg due to num_lf_xlbls */
-- int neededspace = ( (params->xlabel_spacing==MAXSHORT?0:params->xlabel_spacing)+params->xAxisFontHeight() +
-+ int neededspace = ( (params->xlabel_spacing==SHRT_MAX?0:params->xlabel_spacing)+params->xAxisFontHeight() +
- (num_lf_xlbls*(params->xAxisFontHeight()-1))/num_points );
- ASSERT( neededspace );
- int num_xlbls = /* maximum x lables that'll fit */
-@@ -388,7 +388,7 @@
- for(int i=0; i<num_points+(params->do_bar()?2:0); ++i ) {
- if( (i%(1+num_points/num_xlbls) == 0) || // labels are regulated
- (num_xlbls >= num_points) ||
-- params->xlabel_spacing == MAXSHORT ) {
-+ params->xlabel_spacing == SHRT_MAX ) {
- int xi = params->do_bar()? i-1: i;
+-datadir = $(prefix)/share/apps/kformula/pics
++datadir = $(kde_datadir)/kformula/pics
+
+ data_DATA = kformula2-1.png mini-symbols.png enlarge.png kformula2-2.png mini-frac.png mini-vspace.png frac-vline.png kformula2-3.png mini-integral.png mini-xy.png kformula1-0.png kformula3-2.png mini-root.png reduce.png kformula2-0.png mini-bra.png mini-rootindex.png reduceall.png greek.png enlargeall.png enlargenext.png par1.xbm par2.xbm par3.xbm index0.png index1.png index2.png index3.png index.png indexsw.png nextsw.png childrensw.png elementsw.png split.png matrix.png Ilower.png Ihigher.png upalign.png downalign.png midalign.png midline.png delimiter.png insrow.png inscol.png remrow.png remcol.png rootindex.png bold.png italic.png underl.png near.png far.png leftalign.png rightalign.png centralign.png pixmap.png Slower.png Shigher.png
- if( params->grid ) {
diff --git a/misc/koffice/patches/patch-ag b/misc/koffice/patches/patch-ag
index a2eb417627b..8755623028e 100644
--- a/misc/koffice/patches/patch-ag
+++ b/misc/koffice/patches/patch-ag
@@ -1,31 +1,57 @@
-$NetBSD: patch-ag,v 1.1.1.1 2001/03/30 00:25:20 hubertf Exp $
+$NetBSD: patch-ag,v 1.2 2001/11/13 21:23:43 jlam Exp $
---- kchart/kchartWizardSetupAxesPage.cc.orig Mon Aug 7 12:17:15 2000
-+++ kchart/kchartWizardSetupAxesPage.cc
-@@ -104,7 +104,7 @@
- QString tmp;
- y_interval=new QLineEdit(tmpQGroupBox);
- grid2->addWidget(y_interval,0,1);
-- if( _chart->params()->requested_yinterval != -MAXDOUBLE)
-+ if( _chart->params()->requested_yinterval != -DBL_MAX)
- y_interval->setText( tmp.setNum(_chart->params()->requested_yinterval));
+--- lib/kformula/elementindex.h.orig Sun May 27 15:07:03 2001
++++ lib/kformula/elementindex.h
+@@ -30,7 +30,52 @@
- tmpLabel=new QLabel(tmpQGroupBox);
-@@ -112,7 +112,7 @@
- grid2->addWidget(tmpLabel,1,0);
- y_min=new QLineEdit(tmpQGroupBox);
- grid2->addWidget(y_min,1,1);
-- if( _chart->params()->requested_ymin != MAXDOUBLE)
-+ if( _chart->params()->requested_ymin != DBL_MAX)
- y_min->setText( tmp.setNum(_chart->params()->requested_ymin));
+ class ElementIndex;
- tmpLabel=new QLabel(tmpQGroupBox);
-@@ -120,7 +120,7 @@
- grid2->addWidget(tmpLabel,2,0);
- y_max=new QLineEdit(tmpQGroupBox);
- grid2->addWidget(y_max,2,1);
-- if( _chart->params()->requested_ymax != -MAXDOUBLE)
-+ if( _chart->params()->requested_ymax != -DBL_MAX)
- y_max->setText( tmp.setNum(_chart->params()->requested_ymax));
++#if defined(__GNUC__)
++#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 93)
++/*
++ * We add a quick 'n' dirty inline implementation of auto_ptr for older
++ * releases of GCC, which don't include an auto_ptr implementation in
++ * <memory>.
++ */
++
++template <class T> class auto_ptr {
++private:
++ T* _ptr;
++
++public:
++ typedef T element_type;
++ explicit auto_ptr(T* p = 0) : _ptr(p) {}
++ auto_ptr(auto_ptr& a) : _ptr(a.release()) {}
++ template <class T1> auto_ptr(auto_ptr<T1>& a) : _ptr(a.release()) {}
++ auto_ptr& operator=(auto_ptr& a) {
++ if (&a != this) {
++ delete _ptr;
++ _ptr = a.release();
++ }
++ return *this;
++ }
++ template <class T1>
++ auto_ptr& operator=(auto_ptr<T1>& a) {
++ if (a.get() != this->get()) {
++ delete _ptr;
++ _ptr = a.release();
++ }
++ return *this;
++ }
++ ~auto_ptr() { delete _ptr; }
++
++ T& operator*() const { return *_ptr; }
++ T* operator->() const { return _ptr; }
++ T* get() const { return _ptr; }
++ T* release() { T* tmp = _ptr; _ptr = 0; return tmp; }
++ void reset(T* p = 0) { delete _ptr; _ptr = p; }
++};
++
++typedef auto_ptr<ElementIndex> ElementIndexPtr;
++#endif
++#else
+ typedef std::auto_ptr<ElementIndex> ElementIndexPtr;
++#endif
- grid1->addWidget(tmpQGroupBox,1,0);
+
+ /**
diff --git a/misc/koffice/patches/patch-ah b/misc/koffice/patches/patch-ah
deleted file mode 100644
index f48a8efecd3..00000000000
--- a/misc/koffice/patches/patch-ah
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2001/03/30 00:25:20 hubertf Exp $
-
---- kchart/kchartparams.cc.orig Sat Oct 14 16:30:40 2000
-+++ kchart/kchartparams.cc
-@@ -305,9 +305,9 @@
- label_line = false;
- xlabel_spacing = 5;
- ylabel_density = 80;
-- requested_ymin = MAXDOUBLE;
-- requested_ymax = -MAXDOUBLE;
-- requested_yinterval = -MAXDOUBLE;
-+ requested_ymin = DBL_MAX;
-+ requested_ymax = -DBL_MAX;
-+ requested_yinterval = -DBL_MAX;
- shelf = true;
- grid = true;
- xaxis = true;
-@@ -329,7 +329,7 @@
- delete scatter;
- scatter = 0;
- thumbnail = false;
-- thumbval = -MAXFLOAT;
-+ thumbval = -FLT_MAX;
- border = true;
- transparent_bg = false;
- hasxlabel = true;
diff --git a/misc/koffice/patches/patch-ai b/misc/koffice/patches/patch-ai
deleted file mode 100644
index 20afb659efa..00000000000
--- a/misc/koffice/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 2001/03/30 00:25:20 hubertf Exp $
-
---- killustrator/share/BezierTool.cc.orig Fri Jul 28 21:11:48 2000
-+++ killustrator/share/BezierTool.cc
-@@ -22,7 +22,7 @@
-
- */
-
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
- #include <math.h>
- #else
- #include <values.h>
diff --git a/misc/koffice/patches/patch-aj b/misc/koffice/patches/patch-aj
deleted file mode 100644
index 2b2530eecc8..00000000000
--- a/misc/koffice/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1.1.1 2001/03/30 00:25:20 hubertf Exp $
-
---- killustrator/share/GBezier.cc.orig Thu Sep 14 09:48:59 2000
-+++ killustrator/share/GBezier.cc
-@@ -22,7 +22,7 @@
- */
-
- #include <float.h>
--#include <values.h>
-+#include <limits.h>
- #include <GBezier.h>
- #include <GCurve.h>
- #include <Arrow.h>
diff --git a/misc/koffice/patches/patch-ak b/misc/koffice/patches/patch-ak
deleted file mode 100644
index 2485f574745..00000000000
--- a/misc/koffice/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.1.1.1 2001/03/30 00:25:20 hubertf Exp $
-
---- killustrator/share/GDocument.cc.orig Thu Aug 24 19:22:53 2000
-+++ killustrator/share/GDocument.cc
-@@ -39,7 +39,7 @@
- #include <assert.h>
- #include <kdebug.h>
-
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
- #include <math.h>
- #else
- #include <values.h>
diff --git a/misc/koffice/patches/patch-al b/misc/koffice/patches/patch-al
deleted file mode 100644
index 38ee73a8bb4..00000000000
--- a/misc/koffice/patches/patch-al
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-al,v 1.1.1.1 2001/03/30 00:25:20 hubertf Exp $
-
---- kpresenter/kpbackground.cc.orig Sat Jan 6 19:18:18 2001
-+++ kpresenter/kpbackground.cc
-@@ -41,6 +41,7 @@
-
- #include <fstream.h>
-
-+#include <stdlib.h>
- /******************************************************************/
- /* Class: KPBackGround */
- /******************************************************************/
diff --git a/misc/koffice/patches/patch-am b/misc/koffice/patches/patch-am
deleted file mode 100644
index b9392e29bca..00000000000
--- a/misc/koffice/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.1.1.1 2001/03/30 00:25:20 hubertf Exp $
-
---- kpresenter/kppixmapobject.cc.orig Sat Jan 6 14:12:25 2001
-+++ kpresenter/kppixmapobject.cc
-@@ -26,6 +26,8 @@
- #include <qcstring.h>
- #include <kdebug.h>
- #include <iostream>
-+
-+#include <stdlib.h>
- using namespace std;
-
- /******************************************************************/
diff --git a/misc/koffice/patches/patch-an b/misc/koffice/patches/patch-an
deleted file mode 100644
index 6ef25641e8c..00000000000
--- a/misc/koffice/patches/patch-an
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-an,v 1.1.1.1 2001/03/30 00:25:20 hubertf Exp $
-
---- kword/kword_page.cc.orig Sat Jan 6 20:34:54 2001
-+++ kword/kword_page.cc
-@@ -59,6 +59,7 @@
-
- #include <math.h>
-
-+#include <stdlib.h>
- /******************************************************************/
- /* Class: KWPage
- * This class is responsible for the rendering of the frames to