Fix bug 501768 QuantumRange was not declared in this scope when building =sci-mathematics/octave-3.8.0[imagemagick] when media-gfx/graphicsmagick[cxx] is installed. Thanks to Juergen Rose and Francois Bissey for reporting, Jouni Kosonen for testing.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x618E971F

3 files changed, 32 insertions, 17 deletions

diff --git a/sci-mathematics/octave/ChangeLog b/sci-mathematics/octave/ChangeLog
index 830afd84e896..37e082ff3aa1 100644
--- a/sci-mathematics/octave/ChangeLog
+++ b/sci-mathematics/octave/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-mathematics/octave
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.151 2014/02/20 01:57:16 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.152 2014/02/20 03:05:52 gienah Exp $
+
+  20 Feb 2014; Mark Wright <gienah@gentoo.org>
+  files/octave-3.8.0-imagemagick.patch:
+  Fix bug 501768 QuantumRange was not declared in this scope when building =sci-
+  mathematics/octave-3.8.0[imagemagick] when media-gfx/graphicsmagick[cxx] is
+  installed. Thanks to Juergen Rose and Francois Bissey for reporting, Jouni
+  Kosonen for testing.
 
   20 Feb 2014; Mark Wright <gienah@gentoo.org>
   +files/octave-3.8.0-avoid-gui-sigsegv-if-curl-is-not-available.patch,
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 9052dc6e0d90..5af54f33626c 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -12,7 +12,7 @@ AUX octave-3.8.0-avoid-gui-sigsegv-if-curl-is-not-available.patch 5318 SHA256 49
 AUX octave-3.8.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch 298 SHA256 04d83d8a6dac628965e0c5e732df260c66295ff7c4fc9fa44e552ebf467b5d61 SHA512 968c9748c968916612bf652df4638519edfa86259247c1d81441cf64194ec92610680fbe06c24a2cf422dadec58154d2b811d6828818f1762e8cfd0fd160d64f WHIRLPOOL 583d4170b2ec493a89a8a3b25f12abe3055d2da0c5df6b4d9b99496f1a1110ba6e73a49be99290c228dccc16e3cd56bc9aa90ed9d631d663ae909fc778b97129
 AUX octave-3.8.0-fix-compile.patch 543 SHA256 f958d3ec8e9e9eff52b1cc143ee020fef85da79f1e4927c7f9e59271fe97d28d SHA512 5f7dc096108132e290d4354f3ba48fee9b7bd2df1550ce831a1830c6597df9cb2495a1028343628d98750981b8d87ae67b1d99381442617ba433513913104f72 WHIRLPOOL 76ad5745808f827fd9ad9c8ce805afd48ebc3a0afeb15f353c111ab1bcdb349295cfc14459f66d4658b893a87dcb0404fd330d23b329c36aba2645b5745649a7
 AUX octave-3.8.0-imagemagick-configure.patch 811 SHA256 3bd92429c567614061c95b31ce1870abd198d99b3bcda68b373d8e5c6472b981 SHA512 b032feeef9a48535f14b0998557d8b7be544e7ce32ae2d53854f0cad392f379910ec716b4632729c75a604b3e75e363161e3c96aa3ed5367b8bffba286666f4e WHIRLPOOL 146f1353609db5b6f75edda748f6cb084b5600f080771da93b847ed45d8de347cec341d95234b83731b1e1dceea0da95bceeaa1fc547c037814a718ddd0e96a5
