* [gentoo-commits] gentoo-x86 commit in sci-biology/treeviewx/files: treeviewx-0.5.1-gcc4.3.patch
@ 2008-06-16 10:46 Markus Dittrich (markusle)
0 siblings, 0 replies; 2+ messages in thread
From: Markus Dittrich (markusle) @ 2008-06-16 10:46 UTC (permalink / raw
To: gentoo-commits
markusle 08/06/16 10:46:00
Added: treeviewx-0.5.1-gcc4.3.patch
Log:
Added new revision with fix for gcc-4.3 compile issues (bug #227245).
(Portage version: 2.1.4.4)
Revision Changes Path
1.1 sci-biology/treeviewx/files/treeviewx-0.5.1-gcc4.3.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-biology/treeviewx/files/treeviewx-0.5.1-gcc4.3.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-biology/treeviewx/files/treeviewx-0.5.1-gcc4.3.patch?rev=1.1&content-type=text/plain
Index: treeviewx-0.5.1-gcc4.3.patch
===================================================================
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>
#include <ctype.h>
#include "Parse.h"
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
@@ -24,6 +24,8 @@
#include "TreeLib.h"
#include "Parse.h"
+
+#include <cstdlib>
#include <vector>
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 $
+#include <cstring>
+#include <cstdlib>
#include "treereader.h"
#if __MWERKS__
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
@@ -1,3 +1,5 @@
+
+#include <cstring>
#include "nexusdefs.h"
#include "xnexus.h"
#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
@@ -1,3 +1,5 @@
+
+#include <cstring>
#include "nexusdefs.h"
#include "xnexus.h"
#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
@@ -1,3 +1,5 @@
+
+#include <cstring>
#include "nexusdefs.h"
#include "xnexus.h"
#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
@@ -1,3 +1,6 @@
+
+#include <cstring>
+
#ifdef __BORLANDC__
// Undefine __MINMAX_DEFINED so that min and max are correctly defined
#ifdef __MINMAX_DEFINED
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-biology/treeviewx/files: treeviewx-0.5.1-gcc4.3.patch
@ 2008-06-17 10:16 Markus Dittrich (markusle)
0 siblings, 0 replies; 2+ messages in thread
From: Markus Dittrich (markusle) @ 2008-06-17 10:16 UTC (permalink / raw
To: gentoo-commits
markusle 08/06/17 10:16:07
Modified: treeviewx-0.5.1-gcc4.3.patch
Log:
Slightly modified gcc-4.3 patch since it got mangled by cvs during commit.
(Portage version: 2.1.4.4)
Revision Changes Path
1.2 sci-biology/treeviewx/files/treeviewx-0.5.1-gcc4.3.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-biology/treeviewx/files/treeviewx-0.5.1-gcc4.3.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-biology/treeviewx/files/treeviewx-0.5.1-gcc4.3.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-biology/treeviewx/files/treeviewx-0.5.1-gcc4.3.patch?r1=1.1&r2=1.2
Index: treeviewx-0.5.1-gcc4.3.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-biology/treeviewx/files/treeviewx-0.5.1-gcc4.3.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- treeviewx-0.5.1-gcc4.3.patch 16 Jun 2008 10:46:00 -0000 1.1
+++ treeviewx-0.5.1-gcc4.3.patch 17 Jun 2008 10:16:07 -0000 1.2
@@ -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/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 @@
#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 @@
#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 @@
#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>
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-06-17 10:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-17 10:16 [gentoo-commits] gentoo-x86 commit in sci-biology/treeviewx/files: treeviewx-0.5.1-gcc4.3.patch Markus Dittrich (markusle)
-- strict thread matches above, loose matches on Subject: below --
2008-06-16 10:46 Markus Dittrich (markusle)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox