<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b9f3bd7217d53b6b4436e8770eebb39cac9ed925">https://github.com/macports/macports-ports/commit/b9f3bd7217d53b6b4436e8770eebb39cac9ed925</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b9f3bd7217d53b6b4436e8770eebb39cac9ed925
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Aug 18 09:10:00 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> octave-devel: update to latest development snapshot
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/56960
</span>---
math/octave/Portfile | 22 ++++--
math/octave/files/patch-arch_arg-devel.diff | 22 ++++++
math/octave/files/patch-crash_on_exit-devel.diff | 22 ++++++
math/octave/files/patch-figures-devel.diff | 95 +++++++++---------------
math/octave/files/patch-iconsize-devel.diff | 16 ++++
math/octave/files/patch-link-devel.diff | 23 ++++++
math/octave/files/patch-undefined-devel.diff | 73 ++++++++++++++++++
math/octave/files/patch-versions-devel.diff | 6 +-
8 files changed, 211 insertions(+), 68 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/Portfile b/math/octave/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5c9900b..f964cdd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,7 +90,7 @@ post-patch {
</span> ${configure_file}
reinplace \
"s|__MACPORTS_canonical_host_type__|${short_host_name}|g" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build-aux/subst-default-vals.in.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build-aux/subst-config-vals.in.sh
</span> }
pre-configure {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -705,9 +705,9 @@ subport ${name}-devel {
</span> # The generated files, however, are currently corrupted.
fetch.type hg
hg.url http://hg.savannah.gnu.org/hgweb/octave/
<span style='display:block; white-space:pre;background:#ffe0e0;'>- hg.tag 2cf750f5cb7d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hg.tag d98d7df9fd15
</span> version 5.0.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 6
</span>
conflicts-replace ${name}-devel ${name}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -728,11 +728,19 @@ subport ${name}-devel {
</span> ln -s display-available.c ${worksrcpath}/src/display-available.cc
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://savannah.gnu.org/bugs/index.php?53627
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-undefined-devel.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> pre-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # format and variable name changes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-replace patch-versions.diff patch-versions-devel.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-replace patch-force_cxx.diff patch-force_cxx-devel.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-replace patch-figures.diff patch-figures-devel.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-versions.diff patch-versions-devel.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-force_cxx.diff patch-force_cxx-devel.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-figures.diff patch-figures-devel.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-iconsize.diff patch-iconsize-devel.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-link.diff patch-link-devel.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-arch_arg.diff patch-arch_arg-devel.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-crash_on_exit.diff patch-crash_on_exit-devel.diff
</span> }
livecheck.type regexm
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-arch_arg-devel.diff b/math/octave/files/patch-arch_arg-devel.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..3d4ef95
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave/files/patch-arch_arg-devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/mkoctfile.in.cc.orig 2016-11-13 08:16:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/mkoctfile.in.cc 2016-11-26 14:03:33.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -814,6 +814,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pass_on_options += (' ' + arg);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined __APPLE__ && defined __MACH__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else if (arg == "-arch")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (i < argc-1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ arg = argv[++i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pass_on_options += (" -arch " + arg);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ std::cerr << "mkoctfile: arch type missing"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ << std::endl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if (starts_with (arg, "-"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Pass through any unrecognized options.
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-crash_on_exit-devel.diff b/math/octave/files/patch-crash_on_exit-devel.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..e182d5f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave/files/patch-crash_on_exit-devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libgui/src/main-window.cc.orig 2018-04-30 10:03:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libgui/src/main-window.cc 2018-05-18 05:50:20.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -231,9 +231,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ connect (m_interpreter, SIGNAL (octave_finished_signal (int)),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ this, SLOT (handle_octave_finished (int)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- connect (m_interpreter, SIGNAL (octave_finished_signal (int)),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- m_main_thread, SLOT (quit (void)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ connect (m_main_thread, SIGNAL (finished (void)),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_main_thread, SLOT (deleteLater (void)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1598,6 +1595,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void main_window::handle_octave_finished (int exit_status)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* fprintf to stderr is needed by macOS */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fprintf(stderr, "\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ m_main_thread->quit();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qApp->exit (exit_status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-figures-devel.diff b/math/octave/files/patch-figures-devel.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b17d749..3f34792 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/files/patch-figures-devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave/files/patch-figures-devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -r bb43ec3a304e libgui/graphics/Figure.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libgui/graphics/Figure.cc Thu Apr 26 06:49:06 2018 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libgui/graphics/Figure.cc Thu Apr 26 17:46:49 2018 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libgui/graphics/Figure.cc.orig 2018-08-18 04:51:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libgui/graphics/Figure.cc 2018-08-18 04:52:13.000000000 -0700
</span> @@ -41,6 +41,8 @@
#include <QtDebug>
#include <QTimer>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +21,7 @@ diff -r bb43ec3a304e libgui/graphics/Figure.cc
</span> // Status bar
m_statusBar = win->statusBar ();
int boffset = 0;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1079,6 +1086,39 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1088,6 +1095,39 @@
</span> }
void
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,9 +61,8 @@ diff -r bb43ec3a304e libgui/graphics/Figure.cc
</span> Figure::enableMouseTracking (void)
{
// Enable mouse tracking on every widgets
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -r bb43ec3a304e libgui/graphics/Figure.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libgui/graphics/Figure.h Thu Apr 26 06:49:06 2018 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libgui/graphics/Figure.h Thu Apr 26 17:46:49 2018 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libgui/graphics/Figure.h.orig 2018-08-18 04:51:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libgui/graphics/Figure.h 2018-08-18 04:52:13.000000000 -0700
</span> @@ -32,6 +32,7 @@
class QMainWindow;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,7 +71,7 @@ diff -r bb43ec3a304e libgui/graphics/Figure.h
</span>
namespace QtHandles
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -128,6 +129,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -129,6 +130,8 @@
</span> void toggleAxes (void);
void toggleGrid (void);
void autoAxes (void);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -118,9 +116,8 @@ diff -r bb43ec3a304e libgui/graphics/FigureWindow.h
</span> };
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -r bb43ec3a304e libgui/graphics/GLCanvas.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libgui/graphics/GLCanvas.cc Thu Apr 26 06:49:06 2018 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libgui/graphics/GLCanvas.cc Thu Apr 26 17:46:49 2018 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libgui/graphics/GLCanvas.cc.orig 2018-08-18 04:51:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libgui/graphics/GLCanvas.cc 2018-08-18 04:52:13.000000000 -0700
</span> @@ -68,7 +68,10 @@
{
octave::opengl_renderer r;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -145,9 +142,8 @@ diff -r bb43ec3a304e libgui/graphics/GLCanvas.cc
</span> return s.select (ax, pt.x (), height () - pt.y (),
octave::select_ignore_hittest);
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -r bb43ec3a304e libinterp/corefcn/gl-render.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libinterp/corefcn/gl-render.cc Thu Apr 26 06:49:06 2018 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libinterp/corefcn/gl-render.cc Thu Apr 26 17:46:49 2018 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libinterp/corefcn/gl-render.cc.orig 2018-08-18 04:51:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libinterp/corefcn/gl-render.cc 2018-08-18 04:52:13.000000000 -0700
</span> @@ -593,7 +593,7 @@
: toolkit (), xform (), xmin (), xmax (), ymin (), ymax (),
zmin (), zmax (), xZ1 (), xZ2 (), marker_id (), filled_marker_id (),
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -157,7 +153,7 @@ diff -r bb43ec3a304e libinterp/corefcn/gl-render.cc
</span> {
// This constructor will fail if we don't have OpenGL or if the data
// types we assumed in our public interface aren't compatible with the
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -694,8 +694,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -694,6 +694,9 @@
</span> void
opengl_renderer::draw_figure (const figure::properties& props)
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -165,11 +161,8 @@ diff -r bb43ec3a304e libinterp/corefcn/gl-render.cc
</span> + m_devpixfactor = props.get___device_pixel_ratio__ ();
+
// Initialize OpenGL context
<span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- init_gl_context (props.is_graphicssmoothing (), props.get_color_rgb ());
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined (HAVE_OPENGL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ init_gl_context (props.is_graphicssmoothing (), props.get_color_rgb ());
</span> @@ -1123,6 +1126,11 @@
glMultMatrixd (x_mat1.data ());
glMatrixMode (GL_PROJECTION);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -182,7 +175,7 @@ diff -r bb43ec3a304e libinterp/corefcn/gl-render.cc
</span> glOrtho (0, vw[2], vw[3], 0, xZ1, xZ2);
glMultMatrixd (x_mat2.data ());
glMatrixMode (GL_MODELVIEW);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3528,6 +3536,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3578,6 +3586,10 @@
</span> glMatrixMode (GL_PROJECTION);
glPushMatrix ();
glLoadIdentity ();
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -193,7 +186,7 @@ diff -r bb43ec3a304e libinterp/corefcn/gl-render.cc
</span> glOrtho (0, vp[2], vp[3], 0, xZ1, xZ2);
glMatrixMode (GL_MODELVIEW);
glPushMatrix ();
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3697,10 +3709,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3747,10 +3759,12 @@
</span> // FIXME: actually add the code to do it!
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -207,7 +200,7 @@ diff -r bb43ec3a304e libinterp/corefcn/gl-render.cc
</span> glRasterPos3d (im_xmin + nor_dx*j0, im_ymin + nor_dy*i0, 0);
// by default this is 4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3953,7 +3967,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4003,7 +4017,7 @@
</span> {
#if defined (HAVE_OPENGL)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -216,7 +209,7 @@ diff -r bb43ec3a304e libinterp/corefcn/gl-render.cc
</span>
#else
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4103,6 +4117,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4153,6 +4167,10 @@
</span> glMatrixMode (GL_PROJECTION);
glPushMatrix ();
glLoadIdentity ();
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -227,10 +220,9 @@ diff -r bb43ec3a304e libinterp/corefcn/gl-render.cc
</span> glOrtho (0, vw[2], vw[3], 0, xZ1, xZ2);
glMatrixMode (GL_MODELVIEW);
glPushMatrix ();
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -r bb43ec3a304e libinterp/corefcn/gl-render.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libinterp/corefcn/gl-render.h Thu Apr 26 06:49:06 2018 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libinterp/corefcn/gl-render.h Thu Apr 26 17:46:49 2018 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -222,6 +222,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libinterp/corefcn/gl-render.h.orig 2018-08-18 04:51:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libinterp/corefcn/gl-render.h 2018-08-18 04:52:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -221,6 +221,9 @@
</span>
// Indicate we are drawing for selection purpose
bool selecting;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -240,10 +232,9 @@ diff -r bb43ec3a304e libinterp/corefcn/gl-render.h
</span> private:
class patch_tesselator;
};
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -r bb43ec3a304e libinterp/corefcn/graphics.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libinterp/corefcn/graphics.cc Thu Apr 26 06:49:06 2018 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libinterp/corefcn/graphics.cc Thu Apr 26 17:46:49 2018 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -869,6 +869,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libinterp/corefcn/graphics.cc.orig 2018-08-18 04:51:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libinterp/corefcn/graphics.cc 2018-08-18 04:52:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -870,6 +870,19 @@
</span> sz.extract_n (0, 2, 1, 2)).extract_n (0, 2, 1, 2);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -263,7 +254,7 @@ diff -r bb43ec3a304e libinterp/corefcn/graphics.cc
</span> static void
convert_cdata_2 (bool is_scaled, bool is_real, double clim_0, double clim_1,
const double *cmapv, double x, octave_idx_type lda,
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6581,11 +6594,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6641,11 +6654,13 @@
</span>
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -278,7 +269,7 @@ diff -r bb43ec3a304e libinterp/corefcn/graphics.cc
</span> }
// The INTERNAL flag defines whether position or outerposition is used.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7654,6 +7669,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7714,6 +7729,7 @@
</span> {
Matrix ext (1, 2, 0.0);
double wmax, hmax;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -286,7 +277,7 @@ diff -r bb43ec3a304e libinterp/corefcn/graphics.cc
</span> wmax = hmax = 0.0;
int n = std::min (ticklabels.numel (), ticks.numel ());
for (int i = 0; i < n; i++)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7671,8 +7687,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7731,8 +7747,8 @@
</span> ext = txt_renderer.get_extent (label, 0.0,
get_ticklabelinterpreter ());
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -297,7 +288,7 @@ diff -r bb43ec3a304e libinterp/corefcn/graphics.cc
</span> }
else
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8699,7 +8715,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8790,7 +8806,14 @@
</span> m(0) += p(0);
m(1) += p(1);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -313,7 +304,7 @@ diff -r bb43ec3a304e libinterp/corefcn/graphics.cc
</span> }
void
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8737,11 +8770,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8828,11 +8851,13 @@
</span> void
text::properties::update_font (void)
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -328,16 +319,7 @@ diff -r bb43ec3a304e libinterp/corefcn/graphics.cc
</span>
txt_renderer.set_color (get_color_rgb ());
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8781,7 +8806,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // The bbox is relative to the text's position. We'll leave it that
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // way, because get_position does not return valid results when the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // text is first constructed. Conversion to proper coordinates is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- // performed in get_extent.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // performed in get_extent.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_extent (bbox);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (__autopos_tag___is ("xlabel") || __autopos_tag___is ("ylabel")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8838,9 +8863,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8929,9 +8954,9 @@
</span> double fontsz = get_fontsize ();
double parent_height = box_pix_height;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -348,10 +330,9 @@ diff -r bb43ec3a304e libinterp/corefcn/graphics.cc
</span> graphics_object ax (go.get_ancestor ("axes"));
parent_height = ax.get_properties ().get_boundingbox (true).elem (3);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -r bb43ec3a304e libinterp/corefcn/graphics.in.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libinterp/corefcn/graphics.in.h Thu Apr 26 06:49:06 2018 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libinterp/corefcn/graphics.in.h Thu Apr 26 17:46:49 2018 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3178,6 +3178,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libinterp/corefcn/graphics.in.h.orig 2018-08-18 04:51:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libinterp/corefcn/graphics.in.h 2018-08-18 04:52:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3183,6 +3183,7 @@
</span> any_property __plot_stream__ h , Matrix ()
any_property __rotate_mode__ h , Matrix ()
any_property __zoom_mode__ h , Matrix ()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -359,9 +340,8 @@ diff -r bb43ec3a304e libinterp/corefcn/graphics.in.h
</span>
// Obsolete properties: doublebuffer, mincolormap, wvisual, wvisualmode,
// xdisplay, xvisual, xvisualmode
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -r bb43ec3a304e m4/acinclude.m4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- m4/acinclude.m4 Thu Apr 26 06:49:06 2018 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ m4/acinclude.m4 Thu Apr 26 17:46:49 2018 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- m4/acinclude.m4.orig 2018-08-18 04:51:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ m4/acinclude.m4 2018-08-18 04:52:13.000000000 -0700
</span> @@ -666,6 +666,36 @@
fi
])
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -399,7 +379,7 @@ diff -r bb43ec3a304e m4/acinclude.m4
</span> dnl Check whether the Qt class QTabWidget has the setMovable member function.
dnl This member function was introduced in Qt 4.5.
dnl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2104,6 +2134,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2105,6 +2135,7 @@
</span> OCTAVE_CHECK_FUNC_QHELPSEARCHQUERYWIDGET_SEARCHINPUT
OCTAVE_CHECK_FUNC_QINSTALLMESSAGEHANDLER
OCTAVE_CHECK_FUNC_QLINEEDIT_SETPLACEHOLDERTEXT
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -407,10 +387,9 @@ diff -r bb43ec3a304e m4/acinclude.m4
</span> OCTAVE_CHECK_FUNC_QMOUSEEVENT_LOCALPOS
OCTAVE_CHECK_FUNC_QOBJECT_FINDCHILDREN_ACCEPTS_FINDCHILDOPTIONS
OCTAVE_CHECK_FUNC_QTABWIDGET_SETMOVABLE
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -r bb43ec3a304e scripts/plot/util/print.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- scripts/plot/util/print.m Thu Apr 26 06:49:06 2018 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scripts/plot/util/print.m Thu Apr 26 17:46:49 2018 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -382,6 +382,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- scripts/plot/util/print.m.orig 2018-08-18 04:51:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ scripts/plot/util/print.m 2018-08-18 04:52:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -386,6 +386,15 @@
</span> nfig += 1;
endfor
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-iconsize-devel.diff b/math/octave/files/patch-iconsize-devel.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..9b9c5a2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave/files/patch-iconsize-devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libgui/src/octave-dock-widget.cc.orig 2016-10-27 11:48:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libgui/src/octave-dock-widget.cc 2016-11-10 04:08:42.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -43,7 +43,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_default_close_button (nullptr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QStyle *st = style ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- m_icon_size = 0.75*st->pixelMetric (QStyle::PM_SmallIconSize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined (Q_OS_MAC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // fix retina scaling for Mac (bug #46723)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ m_icon_size = 2*st->pixelMetric (QStyle::PM_SmallIconSize) / p->devicePixelRatio();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ m_icon_size = st->pixelMetric (QStyle::PM_SmallIconSize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // keep track of the original buttons on the default title bar,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // the button further left is considered "float"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-link-devel.diff b/math/octave/files/patch-link-devel.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..b4b0fb3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave/files/patch-link-devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/mkoctfile.in.cc.orig 2017-11-08 15:10:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/mkoctfile.in.cc 2017-11-08 16:16:44.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -298,16 +298,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vars["FLIBS"] = get_variable ("FLIBS", %OCTAVE_CONF_FLIBS%);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vars["OCTAVE_LINK_DEPS"] = get_variable ("OCTAVE_LINK_DEPS",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- %OCTAVE_CONF_MKOCTFILE_OCTAVE_LINK_DEPS%);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vars["OCTAVE_LINK_OPTS"] = get_variable ("OCTAVE_LINK_OPTS",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- %OCTAVE_CONF_OCTAVE_LINK_OPTS%);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vars["OCT_LINK_DEPS"] = get_variable ("OCT_LINK_DEPS",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- %OCTAVE_CONF_MKOCTFILE_OCT_LINK_DEPS%);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vars["OCT_LINK_OPTS"] = get_variable ("OCT_LINK_OPTS",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- %OCTAVE_CONF_OCT_LINK_OPTS%);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vars["LD_CXX"] = get_variable ("LD_CXX", %OCTAVE_CONF_MKOCTFILE_LD_CXX%);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-undefined-devel.diff b/math/octave/files/patch-undefined-devel.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..e46e2ae
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave/files/patch-undefined-devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,73 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# HG changeset patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# User Andrew Janke <andrew@apjanke.net>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Date 1531967648 14400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Wed Jul 18 22:34:08 2018 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Branch octfile-no-link-deps
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Node ID 6203a9fa669398b2f5087b0550634e77e18d7b90
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Parent 39fd627b2c5da4aa10d40be3b4f0f87d81814cca
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Use -bundle -undefined dynamic_lookup for DLLs on macOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git configure.ac configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -665,25 +665,33 @@ AC_ARG_ENABLE([dl],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test $STATIC_LIBS = no && test $SHARED_LIBS = no; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_ERROR([You can't disable building both static AND shared libraries!])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ### More configure argument checking related to linking
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++case $host_os in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ msdosmsvc | mingw* | AIX | BeOS | OS/2 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DEFAULT_NO_UNDEFINED_LDFLAG="-no-undefined"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DEFAULT_NO_UNDEFINED_LDFLAG=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_ARG_ENABLE([no-undefined],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [AS_HELP_STRING([--disable-no-undefined],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [don't pass -no-undefined to libtool when linking Octave and its shared libraries])],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [case $enableval in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ yes) NO_UNDEFINED_LDFLAG="-no-undefined" ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ no) NO_UNDEFINED_LDFLAG="" ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *) AC_MSG_ERROR([bad value $enableval for --disable-no-undefined]) ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ esac],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [NO_UNDEFINED_LDFLAG="-no-undefined"])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [NO_UNDEFINED_LDFLAG="$DEFAULT_NO_UNDEFINED_LDFLAG"])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SUBST(NO_UNDEFINED_LDFLAG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_ARG_ENABLE([link-all-dependencies],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [AS_HELP_STRING([--enable-link-all-dependencies],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [link Octave and its shared libraries with all dependencies, not just those immediately referenced (should not be needed on most systems)])],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [case $enableval in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ yes) link_all_deps=yes ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ no) link_all_deps=no ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/m4/acinclude.m4 b/m4/acinclude.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- m4/acinclude.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ m4/acinclude.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2928,20 +2928,20 @@ AC_DEFUN_ONCE([OCTAVE_DEFINE_MKOCTFILE_D
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ alpha*-dec-osf*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPICFLAG=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXXPICFLAG=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FPICFLAG=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SH_LDFLAGS="-shared -Wl,-expect_unresolved -Wl,'*'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *-*-darwin*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DL_LDFLAGS="-bundle -bundle_loader ${ac_top_build_prefix}libinterp/octave ${LDFLAGS}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DL_LDFLAGS="-bundle -undefined dynamic_lookup -bind_at_load -bundle_loader ${ac_top_build_prefix}libinterp/octave ${LDFLAGS}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl Contains variables that are defined and undefined at this point, so use
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl appropriate quoting to defer expansion of ${bindir} and ${version}.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MKOCTFILE_DL_LDFLAGS='-bundle -bundle_loader ${bindir}/octave-${version}'"${EXEEXT}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MKOCTFILE_DL_LDFLAGS='-bundle -undefined dynamic_lookup -bind_at_load -bundle_loader ${bindir}/octave-${version}'"${EXEEXT}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SH_LDFLAGS="-dynamiclib -single_module ${LDFLAGS}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case $canonical_host_type in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ powerpc-*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXXPICFLAG=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPICFLAG=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FPICFLAG=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ esac
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-versions-devel.diff b/math/octave/files/patch-versions-devel.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d343836..be13c7e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/files/patch-versions-devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave/files/patch-versions-devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- build-aux/subst-default-vals.in.sh.orig 2018-05-18 22:11:31.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ build-aux/subst-default-vals.in.sh 2018-05-19 05:21:58.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- build-aux/subst-config-vals.in.sh.orig 2018-05-18 22:11:31.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ build-aux/subst-config-vals.in.sh 2018-05-19 05:21:58.000000000 -0700
</span> @@ -20,7 +20,7 @@
: ${SED=@SED@}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@
</span> man1ext="@man1ext@"
--- configure.ac.orig 2018-05-20 10:22:18.000000000 -0700
+++ configure.ac 2018-05-20 10:24:18.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -97,37 +97,37 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -101,37 +101,37 @@
</span> ## This path usually includes the Octave version and configuration name, so
## that configurations for multiple versions of Octave may be installed at once.
OCTAVE_SET_DEFAULT([archlibdir],
</pre><pre style='margin:0'>
</pre>