[Pkg-octave-commit] [SCM] octave branch, master, updated. 3.2.2-2-19-ga2fd336

[Thomas Weber]

The following commit has been merged in the master branch:
commit 36b03153e476b648085656e8132322cedc28ecc0
Author: Thomas Weber <thomas.weber.mail at gmail.com>
Date:   Thu Mar 4 01:25:12 2010 +0100

    Patch for compiling with graphicsmagick >= 1.3.8

diff --git a/debian/changelog b/debian/changelog
index 344697d..6569ab2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ octave3.2 (3.2.4-3) UNRELEASED; urgency=low
   * debian/in/control: Compile without debug symbols on mips and mipsel
     (closes: #570771). This means we ship with an almost empty -dbg package on
     these architectures.
+  * New patch: handle_new_graphicsmagic, allows building with graphicsmagic >
+    1.3.8. Thanks to John Eaton for the patch.
 
  -- Thomas Weber <thomas.weber.mail at gmail.com>  Sun, 28 Feb 2010 20:22:41 +0100
 
diff --git a/debian/in/series b/debian/in/series
index 1a56151..7865ce9 100644
--- a/debian/in/series
+++ b/debian/in/series
@@ -14,4 +14,5 @@ no_pdf_in_print.diff
 dont_set_helvetica-3.1.diff
 normal-markersize.diff
 filter_empty_vector
+handle_new_graphicsmagic
 :]
diff --git a/debian/patches/handle_new_graphicsmagic b/debian/patches/handle_new_graphicsmagic
new file mode 100644
index 0000000..e86a1f7
--- /dev/null
+++ b/debian/patches/handle_new_graphicsmagic
@@ -0,0 +1,35 @@
+From: John W. Eaton  <jwe at octave.org>
+Description: Allow compilation with graphicsmagick >= 1.3.8.
+ The patch is slightly adapted (header inclusions) to the 3.2 series
+
+Origin: upstream, http://hg.savannah.gnu.org/hgweb/octave/rev/ad0b54ae206a
+Bug: http://www-old.cae.wisc.edu/pipermail/octave-maintainers/2010-February/015292.html
+
+--- a/src/DLD-FUNCTIONS/__magick_read__.cc
++++ b/src/DLD-FUNCTIONS/__magick_read__.cc
+@@ -29,6 +29,7 @@
+ 
+ #include "defun-dld.h"
+ #include "error.h"
++#include "oct-env.h"
+ #include "ov-struct.h"
+ 
+ #ifdef HAVE_MAGICK
+@@ -358,6 +359,17 @@
+ 
+ #ifdef HAVE_MAGICK
+ 
++  static bool initialized = false;
++
++  if (! initialized)
++    {
++      std::string program_name = octave_env::get_program_invocation_name ();
++
++      Magick::InitializeMagick (program_name.c_str ());
++
++      initialized = true;
++    }
++
+   if (args.length () > 2 || args.length () < 1 || ! args(0).is_string ()
+       || nargout > 3)
+     {

-- 
octave