-AUX octave-3.8.0-imagemagick.patch 4716 SHA256 d5efddc576ae19eaf2bdea32206bebe5116a85a7a973982716cddaa96badeb84 SHA512 24f82555d65fdf672c0132b099bfee2fe72c11a8e9c2bb979e4aef140711862ac735b73088d9a604eecbb25fc7585180dac336c3d59a117efb9487d85d9d6107 WHIRLPOOL 4255d6ea82a1f0270346d3fe56d519feef1d95d3043c2be1ec43324a52abc756559d93a7b1766f38e1dcaae88ff635eee268955a82814664174f29fe6bc8cade
+AUX octave-3.8.0-imagemagick.patch 4978 SHA256 fa395b3574cffa43d4776196faa9254aa2cd8b8ebd2c96ac1a6de51707d75e11 SHA512 5d506c9d0b43f44e8b4ac14544fd1fb3e7be118c818b788d0331931a517e650871ded42ba5225cd1562cbb118c2f5b238edc828da8cd7191ea96af5203f0ab9b WHIRLPOOL 816ad3ecc5cfcbd7c566327bb509e23ca4abd88814ceae46ef84ce9286c535c3b270b2e8a0b9c80070df0a5a6f823544dc526c5e61082aa7c086e0c0aa4af5f0
 AUX octave-3.8.0-llvm-3.4.patch 2424 SHA256 40c6ea5fd4c59470038624398cffcb7d9f1b60d1bf678ab168c656c894824746 SHA512 8862dfe1060cc30b083ad62863b789f9c30e7d3d9a660b6ff591f2dc29611e23a75243cd8712fde04833c8285ff57f8e6483d7b23dd1cdc1923b309b8b004ece WHIRLPOOL ecc6ca44bba42f734fa911e81c10b0c4fb8f19815330351eba28ef34df19007112baf59efc8486596354a819d04490d1937945f1c4d3438d95a7270a2f24b44e
 AUX octave-3.8.0-llvm-configure.patch 624 SHA256 96d297d78d423663567e5790407c58ddc52af6bd6c9e3ddf499dc10ad6a955cb SHA512 bdaaf2e7d7fc4254caf9a04b082dc02e58369256ce09c0c3632309f624b2b97a447020b0a37b4da4770a7f8e02ae5f1ad233c986e337e93b89bc83ed8cf34c2c WHIRLPOOL 08d3ab914c964d526f8a7b013166aa6d86258eb0a4eff11ce74c4f377dc15786c9dfe1688048537c09787f37226fd0587d4a8d5afeac74751e86547cd66a8c6d
 AUX octave-3.8.0-pkgbuilddir.patch 1413 SHA256 277a2cf88d50db3125e5bffb989626f806f7140161a12caf6db711e67443b2e9 SHA512 37b1d88f0afcde01c6c59cb1f3a8ed4a73a611d0bc2acb2d9854ad53234c92daf8e38ca8510fcee91552d87dea18bce5c7d6ff3c3b00d73898076cc3f8a3245d WHIRLPOOL d4d1494ad1e25ed13fc4b4df281b49be8d53253e78ef5cc42dfab58a4f519b4e2e66ee6865441c965dcc66791449431e97d4395711515fe20d941b73a453b92a
@@ -21,12 +21,12 @@ DIST octave-3.8.0.tar.bz2 17669638 SHA256 519330c6dd34eb69ca26a811722948fceac2ac
 EBUILD octave-3.6.4-r1.ebuild 3509 SHA256 3eec5c95449373742628be9031622a5b7c6771203df72da13f3654be9c011c50 SHA512 1e4e72e3f67a46c31ee84208141535305d2daa6770dd2767cc523951e140d95de0bda897a1a0f1f88a16cd120b0cccf6ee7691d73effb02d83b1d8b760c85564 WHIRLPOOL 3bf445ad674658f35f0b3ea0665788d328c84f12d166c6f512033b4531c6a9260806d4d68256dc974826abadf85994fcd7cadd64368cd9c4ebd818974c224177
 EBUILD octave-3.6.4.ebuild 3478 SHA256 686c2b49e3aaadf7bc41ecc46908126d65f1510c285a575efb74a5586d28d3b4 SHA512 897cac6e403bf709b6eafa0fa885905b91015d40cff5fd7d6187bd45c0ec95dd68dee3415152b9c29b85bc48b781797b1ada9d3001ea0625c6f97f5bd4dd48b7 WHIRLPOOL 09fdeafb13a7a814fd1304a493c76227fe7b0b7ea420cdcab2c944864a0319f62505f214be9796edee57cc370e8a7e6be0dbbe55035afbbc2a4c37033a6bebf4
 EBUILD octave-3.8.0.ebuild 6135 SHA256 d9eae1e5b5757b12f2e5f3217dc8e30787787d18b8d5623b945467bb4b8bf7d7 SHA512 c5bf8ffff9ec8561d278ebcba71945ef69f689648bac4b8f8c7f4e0a765caba6868239d83aba0e6f3106091443e5fa46ed2b2f451dd3795e6c7029a90e62a532 WHIRLPOOL ece270d7220ab6dfa793f5941a25c42715e69cd4e736834f5f66cd92a9d8a0d2f0eaa8f21b570928315f9e63995fe57bf6ed4679b7ef22720afbb9fd51708369
