[Pkg-octave-commit] r1216 - in octave/trunk/debian: . in patches

[Rafael Laboissiere]

tags 417486 pending
thanks

Author: rafael
Date: 2008-02-22 13:07:21 +0000 (Fri, 22 Feb 2008)
New Revision: 1216

Added:
   octave/trunk/debian/patches/50_compile-with-g++-4.3.dpatch
Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/in/octave2.1-00list
Log:
Fixes for compiling with GCC 4.3

Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2008-02-22 10:06:19 UTC (rev 1215)
+++ octave/trunk/debian/changelog	2008-02-22 13:07:21 UTC (rev 1216)
@@ -9,6 +9,8 @@
     debian/rules accordingly.
   * debian/in/copyright: Added the mention that Octave 2.1 is released under
     version 2 or later of the GPL (closes: #435205)
+  * debian/patches/50_compile-with-g++-4.3.dpatch: Fixes for compiling the
+    octave2.1 with the GCC 4.3 suite (closes: #417486)
 
  -- Rafael Laboissiere <rafael at debian.org>  Fri, 22 Feb 2008 10:30:25 +0100
 

Modified: octave/trunk/debian/in/octave2.1-00list
===================================================================
--- octave/trunk/debian/in/octave2.1-00list	2008-02-22 10:06:19 UTC (rev 1215)
+++ octave/trunk/debian/in/octave2.1-00list	2008-02-22 13:07:21 UTC (rev 1216)
@@ -9,3 +9,4 @@
 50_clean-pdf-docs
 50_rename-octave-tags
 50_drop-lo-manpages
+50_compile-with-g++-4.3

Added: octave/trunk/debian/patches/50_compile-with-g++-4.3.dpatch
===================================================================
--- octave/trunk/debian/patches/50_compile-with-g++-4.3.dpatch	                        (rev 0)
+++ octave/trunk/debian/patches/50_compile-with-g++-4.3.dpatch	2008-02-22 13:07:21 UTC (rev 1216)
@@ -0,0 +1,117 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_compile-with-g++-4.3.dpatch by Rafael Laboissiere <rafael at debian.org>
+##
+## DP: Fixes for compiling octave2.1 with g++-4.3
+
+ at DPATCH@
+
+--- octave2.1-2.1.73.orig/liboctave/data-conv.cc
++++ octave2.1-2.1.73/liboctave/data-conv.cc
+@@ -26,6 +26,7 @@
+ #endif
+ 
+ #include <cctype>
++#include <cstdlib>
+ 
+ #include <iostream>
+ 
+--- octave2.1-2.1.73.orig/liboctave/lo-utils.cc
++++ octave2.1-2.1.73/liboctave/lo-utils.cc
+@@ -29,6 +29,7 @@
+ #include <climits>
+ #include <cstdlib>
+ #include <cstdio>
++#include <cstring>
+ 
+ #include <string>
+ 
+--- octave2.1-2.1.73.orig/liboctave/oct-env.cc
++++ octave2.1-2.1.73/liboctave/oct-env.cc
+@@ -43,6 +43,7 @@
+ 
+ #include <cctype>
+ #include <cstdlib>
++#include <cstring>
+ 
+ #include <string>
+ 
+--- octave2.1-2.1.73.orig/src/unwind-prot.cc
++++ octave2.1-2.1.73/src/unwind-prot.cc
+@@ -30,6 +30,7 @@
+ #endif
+ 
+ #include <cstddef>
++#include <cstring>
+ 
+ #include "CMatrix.h"
+ 
+--- octave2.1-2.1.73.orig/src/pr-output.cc
++++ octave2.1-2.1.73/src/pr-output.cc
+@@ -32,6 +32,7 @@
+ 
+ #include <iomanip>
+ #include <iostream>
++#include <sstream>
+ #include <string>
+ 
+ #include "Array-util.h"
+@@ -1602,7 +1603,7 @@
+ }
+ 
+ template <>
+-static inline void
++/* static */ inline void
+ pr_plus_format (std::ostream& os, const Complex& c)
+ {
+   double rp = c.real ();
+--- octave2.1-2.1.73.orig/src/DLD-FUNCTIONS/sort.cc
++++ octave2.1-2.1.73/src/DLD-FUNCTIONS/sort.cc
+@@ -26,6 +26,8 @@
+ #include <config.h>
+ #endif
+ 
++#include <vector>
++
+ #include "lo-mappers.h"
+ #include "quit.h"
+ 
+@@ -294,7 +296,7 @@
+ template class octave_sort<vec_index<unsigned EIGHT_BYTE_INT> *>;
+ 
+ template <>
+-static octave_value
++/* static */ octave_value
+ mx_sort (ArrayN<double> &m, int dim, sortmode mode)
+ {
+   octave_value retval;
+@@ -431,7 +433,7 @@
+ }
+ 
+ template <>
+-static octave_value_list
++/* static */ octave_value_list
+ mx_sort_indexed (ArrayN<double> &m, int dim, sortmode mode)
+ {
+   octave_value_list retval;
+--- octave2.1-2.1.73.orig/liboctave/oct-sort.cc
++++ octave2.1-2.1.73/liboctave/oct-sort.cc
+@@ -84,6 +84,8 @@
+ #include <config.h>
+ #endif
+ 
++#include <cstdlib>
++
+ #include "lo-mappers.h"
+ #include "quit.h"
+ #include "oct-sort.h"
+--- octave2.1-2.1.73.orig/liboctave/chMatrix.cc
++++ octave2.1-2.1.73/liboctave/chMatrix.cc
+@@ -30,6 +30,8 @@
+ #include <config.h>
+ #endif
+ 
++#include <cstring>
++
+ #include <iostream>
+ #include <string>
+ 


Property changes on: octave/trunk/debian/patches/50_compile-with-g++-4.3.dpatch
___________________________________________________________________
Name: svn:executable
   + *