http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=16320) - Replace %%define by %%globalepel8
Pavel Alexeev
15 years ago
parent
6d673360b3
commit
28437e5a48
@ -1,48 +0,0 @@
|
||||
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'
|
||||
@ -1,12 +0,0 @@
|
||||
diff -up ImageMagick-6.4.9-6/PerlMagick/Makefile.PL.in~ ImageMagick-6.4.9-6/PerlMagick/Makefile.PL.in
|
||||
--- ImageMagick-6.4.9-6/PerlMagick/Makefile.PL.in~ 2009-01-03 16:55:31.000000000 +0100
|
||||
+++ ImageMagick-6.4.9-6/PerlMagick/Makefile.PL.in 2009-03-13 11:22:46.000000000 +0100
|
||||
@@ -77,7 +77,7 @@ WriteMakefile
|
||||
'INSTALLBIN' => '@BIN_DIR@',
|
||||
|
||||
# Library specification
|
||||
- 'LIBS' => [ '-L@MAGICKCORE_PATH@ -L../magick/.libs -lMagickCore -L../wand/.libs -lMagickWand -lperl @MATH_LIBS@' ],
|
||||
+ 'LIBS' => [ '-L../magick/.libs -lMagickCore -L../wand/.libs -lMagickWand -lperl @MATH_LIBS@' ],
|
||||
|
||||
# Perl binary name (if a Perl binary is built)
|
||||
'MAP_TARGET' => 'PerlMagick',
|
||||
@ -1,12 +0,0 @@
|
||||
diff -up ImageMagick-6.4.9-6/magick/magick-type.h~ ImageMagick-6.4.9-6/magick/magick-type.h
|
||||
--- ImageMagick-6.4.9-6/magick/magick-type.h~ 2009-01-15 03:13:58.000000000 +0100
|
||||
+++ ImageMagick-6.4.9-6/magick/magick-type.h 2009-03-13 10:30:59.000000000 +0100
|
||||
@@ -127,7 +127,7 @@ typedef unsigned __int64 MagickSizeType;
|
||||
#define MagickSizeFormat "%10llu"
|
||||
#endif
|
||||
|
||||
-#if _MSC_VER == 1200
|
||||
+#if defined(_MSC_VER) && (_MSC_VER == 1200)
|
||||
typedef MagickOffsetType QuantumAny;
|
||||
#else
|
||||
typedef MagickSizeType QuantumAny;
|
||||
Loading…
Reference in new issue