-MISC ChangeLog 35431 SHA256 107d65718d402881f9c074edce5b086ddbf533c8aa57107607a53a6621c4bd96 SHA512 a1cea4c3a48acb20b5b566e50d6944fba3b9d89d255c509cd79f00f11a9fd0f0a4b4db2ced8b3d0f89a73e0d2b9b87e6c22305b781cc5d72cba8c2c7762c8877 WHIRLPOOL eb657375afdfbf2a4bc419d6d17586b30b630a7a66fd484690b06516f079ba05b41c3e34b27213341f5a21693544ba001d3c001b5e6569a77573bdc39d936fe0
+MISC ChangeLog 35778 SHA256 b2802bbcf22865aedd3fb25e4aa5013bf3a369d0c9a3a778ddf7be3bc7015ed2 SHA512 e5a05922142b0f32838c0681721813638f1f8abf6ce109543959c6903f497ffc4c0b73ef537ae66fe2d86738c365cdeba6f58f59205b605d8e672fa0d150ec75 WHIRLPOOL f99b913c10dc2f0d72eb7726f6d2baa656f5ef4f8fbd30eb7c9f574e8f1ce8c0bef1d681d4cdef74b65e47b761a7ac9170afdbface8e7ef16630da11291fdae8
 MISC metadata.xml 1022 SHA256 1b65adbdcc076642a258fff07b7e362922ac22a8498b20bd96e2c97a2ea45a10 SHA512 bf855dac972af2db8e39396a50fbdc1199f28bf4b29cf2c78315f608584f0258a12985f021003b84553bf289c734397d8c7f92666c022b6b1f68f1ebccf89966 WHIRLPOOL b6d90f1eeec501dab72503cc677792abca0fbc1476d627868090abc2438940ec24088fc95a53df058dffc793f8101a7057a85c64aef6395da6c39864c2f45305
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlMFYQUACgkQoBEVQmGOlx9W0wEAuRVZA/dCy2KwRMLwup8RxHUD
-09wViox9u7eU/vlXZukA+wQEinlxhUI6gXtCUHks4y3/X6WfksXW/8O0w8miJw2m
-=ivoK
+iF4EAREIAAYFAlMFcRkACgkQoBEVQmGOlx+IjQEAua9gQFnQQm2rkDM9kBfJL2MY
+2JNp1uRCd1fULpc2aJIBANIsbt0JXbz9O6mUxzQVwL8evSNxT28MCnHTBeFKtUc1
+=GisU
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/octave/files/octave-3.8.0-imagemagick.patch b/sci-mathematics/octave/files/octave-3.8.0-imagemagick.patch
index 8dc94ca6feb2..efd1d51c090f 100644
--- a/sci-mathematics/octave/files/octave-3.8.0-imagemagick.patch
+++ b/sci-mathematics/octave/files/octave-3.8.0-imagemagick.patch
@@ -1,15 +1,23 @@
 --- octave-3.8.0-orig/libinterp/dldfcn/__magick_read__.cc	2013-12-28 08:57:41.000000000 +1100
