<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/c162006103483b11d4719b49b70d10ade75f8a30">https://github.com/macports/macports-ports/commit/c162006103483b11d4719b49b70d10ade75f8a30</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c162006103483b11d4719b49b70d10ade75f8a30
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Tue Dec 15 20:49:33 2020 -0800
<span style='display:block; white-space:pre;color:#404040;'> octave: fix qt4 build
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> small tweaks to allow qt4 build
</span>---
math/octave/Portfile | 13 +++++++
math/octave/files/patch-octave6-qt4-fixes.diff | 48 ++++++++++++++++++++++++++
2 files changed, 61 insertions(+)
<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 b2ad808fd99..814cf2165e5 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;'>@@ -72,6 +72,10 @@ patchfiles-append patch-run-octave.diff
</span> # see https://trac.macports.org/ticket/58226
patchfiles-append patch-qt5-cxxflags.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# small fixes to allow Octave6 qt4 variant to build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# can be enabled at all times
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-octave6-qt4-fixes.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # see https://savannah.gnu.org/patch/index.php?9806
set java_version 1.8
patchfiles-append patch-java_version.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -565,6 +569,15 @@ if {[variant_isset qt4] || [variant_isset qt5] } {
</span> default_variants-append +app
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# the qt gui uses a few objectiveC calls, and for some reason
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# libobjc.dylib is not being automatically linked in on older systems
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset qt4] || [variant_isset qt5] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.platform} eq "darwin" && ${os.major} < 11 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append -lobjc
</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;'>+
</span> variant docs description {build documentation files} {
depends_build-append port:texinfo
configure.env-append \
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e422a6d9cda
</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-octave6-qt4-fixes.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,48 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git libgui/src/octave-dock-widget.cc libgui/src/octave-dock-widget.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index dccc5c8..0f1117d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libgui/src/octave-dock-widget.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libgui/src/octave-dock-widget.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -504,9 +504,11 @@ namespace octave
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QVariant dock_geom
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ = settings->value (dw_dock_geometry.key.arg (objectName ()),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dw_dock_geometry.def);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if QT_VERSION >= 0x050200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (dock_geom.canConvert (QMetaType::QRect))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_recent_dock_geom = dock_geom.toRect ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_recent_dock_geom = dw_dock_geometry.def.toRect ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notice_settings (settings); // call individual handler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git libgui/src/octave-qobject.cc libgui/src/octave-qobject.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8ecf1ce..427952b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libgui/src/octave-qobject.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libgui/src/octave-qobject.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -73,7 +73,7 @@ static void disable_app_nap (void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned long long NSActivityLatencyCritical = 0xFF00000000ULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Avoid errors on older versions of OS X
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- process_info_class = static_cast<Class> (objc_getClass ("NSProcessInfo"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ process_info_class = reinterpret_cast<Class> (objc_getClass ("NSProcessInfo"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (process_info_class == nil)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git libgui/src/resource-manager.cc libgui/src/resource-manager.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f5be8c3..ee263af 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libgui/src/resource-manager.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libgui/src/resource-manager.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -241,8 +241,14 @@ namespace octave
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // if macOS default font is not available): use QFontDatabase
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (default_family.isEmpty ())
</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;'>++#if QT_VERSION >= 0x050200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Get the system's default monospaced font
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QFont fixed_font = QFontDatabase::systemFont (QFontDatabase::FixedFont);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QFont fixed_font;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fixed_font.setStyleHint (QFont::Monospace);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_family = fixed_font.defaultFamily ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>