pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/misc/koffice Added five patches so koffice would build...
details: https://anonhg.NetBSD.org/pkgsrc/rev/aa69ac2fa516
branches: trunk
changeset: 462699:aa69ac2fa516
user: reed <reed%pkgsrc.org@localhost>
date: Thu Oct 09 18:38:34 2003 +0000
description:
Added five patches so koffice would build with newer gcc 3.3.1.
The first four patches come directly from KDE's cvs for
KOFFICE_1_2_BRANCH. The patch-ae comes from a KDE bug report. I
did not bump the revision, because no features changed -- this just
makes it build on some platforms that couldn't build before. It
is said that these fixes use a non-standard C++ header and maybe
may not work with some compilers.
diffstat:
misc/koffice/distinfo | 7 +++-
misc/koffice/patches/patch-aa | 35 +++++++++++++++++++++
misc/koffice/patches/patch-ab | 49 ++++++++++++++++++++++++++++++
misc/koffice/patches/patch-ac | 22 +++++++++++++
misc/koffice/patches/patch-ad | 13 +++++++
misc/koffice/patches/patch-ae | 70 +++++++++++++++++++++++++++++++++++++++++++
6 files changed, 195 insertions(+), 1 deletions(-)
diffs (225 lines):
diff -r aa34c467262c -r aa69ac2fa516 misc/koffice/distinfo
--- a/misc/koffice/distinfo Thu Oct 09 17:23:16 2003 +0000
+++ b/misc/koffice/distinfo Thu Oct 09 18:38:34 2003 +0000
@@ -1,6 +1,11 @@
-$NetBSD: distinfo,v 1.9 2003/04/09 13:57:14 markd Exp $
+$NetBSD: distinfo,v 1.10 2003/10/09 18:38:34 reed Exp $
SHA1 (koffice-1.2.1.tar.bz2) = f3fd98d081205f2cd7be3fba76e4cf5b053b8e53
Size (koffice-1.2.1.tar.bz2) = 9275595 bytes
SHA1 (1.2.1_kword_crashes.diff) = 13b6a4843ec918371e6de1622be1154d984aa76b
Size (1.2.1_kword_crashes.diff) = 3816 bytes
+SHA1 (patch-aa) = c711cd21da907908c606d2adea39f512431ba113
+SHA1 (patch-ab) = 8eacc52e66341c58075f5ba1e9a26fe8998c7a81
+SHA1 (patch-ac) = e3f2b1f00d98750835907ff6812eef1ed5160d57
+SHA1 (patch-ad) = 32cebc69bc5ba2cad7ddab97a81beb92836802f1
+SHA1 (patch-ae) = aa9f553f4c908ba85cedf8adb6ad7385677029eb
diff -r aa34c467262c -r aa69ac2fa516 misc/koffice/patches/patch-aa
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/koffice/patches/patch-aa Thu Oct 09 18:38:34 2003 +0000
@@ -0,0 +1,35 @@
+$NetBSD: patch-aa,v 1.6 2003/10/09 18:38:34 reed Exp $
+
+formula.cc:4:23: strstream.h: No such file or directory
+formula.cc:477: error: `ostrstream' undeclared (first use this function)
+
+--- filters/kspread/qpro/libqpro/src/formula.cc.orig 2003-09-29 16:37:17.000000000 +0000
++++ filters/kspread/qpro/libqpro/src/formula.cc 2003-09-29 16:37:41.000000000 +0000
+@@ -1,7 +1,7 @@
+ #include <qpro/common.h>
+
+-#include <iostream.h>
+-#include <strstream.h>
++#include <iostream>
++#include <strstream>
+
+ #include <string.h>
+
+@@ -474,7 +474,7 @@
+ QpFormula::floatFuncReal(const char*)
+ {
+ QP_INT64 lFloat;
+- ostrstream lNum;
++ std::ostrstream lNum;
+
+ cFormula >> lFloat;
+
+@@ -489,7 +489,7 @@
+ QpFormula::intFuncReal(const char*)
+ {
+ QP_INT16 lInt;
+- ostrstream lNum;
++ std::ostrstream lNum;
+
+ cFormula >> lInt;
+
diff -r aa34c467262c -r aa69ac2fa516 misc/koffice/patches/patch-ab
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/koffice/patches/patch-ab Thu Oct 09 18:38:34 2003 +0000
@@ -0,0 +1,49 @@
+$NetBSD: patch-ab,v 1.4 2003/10/09 18:38:34 reed Exp $
+
+--- filters/kspread/qpro/libqpro/src/record.cc.orig 2003-09-29 16:45:05.000000000 +0000
++++ filters/kspread/qpro/libqpro/src/record.cc 2003-09-29 16:46:18.000000000 +0000
+@@ -2,7 +2,7 @@
+
+ #include <string.h>
+
+-#include <iostream.h>
++#include <iostream>
+
+ #include <qpro/record.h>
+ #include <qpro/formula.h>
+@@ -10,7 +10,7 @@
+ // -----------------------------------------------------------------------
+
+ #include <iomanip.h>
+-#include <strstream.h>
++#include <strstream>
+
+ void
+ Charout(ostream& pOut, unsigned char pChar)
+@@ -32,7 +32,7 @@
+ int
+ Hexout(char* pChar, int pLen)
+ {
+- ostrstream* lOStr = new ostrstream;
++ std::ostrstream* lOStr = new std::ostrstream;
+
+ while( pLen )
+ {
+@@ -57,7 +57,7 @@
+ cerr << lOStr->rdbuf() << endl;
+
+ delete lOStr;
+- lOStr = new ostrstream;
++ lOStr = new std::ostrstream;
+ }
+
+ delete lOStr;
+@@ -200,7 +200,7 @@
+ {
+ //??? cope with relative/absolute references
+
+- strstream lOut(pText, 20, ios::out); // ??? ard coded len
++ std::strstream lOut(pText, 20, ios::out); // ??? ard coded len
+ int lPageRelative = pRow & 0x8000;
+ int lColRelative = pRow & 0x4000;
+ int lRowRelative = pRow & 0x2000;
diff -r aa34c467262c -r aa69ac2fa516 misc/koffice/patches/patch-ac
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/koffice/patches/patch-ac Thu Oct 09 18:38:34 2003 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-ac,v 1.4 2003/10/09 18:38:34 reed Exp $
+
+--- filters/kspread/qpro/libqpro/src/stream.cc.orig 2003-09-29 16:48:06.000000000 +0000
++++ filters/kspread/qpro/libqpro/src/stream.cc 2003-09-29 16:48:38.000000000 +0000
+@@ -31,7 +31,7 @@
+ #else
+ #include <string.h>
+ #include <fstream.h>
+-#include <strstream.h>
++#include <strstream>
+
+ // For IRIX
+ namespace std {}
+@@ -60,7 +60,7 @@
+ , cOffset(0L)
+ , cStreamBuf(0)
+ {
+- cStreamBuf = new strstreambuf (pBuffer, pLen);
++ cStreamBuf = new std::strstreambuf (pBuffer, pLen);
+
+ cIn = new istream(cStreamBuf);
+ }
diff -r aa34c467262c -r aa69ac2fa516 misc/koffice/patches/patch-ad
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/koffice/patches/patch-ad Thu Oct 09 18:38:34 2003 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.5 2003/10/09 18:38:34 reed Exp $
+
+--- filters/kspread/qpro/qproimport.cc.orig 2003-09-29 16:51:50.000000000 +0000
++++ filters/kspread/qpro/qproimport.cc 2003-09-29 16:51:57.000000000 +0000
+@@ -18,7 +18,7 @@
+ Boston, MA 02111-1307, USA.
+ */
+
+-#include <strstream.h>
++#include <strstream>
+
+ #include <kdebug.h>
+ #include <kmessagebox.h>
diff -r aa34c467262c -r aa69ac2fa516 misc/koffice/patches/patch-ae
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/koffice/patches/patch-ae Thu Oct 09 18:38:34 2003 +0000
@@ -0,0 +1,70 @@
+$NetBSD: patch-ae,v 1.4 2003/10/09 18:38:34 reed Exp $
+
+table.cc:171: error: ISO C++ forbids variable-size array `border'
+http://bugs.kde.org/show_bug.cgi?id=62906
+
+--- filters/kword/latex/export/table.cc~ 2002-05-25 03:16:02.000000000 -0700
++++ filters/kword/latex/export/table.cc 2003-08-19 14:03:48.000000000 -0700
+@@ -20,6 +20,7 @@
+ */
+
+ #include <kdebug.h> /* for kdDebug stream */
++#include <qbitarray.h>
+ #include "listtable.h"
+ #include "texte.h"
+
+@@ -168,7 +169,7 @@
+ void Table::generateTopLineBorder(QTextStream& out, int row)
+ {
+ Element* elt = 0;
+- bool border[getMaxCol()];
++ QBitArray border(getMaxCol());
+ bool fullLine = true;
+ for(int index = 0; index <= getMaxCol(); index++)
+ {
+@@ -179,11 +180,11 @@
+ /* If the element has a border display it here */
+ if(elt->hasTopBorder())
+ {
+- border[index] = true;
++ border[index] = 1;
+ }
+ else
+ {
+- border[index] = false;
++ border[index] = 0;
+ fullLine = false;
+ }
+ }
+@@ -221,7 +222,7 @@
+ void Table::generateBottomLineBorder(QTextStream& out, int row)
+ {
+ Element* elt = 0;
+- bool border[getMaxCol()];
++ QBitArray border(getMaxCol());
+ bool fullLine = true;
+
+ for(int index = 0; index <= getMaxCol(); index++)
+@@ -232,11 +233,11 @@
+ /* If the element has a border display it here */
+ if(elt->hasBottomBorder())
+ {
+- border[index] = true;
++ border[index] = 1;
+ }
+ else
+ {
+- border[index] = false;
++ border[index] = 0;
+ fullLine = false;
+ }
+ }
+@@ -256,7 +257,7 @@
+ {
+ int begin = index;
+ int end = index;
+- while(border[index] == true && index <= getMaxCol())
++ while(border[index] && index <= getMaxCol())
+ {
+ index = index + 1;
+ }
Home |
Main Index |
Thread Index |
Old Index