diff options
39 files changed, 1349 insertions, 11 deletions
diff --git a/app-office/kivio/ChangeLog b/app-office/kivio/ChangeLog index bf4f0c4dd9b3..18df2b2f0734 100644 --- a/app-office/kivio/ChangeLog +++ b/app-office/kivio/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-office/kivio # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/kivio/ChangeLog,v 1.15 2005/09/11 18:41:01 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/kivio/ChangeLog,v 1.16 2005/10/10 22:05:10 greg_g Exp $ + +*kivio-1.4.2 (10 Oct 2005) + + 10 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> +kivio-1.4.2.ebuild: + New version. 11 Sep 2005; Aron Griffis <agriffis@gentoo.org> kivio-1.4.1.ebuild: Mark 1.4.1 stable on alpha diff --git a/app-office/kivio/files/digest-kivio-1.4.2 b/app-office/kivio/files/digest-kivio-1.4.2 new file mode 100644 index 000000000000..a054824ae545 --- /dev/null +++ b/app-office/kivio/files/digest-kivio-1.4.2 @@ -0,0 +1 @@ +MD5 6b456fb7d54c84b11396b27a96ae0cf8 koffice-1.4.2.tar.bz2 19486852 diff --git a/app-office/kivio/kivio-1.4.2.ebuild b/app-office/kivio/kivio-1.4.2.ebuild new file mode 100644 index 000000000000..b74fb5715558 --- /dev/null +++ b/app-office/kivio/kivio-1.4.2.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/kivio/kivio-1.4.2.ebuild,v 1.1 2005/10/10 22:05:10 greg_g Exp $ + +MAXKOFFICEVER=${PV} +KMNAME=koffice +inherit kde-meta eutils + +DESCRIPTION="KOffice flowchart and diagram tool." +HOMEPAGE="http://www.koffice.org/" +LICENSE="GPL-2 LGPL-2" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="" + +RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs) + dev-lang/python" + +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +KMCOPYLIB=" + libkformula lib/kformula + libkofficecore lib/kofficecore + libkofficeui lib/kofficeui + libkopainter lib/kopainter + libkoscript lib/koscript + libkotext lib/kotext + libkwmf lib/kwmf + libkowmf lib/kwmf + libkstore lib/store" + +KMEXTRACTONLY="lib/" + +need-kde 3.3 diff --git a/app-office/koffice-data/ChangeLog b/app-office/koffice-data/ChangeLog index 62f9818fde6a..8e4ff206bd1c 100644 --- a/app-office/koffice-data/ChangeLog +++ b/app-office/koffice-data/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-office/koffice-data # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-data/ChangeLog,v 1.15 2005/09/11 17:01:32 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-data/ChangeLog,v 1.16 2005/10/10 22:06:27 greg_g Exp $ + +*koffice-data-1.4.2 (10 Oct 2005) + + 10 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> + +koffice-data-1.4.2.ebuild: + New version. 11 Sep 2005; Aron Griffis <agriffis@gentoo.org> koffice-data-1.4.1.ebuild: Mark 1.4.1 stable on alpha diff --git a/app-office/koffice-data/files/digest-koffice-data-1.4.2 b/app-office/koffice-data/files/digest-koffice-data-1.4.2 new file mode 100644 index 000000000000..a054824ae545 --- /dev/null +++ b/app-office/koffice-data/files/digest-koffice-data-1.4.2 @@ -0,0 +1 @@ +MD5 6b456fb7d54c84b11396b27a96ae0cf8 koffice-1.4.2.tar.bz2 19486852 diff --git a/app-office/koffice-data/koffice-data-1.4.2.ebuild b/app-office/koffice-data/koffice-data-1.4.2.ebuild new file mode 100644 index 000000000000..5fa388ba3196 --- /dev/null +++ b/app-office/koffice-data/koffice-data-1.4.2.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-data/koffice-data-1.4.2.ebuild,v 1.1 2005/10/10 22:06:27 greg_g Exp $ + +MAXKOFFICEVER=${PV} +KMNAME=koffice +KMMODULE= +inherit kde-meta eutils + +DESCRIPTION="Shared KOffice data files." +HOMEPAGE="http://www.koffice.org/" +LICENSE="GPL-2 LGPL-2" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="" + +RDEPEND="" + +DEPEND="dev-util/pkgconfig" + +KMEXTRA=" + mimetypes/ + servicetypes/ + pics/ + templates/ + autocorrect/" + +need-kde 3.3
\ No newline at end of file diff --git a/app-office/koffice-libs/ChangeLog b/app-office/koffice-libs/ChangeLog index a91045bf0fcc..ab70e76d250c 100644 --- a/app-office/koffice-libs/ChangeLog +++ b/app-office/koffice-libs/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-office/koffice-libs # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-libs/ChangeLog,v 1.17 2005/09/11 17:02:13 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-libs/ChangeLog,v 1.18 2005/10/10 22:06:55 greg_g Exp $ + +*koffice-libs-1.4.2 (10 Oct 2005) + + 10 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> + +koffice-libs-1.4.2.ebuild: + New version. 11 Sep 2005; Aron Griffis <agriffis@gentoo.org> koffice-libs-1.4.1.ebuild: Mark 1.4.1 stable on alpha diff --git a/app-office/koffice-libs/files/digest-koffice-libs-1.4.2 b/app-office/koffice-libs/files/digest-koffice-libs-1.4.2 new file mode 100644 index 000000000000..a054824ae545 --- /dev/null +++ b/app-office/koffice-libs/files/digest-koffice-libs-1.4.2 @@ -0,0 +1 @@ +MD5 6b456fb7d54c84b11396b27a96ae0cf8 koffice-1.4.2.tar.bz2 19486852 diff --git a/app-office/koffice-libs/koffice-libs-1.4.2.ebuild b/app-office/koffice-libs/koffice-libs-1.4.2.ebuild new file mode 100644 index 000000000000..1433cd0f454d --- /dev/null +++ b/app-office/koffice-libs/koffice-libs-1.4.2.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-libs/koffice-libs-1.4.2.ebuild,v 1.1 2005/10/10 22:06:55 greg_g Exp $ + +MAXKOFFICEVER=${PV} +KMNAME=koffice +KMMODULE=lib +inherit kde-meta eutils + +DESCRIPTION="Shared KOffice libraries." +HOMEPAGE="http://www.koffice.org/" +LICENSE="GPL-2 LGPL-2" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="doc" + +RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-data)" + +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen ) + dev-util/pkgconfig" + +KMEXTRA=" + interfaces/ + plugins/ + tools/ + filters/olefilters/ + filters/xsltfilter/ + filters/generic_wrapper/ + kounavail/ + doc/api/ + doc/koffice/ + doc/thesaurus/" + +KMEXTRACTONLY=" + kchart/kdchart/" + +need-kde 3.3 + +src_unpack() { + kde-meta_src_unpack unpack + + # Force the compilation of libkopainter. + sed -i 's:$(KOPAINTERDIR):kopainter:' $S/lib/Makefile.am + + kde-meta_src_unpack makefiles +} + +src_compile() { + kde-meta_src_compile + if use doc; then + make apidox || die + fi +} + +src_install() { + kde-meta_src_install + if use doc; then + make DESTDIR=${D} install-apidox || die + fi +} diff --git a/app-office/koffice-meta/ChangeLog b/app-office/koffice-meta/ChangeLog index eb4ecdaf3cd7..f87bae3c1ca3 100644 --- a/app-office/koffice-meta/ChangeLog +++ b/app-office/koffice-meta/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-office/koffice-meta # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-meta/ChangeLog,v 1.17 2005/09/12 14:09:48 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-meta/ChangeLog,v 1.18 2005/10/10 22:07:20 greg_g Exp $ + +*koffice-meta-1.4.2 (10 Oct 2005) + + 10 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> + +koffice-meta-1.4.2.ebuild: + New version. 11 Sep 2005; Aron Griffis <agriffis@gentoo.org> koffice-meta-1.4.1.ebuild: Mark 1.4.1 stable on alpha diff --git a/app-office/koffice-meta/files/digest-koffice-meta-1.4.2 b/app-office/koffice-meta/files/digest-koffice-meta-1.4.2 new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/app-office/koffice-meta/files/digest-koffice-meta-1.4.2 diff --git a/app-office/koffice-meta/koffice-meta-1.4.2.ebuild b/app-office/koffice-meta/koffice-meta-1.4.2.ebuild new file mode 100644 index 000000000000..6f381867c312 --- /dev/null +++ b/app-office/koffice-meta/koffice-meta-1.4.2.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-meta/koffice-meta-1.4.2.ebuild,v 1.1 2005/10/10 22:07:20 greg_g Exp $ + +MAXKOFFICEVER=${PV} +inherit kde-functions + +DESCRIPTION="KOffice - merge this to pull in all KOffice-derived packages." +HOMEPAGE="http://www.koffice.org/" +LICENSE="GPL-2" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="" + +RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/karbon) + $(deprange $PV $MAXKOFFICEVER app-office/kchart) + $(deprange $PV $MAXKOFFICEVER app-office/kexi) + $(deprange $PV $MAXKOFFICEVER app-office/kformula) + $(deprange $PV $MAXKOFFICEVER app-office/kivio) + $(deprange $PV $MAXKOFFICEVER app-office/koffice-data) + $(deprange $PV $MAXKOFFICEVER app-office/koffice-libs) + $(deprange $PV $MAXKOFFICEVER app-office/koshell) + $(deprange $PV $MAXKOFFICEVER app-office/kpresenter) + $(deprange $PV $MAXKOFFICEVER app-office/krita) + $(deprange $PV $MAXKOFFICEVER app-office/kspread) + $(deprange $PV $MAXKOFFICEVER app-office/kugar) + $(deprange $PV $MAXKOFFICEVER app-office/kword)" diff --git a/app-office/koffice/ChangeLog b/app-office/koffice/ChangeLog index fe1f4c2c5f71..34ee9280bb40 100644 --- a/app-office/koffice/ChangeLog +++ b/app-office/koffice/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for app-office/koffice # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.113 2005/09/03 15:52:24 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.114 2005/10/10 22:06:00 greg_g Exp $ + +*koffice-1.4.2 (10 Oct 2005) +*koffice-1.4.1-r1 (10 Oct 2005) + + 10 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> + +files/koffice-1.4.1-rtfimport.patch, +koffice-1.4.1-r1.ebuild, + +koffice-1.4.2.ebuild: + New version. Includes fix for buffer overflow in RTF import. Fix applied to + 1.4.1, too. 03 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> koffice-1.4.1.ebuild: Stable on ppc. diff --git a/app-office/koffice/files/digest-koffice-1.4.1-r1 b/app-office/koffice/files/digest-koffice-1.4.1-r1 new file mode 100644 index 000000000000..47d9bab5c838 --- /dev/null +++ b/app-office/koffice/files/digest-koffice-1.4.1-r1 @@ -0,0 +1 @@ +MD5 91a7b68757addc5934c5a8209a4926d5 koffice-1.4.1.tar.bz2 19364338 diff --git a/app-office/koffice/files/digest-koffice-1.4.2 b/app-office/koffice/files/digest-koffice-1.4.2 new file mode 100644 index 000000000000..a054824ae545 --- /dev/null +++ b/app-office/koffice/files/digest-koffice-1.4.2 @@ -0,0 +1 @@ +MD5 6b456fb7d54c84b11396b27a96ae0cf8 koffice-1.4.2.tar.bz2 19486852 diff --git a/app-office/koffice/files/koffice-1.4.1-rtfimport.patch b/app-office/koffice/files/koffice-1.4.1-rtfimport.patch new file mode 100644 index 000000000000..1bcf326fe121 --- /dev/null +++ b/app-office/koffice/files/koffice-1.4.1-rtfimport.patch @@ -0,0 +1,325 @@ +diff -Nur koffice-1.4.1.orig/filters/kword/rtf/import/rtfimport_tokenizer.cpp koffice-1.4.1/filters/kword/rtf/import/rtfimport_tokenizer.cpp +--- koffice-1.4.1.orig/filters/kword/rtf/import/rtfimport_tokenizer.cpp 2005-07-19 16:09:11.000000000 +0200 ++++ koffice-1.4.1/filters/kword/rtf/import/rtfimport_tokenizer.cpp 2005-10-08 10:17:14.000000000 +0200 +@@ -16,7 +16,7 @@ + + RTFTokenizer::RTFTokenizer() + { +- tokenText.resize( 4112 ); ++ tokenText.resize( 4113 ); + fileBuffer.resize( 4096 ); + infile = 0L; + } +@@ -30,8 +30,25 @@ + fileBufferPtr = 0L; + fileBufferEnd = 0L; + infile = in; ++ type = RTFTokenizer::PlainText; + } + ++int RTFTokenizer::nextChar() ++{ ++ if ( fileBufferPtr == fileBufferEnd ) { ++ int n = infile->readBlock( fileBuffer.data(), fileBuffer.size() ); ++ fileBufferPtr = ( uchar* ) fileBuffer.data(); ++ fileBufferEnd = fileBufferPtr; ++ ++ if ( n <= 0 ) ++ return -1; ++ ++ fileBufferEnd = fileBufferPtr + n; ++ } ++ return *fileBufferPtr++; ++} ++ ++ + /** + * Reads the next token. + */ +@@ -42,22 +59,15 @@ + if (!infile) + return; + +- do +- { +- if (fileBufferPtr == fileBufferEnd) +- { +- int n = infile->readBlock( fileBuffer.data(), fileBuffer.size() ); ++ do { ++ int n = nextChar(); + +- if (n <= 0) +- { +- // Return CloseGroup on EOF +- ch = '}'; +- break; +- } +- fileBufferPtr = (uchar *)fileBuffer.data(); +- fileBufferEnd = (fileBufferPtr + n); +- } +- ch = *fileBufferPtr++; ++ if ( n <= 0 ) { ++ ch = '}'; ++ break; ++ } ++ ++ ch = n; + } + while (ch == '\n' || ch == '\r' && ch != 0); + +@@ -67,6 +77,7 @@ + + uchar *_text = (uchar *)text; + ++ + if (ch == '{') + type = RTFTokenizer::OpenGroup; + else if (ch == '}') +@@ -75,20 +86,14 @@ + { + type = RTFTokenizer::ControlWord; + +- if (fileBufferPtr == fileBufferEnd) +- { +- int n = infile->readBlock( fileBuffer.data(), fileBuffer.size() ); ++ int n = nextChar(); + +- if (n <= 0) +- { +- // Return CloseGroup on EOF +- type = RTFTokenizer::CloseGroup; +- return; +- } +- fileBufferPtr = (uchar *)fileBuffer.data(); +- fileBufferEnd = (fileBufferPtr + n); +- } +- ch = *fileBufferPtr++; ++ if ( n <= 0 ) { ++ // Return CloseGroup on EOF ++ type = RTFTokenizer::CloseGroup; ++ return; ++ } ++ ch = n; + + // Type is either control word or control symbol + if ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z')) +@@ -96,64 +101,41 @@ + int v = 0; + + // Read alphabetic string (command) +- while ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z')) ++ while (_text < ( uchar* )tokenText.data()+tokenText.size()-3 && ++ ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z')) ) + { + *_text++ = ch; + +- if (fileBufferPtr == fileBufferEnd) +- { +- int n = infile->readBlock( fileBuffer.data(), fileBuffer.size() ); +- +- if (n <= 0) +- { +- ch = ' '; +- break; +- } +- fileBufferPtr = (uchar *)fileBuffer.data(); +- fileBufferEnd = (fileBufferPtr + n); +- } +- ch = *fileBufferPtr++; ++ int n = nextChar(); ++ if ( n <= 0 ) { ++ ch = ' '; ++ break; ++ } ++ ch = n; + } + + // Read numeric parameter (param) + bool isneg = (ch == '-'); + +- if (isneg) +- { +- if (fileBufferPtr == fileBufferEnd) +- { +- int n = infile->readBlock( fileBuffer.data(), fileBuffer.size() ); +- +- if (n <= 0) +- { +- // Return CloseGroup on EOF +- type = RTFTokenizer::CloseGroup; +- return; +- } +- fileBufferPtr = (uchar *)fileBuffer.data(); +- fileBufferEnd = (fileBufferPtr + n); +- } +- ch = *fileBufferPtr++; ++ if (isneg) { ++ int n = nextChar(); ++ if ( n <= 0 ) { ++ type = RTFTokenizer::CloseGroup; ++ return; ++ } ++ ch = n; + } +- while (ch >= '0' && ch <= '9') +- { ++ ++ while (ch >= '0' && ch <= '9') { + v = (10 * v) + ch - '0'; + hasParam = true; + +- if (fileBufferPtr == fileBufferEnd) +- { +- int n = infile->readBlock( fileBuffer.data(), fileBuffer.size() ); +- +- if (n <= 0) +- { +- ch = ' '; +- break; +- } +- fileBufferPtr = (uchar *)fileBuffer.data(); +- fileBufferEnd = (fileBufferPtr + n); +- } +- ch = *fileBufferPtr++; +- } ++ int n = nextChar(); ++ ++ if ( n <= 0 ) ++ n = ' '; ++ ch = n; ++ } + value = isneg ? -v : v; + + // If delimiter is a space, it's part of the control word +@@ -163,7 +145,7 @@ + } + + *_text = 0; // Just put an end of string for the test, it can then be over-written again +- if ( !qstrncmp( tokenText.data()+1, "bin", 4 ) ) // Test the NULL too to avoid catching keywords starting with "bin" ++ if ( !memcmp( tokenText.data()+1, "bin", 4 ) ) + { // We have \bin, so we need to read the bytes + kdDebug(30515) << "Token:" << tokenText << endl; + if (value > 0) +@@ -173,26 +155,15 @@ + binaryData.resize(value); + for (int i=0; i<value; i++) + { +- if (fileBufferPtr == fileBufferEnd) +- { +- const int n = infile->readBlock( fileBuffer.data(), fileBuffer.size() ); +- +- if (n <= 0) +- { +- kdError(30515) << "\\bin stream hit end of file." << endl; +- type = RTFTokenizer::CloseGroup; +- break; +- } +- fileBufferPtr = (uchar *)fileBuffer.data(); +- fileBufferEnd = (fileBufferPtr + n); ++ int n = nextChar(); ++ if ( n <= 0 ) { ++ type = RTFTokenizer::CloseGroup; ++ break; + } +- binaryData[i]=*fileBufferPtr++; ++ ++ binaryData[i] = n; + } + } +- else +- { +- kdError(30515) << "\\bin with negative value skipping" << endl; +- } + } + + } +@@ -200,19 +171,13 @@ + { + type = RTFTokenizer::ControlWord; + *_text++ = ch; +- if (fileBufferPtr == fileBufferEnd) +- { +- int n = infile->readBlock( fileBuffer.data(), fileBuffer.size() ); + +- if (n <= 0) +- { +- // Return CloseGroup on EOF +- type = RTFTokenizer::CloseGroup; +- return; +- } +- fileBufferPtr = (uchar *)fileBuffer.data(); +- fileBufferEnd = (fileBufferPtr + n); +- } ++ int n = nextChar(); ++ ++ if ( n <= 0 ) { ++ type = RTFTokenizer::CloseGroup; ++ return; ++ } + ch = *fileBufferPtr++; + for(int i=0;i<2;i++) + { +@@ -220,22 +185,16 @@ + value<<=4; + value=value|((ch + ((ch & 16) ? 0 : 9)) & 0xf); + +- if (fileBufferPtr == fileBufferEnd) +- { +- int n = infile->readBlock( fileBuffer.data(), fileBuffer.size() ); +- +- if (n <= 0) +- { +- ch = ' '; +- break; +- } +- fileBufferPtr = (uchar *)fileBuffer.data(); +- fileBufferEnd = (fileBufferPtr + n); +- } ++ int n = nextChar(); ++ ++ if ( n <= 0 ) { ++ ch = ' '; ++ break; ++ } + ch = *fileBufferPtr++; + } +- --fileBufferPtr; +- } ++ --fileBufferPtr; ++ } + else + { + type = RTFTokenizer::ControlWord; +@@ -248,14 +207,16 @@ + + // Everything until next backslash, opener or closer + while ( ch != '\\' && ch != '{' && ch != '}' && ch != '\n' && +- ch != '\r' && fileBufferPtr <= fileBufferEnd ) ++ ch != '\r') + { + *_text++ = ch; ++ if(fileBufferPtr >= fileBufferEnd) ++ break; + ch = *fileBufferPtr++; + } +- +- // Give back last char +- --fileBufferPtr; ++ if(fileBufferPtr < fileBufferEnd) ++ --fileBufferPtr; // give back the last char + } + *_text++ = 0; ++ + } +diff -Nur koffice-1.4.1.orig/filters/kword/rtf/import/rtfimport_tokenizer.h koffice-1.4.1/filters/kword/rtf/import/rtfimport_tokenizer.h +--- koffice-1.4.1.orig/filters/kword/rtf/import/rtfimport_tokenizer.h 2005-07-19 16:09:11.000000000 +0200 ++++ koffice-1.4.1/filters/kword/rtf/import/rtfimport_tokenizer.h 2005-10-08 10:17:14.000000000 +0200 +@@ -50,6 +50,8 @@ + + // tokenizer (private) data + private: ++ int nextChar(); ++ + QFile *infile; + QByteArray fileBuffer; + QCString tokenText; diff --git a/app-office/koffice/koffice-1.4.1-r1.ebuild b/app-office/koffice/koffice-1.4.1-r1.ebuild new file mode 100644 index 000000000000..ea359a075e30 --- /dev/null +++ b/app-office/koffice/koffice-1.4.1-r1.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.4.1-r1.ebuild,v 1.1 2005/10/10 22:06:00 greg_g Exp $ + +inherit kde + +DESCRIPTION="An integrated office suite for KDE, the K Desktop Environment." +HOMEPAGE="http://www.koffice.org/" +SRC_URI="mirror://kde/stable/koffice-${PV}/src/${P}.tar.bz2" +LICENSE="GPL-2 LGPL-2" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="doc javascript mysql postgres" + +RDEPEND=">=media-gfx/imagemagick-5.5.2 + >=app-text/wv2-0.1.9 + >=media-libs/freetype-2 + media-libs/fontconfig + media-libs/libart_lgpl + dev-libs/libxml2 + dev-libs/libxslt + sys-libs/readline + mysql? ( dev-db/mysql ) + postgres? ( dev-libs/libpqxx ) + dev-lang/python + >=media-libs/lcms-1.12 + javascript? ( kde-base/kjsembed ) + !dev-db/kexi" + +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen ) + dev-util/pkgconfig" + +# add blockers on split packages derived from this one +for x in $(get-child-packages ${CATEGORY}/${PN}); do + DEPEND="${DEPEND} !${x}" + RDEPEND="${RDEPEND} !${x}" +done + +need-kde 3.3 + +# TODO: kword sql plugin needs Qt compiled with sql support +# the dependency on python is needed for scripting support in kexi +# and for kivio/kiviopart/kiviosdk. + +src_unpack() { + kde_src_unpack + + # Fix RTF import buffer overflow. Applied in 1.4.2. + epatch "${FILESDIR}/koffice-1.4.1-rtfimport.patch" +} + +src_compile() { + local myconf="$(use_enable mysql) $(use_enable postgres pgsql)" + + kde_src_compile + if use doc; then + make apidox || die + fi +} + +src_install() { + kde_src_install + if use doc; then + make DESTDIR="${D}" install-apidox || die + fi + + dodoc changes-* +} diff --git a/app-office/koffice/koffice-1.4.2.ebuild b/app-office/koffice/koffice-1.4.2.ebuild new file mode 100644 index 000000000000..22974df8b2c5 --- /dev/null +++ b/app-office/koffice/koffice-1.4.2.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.4.2.ebuild,v 1.1 2005/10/10 22:06:00 greg_g Exp $ + +inherit kde + +DESCRIPTION="An integrated office suite for KDE, the K Desktop Environment." +HOMEPAGE="http://www.koffice.org/" +SRC_URI="mirror://kde/stable/koffice-${PV}/src/${P}.tar.bz2" +LICENSE="GPL-2 LGPL-2" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="doc javascript mysql postgres" + +RDEPEND=">=media-gfx/imagemagick-5.5.2 + >=app-text/wv2-0.1.9 + >=media-libs/freetype-2 + media-libs/fontconfig + media-libs/libart_lgpl + dev-libs/libxml2 + dev-libs/libxslt + sys-libs/readline + mysql? ( dev-db/mysql ) + postgres? ( dev-libs/libpqxx ) + dev-lang/python + >=media-libs/lcms-1.12 + javascript? ( kde-base/kjsembed ) + !dev-db/kexi" + +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen ) + dev-util/pkgconfig" + +# add blockers on split packages derived from this one +for x in $(get-child-packages ${CATEGORY}/${PN}); do + DEPEND="${DEPEND} !${x}" + RDEPEND="${RDEPEND} !${x}" +done + +need-kde 3.3 + +# TODO: kword sql plugin needs Qt compiled with sql support +# the dependency on python is needed for scripting support in kexi +# and for kivio/kiviopart/kiviosdk. + +src_compile() { + local myconf="$(use_enable mysql) $(use_enable postgres pgsql)" + + kde_src_compile + if use doc; then + make apidox || die + fi +} + +src_install() { + kde_src_install + if use doc; then + make DESTDIR="${D}" install-apidox || die + fi + + dodoc changes-* +} diff --git a/app-office/koshell/ChangeLog b/app-office/koshell/ChangeLog index 6c7bd611767d..5d5018e27ecb 100644 --- a/app-office/koshell/ChangeLog +++ b/app-office/koshell/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-office/koshell # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/koshell/ChangeLog,v 1.15 2005/09/12 14:02:39 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/koshell/ChangeLog,v 1.16 2005/10/10 22:07:46 greg_g Exp $ + +*koshell-1.4.2 (10 Oct 2005) + + 10 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> +koshell-1.4.2.ebuild: + New version. 12 Sep 2005; Aron Griffis <agriffis@gentoo.org> koshell-1.4.1.ebuild: Mark 1.4.1 stable on alpha diff --git a/app-office/koshell/files/digest-koshell-1.4.2 b/app-office/koshell/files/digest-koshell-1.4.2 new file mode 100644 index 000000000000..a054824ae545 --- /dev/null +++ b/app-office/koshell/files/digest-koshell-1.4.2 @@ -0,0 +1 @@ +MD5 6b456fb7d54c84b11396b27a96ae0cf8 koffice-1.4.2.tar.bz2 19486852 diff --git a/app-office/koshell/koshell-1.4.2.ebuild b/app-office/koshell/koshell-1.4.2.ebuild new file mode 100644 index 000000000000..60f6e4150c0b --- /dev/null +++ b/app-office/koshell/koshell-1.4.2.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/koshell/koshell-1.4.2.ebuild,v 1.1 2005/10/10 22:07:46 greg_g Exp $ + +MAXKOFFICEVER=${PV} +KMNAME=koffice +inherit kde-meta eutils + +DESCRIPTION="KOffice workspace." +HOMEPAGE="http://www.koffice.org/" +LICENSE="GPL-2 LGPL-2" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="" + +RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)" + +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +KMCOPYLIB=" + libkformula lib/kformula + libkofficecore lib/kofficecore + libkofficeui lib/kofficeui + libkopainter lib/kopainter + libkoscript lib/koscript + libkotext lib/kotext + libkwmf lib/kwmf + libkowmf lib/kwmf + libkstore lib/store" + +KMEXTRACTONLY="lib/" + +need-kde 3.3 diff --git a/app-office/kpresenter/ChangeLog b/app-office/kpresenter/ChangeLog index 05c74011719c..bd05444460a7 100644 --- a/app-office/kpresenter/ChangeLog +++ b/app-office/kpresenter/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-office/kpresenter # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/kpresenter/ChangeLog,v 1.15 2005/09/12 14:03:25 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/kpresenter/ChangeLog,v 1.16 2005/10/10 22:08:13 greg_g Exp $ + +*kpresenter-1.4.2 (10 Oct 2005) + + 10 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> +kpresenter-1.4.2.ebuild: + New version. 12 Sep 2005; Aron Griffis <agriffis@gentoo.org> kpresenter-1.4.1.ebuild: Mark 1.4.1 stable on alpha diff --git a/app-office/kpresenter/files/digest-kpresenter-1.4.2 b/app-office/kpresenter/files/digest-kpresenter-1.4.2 new file mode 100644 index 000000000000..a054824ae545 --- /dev/null +++ b/app-office/kpresenter/files/digest-kpresenter-1.4.2 @@ -0,0 +1 @@ +MD5 6b456fb7d54c84b11396b27a96ae0cf8 koffice-1.4.2.tar.bz2 19486852 diff --git a/app-office/kpresenter/kpresenter-1.4.2.ebuild b/app-office/kpresenter/kpresenter-1.4.2.ebuild new file mode 100644 index 000000000000..eabe3ea3a125 --- /dev/null +++ b/app-office/kpresenter/kpresenter-1.4.2.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/kpresenter/kpresenter-1.4.2.ebuild,v 1.1 2005/10/10 22:08:13 greg_g Exp $ + +KMNAME=koffice +MAXKOFFICEVER=${PV} +inherit kde-meta eutils + +DESCRIPTION="KOffice presentation program." +HOMEPAGE="http://www.koffice.org/" +LICENSE="GPL-2 LGPL-2" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="" + +RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)" + +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +KMCOPYLIB=" + libkformula lib/kformula + libkofficecore lib/kofficecore + libkofficeui lib/kofficeui + libkopainter lib/kopainter + libkoscript lib/koscript + libkotext lib/kotext + libkwmf lib/kwmf + libkowmf lib/kwmf + libkstore lib/store" + +KMEXTRACTONLY="lib/" + +KMCOMPILEONLY="filters/liboofilter" + +KMEXTRA="filters/kpresenter" + +need-kde 3.3 + +src_unpack() { + kde-meta_src_unpack unpack + + # We need to compile liboofilter first + echo "SUBDIRS = liboofilter kpresenter" > $S/filters/Makefile.am + + kde-meta_src_unpack makefiles +} diff --git a/app-office/krita/ChangeLog b/app-office/krita/ChangeLog index f12a1a58700a..3831a4436d92 100644 --- a/app-office/krita/ChangeLog +++ b/app-office/krita/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-office/krita # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/krita/ChangeLog,v 1.13 2005/09/12 13:47:20 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/krita/ChangeLog,v 1.14 2005/10/10 22:08:42 greg_g Exp $ + +*krita-1.4.2 (10 Oct 2005) + + 10 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> +krita-1.4.2.ebuild: + New version. 11 Sep 2005; Aron Griffis <agriffis@gentoo.org> krita-1.4.1.ebuild: Mark 1.4.1 stable on alpha diff --git a/app-office/krita/files/digest-krita-1.4.2 b/app-office/krita/files/digest-krita-1.4.2 new file mode 100644 index 000000000000..a054824ae545 --- /dev/null +++ b/app-office/krita/files/digest-krita-1.4.2 @@ -0,0 +1 @@ +MD5 6b456fb7d54c84b11396b27a96ae0cf8 koffice-1.4.2.tar.bz2 19486852 diff --git a/app-office/krita/krita-1.4.2.ebuild b/app-office/krita/krita-1.4.2.ebuild new file mode 100644 index 000000000000..03d3cb177344 --- /dev/null +++ b/app-office/krita/krita-1.4.2.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/krita/krita-1.4.2.ebuild,v 1.1 2005/10/10 22:08:42 greg_g Exp $ + +MAXKOFFICEVER=${PV} +KMNAME=koffice +inherit kde-meta eutils + +DESCRIPTION="KOffice image manipulation program." +HOMEPAGE="http://www.koffice.org/" +LICENSE="GPL-2 LGPL-2" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="javascript" + +RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs) + >=media-gfx/imagemagick-5.5.2 + >=media-libs/lcms-1.12 + javascript? ( kde-base/kjsembed )" + +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +KMCOPYLIB=" + libkformula lib/kformula + libkofficecore lib/kofficecore + libkofficeui lib/kofficeui + libkopainter lib/kopainter + libkoscript lib/koscript + libkotext lib/kotext + libkwmf lib/kwmf + libkowmf lib/kwmf + libkstore lib/store" + +KMEXTRACTONLY="lib/" + +KMEXTRA="filters/krita" + +need-kde 3.3 diff --git a/app-office/kspread/ChangeLog b/app-office/kspread/ChangeLog index dbc646cf49a9..18e4f0c57fa4 100644 --- a/app-office/kspread/ChangeLog +++ b/app-office/kspread/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-office/kspread # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/kspread/ChangeLog,v 1.16 2005/09/12 14:06:12 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/kspread/ChangeLog,v 1.17 2005/10/10 22:09:09 greg_g Exp $ + +*kspread-1.4.2 (10 Oct 2005) + + 10 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> +kspread-1.4.2.ebuild: + New version. 12 Sep 2005; Aron Griffis <agriffis@gentoo.org> kspread-1.4.1.ebuild: Mark 1.4.1 stable on alpha diff --git a/app-office/kspread/files/digest-kspread-1.4.2 b/app-office/kspread/files/digest-kspread-1.4.2 new file mode 100644 index 000000000000..a054824ae545 --- /dev/null +++ b/app-office/kspread/files/digest-kspread-1.4.2 @@ -0,0 +1 @@ +MD5 6b456fb7d54c84b11396b27a96ae0cf8 koffice-1.4.2.tar.bz2 19486852 diff --git a/app-office/kspread/kspread-1.4.2.ebuild b/app-office/kspread/kspread-1.4.2.ebuild new file mode 100644 index 000000000000..62f64eea370a --- /dev/null +++ b/app-office/kspread/kspread-1.4.2.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/kspread/kspread-1.4.2.ebuild,v 1.1 2005/10/10 22:09:09 greg_g Exp $ + +KMNAME=koffice +MAXKOFFICEVER=${PV} +inherit kde-meta eutils + +DESCRIPTION="KOffice spreadsheet application." +HOMEPAGE="http://www.koffice.org/" +LICENSE="GPL-2 LGPL-2" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="" + +RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs) + $(deprange $PV $MAXKOFFICEVER app-office/kchart)" + +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +KMCOPYLIB=" + libkformula lib/kformula + libkofficecore lib/kofficecore + libkofficeui lib/kofficeui + libkopainter lib/kopainter + libkoscript lib/koscript + libkotext lib/kotext + libkwmf lib/kwmf + libkowmf lib/kwmf + libkstore lib/store + libkochart interfaces" + +KMEXTRACTONLY="lib/ + interfaces/" + +KMCOMPILEONLY="filters/liboofilter" + +KMEXTRA="filters/kspread" + +need-kde 3.3 + +src_unpack() { + kde-meta_src_unpack unpack + + # We need to compile liboofilter first + echo "SUBDIRS = liboofilter kspread" > $S/filters/Makefile.am + + kde-meta_src_unpack makefiles +} diff --git a/app-office/kugar/ChangeLog b/app-office/kugar/ChangeLog index 53022f4d2818..706c3047d307 100644 --- a/app-office/kugar/ChangeLog +++ b/app-office/kugar/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-office/kugar # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/kugar/ChangeLog,v 1.15 2005/09/12 14:01:54 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/kugar/ChangeLog,v 1.16 2005/10/10 22:09:38 greg_g Exp $ + +*kugar-1.4.2 (10 Oct 2005) + + 10 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> +kugar-1.4.2.ebuild: + New version. 12 Sep 2005; Aron Griffis <agriffis@gentoo.org> kugar-1.4.1.ebuild: Mark 1.4.1 stable on alpha diff --git a/app-office/kugar/files/digest-kugar-1.4.2 b/app-office/kugar/files/digest-kugar-1.4.2 new file mode 100644 index 000000000000..a054824ae545 --- /dev/null +++ b/app-office/kugar/files/digest-kugar-1.4.2 @@ -0,0 +1 @@ +MD5 6b456fb7d54c84b11396b27a96ae0cf8 koffice-1.4.2.tar.bz2 19486852 diff --git a/app-office/kugar/kugar-1.4.2.ebuild b/app-office/kugar/kugar-1.4.2.ebuild new file mode 100644 index 000000000000..26f7d4e49dde --- /dev/null +++ b/app-office/kugar/kugar-1.4.2.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/kugar/kugar-1.4.2.ebuild,v 1.1 2005/10/10 22:09:38 greg_g Exp $ + +KMNAME=koffice +MAXKOFFICEVER=${PV} +inherit kde-meta eutils + +DESCRIPTION="KOffice report viewer and generator." +HOMEPAGE="http://www.koffice.org/" +LICENSE="GPL-2 LGPL-2" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="" + +RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)" + +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +KMCOPYLIB=" + libkformula lib/kformula + libkofficecore lib/kofficecore + libkofficeui lib/kofficeui + libkopainter lib/kopainter + libkoscript lib/koscript + libkotext lib/kotext + libkwmf lib/kwmf + libkowmf lib/kwmf + libkstore lib/store" + +KMEXTRACTONLY="lib/" + +KMEXTRA="filters/kugar" + +need-kde 3.3 diff --git a/app-office/kword/ChangeLog b/app-office/kword/ChangeLog index a0a94528dae2..e44aa28f0bb6 100644 --- a/app-office/kword/ChangeLog +++ b/app-office/kword/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for app-office/kword # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/kword/ChangeLog,v 1.15 2005/09/12 14:07:17 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/kword/ChangeLog,v 1.16 2005/10/10 22:10:08 greg_g Exp $ + +*kword-1.4.2 (10 Oct 2005) +*kword-1.4.1-r1 (10 Oct 2005) + + 10 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> + +files/koffice-1.4.1-rtfimport.patch, +kword-1.4.1-r1.ebuild, + +kword-1.4.2.ebuild: + New version. Includes fix for buffer overflow in RTF import. Fix applied to + 1.4.1, too. 12 Sep 2005; Aron Griffis <agriffis@gentoo.org> kword-1.4.1.ebuild: Mark 1.4.1 stable on alpha diff --git a/app-office/kword/files/digest-kword-1.4.1-r1 b/app-office/kword/files/digest-kword-1.4.1-r1 new file mode 100644 index 000000000000..47d9bab5c838 --- /dev/null +++ b/app-office/kword/files/digest-kword-1.4.1-r1 @@ -0,0 +1 @@ +MD5 91a7b68757addc5934c5a8209a4926d5 koffice-1.4.1.tar.bz2 19364338 diff --git a/app-office/kword/files/digest-kword-1.4.2 b/app-office/kword/files/digest-kword-1.4.2 new file mode 100644 index 000000000000..a054824ae545 --- /dev/null +++ b/app-office/kword/files/digest-kword-1.4.2 @@ -0,0 +1 @@ +MD5 6b456fb7d54c84b11396b27a96ae0cf8 koffice-1.4.2.tar.bz2 19486852 diff --git a/app-office/kword/files/koffice-1.4.1-rtfimport.patch b/app-office/kword/files/koffice-1.4.1-rtfimport.patch new file mode 100644 index 000000000000..1bcf326fe121 --- /dev/null +++ b/app-office/kword/files/koffice-1.4.1-rtfimport.patch @@ -0,0 +1,325 @@ +diff -Nur koffice-1.4.1.orig/filters/kword/rtf/import/rtfimport_tokenizer.cpp koffice-1.4.1/filters/kword/rtf/import/rtfimport_tokenizer.cpp +--- koffice-1.4.1.orig/filters/kword/rtf/import/rtfimport_tokenizer.cpp 2005-07-19 16:09:11.000000000 +0200 ++++ koffice-1.4.1/filters/kword/rtf/import/rtfimport_tokenizer.cpp 2005-10-08 10:17:14.000000000 +0200 +@@ -16,7 +16,7 @@ + + RTFTokenizer::RTFTokenizer() + { +- tokenText.resize( 4112 ); ++ tokenText.resize( 4113 ); + fileBuffer.resize( 4096 ); + infile = 0L; + } +@@ -30,8 +30,25 @@ + fileBufferPtr = 0L; + fileBufferEnd = 0L; + infile = in; ++ type = RTFTokenizer::PlainText; + } + ++int RTFTokenizer::nextChar() ++{ ++ if ( fileBufferPtr == fileBufferEnd ) { ++ int n = infile->readBlock( fileBuffer.data(), fileBuffer.size() ); ++ fileBufferPtr = ( uchar* ) fileBuffer.data(); ++ fileBufferEnd = fileBufferPtr; ++ ++ if ( n <= 0 ) ++ return -1; ++ ++ fileBufferEnd = fileBufferPtr + n; ++ } ++ return *fileBufferPtr++; ++} ++ ++ + /** + * Reads the next token. + */ +@@ -42,22 +59,15 @@ + if (!infile) + return; + +- do +- { +- if (fileBufferPtr == fileBufferEnd) +- { +- int n = infile->readBlock( fileBuffer.data(), fileBuffer.size() ); ++ do { ++ int n = nextChar(); + +- if (n <= 0) +- { +- // Return CloseGroup on EOF +- ch = '}'; +- break; +- } +- fileBufferPtr = (uchar *)fileBuffer.data(); +- fileBufferEnd = (fileBufferPtr + n); +- } +- ch = *fileBufferPtr++; ++ if ( n <= 0 ) { ++ ch = '}'; ++ break; ++ } ++ ++ ch = n; + } + while (ch == '\n' || ch == '\r' && ch != 0); + +@@ -67,6 +77,7 @@ + + uchar *_text = (uchar *)text; + ++ + if (ch == '{') + type = RTFTokenizer::OpenGroup; + else if (ch == '}') +@@ -75,20 +86,14 @@ + { + type = RTFTokenizer::ControlWord; + +- if (fileBufferPtr == fileBufferEnd) +- { +- int n = infile->readBlock( fileBuffer.data(), fileBuffer.size() ); ++ int n = nextChar(); + +- if (n <= 0) +- { +- // Return CloseGroup on EOF +- type = RTFTokenizer::CloseGroup; +- return; +- } +- fileBufferPtr = (uchar *)fileBuffer.data(); +- fileBufferEnd = (fileBufferPtr + n); +- } +- ch = *fileBufferPtr++; ++ if ( n <= 0 ) { ++ // Return CloseGroup on EOF ++ type = RTFTokenizer::CloseGroup; ++ return; ++ } ++ ch = n; + + // Type is either control word or control symbol + if ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z')) +@@ -96,64 +101,41 @@ + int v = 0; + + // Read alphabetic string (command) +- while ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z')) ++ while (_text < ( uchar* )tokenText.data()+tokenText.size()-3 && ++ ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z')) ) + { + *_text++ = ch; + +- if (fileBufferPtr == fileBufferEnd) +- { +- int n = infile->readBlock( fileBuffer.data(), fileBuffer.size() ); +- +- if (n <= 0) +- { +- ch = ' '; +- break; +- } +- fileBufferPtr = (uchar *)fileBuffer.data(); +- fileBufferEnd = (fileBufferPtr + n); +- } +- ch = *fileBufferPtr++; ++ int n = nextChar(); ++ if ( n <= 0 ) { ++ ch = ' '; ++ break; ++ } ++ ch = n; + } + + // Read numeric parameter (param) + bool isneg = (ch == '-'); + +- if (isneg) +- { +- if (fileBufferPtr == fileBufferEnd) +- { +- int n = infile->readBlock( fileBuffer.data(), fileBuffer.size() ); +- +- if (n <= 0) +- { +- // Return CloseGroup on EOF +- type = RTFTokenizer::CloseGroup; +- return; +- } +- fileBufferPtr = (uchar *)fileBuffer.data(); +- fileBufferEnd = (fileBufferPtr + n); +- } +- ch = *fileBufferPtr++; ++ if (isneg) { ++ int n = nextChar(); ++ if ( n <= 0 ) { ++ type = RTFTokenizer::CloseGroup; ++ return; ++ } ++ ch = n; + } +- while (ch >= '0' && ch <= '9') +- { ++ ++ while (ch >= '0' && ch <= '9') { + v = (10 * v) + ch - '0'; + hasParam = true; + +- if (fileBufferPtr == fileBufferEnd) +- { +- int n = infile->readBlock( fileBuffer.data(), fileBuffer.size() ); +- +- if (n <= 0) +- { +- ch = ' '; +- break; +- } +- fileBufferPtr = (uchar *)fileBuffer.data(); +- fileBufferEnd = (fileBufferPtr + n); +- } +- ch = *fileBufferPtr++; +- } ++ int n = nextChar(); ++ ++ if ( n <= 0 ) ++ n = ' '; ++ ch = n; ++ } + value = isneg ? -v : v; + + // If delimiter is a space, it's part of the control word +@@ -163,7 +145,7 @@ + } + + *_text = 0; // Just put an end of string for the test, it can then be over-written again +- if ( !qstrncmp( tokenText.data()+1, "bin", 4 ) ) // Test the NULL too to avoid catching keywords starting with "bin" ++ if ( !memcmp( tokenText.data()+1, "bin", 4 ) ) + { // We have \bin, so we need to read the bytes + kdDebug(30515) << "Token:" << tokenText << endl; + if (value > 0) +@@ -173,26 +155,15 @@ + binaryData.resize(value); + for (int i=0; i<value; i++) + { +- if (fileBufferPtr == fileBufferEnd) +- { +- const int n = infile->readBlock( fileBuffer.data(), fileBuffer.size() ); +- +- if (n <= 0) +- { +- kdError(30515) << "\\bin stream hit end of file." << endl; +- type = RTFTokenizer::CloseGroup; +- break; +- } +- fileBufferPtr = (uchar *)fileBuffer.data(); +- fileBufferEnd = (fileBufferPtr + n); ++ int n = nextChar(); ++ if ( n <= 0 ) { ++ type = RTFTokenizer::CloseGroup; ++ break; + } +- binaryData[i]=*fileBufferPtr++; ++ ++ binaryData[i] = n; + } + } +- else +- { +- kdError(30515) << "\\bin with negative value skipping" << endl; +- } + } + + } +@@ -200,19 +171,13 @@ + { + type = RTFTokenizer::ControlWord; + *_text++ = ch; +- if (fileBufferPtr == fileBufferEnd) +- { +- int n = infile->readBlock( fileBuffer.data(), fileBuffer.size() ); + +- if (n <= 0) +- { +- // Return CloseGroup on EOF +- type = RTFTokenizer::CloseGroup; +- return; +- } +- fileBufferPtr = (uchar *)fileBuffer.data(); +- fileBufferEnd = (fileBufferPtr + n); +- } ++ int n = nextChar(); ++ ++ if ( n <= 0 ) { ++ type = RTFTokenizer::CloseGroup; ++ return; ++ } + ch = *fileBufferPtr++; + for(int i=0;i<2;i++) + { +@@ -220,22 +185,16 @@ + value<<=4; + value=value|((ch + ((ch & 16) ? 0 : 9)) & 0xf); + +- if (fileBufferPtr == fileBufferEnd) +- { +- int n = infile->readBlock( fileBuffer.data(), fileBuffer.size() ); +- +- if (n <= 0) +- { +- ch = ' '; +- break; +- } +- fileBufferPtr = (uchar *)fileBuffer.data(); +- fileBufferEnd = (fileBufferPtr + n); +- } ++ int n = nextChar(); ++ ++ if ( n <= 0 ) { ++ ch = ' '; ++ break; ++ } + ch = *fileBufferPtr++; + } +- --fileBufferPtr; +- } ++ --fileBufferPtr; ++ } + else + { + type = RTFTokenizer::ControlWord; +@@ -248,14 +207,16 @@ + + // Everything until next backslash, opener or closer + while ( ch != '\\' && ch != '{' && ch != '}' && ch != '\n' && +- ch != '\r' && fileBufferPtr <= fileBufferEnd ) ++ ch != '\r') + { + *_text++ = ch; ++ if(fileBufferPtr >= fileBufferEnd) ++ break; + ch = *fileBufferPtr++; + } +- +- // Give back last char +- --fileBufferPtr; ++ if(fileBufferPtr < fileBufferEnd) ++ --fileBufferPtr; // give back the last char + } + *_text++ = 0; ++ + } +diff -Nur koffice-1.4.1.orig/filters/kword/rtf/import/rtfimport_tokenizer.h koffice-1.4.1/filters/kword/rtf/import/rtfimport_tokenizer.h +--- koffice-1.4.1.orig/filters/kword/rtf/import/rtfimport_tokenizer.h 2005-07-19 16:09:11.000000000 +0200 ++++ koffice-1.4.1/filters/kword/rtf/import/rtfimport_tokenizer.h 2005-10-08 10:17:14.000000000 +0200 +@@ -50,6 +50,8 @@ + + // tokenizer (private) data + private: ++ int nextChar(); ++ + QFile *infile; + QByteArray fileBuffer; + QCString tokenText; diff --git a/app-office/kword/kword-1.4.1-r1.ebuild b/app-office/kword/kword-1.4.1-r1.ebuild new file mode 100644 index 000000000000..56edef90b495 --- /dev/null +++ b/app-office/kword/kword-1.4.1-r1.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-1.4.1-r1.ebuild,v 1.1 2005/10/10 22:10:08 greg_g Exp $ + +KMNAME=koffice +MAXKOFFICEVER=${PV} +inherit kde-meta eutils + +DESCRIPTION="KOffice word processor." +HOMEPAGE="http://www.koffice.org/" +LICENSE="GPL-2 LGPL-2" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="" + +RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs) + $(deprange $PV $MAXKOFFICEVER app-office/kspread) + >=app-text/wv2-0.1.8 + >=media-gfx/imagemagick-5.5.2" + +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +KMCOPYLIB=" + libkformula lib/kformula + libkofficecore lib/kofficecore + libkofficeui lib/kofficeui + libkopainter lib/kopainter + libkoscript lib/koscript + libkotext lib/kotext + libkwmf lib/kwmf + libkowmf lib/kwmf + libkstore lib/store + libkspreadcommon kspread" + +KMEXTRACTONLY=" + lib/ + kspread/" + +KMCOMPILEONLY="filters/liboofilter" + +KMEXTRA="filters/kword" + +need-kde 3.3 + +src_unpack() { + kde-meta_src_unpack unpack + + # Fix RTF import buffer overflow. Applied in 1.4.2. + epatch "${FILESDIR}/koffice-1.4.1-rtfimport.patch" + + # We need to compile liboofilter first + echo "SUBDIRS = liboofilter kword" > $S/filters/Makefile.am + + kde-meta_src_unpack makefiles +} diff --git a/app-office/kword/kword-1.4.2.ebuild b/app-office/kword/kword-1.4.2.ebuild new file mode 100644 index 000000000000..bc4cad24f030 --- /dev/null +++ b/app-office/kword/kword-1.4.2.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-1.4.2.ebuild,v 1.1 2005/10/10 22:10:08 greg_g Exp $ + +KMNAME=koffice +MAXKOFFICEVER=${PV} +inherit kde-meta eutils + +DESCRIPTION="KOffice word processor." +HOMEPAGE="http://www.koffice.org/" +LICENSE="GPL-2 LGPL-2" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="" + +RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs) + $(deprange $PV $MAXKOFFICEVER app-office/kspread) + >=app-text/wv2-0.1.8 + >=media-gfx/imagemagick-5.5.2" + +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +KMCOPYLIB=" + libkformula lib/kformula + libkofficecore lib/kofficecore + libkofficeui lib/kofficeui + libkopainter lib/kopainter + libkoscript lib/koscript + libkotext lib/kotext + libkwmf lib/kwmf + libkowmf lib/kwmf + libkstore lib/store + libkspreadcommon kspread" + +KMEXTRACTONLY=" + lib/ + kspread/" + +KMCOMPILEONLY="filters/liboofilter" + +KMEXTRA="filters/kword" + +need-kde 3.3 + +src_unpack() { + kde-meta_src_unpack unpack + + # We need to compile liboofilter first + echo "SUBDIRS = liboofilter kword" > $S/filters/Makefile.am + + kde-meta_src_unpack makefiles +} |