Package: chemical-mime-data Version: 0.1.94-5 Severity: wishlist Tags: patch User: [email protected] Usertags: origin-ubuntu precise ubuntu-patch
Hi, chemical-mime-data 0.1.94 uses rsvg to convert svg icons to png. Upstream librsvg has dropped the rsvg binary, in favour of rsvg-convert. I haven't seen any coordinated effort on this problem, but imagemagick also recently accepted a patch (Bug #659259). Here's a patch to use rsvg-convert instead of rsvg, fixing an FTBFS in Ubuntu. I haven't forwarded it upstream, as chemical-mime-data trunk dropped the icons. Thanks for considering the patch. SR
Description: Use rsvg-convert instead of rsvg (deprecated) Upstream has dropped the icons in trunk, so this doesn't need to be forwarded. Author: Stefano Rivera <[email protected]> Bug-Ubuntu: https://bugs.launchpad.net/bugs/931802 Forwarded: not-needed Last-Update: 2012-02-26 --- a/configure.ac +++ b/configure.ac @@ -72,13 +72,13 @@ [enable_update_database=yes] ) -dnl Choose to run rsvg or convert if both are installed +dnl Choose to run rsvg-convert or convert if both are installed AC_ARG_ENABLE( [convert], AC_HELP_STRING( [--enable-convert], [ - enable or disable the usage of convert (imagemagick) if both rsvg and convert are available + enable or disable the usage of convert (imagemagick) if both rsvg-convert and convert are available @<:@default=no@:>@ ] ), @@ -87,7 +87,7 @@ ) dnl -------------------------------------------------------------------------- -dnl rsvg or convert (imagemagick) +dnl rsvg-convert or convert (imagemagick) dnl -------------------------------------------------------------------------- AC_ARG_VAR( @@ -100,14 +100,14 @@ if test "x$enable_convert" != "xyes" -a "x$CONVERT" = "xno" ; then AC_ARG_VAR( [RSVG], - [The 'rsvg' binary with path. Use it to define or override the location of 'rsvg'.] + [The 'rsvg-convert' binary with path. Use it to define or override the location of 'rsvg-convert'.] ) - AC_PATH_PROG([RSVG], [rsvg], [no]) + AC_PATH_PROG([RSVG], [rsvg-convert], [no]) AC_SUBST([RSVG]) fi if test "x$RSVG" = "xno" -a "x$CONVERT" = "xno" ; then - AC_MSG_ERROR([Cannot find rsvg (librsvg binary) or convert (imagemagick). Please install one of them.]) + AC_MSG_ERROR([Cannot find rsvg-convert (librsvg binary) or convert (imagemagick). Please install one of them.]) fi dnl -------------------------------------------------------------------------- --- a/icons/hicolor/Makefile.am +++ b/icons/hicolor/Makefile.am @@ -24,7 +24,7 @@ gzip $< -c > $@ for size in $(icon_sizes) ; do \ if test "x$(RSVG)" != "x" ; then \ - $(RSVG) -w $${size} -h $${size} -f png $< $*_$${size}.png ; \ + $(RSVG) -w $${size} -h $${size} -f png $< -o $*_$${size}.png ; \ else \ $(CONVERT) $< -resize $${size}x$${size} $*_$${size}.png ; \ fi \ --- a/configure +++ b/configure @@ -1323,7 +1323,8 @@ update-mime-database utility after installation [default=yes] --enable-convert enable or disable the usage of convert (imagemagick) - if both rsvg and convert are available [default=no] + if both rsvg-convert and convert are available + [default=no] Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1369,8 +1370,8 @@ e.g. '--nonet'. CONVERT The 'convert' binary with path. Use it to define or override the location of 'convert'. - RSVG The 'rsvg' binary with path. Use it to define or override the - location of 'rsvg'. + RSVG The 'rsvg-convert' binary with path. Use it to define or override + the location of 'rsvg-convert'. UPDATE_MIME_DATABASE The update-mime-database binary with path. Use it to define or override the location of update-mime-database. @@ -4525,8 +4526,8 @@ if test "x$enable_convert" != "xyes" -a "x$CONVERT" = "xno" ; then - # Extract the first word of "rsvg", so it can be a program name with args. -set dummy rsvg; ac_word=$2 + # Extract the first word of "rsvg-convert", so it can be a program name with args. +set dummy rsvg-convert; ac_word=$2 { echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_RSVG+set}" = set; then @@ -4570,8 +4571,8 @@ fi if test "x$RSVG" = "xno" -a "x$CONVERT" = "xno" ; then - { { echo "$as_me:$LINENO: error: Cannot find rsvg (librsvg binary) or convert (imagemagick). Please install one of them." >&5 -echo "$as_me: error: Cannot find rsvg (librsvg binary) or convert (imagemagick). Please install one of them." >&2;} + { { echo "$as_me:$LINENO: error: Cannot find rsvg-convert (librsvg binary) or convert (imagemagick). Please install one of them." >&5 +echo "$as_me: error: Cannot find rsvg-convert (librsvg binary) or convert (imagemagick). Please install one of them." >&2;} { (exit 1); exit 1; }; } fi --- a/icons/hicolor/Makefile.in +++ b/icons/hicolor/Makefile.in @@ -365,7 +365,7 @@ @BOOL_HICOLOR_THEME_TRUE@ gzip $< -c > $@ @BOOL_HICOLOR_THEME_TRUE@ for size in $(icon_sizes) ; do \ @BOOL_HICOLOR_THEME_TRUE@ if test "x$(RSVG)" != "x" ; then \ -@BOOL_HICOLOR_THEME_TRUE@ $(RSVG) -w $${size} -h $${size} -f png $< $*_$${size}.png ; \ +@BOOL_HICOLOR_THEME_TRUE@ $(RSVG) -w $${size} -h $${size} -f png $< -o $*_$${size}.png ; \ @BOOL_HICOLOR_THEME_TRUE@ else \ @BOOL_HICOLOR_THEME_TRUE@ $(CONVERT) $< -resize $${size}x$${size} $*_$${size}.png ; \ @BOOL_HICOLOR_THEME_TRUE@ fi \
