diff options
| author |   Markus Dittrich <markusle@gentoo.org> | 2008-06-17 10:16:07 +0000 |
|---|---|---|
| committer | Markus Dittrich <markusle@gentoo.org> | 2008-06-17 10:16:07 +0000 |
| commit | 400d70f52de5db4326fc7d21b23fe2f67595508a (patch) | |
| tree | a08344f2259272cd568d1ff2a6cd30f35cf6b4fc | |
| parent | Fix bug #218888 (diff) | |
| download | gentoo-2-400d70f52de5db4326fc7d21b23fe2f67595508a.tar.gz gentoo-2-400d70f52de5db4326fc7d21b23fe2f67595508a.tar.bz2 gentoo-2-400d70f52de5db4326fc7d21b23fe2f67595508a.zip | |
Slightly modified gcc-4.3 patch since it got mangled by cvs during commit.
(Portage version: 2.1.4.4)
| -rw-r--r-- | sci-biology/treeviewx/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-biology/treeviewx/files/treeviewx-0.5.1-gcc4.3.patch | 44 |
2 files changed, 28 insertions, 22 deletions
diff --git a/sci-biology/treeviewx/ChangeLog b/sci-biology/treeviewx/ChangeLog index 52c917009e2c..2c6f0ac4707e 100644 --- a/sci-biology/treeviewx/ChangeLog +++ b/sci-biology/treeviewx/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-biology/treeviewx # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-biology/treeviewx/ChangeLog,v 1.17 2008/06/16 10:45:59 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-biology/treeviewx/ChangeLog,v 1.18 2008/06/17 10:16:06 markusle Exp $ + + 17 Jun 2008; Markus Dittrich <markusle@gentoo.org> + files/treeviewx-0.5.1-gcc4.3.patch: + Slightly modified gcc-4.3 patch since it got mangled by cvs during commit. *treeviewx-0.5.1-r1 (16 Jun 2008) diff --git a/sci-biology/treeviewx/files/treeviewx-0.5.1-gcc4.3.patch b/sci-biology/treeviewx/files/treeviewx-0.5.1-gcc4.3.patch index 7d42d962eaff..33bd3b1741f6 100644 --- a/sci-biology/treeviewx/files/treeviewx-0.5.1-gcc4.3.patch +++ b/sci-biology/treeviewx/files/treeviewx-0.5.1-gcc4.3.patch @@ -1,20 +1,21 @@ diff -Naur tv-0.5.1/TreeLib/Parse.cpp tv-0.5.1.new/TreeLib/Parse.cpp --- tv-0.5.1/TreeLib/Parse.cpp 2002-02-23 07:22:32.000000000 -0500 -+++ tv-0.5.1.new/TreeLib/Parse.cpp 2008-06-16 06:32:30.000000000 -0400 -@@ -20,7 +20,9 @@ - */ - - // $Id: treeviewx-0.5.1-gcc4.3.patch,v 1.1 2008/06/16 10:46:00 markusle Exp $ -- -+ -+ -+#include <cstring> ++++ tv-0.5.1.new/TreeLib/Parse.cpp 2008-06-17 06:08:24.000000000 -0400 +@@ -24,6 +24,11 @@ #include <ctype.h> #include "Parse.h" ++ ++ ++ ++#include <cstring> ++ + // Return the next token in the string + tokentype Parser::NextToken () + { diff -Naur tv-0.5.1/TreeLib/TreeLib.cpp tv-0.5.1.new/TreeLib/TreeLib.cpp --- tv-0.5.1/TreeLib/TreeLib.cpp 2004-05-13 08:22:11.000000000 -0400 -+++ tv-0.5.1.new/TreeLib/TreeLib.cpp 2008-06-16 06:32:30.000000000 -0400 ++++ tv-0.5.1.new/TreeLib/TreeLib.cpp 2008-06-17 05:58:17.000000000 -0400 @@ -24,6 +24,8 @@ #include "TreeLib.h" #include "Parse.h" @@ -26,19 +27,20 @@ diff -Naur tv-0.5.1/TreeLib/TreeLib.cpp tv-0.5.1.new/TreeLib/TreeLib.cpp diff -Naur tv-0.5.1/TreeLib/treereader.cpp tv-0.5.1.new/TreeLib/treereader.cpp --- tv-0.5.1/TreeLib/treereader.cpp 2003-09-10 08:58:16.000000000 -0400 -+++ tv-0.5.1.new/TreeLib/treereader.cpp 2008-06-16 06:32:30.000000000 -0400 -@@ -21,6 +21,8 @@ - - // $Id: treeviewx-0.5.1-gcc4.3.patch,v 1.1 2008/06/16 10:46:00 markusle Exp $ ++++ tv-0.5.1.new/TreeLib/treereader.cpp 2008-06-17 06:07:15.000000000 -0400 +@@ -28,6 +28,9 @@ + #include <stdlib.h> + #endif +#include <cstring> +#include <cstdlib> - #include "treereader.h" - - #if __MWERKS__ ++ + //------------------------------------------------------------------------------ + TreeReader::TreeReader (Tokeniser &p) : parser (p) + { diff -Naur tv-0.5.1/ncl-2.0/src/charactersblock.cpp tv-0.5.1.new/ncl-2.0/src/charactersblock.cpp --- tv-0.5.1/ncl-2.0/src/charactersblock.cpp 2002-12-10 06:35:49.000000000 -0500 -+++ tv-0.5.1.new/ncl-2.0/src/charactersblock.cpp 2008-06-16 06:32:30.000000000 -0400 ++++ tv-0.5.1.new/ncl-2.0/src/charactersblock.cpp 2008-06-17 05:58:17.000000000 -0400 @@ -1,3 +1,5 @@ + +#include <cstring> @@ -47,7 +49,7 @@ diff -Naur tv-0.5.1/ncl-2.0/src/charactersblock.cpp tv-0.5.1.new/ncl-2.0/src/cha #include "nexustoken.h" diff -Naur tv-0.5.1/ncl-2.0/src/nexus.cpp tv-0.5.1.new/ncl-2.0/src/nexus.cpp --- tv-0.5.1/ncl-2.0/src/nexus.cpp 2002-12-10 06:35:50.000000000 -0500 -+++ tv-0.5.1.new/ncl-2.0/src/nexus.cpp 2008-06-16 06:32:30.000000000 -0400 ++++ tv-0.5.1.new/ncl-2.0/src/nexus.cpp 2008-06-17 05:58:17.000000000 -0400 @@ -1,3 +1,5 @@ + +#include <cstring> @@ -56,7 +58,7 @@ diff -Naur tv-0.5.1/ncl-2.0/src/nexus.cpp tv-0.5.1.new/ncl-2.0/src/nexus.cpp #include "nexustoken.h" diff -Naur tv-0.5.1/ncl-2.0/src/nexustoken.cpp tv-0.5.1.new/ncl-2.0/src/nexustoken.cpp --- tv-0.5.1/ncl-2.0/src/nexustoken.cpp 2005-04-29 10:28:17.000000000 -0400 -+++ tv-0.5.1.new/ncl-2.0/src/nexustoken.cpp 2008-06-16 06:32:30.000000000 -0400 ++++ tv-0.5.1.new/ncl-2.0/src/nexustoken.cpp 2008-06-17 05:58:17.000000000 -0400 @@ -1,3 +1,5 @@ + +#include <cstring> @@ -65,7 +67,7 @@ diff -Naur tv-0.5.1/ncl-2.0/src/nexustoken.cpp tv-0.5.1.new/ncl-2.0/src/nexustok #include "nexustoken.h" diff -Naur tv-0.5.1/ncl-2.0/src/nxsstring.cpp tv-0.5.1.new/ncl-2.0/src/nxsstring.cpp --- tv-0.5.1/ncl-2.0/src/nxsstring.cpp 2001-02-02 07:55:40.000000000 -0500 -+++ tv-0.5.1.new/ncl-2.0/src/nxsstring.cpp 2008-06-16 06:32:30.000000000 -0400 ++++ tv-0.5.1.new/ncl-2.0/src/nxsstring.cpp 2008-06-17 05:58:17.000000000 -0400 @@ -1,3 +1,6 @@ + +#include <cstring> |