<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/d2f47bf3fbe0705c87603b031fe8b680fa2018e4">https://github.com/macports/macports-ports/commit/d2f47bf3fbe0705c87603b031fe8b680fa2018e4</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d2f47bf3fbe0705c87603b031fe8b680fa2018e4
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Wed Oct 17 10:25:59 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> octave-devel: update to latest development version
</span>---
math/octave/Portfile | 9 +-
math/octave/files/patch-bsdtar-devel.diff | 36 ++
math/octave/files/patch-crash_on_exit-devel.diff | 4 +-
math/octave/files/patch-figures-devel.diff | 407 -----------------------
math/octave/files/patch-force_cxx-devel.diff | 2 +-
math/octave/files/patch-undefined-devel.diff | 4 +-
6 files changed, 47 insertions(+), 415 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 68af6c8..0ee7851 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;'>@@ -703,9 +703,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 d98d7df9fd15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hg.tag ea5182364e5f
</span> version 5.0.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 8
</span>
# see https://trac.macports.org/ticket/57270
compiler.blacklist-append {clang < 802}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -738,10 +738,13 @@ subport ${name}-devel {
</span> patch-run-octave.diff
pre-patch {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-figures.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> patchfiles-replace \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-bsdtar.diff patch-bsdtar-devel.diff \
</span> patch-versions.diff patch-versions-devel.diff \
patch-force_cxx.diff patch-force_cxx-devel.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-figures.diff patch-figures-devel.diff \
</span> patch-iconsize.diff patch-iconsize-devel.diff \
patch-link.diff patch-link-devel.diff \
patch-arch_arg.diff patch-arch_arg-devel.diff \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-bsdtar-devel.diff b/math/octave/files/patch-bsdtar-devel.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..414efca
</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-bsdtar-devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,36 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- scripts/miscellaneous/unpack.m.orig 2016-11-20 04:39:35.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ scripts/miscellaneous/unpack.m 2016-11-20 04:39:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -187,15 +187,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'bzip2 -d -f "%s"', ...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @__parse_bzip2__, true};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ commandlist.bz = commandlist.bz2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- commandlist.tar = {'tar xvf "%s"', ...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'tar xf "%s"', ...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ commandlist.tar = {'bsdtar xvf "%s"', ...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 'bsdtar xf "%s"', ...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @__parse_tar__, false};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- commandlist.targz = {'gzip -d -c "%s" | tar xvf -', ...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'gzip -d -c "%s" | tar xf -', ...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ commandlist.targz = {'gzip -d -c "%s" | bsdtar xvf -', ...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 'gzip -d -c "%s" | bsdtar xf -', ...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @__parse_tar__, false};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ commandlist.tgz = commandlist.targz;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- commandlist.tarbz2 = {'bzip2 -d -c "%s" | tar xvf -', ...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'bzip2 -d -c "%s" | tar xf -', ...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ commandlist.tarbz2 = {'bzip2 -d -c "%s" | bsdtar xvf -', ...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 'bzip2 -d -c "%s" | bsdtar xf -', ...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @__parse_tar__, false};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ commandlist.tarbz = commandlist.tarbz2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ commandlist.tbz2 = commandlist.tarbz2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -303,8 +303,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ files = cellstr (files(:,14:end));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endfunction
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-function output = __parse_tar__ (output)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++function files = __parse_tar__ (output)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## This is a no-op, but it makes things simpler for other cases.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ files = regexprep (output, '^x (.*)$', '$1');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endfunction
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ function files = __parse_gzip__ (output)
</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><span style='display:block; white-space:pre;color:#808080;'>index e182d5f..93c7520 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/files/patch-crash_on_exit-devel.diff
</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;'>@@ -1,6 +1,6 @@
</span> --- libgui/src/main-window.cc.orig 2018-04-30 10:03:56.000000000 -0700
+++ libgui/src/main-window.cc 2018-05-18 05:50:20.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -231,9 +231,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -234,9 +234,6 @@
</span> connect (m_interpreter, SIGNAL (octave_finished_signal (int)),
this, SLOT (handle_octave_finished (int)));
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@
</span> connect (m_main_thread, SIGNAL (finished (void)),
m_main_thread, SLOT (deleteLater (void)));
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1598,6 +1595,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1570,6 +1567,9 @@
</span>
void main_window::handle_octave_finished (int exit_status)
{
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3f34792..0000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,407 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libgui/graphics/Figure.cc.orig 2018-08-18 04:51:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libgui/graphics/Figure.cc 2018-08-18 04:52:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -41,6 +41,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QtDebug>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QTimer>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QToolBar>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <QWindow>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <QScreen>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "Canvas.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "Container.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -133,6 +135,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- figure::properties& fp = properties<figure> ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Register for the signal that indicates when a window has moved
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // to a different screen
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ connect (win, SIGNAL (figureWindowShown ()),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ this, SLOT (figureWindowShown ()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Status bar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_statusBar = win->statusBar ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int boffset = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1088,6 +1095,39 @@
</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;'>-+ Figure::figureWindowShown ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined (HAVE_QSCREEN_DEVICEPIXELRATIO)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ figure::properties& fp = properties<figure> ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ QMainWindow *win = qWidget<QMainWindow> ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ QWindow* window = win->windowHandle ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ QScreen* screen = window->screen ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fp.set___device_pixel_ratio__ (screen->devicePixelRatio ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Make sure the figure gets redrawn after the devicePixelRatio is updated
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ graphics_object go = gh_manager::get_object (fp.get___myhandle__ ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fp.get_toolkit ().redraw_figure (go);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ connect (window, SIGNAL (screenChanged (QScreen*)),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ this, SLOT (screenChanged (QScreen*)));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</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;'>-+ Figure::screenChanged (QScreen* screen)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined (HAVE_QSCREEN_DEVICEPIXELRATIO)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ figure::properties& fp = properties<figure> ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ float old_device_pixel_ratio = fp.get___device_pixel_ratio__ ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fp.set___device_pixel_ratio__ (screen->devicePixelRatio ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Make sure the figure gets redrawn after the devicePixelRatio is updated
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ graphics_object go = gh_manager::get_object (fp.get___myhandle__ ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fp.get_toolkit ().redraw_figure (go);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</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;'>- Figure::enableMouseTracking (void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Enable mouse tracking on every widgets
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libgui/graphics/Figure.h.orig 2018-08-18 04:51:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libgui/graphics/Figure.h 2018-08-18 04:52:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -32,6 +32,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class QMainWindow;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class QToolBar;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+class QScreen;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace QtHandles
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -129,6 +130,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void toggleAxes (void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void toggleGrid (void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void autoAxes (void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ void figureWindowShown ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ void screenChanged (QScreen*);
</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;'>- uint8NDArray slotGetPixels (void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -r bb43ec3a304e libgui/graphics/FigureWindow.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libgui/graphics/FigureWindow.cc Thu Apr 26 06:49:06 2018 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libgui/graphics/FigureWindow.cc Thu Apr 26 17:46:49 2018 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -48,4 +48,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return nullptr;
</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 FigureWindow::showEvent (QShowEvent* ev)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ QMainWindow::showEvent (ev);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ emit figureWindowShown();
</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;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -r bb43ec3a304e libgui/graphics/FigureWindow.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libgui/graphics/FigureWindow.h Thu Apr 26 06:49:06 2018 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libgui/graphics/FigureWindow.h Thu Apr 26 17:46:49 2018 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -37,10 +37,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Q_OBJECT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- public:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- FigureWindow (QWidget *parent = nullptr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ explicit FigureWindow (QWidget *parent = nullptr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ~FigureWindow (void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMenu * createPopupMenu (void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ protected:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ void showEvent(QShowEvent *ev);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ signals:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ void figureWindowShown();
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libgui/graphics/GLCanvas.cc.orig 2018-08-18 04:51:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libgui/graphics/GLCanvas.cc 2018-08-18 04:52:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -68,7 +68,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- octave::opengl_renderer r;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- r.set_viewport (width (), height ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ graphics_object fig = go.get_ancestor ("figure");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ double dpr = fig.get ("__device_pixel_ratio__").double_value ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ r.set_viewport (dpr * width (), dpr * height ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- r.draw (go);
</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;'>-@@ -173,7 +176,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- octave::opengl_selector s;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- s.set_viewport (width (), height ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ graphics_object fig = ax.get_ancestor ("figure");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ double dpr = fig.get ("__device_pixel_ratio__").double_value ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ s.set_viewport (dpr * width (), dpr * height ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return s.select (ax, pt.x (), height () - pt.y (),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- octave::select_ignore_hittest);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libinterp/corefcn/gl-render.cc.orig 2018-08-18 04:51:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libinterp/corefcn/gl-render.cc 2018-08-18 04:52:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -593,7 +593,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- : toolkit (), xform (), xmin (), xmax (), ymin (), ymax (),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- zmin (), zmax (), xZ1 (), xZ2 (), marker_id (), filled_marker_id (),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- camera_pos (), camera_dir (), interpreter ("none"), txt_renderer (),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- selecting (false)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ selecting (false), m_devpixfactor (1.)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // This constructor will fail if we don't have OpenGL or if the data
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // types we assumed in our public interface aren't compatible with the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -694,6 +694,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- opengl_renderer::draw_figure (const figure::properties& props)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Current physical-pixel to toolkit-pixel factor
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_devpixfactor = props.get___device_pixel_ratio__ ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Initialize OpenGL context
</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;'>-@@ -1123,6 +1126,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glMultMatrixd (x_mat1.data ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glMatrixMode (GL_PROJECTION);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glLoadIdentity ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Use abstract Octave-pixels for transformation, not physical-pixels
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vw[2] = octave::math::round (static_cast<float> (vw[2]) / m_devpixfactor);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vw[3] = octave::math::round (static_cast<float> (vw[3]) / m_devpixfactor);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glOrtho (0, vw[2], vw[3], 0, xZ1, xZ2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glMultMatrixd (x_mat2.data ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glMatrixMode (GL_MODELVIEW);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3578,6 +3586,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glMatrixMode (GL_PROJECTION);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glPushMatrix ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glLoadIdentity ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vp[2] = octave::math::round (static_cast<float> (vp[2]) / m_devpixfactor);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vp[3] = octave::math::round (static_cast<float> (vp[3]) / m_devpixfactor);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glOrtho (0, vp[2], vp[3], 0, xZ1, xZ2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glMatrixMode (GL_MODELVIEW);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glPushMatrix ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3747,10 +3759,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // FIXME: actually add the code to do it!
</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;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (i0 >= i1 || j0 >= j1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- glPixelZoom (pix_dx, -pix_dy);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ glPixelZoom (m_devpixfactor * pix_dx,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ - m_devpixfactor * pix_dy);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glRasterPos3d (im_xmin + nor_dx*j0, im_ymin + nor_dy*i0, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // by default this is 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4003,7 +4017,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined (HAVE_OPENGL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- glLineWidth (w);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ glLineWidth (w * m_devpixfactor);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4153,6 +4167,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glMatrixMode (GL_PROJECTION);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glPushMatrix ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glLoadIdentity ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vw[2] = octave::math::round (static_cast<float> (vw[2]) / m_devpixfactor);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vw[3] = octave::math::round (static_cast<float> (vw[3]) / m_devpixfactor);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glOrtho (0, vw[2], vw[3], 0, xZ1, xZ2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glMatrixMode (GL_MODELVIEW);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glPushMatrix ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libinterp/corefcn/gl-render.h.orig 2018-08-18 04:51:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libinterp/corefcn/gl-render.h 2018-08-18 04:52:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -221,6 +221,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Indicate we are drawing for selection purpose
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool selecting;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Factor used for translating Octave pixels to actual device pixels
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ double m_devpixfactor;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- private:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class patch_tesselator;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libinterp/corefcn/graphics.cc.orig 2018-08-18 04:51:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libinterp/corefcn/graphics.cc 2018-08-18 04:52:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -870,6 +870,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sz.extract_n (0, 2, 1, 2)).extract_n (0, 2, 1, 2);
</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;'>-+static double
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+device_pixel_ratio (graphics_handle h)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ double retval = 1.0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ graphics_object fig = gh_manager::get_object (h).get_ancestor ("figure");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (fig.valid_object ())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ retval = fig.get ("__device_pixel_ratio__").double_value ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return retval;
</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;'>- static void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- convert_cdata_2 (bool is_scaled, bool is_real, double clim_0, double clim_1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const double *cmapv, double x, octave_idx_type lda,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6641,11 +6654,13 @@
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ double dpr = device_pixel_ratio (get___myhandle__ ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gh_manager::auto_lock guard;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- txt_renderer.set_font (get ("fontname").string_value (),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- get ("fontweight").string_value (),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- get ("fontangle").string_value (),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- get ("__fontsize_points__").double_value ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ get ("__fontsize_points__").double_value () * dpr);
</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;'>- // The INTERNAL flag defines whether position or outerposition is used.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7714,6 +7729,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Matrix ext (1, 2, 0.0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double wmax, hmax;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ double dpr = device_pixel_ratio (get___myhandle__ ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wmax = hmax = 0.0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int n = std::min (ticklabels.numel (), ticks.numel ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (int i = 0; i < n; i++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7731,8 +7747,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ext = txt_renderer.get_extent (label, 0.0,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- get_ticklabelinterpreter ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- wmax = std::max (wmax, ext(0));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- hmax = std::max (hmax, ext(1));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ wmax = std::max (wmax, ext(0) / dpr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ hmax = std::max (hmax, ext(1) / dpr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8790,7 +8806,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m(0) += p(0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m(1) += p(1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return convert_text_position (m, *this, "pixels", get_units ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Matrix bbox = convert_text_position (m, *this, "pixels", get_units ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ double dpr = device_pixel_ratio (get___myhandle__ ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (octave_idx_type ii = 0; ii < bbox.numel (); ii++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bbox(ii) = bbox(ii) / dpr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return bbox;
</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;'>-@@ -8828,11 +8851,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- text::properties::update_font (void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ double dpr = device_pixel_ratio (get___myhandle__ ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gh_manager::auto_lock guard;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- txt_renderer.set_font (get ("fontname").string_value (),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- get ("fontweight").string_value (),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- get ("fontangle").string_value (),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- get ("__fontsize_points__").double_value ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ get ("__fontsize_points__").double_value () * dpr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- txt_renderer.set_color (get_color_rgb ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8929,9 +8954,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double fontsz = get_fontsize ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double parent_height = box_pix_height;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ graphics_object go (gh_manager::get_object (get___myhandle__ ()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (fontunits_is ("normalized") && parent_height <= 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- graphics_object go (gh_manager::get_object (get___myhandle__ ()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- graphics_object ax (go.get_ancestor ("axes"));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- parent_height = ax.get_properties ().get_boundingbox (true).elem (3);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libinterp/corefcn/graphics.in.h.orig 2018-08-18 04:51:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libinterp/corefcn/graphics.in.h 2018-08-18 04:52:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3183,6 +3183,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- any_property __plot_stream__ h , Matrix ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- any_property __rotate_mode__ h , Matrix ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- any_property __zoom_mode__ h , Matrix ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ double_property __device_pixel_ratio__ h , 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Obsolete properties: doublebuffer, mincolormap, wvisual, wvisualmode,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // xdisplay, xvisual, xvisualmode
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- m4/acinclude.m4.orig 2018-08-18 04:51:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ m4/acinclude.m4 2018-08-18 04:52:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -666,6 +666,36 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+dnl Check whether the Qt class QScreen has the devicePixelRatio member function.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+dnl This member function was introduced in Qt 5.5.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+dnl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AC_DEFUN([OCTAVE_CHECK_FUNC_QSCREEN_DEVICEPIXELRATIO], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_CACHE_CHECK([for QScreen::devicePixelRatio in <QScreen>],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [octave_cv_func_qscreen_devicepixelratio],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [AC_LANG_PUSH(C++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ac_octave_save_CPPFLAGS="$CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ac_octave_save_CXXFLAGS="$CXXFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CXXFLAGS="$CXXPICFLAG $CXXFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #include <QApplication>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #include <QScreen>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ]], [[
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ QScreen *screen = QApplication::primaryScreen ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ qreal ratio = screen->devicePixelRatio ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ]])],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ octave_cv_func_qscreen_devicepixelratio=yes,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ octave_cv_func_qscreen_devicepixelratio=no)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CPPFLAGS="$ac_octave_save_CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CXXFLAGS="$ac_octave_save_CXXFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_LANG_POP(C++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if test $octave_cv_func_qscreen_devicepixelratio = yes; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_DEFINE(HAVE_QSCREEN_DEVICEPIXELRATIO, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [Define to 1 if you have the `QScreen::devicePixelRatio' member function.])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+dnl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl Check whether the Qt class QTabWidget has the setMovable member function.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl This member function was introduced in Qt 4.5.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2105,6 +2135,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OCTAVE_CHECK_FUNC_QHELPSEARCHQUERYWIDGET_SEARCHINPUT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OCTAVE_CHECK_FUNC_QINSTALLMESSAGEHANDLER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OCTAVE_CHECK_FUNC_QLINEEDIT_SETPLACEHOLDERTEXT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OCTAVE_CHECK_FUNC_QSCREEN_DEVICEPIXELRATIO
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OCTAVE_CHECK_FUNC_QMOUSEEVENT_LOCALPOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OCTAVE_CHECK_FUNC_QOBJECT_FINDCHILDREN_ACCEPTS_FINDCHILDOPTIONS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OCTAVE_CHECK_FUNC_QTABWIDGET_SETMOVABLE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- scripts/plot/util/print.m.orig 2018-08-18 04:51:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scripts/plot/util/print.m 2018-08-18 04:52:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -386,6 +386,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nfig += 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endfor
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ## Don't account for the actual pixel density
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (strcmp (tk, "qt"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ props(end+1).h = opts.figure;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ props(end).name = "__device_pixel_ratio__";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ props(end).value = {get(opts.figure, "__device_pixel_ratio__")};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set (opts.figure, "__device_pixel_ratio__", 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ nfig += 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## print() requires axes units = "normalized"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hax = findall (opts.figure, "-depth", 1, "type", "axes", ...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "-not", "units", "normalized");
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-force_cxx-devel.diff b/math/octave/files/patch-force_cxx-devel.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index ee967cb..f5838c0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/files/patch-force_cxx-devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave/files/patch-force_cxx-devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- libinterp/corefcn/module.mk.orig 2017-11-08 15:10:37.000000000 -0700
+++ libinterp/corefcn/module.mk 2017-11-10 02:35:29.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -121,7 +121,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -125,7 +125,7 @@
</span> %reldir%/bsxfun.cc \
%reldir%/c-file-ptr-stream.cc \
%reldir%/call-stack.cc \
<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><span style='display:block; white-space:pre;color:#808080;'>index e46e2ae..89c35f6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/files/patch-undefined-devel.diff
</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;'>@@ -10,7 +10,7 @@ Use -bundle -undefined dynamic_lookup for DLLs on macOS
</span> diff --git configure.ac configure.ac
--- configure.ac
+++ configure.ac
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -665,25 +665,33 @@ AC_ARG_ENABLE([dl],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -650,25 +650,33 @@ AC_ARG_ENABLE([dl],
</span>
if test $STATIC_LIBS = no && test $SHARED_LIBS = no; then
AC_MSG_ERROR([You can't disable building both static AND shared libraries!])
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,7 +48,7 @@ diff --git configure.ac configure.ac
</span> diff --git a/m4/acinclude.m4 b/m4/acinclude.m4
--- m4/acinclude.m4
+++ m4/acinclude.m4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2928,20 +2928,20 @@ AC_DEFUN_ONCE([OCTAVE_DEFINE_MKOCTFILE_D
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2880,20 +2880,20 @@ AC_DEFUN_ONCE([OCTAVE_DEFINE_MKOCTFILE_D
</span> ;;
alpha*-dec-osf*)
CPICFLAG=
</pre><pre style='margin:0'>
</pre>