-+++ octave-3.8.0/libinterp/dldfcn/__magick_read__.cc	2014-02-15 00:12:10.909254448 +1100
-@@ -38,7 +38,7 @@
++++ octave-3.8.0/libinterp/dldfcn/__magick_read__.cc	2014-02-20 13:40:54.981809963 +1100
+@@ -38,8 +38,15 @@
  #include "gripes.h"
  
  #ifdef HAVE_MAGICK
 -
 +#define MAGICKCORE_EXCLUDE_DEPRECATED 1
  #include <Magick++.h>
++#if !defined(QuantumRange) && defined(MaxRGB)
++#define QuantumRange MaxRGB
++#endif
++#if !defined(MAGICKCORE_QUANTUM_DEPTH) && defined(QuantumDepth)
++#define MAGICKCORE_QUANTUM_DEPTH QuantumDepth
++#endif
++
  #include <clocale>
  
-@@ -332,7 +332,10 @@
+ // In theory, it should be enough to check the class:
+@@ -332,7 +339,10 @@
    if (imvec[def_elem].depth () == 32)
      divisor = std::numeric_limits<uint32_t>::max ();
    else
@@ -21,7 +29,7 @@
  
    // FIXME: this workaround should probably be fixed in GM by creating a
    //        new ImageType BilevelMatteType
-@@ -463,7 +466,8 @@
+@@ -463,7 +473,8 @@
                  for (octave_idx_type row = 0; row < nRows; row++)
                    {
                      img_fvec[idx] = pix->red / divisor;
@@ -31,7 +39,7 @@
                      pix += row_shift;
                      idx++;
                    }
-@@ -538,7 +542,8 @@
+@@ -538,7 +549,8 @@
                      rbuf[idx]     = pix->red     / divisor;
                      gbuf[idx]     = pix->green   / divisor;
                      bbuf[idx]     = pix->blue    / divisor;
@@ -41,7 +49,7 @@
                      pix += row_shift;
                      idx++;
                    }
-@@ -620,7 +625,8 @@
+@@ -620,7 +632,8 @@
                      mbuf[idx]     = pix->green   / divisor;
                      ybuf[idx]     = pix->blue    / divisor;
                      kbuf[idx]     = pix->opacity / divisor;
@@ -51,7 +59,7 @@
                      pix += row_shift;
                      idx++;
                    }
-@@ -678,9 +684,10 @@
+@@ -678,9 +691,10 @@
        // Restore locale from before GraphicsMagick initialisation
        setlocale (LC_ALL, locale.c_str ());
  
@@ -64,7 +72,7 @@
  
        initialized = true;
      }
-@@ -1053,8 +1060,9 @@
+@@ -1053,8 +1067,9 @@
    // From GM documentation:
    //  Color arguments are must be scaled to fit the Quantum size according to
    //  the range of MaxRGB
@@ -75,7 +83,7 @@
  
    const P *img_fvec = img.fortran_vec ();
    const P *a_fvec   = alpha.fortran_vec ();
-@@ -1105,7 +1113,8 @@
+@@ -1105,7 +1120,8 @@
                    {
                      Magick::Color c;
                      c.redQuantum   (double (*img_fvec) / divisor);
@@ -85,7 +93,7 @@
                      pix[GM_idx] = c;
                      img_fvec++;
                      a_fvec++;
-@@ -1170,10 +1179,11 @@
+@@ -1170,10 +1186,11 @@
                {
                  for (octave_idx_type row = 0; row < nRows; row++)
                    {
@@ -98,7 +106,7 @@
                      pix[GM_idx] = c;
                      img_fvec++;
                      a_fvec++;
-@@ -1247,7 +1257,8 @@
+@@ -1247,7 +1264,8 @@
                                       double (img_fvec[Y_offset]) / divisor,
                                       double (img_fvec[K_offset]) / divisor);
                      pix[GM_idx] = c;