<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f11bcc7ca7b6ddb67148198ebeced23457e9c7dc">https://github.com/macports/macports-ports/commit/f11bcc7ca7b6ddb67148198ebeced23457e9c7dc</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f11bcc7ca7b6ddb67148198ebeced23457e9c7dc
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Sun Mar 18 09:56:29 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> octave: update to version 4.2.2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/56060
</span>---
math/octave/Portfile | 18 ++------
math/octave/files/patch-crash_on_exit.diff | 72 ------------------------------
math/octave/files/patch-file-stat.cc.diff | 11 -----
math/octave/files/patch-qscintilla2.diff | 16 -------
4 files changed, 4 insertions(+), 113 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 b550e69..c8e57d8 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;'>@@ -11,8 +11,8 @@ PortGroup cxx11 1.1
</span> compiler.blacklist-append {*gcc-4.6} {clang < 700}
name octave
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.2.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.2.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories math science
platforms darwin
license GPL-3+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,14 +27,11 @@ homepage https://www.gnu.org/software/octave
</span>
master_sites gnu:octave
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 7bcefebcbcb644b4527ca97501a4e05b15c04d94 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 80c28f6398576b50faca0e602defb9598d6f7308b0903724442c2a35a605333b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a54feb50c7ddf00539ba9b928c3570b5cd08e99c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 77b84395d8e7728a1ab223058fe5e92dc38c03bc13f7358e6533aab36f76726e
</span>
conflicts-append ${name}-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# see http://savannah.gnu.org/bugs/?48773
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-qscintilla2.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # if there is an error bulding octave package, avoid
# error: structure has no member 'dir'
patchfiles-append patch-better_error.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,13 +58,6 @@ patchfiles-append patch-arch_arg.diff
</span> # the following patch attempts to prevent this
patchfiles-append patch-host_name.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# see http://hg.savannah.gnu.org/hgweb/octave/rev/a6e4157694ef
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://savannah.gnu.org/bugs/?50234
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-file-stat.cc.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://savannah.gnu.org/bugs/?50664
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-crash_on_exit.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # see https://savannah.gnu.org/patch/index.php?9439
patchfiles-append patch-java.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-crash_on_exit.diff b/math/octave/files/patch-crash_on_exit.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5a469fc..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/files/patch-crash_on_exit.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,72 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# HG changeset patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# User John W. Eaton <jwe@octave.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Date 1504620623 14400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Node ID 16fae04366b2eaeb6422967fd084213cbd567e6f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Parent 20dd13700c08bd07acb5fb2cb4c2a27e75393b80
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-avoid abort on exit from GUI (bug #50664)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* octave-interpreter.cc (octave_interpreter::execute): Emit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-octave_finished_signal when execute_interpreter returns.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* octave-interpreter.h (octave_interpreter::octave_finished_signal):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-New signal.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* octave-qt-link.cc (octave_qt_link::octave_qt_link): Connect
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-command_interpreter octave_finished_signal to main_thread quit slot.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Connect main_thread finished signal to main_thread deleteLater slot.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(octave_qt_link::~octave_qt_link): Don't delete main_thread.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/libgui/src/octave-interpreter.cc b/libgui/src/octave-interpreter.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libgui/src/octave-interpreter.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libgui/src/octave-interpreter.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -48,6 +48,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- emit octave_ready_signal ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_exit_status = m_app_context->execute_interpreter ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ emit octave_finished_signal (m_exit_status);
</span><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;'>- void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/libgui/src/octave-interpreter.h b/libgui/src/octave-interpreter.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libgui/src/octave-interpreter.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libgui/src/octave-interpreter.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -46,6 +46,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void octave_ready_signal ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ void octave_finished_signal (int);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- public slots:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Initialize and execute the octave interpreter.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/libgui/src/octave-qt-link.cc b/libgui/src/octave-qt-link.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libgui/src/octave-qt-link.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libgui/src/octave-qt-link.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -60,6 +60,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- connect (command_interpreter, SIGNAL (octave_ready_signal ()),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- p, SLOT (handle_octave_ready ()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ connect (command_interpreter, SIGNAL (octave_finished_signal (int)),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ main_thread, SLOT (quit ()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ connect (main_thread, SIGNAL (finished ()),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ main_thread, SLOT (deleteLater ()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- command_interpreter->moveToThread (main_thread);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- main_thread->start ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -67,8 +73,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- octave_qt_link::~octave_qt_link (void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Note that we don't delete main_thread here. That is handled by
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // deleteLater slot that is called when the main_thread issues a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // finished signal.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete command_interpreter;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- delete main_thread;
</span><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;'>- void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-file-stat.cc.diff b/math/octave/files/patch-file-stat.cc.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 766fd67..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/files/patch-file-stat.cc.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- liboctave/system/file-stat.cc.orig 2017-02-22 11:01:55.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ liboctave/system/file-stat.cc 2017-03-11 06:43:23.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -174,7 +174,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- update_internal ();
</span><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;'>-- inline file_stat::~file_stat () { }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ file_stat::~file_stat () { }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file_stat::update_internal (bool force)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-qscintilla2.diff b/math/octave/files/patch-qscintilla2.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fe289de..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/files/patch-qscintilla2.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2016-11-13 08:22:50.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2017-02-26 08:38:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34697,11 +34697,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case "$qt_version" in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QT_MODULES="QtCore QtGui QtNetwork QtOpenGL"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- octave_qscintilla_libnames=qscintilla2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ octave_qscintilla_libnames="qscintilla2 qscintilla2_qt4"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QT_MODULES="Qt5Core Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- octave_qscintilla_libnames="qscintilla2-qt5 qt5scintilla2"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ octave_qscintilla_libnames="qscintilla2-qt5 qt5scintilla2 qscintilla2_qt5"
</span><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;'>- as_fn_error $? "Unrecognized Qt version $qt_version" "$LINENO" 5
</span></pre><pre style='margin:0'>
</pre>