debian/midori
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Use rsvg instead of imagemagick to render icons

Browse source 
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.
This commit is contained in:
Christian Dywan 2008-08-10 15:53:07 +02:00
parent 1b0fc074e3
commit 212597f416
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
icons/wscript_build
View file

@ -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,

2
wscript
View file

@ -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'