<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[133137] trunk/dports/math/octave</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/133137">133137</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2015-02-20 19:00:49 -0800 (Fri, 20 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>octave: fix gl2ps renderer interface for compiling using older clang (3.3 and earlier); should address ticket #44704.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmathoctavePortfile">trunk/dports/math/octave/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsmathoctavefilespatchgl2ps_rendererdiff">trunk/dports/math/octave/files/patch-gl2ps_renderer.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmathoctavePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/math/octave/Portfile (133136 => 133137)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/octave/Portfile 2015-02-20 22:28:56 UTC (rev 133136)
+++ trunk/dports/math/octave/Portfile 2015-02-21 03:00:49 UTC (rev 133137)
</span><span class="lines">@@ -93,6 +93,11 @@
</span><span class="cx">
</span><span class="cx"> patchfiles-append patch-clang-libcxx.diff
</span><span class="cx">
</span><ins>+# fix gl2ps renderer interface for compiling using older clang.
+# See also: < https://trac.macports.org/ticket/44704 >
+
+patchfiles-append patch-gl2ps_renderer.diff
+
</ins><span class="cx"> # common configure arguments
</span><span class="cx">
</span><span class="cx"> configure.args \
</span></span></pre></div>
<a id="trunkdportsmathoctavefilespatchgl2ps_rendererdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/math/octave/files/patch-gl2ps_renderer.diff (0 => 133137)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/octave/files/patch-gl2ps_renderer.diff (rev 0)
+++ trunk/dports/math/octave/files/patch-gl2ps_renderer.diff 2015-02-21 03:00:49 UTC (rev 133137)
</span><span class="lines">@@ -0,0 +1,89 @@
</span><ins>+--- libinterp/corefcn/gl2ps-renderer.cc.orig
++++ libinterp/corefcn/gl2ps-renderer.cc
+@@ -34,6 +34,9 @@ along with Octave; see the file COPYING. If not, see
+ #include "gl2ps-renderer.h"
+ #include "gl2ps.h"
+
++glps_renderer::glps_renderer (FILE *_fp, const std::string& _term)
++ : opengl_renderer () , fp (_fp), term (_term), fontsize (), fontname () { }
++
+ void
+ glps_renderer::draw (const graphics_object& go, const std::string print_cmd)
+ {
+@@ -253,4 +256,31 @@ glps_renderer::draw_text (const text::properties& props)
+ alignment_to_mode (halign, valign), props.get_rotation ());
+ }
+
++void
++glps_renderer::set_linestyle (const std::string& s, bool use_stipple)
++{
++ opengl_renderer::set_linestyle (s, use_stipple);
++
++ if (s == "-" && ! use_stipple)
++ gl2psDisable (GL2PS_LINE_STIPPLE);
++ else
++ gl2psEnable (GL2PS_LINE_STIPPLE);
++}
++
++void
++glps_renderer::set_polygon_offset (bool on, double offset)
++{
++ opengl_renderer::set_polygon_offset (on, offset);
++ if (on)
++ gl2psEnable (GL2PS_POLYGON_OFFSET_FILL);
++ else
++ gl2psDisable (GL2PS_POLYGON_OFFSET_FILL);
++}
++
++void
++glps_renderer::set_linewidth (float w)
++{
++ gl2psLineWidth (w);
++}
++
+ #endif
+--- libinterp/corefcn/gl2ps-renderer.h.orig
++++ libinterp/corefcn/gl2ps-renderer.h
+@@ -33,8 +33,7 @@ OCTINTERP_API
+ glps_renderer : public opengl_renderer
+ {
+ public:
+- glps_renderer (FILE *_fp, const std::string& _term)
+- : opengl_renderer () , fp (_fp), term (_term), fontsize (), fontname () { }
++ glps_renderer (FILE *_fp, const std::string& _term);
+
+ ~glps_renderer (void) { }
+
+@@ -52,29 +51,9 @@ protected:
+ void draw_pixels (GLsizei w, GLsizei h, GLenum format,
+ GLenum type, const GLvoid *data);
+
+- void set_linestyle (const std::string& s, bool use_stipple = false)
+- {
+- opengl_renderer::set_linestyle (s, use_stipple);
+-
+- if (s == "-" && ! use_stipple)
+- gl2psDisable (GL2PS_LINE_STIPPLE);
+- else
+- gl2psEnable (GL2PS_LINE_STIPPLE);
+- }
+-
+- void set_polygon_offset (bool on, double offset = 0.0)
+- {
+- opengl_renderer::set_polygon_offset (on, offset);
+- if (on)
+- gl2psEnable (GL2PS_POLYGON_OFFSET_FILL);
+- else
+- gl2psDisable (GL2PS_POLYGON_OFFSET_FILL);
+- }
+-
+- void set_linewidth (float w)
+- {
+- gl2psLineWidth (w);
+- }
++ void set_linestyle (const std::string& s, bool use_stipple = false);
++ void set_polygon_offset (bool on, double offset = 0.0);
++ void set_linewidth (float w);
+
+ private:
+ int alignment_to_mode (int ha, int va) const;
</ins></span></pre>
</div>
</div>
</body>
</html>