octave*: use libRSVG to generate icons

ImageMagick can not properly convert Octave SVG file to PNG. See http://savannah.gnu.org/bugs/?37062#comment26
macports · Jul 25, 2017 · 0f27393 · 0f27393
1 parent 77e4aee
commit 0f27393
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 24 deletions.
diff --git a/math/octave-devel/Portfile b/math/octave-devel/Portfile
@@ -29,7 +29,7 @@ set version_tip     4.2.0-rc4
 
 if { ${name} eq ${subport} } {
     version         ${version_tip}
-    revision        2
+    revision        3
     hg.tag          e078f5607762
 
     # see http://savannah.gnu.org/bugs/?48773
@@ -46,7 +46,7 @@ if { ${name} eq ${subport} } {
 
 subport octave-devel-rc {
     version         ${version_rc}
-    revision        3
+    revision        4
     hg.tag          69ac19073ae6
 
     if {${version_rc} eq ${version_release}} {
@@ -67,7 +67,7 @@ subport octave-devel-rc {
 
 subport octave-devel-release {
     version         ${version_release}
-    revision        3
+    revision        4
     hg.tag          00f7b278defd
 
     if {${version_release} eq ${version_rc}} {
@@ -502,7 +502,7 @@ variant sound description {enable audio support (file I/O and playback)} {
 default_variants-append +sound
 
 variant app description "build application bundle to launch ${subport}" {
-    depends_build-append port:ImageMagick
+    depends_build-append port:librsvg
 
     if {[vercmp ${xcodeversion} 4.5] < 0} {
         # need a way to generate icns file for XCode prior to 4.5
@@ -572,15 +572,10 @@ variant app description "build application bundle to launch ${subport}" {
 
             set hres [expr 2*${res}]
 
-            # find new density so that converted PNG files do not look pixelated
-            set denw  [expr ${dpi}*${res}/${width}]
-            set denh  [expr ${dpi}*${res}/${height}]
-
-            set hdenw [expr 2*${denw}]
-            set hdenh [expr 2*${denh}]
-
-            system -W ${worksrcpath} "${prefix}/bin/convert -background transparent -resize ${res}x${res}   -density ${denw}x${denh}   ${svg} Octave.iconset/icon_${res}x${res}.png"
-            system -W ${worksrcpath} "${prefix}/bin/convert -background transparent -resize ${hres}x${hres} -density ${hdenw}x${hdenh} ${svg} Octave.iconset/icon_${res}x${res}@2x.png"
+            # see http://savannah.gnu.org/bugs/?37062
+            # see http://hg.savannah.gnu.org/hgweb/octave/rev/1687269e31e4
+            system -W ${worksrcpath} "${prefix}/bin/rsvg-convert -w ${res} ${svg}  > Octave.iconset/icon_${res}x${res}.png"
+            system -W ${worksrcpath} "${prefix}/bin/rsvg-convert -w ${hres} ${svg} > Octave.iconset/icon_${res}x${res}@2x.png"
         }
 
         if {[vercmp ${xcodeversion} 4.5] >= 0} {

diff --git a/math/octave/Portfile b/math/octave/Portfile
@@ -12,7 +12,7 @@ compiler.blacklist-append   {*gcc-4.6} {clang < 700}
 
 name                octave
 version             4.2.1
-revision            3
+revision            4
 categories          math science
 platforms           darwin
 license             GPL-3+
@@ -410,7 +410,7 @@ variant sound description {enable audio support (file I/O and playback)} {
 default_variants-append +sound
 
 variant app description "build application bundle to launch ${subport}" {
-    depends_build-append port:ImageMagick
+    depends_build-append port:librsvg
 
     if {[vercmp ${xcodeversion} 4.5] < 0} {
         # need a way to generate icns file for XCode prior to 4.5
@@ -481,15 +481,10 @@ variant app description "build application bundle to launch ${subport}" {
 
             set hres [expr 2*${res}]
 
-            # find new density so that converted PNG files do not look pixelated
-            set denw  [expr ${dpi}*${res}/${width}]
-            set denh  [expr ${dpi}*${res}/${height}]
-
-            set hdenw [expr 2*${denw}]
-            set hdenh [expr 2*${denh}]
-
-            system -W ${worksrcpath} "${prefix}/bin/convert -background transparent -resize ${res}x${res}   -density ${denw}x${denh}   ${svg} Octave.iconset/icon_${res}x${res}.png"
-            system -W ${worksrcpath} "${prefix}/bin/convert -background transparent -resize ${hres}x${hres} -density ${hdenw}x${hdenh} ${svg} Octave.iconset/icon_${res}x${res}@2x.png"
+            # see http://savannah.gnu.org/bugs/?37062
+            # see http://hg.savannah.gnu.org/hgweb/octave/rev/1687269e31e4
+            system -W ${worksrcpath} "${prefix}/bin/rsvg-convert -w ${res} ${svg}  > Octave.iconset/icon_${res}x${res}.png"
+            system -W ${worksrcpath} "${prefix}/bin/rsvg-convert -w ${hres} ${svg} > Octave.iconset/icon_${res}x${res}@2x.png"
         }
 
         if {[vercmp ${xcodeversion} 4.5] >= 0} {