- This fixes conversion of 24 bpp windows icons (bz 440136) - Don't reuse GError structs, that upsets glib2 (bz 325211) - Use the system ltdl, not the included copy (bz 237475) - Fix various multilib conflicts (bz 341561) - Use xdg-open instead of htmlview (bz 388451) - Some small specfile cleanups (utf-8 stuff & others) fixing rpmlint warnings
49 lines
3.6 KiB
Diff
49 lines
3.6 KiB
Diff
diff -up ImageMagick-6.4.0/configure.ac.orig ImageMagick-6.4.0/configure.ac
|
|
--- ImageMagick-6.4.0/configure.ac.orig 2008-04-22 05:38:56.000000000 +0200
|
|
+++ ImageMagick-6.4.0/configure.ac 2008-04-27 16:33:28.000000000 +0200
|
|
@@ -2391,7 +2391,7 @@ AC_MSG_RESULT([-------------------------
|
|
AutotraceDecodeDelegateDefault='autotrace'
|
|
AVIDecodeDelegateDefault='mplayer'
|
|
BZIPDelegateDefault='bzip2'
|
|
-BrowseDelegateDefault='htmlview'
|
|
+BrowseDelegateDefault='xdg-open'
|
|
CGMDecodeDelegateDefault='ralcgm'
|
|
CatDelegateDefault='cat'
|
|
DNGDecodeDelegateDefault='ufraw-batch'
|
|
diff -up ImageMagick-6.4.0/magick/delegate.c.orig ImageMagick-6.4.0/magick/delegate.c
|
|
--- ImageMagick-6.4.0/magick/delegate.c.orig 2008-04-06 03:39:42.000000000 +0200
|
|
+++ ImageMagick-6.4.0/magick/delegate.c 2008-04-27 16:35:46.000000000 +0200
|
|
@@ -78,7 +78,7 @@ static const char
|
|
"<delegatemap>"
|
|
" <delegate decode=\"autotrace\" stealth=\"True\" command=\""autotrace" -output-format svg -output-file "%o" "%i"\"/>"
|
|
" <delegate decode=\"avi:decode\" stealth=\"True\" command=\""mplayer" "%i" -really-quiet -ao null -vo png:z=3\"/>"
|
|
- " <delegate decode=\"browse\" stealth=\"True\" spawn=\"True\" command=\""htmlview" http://www.imagemagick.org/\"/>"
|
|
+ " <delegate decode=\"browse\" stealth=\"True\" spawn=\"True\" command=\""xdg-open" http://www.imagemagick.org/\"/>"
|
|
" <delegate decode=\"cgm\" thread-support=\"False\" command=\""ralcgm" -d ps -oC < "%i" > "%o" >>/dev/null\"/>"
|
|
" <delegate decode=\"dng:decode\" command=\""/usr/bin/ufraw-batch" --silent --wb=camera --black-point=auto --exposure=auto --create-id=also --out-type=ppm16 "--output=%u.pnm" "%i"\"/>"
|
|
" <delegate decode=\"edit\" stealth=\"True\" command=\""xterm" -title "Edit Image Comment" -e vi "%o"\"/>"
|
|
diff -up ImageMagick-6.4.0/www/source/delegates.xml.orig ImageMagick-6.4.0/www/source/delegates.xml
|
|
--- ImageMagick-6.4.0/www/source/delegates.xml.orig 2008-04-04 18:43:27.000000000 +0200
|
|
+++ ImageMagick-6.4.0/www/source/delegates.xml 2008-04-27 16:35:06.000000000 +0200
|
|
@@ -57,7 +57,7 @@
|
|
-->
|
|
<delegatemap>
|
|
<delegate decode="autotrace" stealth="True" command=""autotrace" -output-format svg -output-file "%o" "%i""/>
|
|
- <delegate decode="browse" stealth="True" spawn="True" command=""htmlview" http://www.imagemagick.org/"/>
|
|
+ <delegate decode="browse" stealth="True" spawn="True" command=""xdg-open" http://www.imagemagick.org/"/>
|
|
<delegate decode="cgm" thread-support="False" command=""ralcgm" -d ps -oC < "%i" > "%o" 2> "%u""/>
|
|
<delegate decode="dng:decode" command=""ufraw-batch" --silent --wb=camera --black-point=auto --exposure=auto --create-id=also --out-type=ppm16 "--output=%u.pnm" "%i""/>
|
|
<delegate decode="edit" stealth="True" command=""xterm" -title "Edit Image Comment" -e vi "%o""/>
|
|
diff -up ImageMagick-6.4.0/configure.orig ImageMagick-6.4.0/configure
|
|
--- ImageMagick-6.4.0/configure.orig 2008-04-24 17:07:05.000000000 +0200
|
|
+++ ImageMagick-6.4.0/configure 2008-04-27 16:33:28.000000000 +0200
|
|
@@ -40762,7 +40762,7 @@ $as_echo "------------------------------
|
|
AutotraceDecodeDelegateDefault='autotrace'
|
|
AVIDecodeDelegateDefault='mplayer'
|
|
BZIPDelegateDefault='bzip2'
|
|
-BrowseDelegateDefault='htmlview'
|
|
+BrowseDelegateDefault='xdg-open'
|
|
CGMDecodeDelegateDefault='ralcgm'
|
|
CatDelegateDefault='cat'
|
|
DNGDecodeDelegateDefault='ufraw-batch'
|