Use rsvg instead of imagemagick to render icons

Apparently rsvg-convert is good enough for what we
need and it is a dependency of gtk already, unlike
imagemagick's convert which even requires rsvg.

diff --git a/icons/wscript_build b/icons/wscript_build
index bbf8ad642c1e8edc351988ec1fe1edf339480ae2..51946f32cd37d3c5fada5c7947291d35ce02239d 100644 (file)
--- a/icons/wscript_build
+++ b/icons/wscript_build
@@ -18,7 +18,9 @@ def add_image (bld, install_files, category, name):
         except:
             pass
 
-    if bld.env ()['CONVERT']:
+    rsvg_convert = bld.env ()['RSVG_CONVERT']
+
+    if rsvg_convert:
         mkdir (blddir + '/icons')
 
     for size in [16, 22, 32, 48]:
@@ -26,15 +28,14 @@ def add_image (bld, install_files, category, name):
         if os.access (srcdir + '/icons/' + format + '/' + name + '.png', os.F_OK):
             _install_files ('DATADIR', 'icons/hicolor/' + format + '/' + category,
                             srcdir + '/icons/' + format + '/' + name + '.png')
-        elif not bld.env ()['CONVERT']:
+        elif not rsvg_convert:
             pass
         elif os.access (srcdir + '/icons/scalable/' + name + '.svg', os.F_OK):
             mkdir (blddir + '/icons/' + format)
-            convert = subprocess.Popen (['convert',
-                '-background', 'transparent',
-                '-geometry', format, '-extent', format,
-                srcdir + '/icons/scalable/' + name + '.svg',
-                blddir + '/icons/' + format + '/' + name + '.png'],
+            convert = subprocess.Popen ([rsvg_convert,
+                '-w', str (size), '-h', str (size),
+                '-o', blddir + '/icons/' + format + '/' + name + '.png',
+                srcdir + '/icons/scalable/' + name + '.svg'],
                 stderr=subprocess.PIPE)
             if not convert.wait ():
                 _install_files ('DATADIR', 'icons/hicolor/' + format + '/' + category,

diff --git a/wscript b/wscript
index 9bd8d9503614683e14fa1b9ca7ab53b54949c79d..52fa64f954248176217b2664adac7f3f5ac020a3 100644 (file)
--- a/wscript
+++ b/wscript
@@ -43,7 +43,7 @@ def configure (conf):
 
     conf.check_header ('unistd.h', 'HAVE_UNISTD_H')
 
-    if conf.find_program ('convert', var='CONVERT'):
+    if conf.find_program ('rsvg-convert', var='RSVG_CONVERT'):
         icons = 'yes'
     else:
         icons = 'no'