← Back to branch summary

~ubuntu-branches/ubuntu/precise/imagemagick/precise

« back to all changes in this revision

Viewing changes to debian/patches/0006-rsvg-convert.patch

  • Committer: Package Import Robot
  • Author(s): Scott Howard
  • Date: 2012-02-17 12:39:05 UTC
  • Revision ID: package-import@ubuntu.com-20120217123905-1ar7zsoye03nt82o
Tags: 8:6.6.9.7-5ubuntu3
https://launchpad.net/bugs/929573
0006-rsvg-convert.patch: upstream removed the rsvg command from
librsvg2-bin, use rsvg-convert instead (LP: #929573)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0006-rsvg-convert.patch
 
1
Description: call rsvg-convert instead of rsvg
 
2
Author: Scott Howard <showard@debian.org>
 
3
Bug: bugs.debian.org/659259
 
4
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/imagemagick/+bug/929573
 
5
--- imagemagick-6.6.9.7.orig/configure.ac
 
6
+++ imagemagick-6.6.9.7/configure.ac
 
7
@@ -2861,7 +2861,7 @@ else
 
8
 fi
 
9
 RLEEncodeDelegateDefault='rawtorle'
 
10
 RMDelegateDefault='rm'
 
11
-RSVGDecodeDelegateDefault='rsvg'
 
12
+RSVGDecodeDelegateDefault='rsvg-convert'
 
13
 SCANDecodeDelegateDefault='scanimage'
 
14
 TXTDelegateDefault='enscript'
 
15
 UniconvertorDelegateDefault='uniconvertor'
 
16
--- imagemagick-6.6.9.7.orig/configure
 
17
+++ imagemagick-6.6.9.7/configure
 
18
@@ -30578,7 +30578,7 @@ else
 
19
 fi
 
20
 RLEEncodeDelegateDefault='rawtorle'
 
21
 RMDelegateDefault='rm'
 
22
-RSVGDecodeDelegateDefault='rsvg'
 
23
+RSVGDecodeDelegateDefault='rsvg-convert'
 
24
 SCANDecodeDelegateDefault='scanimage'
 
25
 TXTDelegateDefault='enscript'
 
26
 UniconvertorDelegateDefault='uniconvertor'
 
27
--- imagemagick-6.6.9.7.orig/config/delegates.xml
 
28
+++ imagemagick-6.6.9.7/config/delegates.xml
 
29
@@ -102,7 +102,7 @@
 
30
   <delegate decode="scanx" command="&quot;scanimage&quot; &gt; &quot;%o&quot;"/>
 
31
   <delegate decode="png" encode="show" spawn="True" command="&quot;/usr/local/bin/display&quot; -delay 0 -window-group %[group] -title &quot;%l &quot; &quot;ephemeral:%i&quot;"/>
 
32
   <delegate decode="shtml" command="&quot;html2ps&quot; -U -o &quot;%o&quot; &quot;%i&quot;"/>
 
33
-  <delegate decode="svg" command="&quot;rsvg&quot; &quot;%i&quot; &quot;%o&quot;"/>
 
34
+  <delegate decode="svg" command="&quot;rsvg-convert&quot; -o &quot;%o&quot; &quot;%i&quot;"/>
 
35
   <delegate decode="txt" encode="ps" mode="bi" command="&quot;enscript&quot; -o &quot;%o&quot; &quot;%i&quot;"/>
 
36
   <delegate decode="png" encode="win" stealth="True" spawn="True" command="&quot;/usr/local/bin/display&quot; -immutable -delay 0 -window-group %[group] -title &quot;%l &quot; &quot;ephemeral:%i&quot;"/>
 
37
   <delegate decode="wmf" command="&quot;wmf2eps&quot; -o &quot;%o&quot; &quot;%i&quot;"/>
 
38
--- imagemagick-6.6.9.7.orig/config/delegates.xml.in
 
39
+++ imagemagick-6.6.9.7/config/delegates.xml.in
 
40
@@ -102,7 +102,7 @@
 
41
   <delegate decode="scanx" command="&quot;@SCANDecodeDelegate@&quot; &gt; &quot;%o&quot;"/>
 
42
   <delegate decode="miff" encode="show" spawn="True" command="&quot;@DisplayDelegate@&quot; -delay 0 -window-group %[group] -title &quot;%l &quot; &quot;ephemeral:%i&quot;"/>
 
43
   <delegate decode="shtml" command="&quot;@HTMLDecodeDelegate@&quot; -U -o &quot;%o&quot; &quot;%i&quot;"/>
 
44
-  <delegate decode="svg" command="&quot;@RSVGDecodeDelegate@&quot; &quot;%i&quot; &quot;%o&quot;"/>
 
45
+  <delegate decode="svg" command="&quot;@RSVGDecodeDelegate@&quot; -o &quot;%o&quot; &quot;%i&quot;"/>
 
46
   <delegate decode="txt" encode="ps" mode="bi" command="&quot;@TXTDelegate@&quot; -o &quot;%o&quot; &quot;%i&quot;"/>
 
47
   <delegate decode="miff" encode="win" stealth="True" spawn="True" command="&quot;@DisplayDelegate@&quot; -immutable -delay 0 -window-group %[group] -title &quot;%l &quot; &quot;ephemeral:%i&quot;"/>
 
48
   <delegate decode="wmf" command="&quot;@WMFDecodeDelegate@&quot; -o &quot;%o&quot; &quot;%i&quot;"/>