<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/95cf9a2e16787c928480b0440e6d17a9397bd432">https://github.com/macports/macports-ports/commit/95cf9a2e16787c928480b0440e6d17a9397bd432</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 95cf9a2e167 octave: bump to 6.2.0
</span>95cf9a2e167 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 95cf9a2e16787c928480b0440e6d17a9397bd432
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Wed Mar 10 16:28:45 2021 -0800
<span style='display:block; white-space:pre;color:#404040;'> octave: bump to 6.2.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> small tweak needed to qt4 patch
</span><span style='display:block; white-space:pre;color:#404040;'> some issues have been fixed upstream
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> documentation building has changed; qt4 variant is not
</span><span style='display:block; white-space:pre;color:#404040;'> building the documentation at present
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> the same default system language error in the qt4 variant
</span><span style='display:block; white-space:pre;color:#404040;'> remains as before with 6.1.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> you must manually set the language in the preferences
</span>---
math/octave/Portfile | 17 ++++++++----
math/octave/files/patch-octave6-qt4-fixes.diff | 37 +-------------------------
2 files changed, 13 insertions(+), 41 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 fba92b7a1cc..7a619cc045a 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;'>@@ -7,7 +7,7 @@ PortGroup compiler_blacklist_versions 1.0
</span> PortGroup linear_algebra 1.0
name octave
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 6.1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 6.2.0
</span> set package_version 6.x.x
revision 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,9 +25,9 @@ homepage https://www.gnu.org/software/octave
</span>
master_sites gnu:octave
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 4f2094359ae531e08a01460f6b8ac8788cc933da \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6ff34e401658622c44094ecb67e497672e4337ca2d36c0702d0403ecc60b0a57 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 32592405
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a7d084c684f233b2c674d3cb0dc1c38e3ca16751 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 457d1fda8634a839e2fd7cfc55b98bd56f36b6ae73d31bb9df43dde3012caa7c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 32620419
</span>
# see https://lists.gnu.org/archive/html/octave-maintainers/2016-05/msg00286.html
compiler.cxx_standard \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -466,6 +466,10 @@ if { ([variant_isset fltk] && [variant_isset qt4]) || ([variant_isset fltk] && [
</span> notes-append "unless octave is run with --no-gui-libs, graphics_toolkit(\"fltk\") will cause a crash"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset qt4]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes-append "on-disk documentation is not building at present with qt4 variant, but online is available"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant sound description {enable audio support (file I/O and playback)} {
depends_lib-append port:libsndfile
depends_lib-append port:portaudio
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -596,7 +600,10 @@ variant docs description {build documentation files} {
</span>
configure.args-replace --disable-docs --enable-docs
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants-append +docs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# the documentation is not building when using qt4 at present
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset qt4]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +docs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
# GraphicsMagick and octave need to be built with the same C++ standard library
# or else undefined symbols:
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-octave6-qt4-fixes.diff b/math/octave/files/patch-octave6-qt4-fixes.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index e422a6d9cda..fb661631310 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/files/patch-octave6-qt4-fixes.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave/files/patch-octave6-qt4-fixes.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,21 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git libgui/src/octave-dock-widget.cc libgui/src/octave-dock-widget.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index dccc5c8..0f1117d 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libgui/src/octave-dock-widget.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libgui/src/octave-dock-widget.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -504,9 +504,11 @@ namespace octave
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QVariant dock_geom
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- = settings->value (dw_dock_geometry.key.arg (objectName ()),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dw_dock_geometry.def);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if QT_VERSION >= 0x050200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (dock_geom.canConvert (QMetaType::QRect))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_recent_dock_geom = dock_geom.toRect ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_recent_dock_geom = dw_dock_geometry.def.toRect ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- notice_settings (settings); // call individual handler
</span> diff --git libgui/src/octave-qobject.cc libgui/src/octave-qobject.cc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 8ecf1ce..427952b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 1320283..42cfaca 100644
</span> --- libgui/src/octave-qobject.cc
+++ libgui/src/octave-qobject.cc
@@ -73,7 +73,7 @@ static void disable_app_nap (void)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,22 +11,3 @@ index 8ecf1ce..427952b 100644
</span> if (process_info_class == nil)
return;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git libgui/src/resource-manager.cc libgui/src/resource-manager.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index f5be8c3..ee263af 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libgui/src/resource-manager.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libgui/src/resource-manager.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -241,8 +241,14 @@ namespace octave
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // if macOS default font is not available): use QFontDatabase
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (default_family.isEmpty ())
</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;'>-+#if QT_VERSION >= 0x050200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Get the system's default monospaced font
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QFont fixed_font = QFontDatabase::systemFont (QFontDatabase::FixedFont);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ QFont fixed_font;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fixed_font.setStyleHint (QFont::Monospace);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_family = fixed_font.defaultFamily ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>