[133137] trunk/dports/math/octave

[michaelld at macports.org]

Revision: 133137
          https://trac.macports.org/changeset/133137
Author:   michaelld at macports.org
Date:     2015-02-20 19:00:49 -0800 (Fri, 20 Feb 2015)
Log Message:
-----------
octave: fix gl2ps renderer interface for compiling using older clang (3.3 and earlier); should address ticket #44704.

Modified Paths:
--------------
    trunk/dports/math/octave/Portfile

Added Paths:
-----------
    trunk/dports/math/octave/files/patch-gl2ps_renderer.diff

Modified: trunk/dports/math/octave/Portfile
===================================================================
--- 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)
@@ -93,6 +93,11 @@
 
 patchfiles-append   patch-clang-libcxx.diff
 
+# fix gl2ps renderer interface for compiling using older clang.
+# See also: < https://trac.macports.org/ticket/44704 >
+
+patchfiles-append   patch-gl2ps_renderer.diff
+
 # common configure arguments
 
 configure.args \

Added: trunk/dports/math/octave/files/patch-gl2ps_renderer.diff
===================================================================
--- 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)
@@ -0,0 +1,89 @@
+--- 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;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150220/b2f615ad/attachment-0001.html>