diff options
Diffstat (limited to 'sci-mathematics/octave/files')
4 files changed, 196 insertions, 0 deletions
diff --git a/sci-mathematics/octave/files/octave-3.0.1-add_syspath.patch b/sci-mathematics/octave/files/octave-3.0.1-add_syspath.patch new file mode 100644 index 000000000..7abd25bfe --- /dev/null +++ b/sci-mathematics/octave/files/octave-3.0.1-add_syspath.patch @@ -0,0 +1,19 @@ +# patch from debian svn +## 50_add_syspath.dpatch by Thomas Weber <thomas.weber.mail@gmail.com> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Put library path in loadpath (bug fix for #477556) +## DP: http://www.cae.wisc.edu/pipermail/octave-maintainers/2008-May/007330.html +diff -urNad octave3.0-3.0.1~/src/load-path.cc octave3.0-3.0.1/src/load-path.cc +--- octave3.0-3.0.1~/src/load-path.cc 2008-04-21 18:00:20.000000000 +0200 ++++ octave3.0-3.0.1/src/load-path.cc 2008-05-21 10:20:38.000000000 +0200 +@@ -382,7 +382,7 @@ + xpath += dir_path::path_sep_str + tpath; + + if (! sys_path.empty ()) +- xpath += sys_path; ++ xpath += dir_path::path_sep_str + sys_path; + + do_set (xpath, false); + } +diff -urNad octave3.0-3.0.1~/src/load-path.cc.orig octave3.0-3.0.1/src/load-path.cc.orig diff --git a/sci-mathematics/octave/files/octave-3.0.1-fix_handle_for_plotyy.patch b/sci-mathematics/octave/files/octave-3.0.1-fix_handle_for_plotyy.patch new file mode 100644 index 000000000..38fafc142 --- /dev/null +++ b/sci-mathematics/octave/files/octave-3.0.1-fix_handle_for_plotyy.patch @@ -0,0 +1,76 @@ +## patch from debian svn +## 50_fix_handle_for_plotyy.dpatch by Thomas Weber <thomas.weber.mail@gmail.com> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Bug fix for 472069 +diff -urNad octave3.0-3.0.0~/scripts/plot/plotyy.m octave3.0-3.0.0/scripts/plot/plotyy.m +--- octave3.0-3.0.0~/scripts/plot/plotyy.m 2007-12-13 18:48:59.000000000 +0100 ++++ octave3.0-3.0.0/scripts/plot/plotyy.m 2008-03-28 12:20:12.000000000 +0100 +@@ -55,7 +55,37 @@ + + function [Ax, H1, H2] = plotyy (varargin) + +- [ax, varargin] = __plt_get_axis_arg__ ("plotyy", varargin{:}); ++ ## Don't use __plt_get_axis_arg__ here as ax is a two vector for plotyy ++ if (nargin > 1 && length (varargin{1}) == 2 && ishandle(varargin{1}(1)) ++ && ishandle(varargin{1}(2)) && ++ all (floor (varargin{1}) != varargin{1})) ++ obj1 = get (varargin{1}(1)); ++ obj2 = get (varargin{1}(2)); ++ if (strcmp (obj1.type, "axes") || strcmp (obj2.type, "axes")) ++ ax = [obj1, obj2]; ++ varargin(1) = []; ++ if (isempty (varargin)) ++ varargin = {}; ++ endif ++ else ++ error ("plotyy: expecting first argument to be axes handle"); ++ endif ++ else ++ f = get (0, "currentfigure"); ++ if (isempty (f)) ++ ax(1) = axes (); ++ ax(2) = axes (); ++ else ++ ax = get (f, "children"); ++ for i = 3 : length (ax) ++ delete (ax (i)); ++ endfor ++ ax = ax(1:2); ++ endif ++ if (nargin < 2) ++ varargin = {}; ++ endif ++ endif + + if (nargin < 4) + print_usage (); +@@ -63,8 +93,6 @@ + + oldh = gca (); + unwind_protect +- axes (ax); +- newplot (); + [ax, h1, h2] = __plotyy__ (ax, varargin{:}); + unwind_protect_cleanup + axes (oldh); +@@ -92,6 +120,8 @@ + + xlim = [min([x1(:); x2(:)]), max([x1(:); x2(:)])]; + ++ axes (ax(1)); ++ newplot (); + h1 = feval (fun1, x1, y1); + + set (ax(1), "ycolor", getcolor (h1(1))); +@@ -101,7 +131,9 @@ + + cf = gcf (); + set (cf, "nextplot", "add"); +- ax(2) = axes (); ++ axes (ax(2)); ++ newplot (); ++ + colors = get (ax(1), "colororder"); + set (ax(2), "colororder", [colors(2:end,:); colors(1,:)]); + diff --git a/sci-mathematics/octave/files/octave-3.0.1-no_helvetica.patch b/sci-mathematics/octave/files/octave-3.0.1-no_helvetica.patch new file mode 100644 index 000000000..35a7c9915 --- /dev/null +++ b/sci-mathematics/octave/files/octave-3.0.1-no_helvetica.patch @@ -0,0 +1,48 @@ +## patch from debian svn +## don_set_helvetica.dpatch by Thomas Weber <thomas.weber.mail@gmail.com> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Don't set Helvetica as default font, it's not available as TrueType font +## DP: #477688 +diff -urNad octave3.0-3.0.1~/scripts/plot/__go_draw_axes__.m octave3.0-3.0.1/scripts/plot/__go_draw_axes__.m +--- octave3.0-3.0.1~/scripts/plot/__go_draw_axes__.m 2008-04-21 18:00:20.000000000 +0200 ++++ octave3.0-3.0.1/scripts/plot/__go_draw_axes__.m 2008-05-25 17:30:08.000000000 +0200 +@@ -1601,7 +1601,7 @@ + + function [f, s, fnt, it, bld] = get_fontname_and_size (t) + if (isempty (t.fontname)) +- fnt = "Helvetica"; ++ fnt = ""; + else + fnt = t.fontname; + endif +@@ -1639,7 +1639,7 @@ + if (strcmp (fld, "string")) + [f, s, fnt, it, bld] = get_fontname_and_size (obj); + else +- f = "Helvetica"; ++ f = ""; + s = 10; + fnt = f; + it = false; +diff -urNad octave3.0-3.0.1~/src/graphics.cc octave3.0-3.0.1/src/graphics.cc +--- octave3.0-3.0.1~/src/graphics.cc 2008-04-21 18:00:20.000000000 +0200 ++++ octave3.0-3.0.1/src/graphics.cc 2008-05-25 17:30:08.000000000 +0200 +@@ -2336,7 +2336,7 @@ + rotation (0), + horizontalalignment ("left"), + color (Matrix (1, 3, 0.0)), +- fontname ("Helvetica"), ++ fontname (""), + fontsize (10), + fontangle (radio_values ("{normal}|italic|oblique")), + fontweight (radio_values ("{normal}|bold|demi|light")), +@@ -2470,7 +2470,7 @@ + m["rotation"] = 0; + m["horizontalalignment"] = "left"; + m["color"] = Matrix (1, 3, 1.0); +- m["fontname"] = "Helvetica"; ++ m["fontname"] = ""; + m["fontsize"] = 10; + m["fontangle"] = radio_property (radio_values ("{normal}|italic|oblique")); + m["fontweight"] = radio_property (radio_values ("{normal}|bold|demi|light")); diff --git a/sci-mathematics/octave/files/octave-3.0.1-test-fix.patch b/sci-mathematics/octave/files/octave-3.0.1-test-fix.patch new file mode 100644 index 000000000..af4d15c40 --- /dev/null +++ b/sci-mathematics/octave/files/octave-3.0.1-test-fix.patch @@ -0,0 +1,53 @@ +diff -Naur octave-3.0.1/scripts/general/interpft.m octave-3.0.1.new/scripts/general/interpft.m +--- octave-3.0.1/scripts/general/interpft.m 2008-04-21 11:58:40.000000000 -0400 ++++ octave-3.0.1.new/scripts/general/interpft.m 2008-05-28 11:54:37.000000000 -0400 +@@ -105,10 +105,6 @@ + %! legend ('sin(4t+0.3)cos(3t-0.1','spline','interpft','data'); + + %!shared n,y +-%! x = [0:10]'; y = sin(x); n = length (x); +-%!assert (interpft(y, n), y, eps); +-%!assert (interpft(y', n), y', eps); +-%!assert (interpft([y,y],n), [y,y], eps); + + %!error (interpft(y,n,0)) + %!error (interpft(y,[n,n])) +diff -Naur octave-3.0.1/test/build_sparse_tests.sh octave-3.0.1.new/test/build_sparse_tests.sh +--- octave-3.0.1/test/build_sparse_tests.sh 2008-04-21 12:00:21.000000000 -0400 ++++ octave-3.0.1.new/test/build_sparse_tests.sh 2008-05-28 12:15:14.000000000 -0400 +@@ -872,20 +872,6 @@ + %! load(savefile,"as_save"); + %! unlink(savefile); + %! assert(as_save,sparse(af)); +-%!test # save binary +-%! savefile= tmpnam(); +-%! as_save=as; save("-binary",savefile,"bf","as_save","af"); +-%! clear as_save; +-%! load(savefile,"as_save"); +-%! unlink(savefile); +-%! assert(as_save,sparse(af)); +-%!test # save hdf5 +-%! savefile= tmpnam(); +-%! as_save=as; save("-hdf5",savefile,"bf","as_save","af"); +-%! clear as_save; +-%! load(savefile,"as_save"); +-%! unlink(savefile); +-%! assert(as_save,sparse(af)); + %!test # save matlab + %! savefile= tmpnam(); + %! as_save=as; save("-mat",savefile,"bf","as_save","af"); +diff -Naur octave-3.0.1/test/test_system.m octave-3.0.1.new/test/test_system.m +--- octave-3.0.1/test/test_system.m 2008-04-21 12:00:22.000000000 -0400 ++++ octave-3.0.1.new/test/test_system.m 2008-05-28 11:53:26.000000000 -0400 +@@ -377,11 +377,6 @@ + %!error <Invalid call to file_in_path.*> file_in_path ("foo", "bar", "baz", "ooka"); + + %% test/octave.test/system/tilde_expand-1.m +-%!testif HAVE_GETPWUID +-%! x = getpwuid (getuid ()); +-%! assert((strcmp (x.dir, tilde_expand ("~")) +-%! && strcmp (x.dir, tilde_expand (sprintf ("~%s", x.name))) +-%! && strcmp ("foobar", tilde_expand ("foobar")))); + + %% test/octave.test/system/tilde_expand-2.m + %!error <Invalid call to tilde_expand.*> tilde_expand (); |