From 8ba8b562e4a3598496ba84896d0d611041767a77 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Apr 27 2008 19:40:45 +0000 Subject: - New upstream release 6.4.0.10 - 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 --- diff --git a/.cvsignore b/.cvsignore index da469d0..10e965f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ImageMagick-6.3.8-1.tar.bz2 +ImageMagick-6.4.0-10.tar.bz2 diff --git a/ImageMagick-5.3.6-nonroot.patch b/ImageMagick-5.3.6-nonroot.patch deleted file mode 100644 index fa98ca2..0000000 --- a/ImageMagick-5.3.6-nonroot.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ImageMagick-5.3.6/Makefile.am.nonroot Thu Jun 14 17:54:36 2001 -+++ ImageMagick-5.3.6/Makefile.am Mon Jul 9 14:34:35 2001 -@@ -74,7 +74,7 @@ - # - - # Install HTML files --pkgdocdir = @MagickSharePath@ -+pkgdocdir = $(DESTDIR)/@MagickSharePath@ - DOCDIRS = images www www/api www/api/types www/Magick++ - install-data-html: - $(mkinstalldirs) $(pkgdocdir) diff --git a/ImageMagick-5.3.7-config.patch b/ImageMagick-5.3.7-config.patch deleted file mode 100644 index 8347787..0000000 --- a/ImageMagick-5.3.7-config.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- ImageMagick-5.3.7/Magick++/lib/Magick++/Makefile.am.orig Sun Aug 12 20:44:08 2001 -+++ ImageMagick-5.3.7/Magick++/lib/Magick++/Makefile.am Sun Aug 12 20:44:21 2001 -@@ -5,7 +5,7 @@ - # - AUTOMAKE_OPTIONS = 1.4 - --includedir = ${prefix}/include -+includedir = ${prefix}/include/X11/magick - pkgdatadir = $(datadir)/Magick++ - pkglibdir = $(libdir)/Magick++ - pkgincludedir = $(includedir)/Magick++ ---- ImageMagick-5.3.7/Magick++/lib/Makefile.am.orig Sun Aug 12 20:40:56 2001 -+++ ImageMagick-5.3.7/Magick++/lib/Makefile.am Sun Aug 12 20:42:22 2001 -@@ -9,7 +9,7 @@ - - INCLUDES = -I../.. -I$(top_srcdir) - --includedir = ${prefix}/include -+includedir = ${prefix}/include/X11/magick - pkgdatadir = $(datadir)/Magick++ - pkglibdir = $(libdir)/Magick++ - pkgincludedir = $(includedir)/Magick++ diff --git a/ImageMagick-5.4.7-localdoc.patch b/ImageMagick-5.4.7-localdoc.patch deleted file mode 100644 index d95378e..0000000 --- a/ImageMagick-5.4.7-localdoc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ImageMagick-5.4.7/configure.ac.ImageMagick 2002-06-30 15:18:18.000000000 -0400 -+++ ImageMagick-5.4.7/configure.ac 2002-07-01 08:20:59.000000000 -0400 -@@ -1587,7 +1587,7 @@ - # Default delegate definitions - AutotraceDecodeDelegateDefault='autotrace' - BZIPDelegateDefault='bzip2' --BrowseDelegateDefault='mozilla' -+BrowseDelegateDefault='htmlview' - CGMDecodeDelegateDefault='ralcgm' - CatDelegateDefault='cat' - ConvertDelegateDefault='convert' diff --git a/ImageMagick-5.5.6-mask.patch b/ImageMagick-5.5.6-mask.patch deleted file mode 100644 index 633c7cf..0000000 --- a/ImageMagick-5.5.6-mask.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- ImageMagick-5.5.6/coders/xwd.c.mask 2003-01-04 22:55:30.000000000 -0500 -+++ ImageMagick-5.5.6/coders/xwd.c 2005-05-26 08:22:43.627646000 -0400 -@@ -343,21 +343,21 @@ - */ - red_mask=ximage->red_mask; - red_shift=0; -- while ((red_mask & 0x01) == 0) -+ while ((red_mask != 0) && ((red_mask & 0x01) == 0)) - { - red_mask>>=1; - red_shift++; - } - green_mask=ximage->green_mask; - green_shift=0; -- while ((green_mask & 0x01) == 0) -+ while ((green_mask != 0) && ((green_mask & 0x01) == 0)) - { - green_mask>>=1; - green_shift++; - } - blue_mask=ximage->blue_mask; - blue_shift=0; -- while ((blue_mask & 0x01) == 0) -+ while ((blue_mask != 0) && ((blue_mask & 0x01) == 0)) - { - blue_mask>>=1; - blue_shift++; diff --git a/ImageMagick-5.5.7-automake.patch b/ImageMagick-5.5.7-automake.patch deleted file mode 100644 index c093169..0000000 --- a/ImageMagick-5.5.7-automake.patch +++ /dev/null @@ -1,142 +0,0 @@ ---- ImageMagick-5.5.7/Magick++/bin/Makefile.am.amake 2003-03-25 16:09:40.000000000 +0100 -+++ ImageMagick-5.5.7/Magick++/bin/Makefile.am 2003-09-10 15:44:00.000000000 +0200 -@@ -3,7 +3,7 @@ - # - # Copyright Bob Friesenhahn, 1999, 2000, 2002 - # --AUTOMAKE_OPTIONS = 1.7 -+AUTOMAKE_OPTIONS = 1.6 - - INCLUDES = -I../.. -I$(top_srcdir) - ---- ImageMagick-5.5.7/Magick++/lib/Magick++/Makefile.am.amake 2003-05-11 06:07:47.000000000 +0200 -+++ ImageMagick-5.5.7/Magick++/lib/Magick++/Makefile.am 2003-09-10 15:44:00.000000000 +0200 -@@ -3,7 +3,7 @@ - # - # Copyright Bob Friesenhahn, 1999, 2000, 2001, 2002 - # --AUTOMAKE_OPTIONS = 1.7 -+AUTOMAKE_OPTIONS = 1.6 - - includedir = ${prefix}/include - pkgdatadir = $(datadir)/Magick++ ---- ImageMagick-5.5.7/Magick++/lib/Makefile.am.amake 2003-05-31 16:53:42.000000000 +0200 -+++ ImageMagick-5.5.7/Magick++/lib/Makefile.am 2003-09-10 15:44:00.000000000 +0200 -@@ -3,7 +3,7 @@ - # - # Copyright Bob Friesenhahn, 1999, 2000, 2001, 2002, 2003 - # --AUTOMAKE_OPTIONS = 1.7 nostdinc -+AUTOMAKE_OPTIONS = 1.6 nostdinc - - SUBDIRS = Magick++ - ---- ImageMagick-5.5.7/Magick++/tests/Makefile.am.amake 2003-05-06 17:15:08.000000000 +0200 -+++ ImageMagick-5.5.7/Magick++/tests/Makefile.am 2003-09-10 15:44:00.000000000 +0200 -@@ -3,7 +3,7 @@ - # - # Copyright Bob Friesenhahn, 1999, 2000, 2002 - # --AUTOMAKE_OPTIONS = 1.7 foreign -+AUTOMAKE_OPTIONS = 1.6 foreign - - INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/magick -I$(top_builddir)/magick - ---- ImageMagick-5.5.7/Magick++/demo/Makefile.am.amake 2003-05-06 17:08:22.000000000 +0200 -+++ ImageMagick-5.5.7/Magick++/demo/Makefile.am 2003-09-10 15:44:00.000000000 +0200 -@@ -3,7 +3,7 @@ - # - # Copyright Bob Friesenhahn, 1999, 2000, 2001, 2002 - # --AUTOMAKE_OPTIONS = 1.7 foreign -+AUTOMAKE_OPTIONS = 1.6 foreign - - INCLUDES = -I$(srcdir)/../lib -I../.. -I$(top_srcdir) - ---- ImageMagick-5.5.7/Magick++/Makefile.am.amake 2003-03-25 16:09:40.000000000 +0100 -+++ ImageMagick-5.5.7/Magick++/Makefile.am 2003-09-10 15:44:00.000000000 +0200 -@@ -3,7 +3,7 @@ - # - # Copyright Bob Friesenhahn, 1999, 2000, 2002 - # --AUTOMAKE_OPTIONS = 1.7 foreign -+AUTOMAKE_OPTIONS = 1.6 foreign - - # Additional files to distribute - EXTRA_DIST = ---- ImageMagick-5.5.7/coders/Makefile.am.amake 2003-05-12 22:00:59.000000000 +0200 -+++ ImageMagick-5.5.7/coders/Makefile.am 2003-09-10 15:44:00.000000000 +0200 -@@ -32,7 +32,7 @@ - # - - # Don't require all the GNU mandated files --AUTOMAKE_OPTIONS = 1.7 foreign -+AUTOMAKE_OPTIONS = 1.6 foreign - - INCLUDES = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/magick - ---- ImageMagick-5.5.7/magick/Makefile.am.amake 2003-05-31 16:52:41.000000000 +0200 -+++ ImageMagick-5.5.7/magick/Makefile.am 2003-09-10 15:44:00.000000000 +0200 -@@ -29,7 +29,7 @@ - # - - # Don't require all the GNU mandated files --AUTOMAKE_OPTIONS = 1.7 foreign -+AUTOMAKE_OPTIONS = 1.6 foreign - - includedir = ${prefix}/include - pkgincludedir = $(includedir)/magick ---- ImageMagick-5.5.7/filters/Makefile.am.amake 2003-09-10 15:44:40.000000000 +0200 -+++ ImageMagick-5.5.7/filters/Makefile.am 2003-09-10 15:44:59.000000000 +0200 -@@ -29,7 +29,7 @@ - # - - # Don't require all the GNU mandated files --AUTOMAKE_OPTIONS = 1.7 foreign -+AUTOMAKE_OPTIONS = 1.6 foreign - - INCLUDES = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/magick - ---- ImageMagick-5.5.7/locale/Makefile.am.amake 2003-09-10 15:44:40.000000000 +0200 -+++ ImageMagick-5.5.7/locale/Makefile.am 2003-09-10 15:45:03.000000000 +0200 -@@ -29,7 +29,7 @@ - # - - # Don't require all the GNU mandated files --AUTOMAKE_OPTIONS = 1.7 foreign -+AUTOMAKE_OPTIONS = 1.6 foreign - - # Where locale modules are installed - pkgdir = @MagickLibPath@ ---- ImageMagick-5.5.7/utilities/Makefile.am.amake 2003-03-25 16:10:38.000000000 +0100 -+++ ImageMagick-5.5.7/utilities/Makefile.am 2003-09-10 15:44:00.000000000 +0200 -@@ -29,7 +29,7 @@ - # - - # Don't require all the GNU mandated files --AUTOMAKE_OPTIONS = 1.7 foreign -+AUTOMAKE_OPTIONS = 1.6 foreign - - MAGICK_LIB = ../magick/libMagick.la # libtool library name - INCLUDES = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/magick ---- ImageMagick-5.5.7/tests/Makefile.am.amake 2003-09-10 15:44:40.000000000 +0200 -+++ ImageMagick-5.5.7/tests/Makefile.am 2003-09-10 15:45:07.000000000 +0200 -@@ -1,6 +1,6 @@ - # Makefile written by Bob Friesenhahn - --AUTOMAKE_OPTIONS = 1.7 foreign -+AUTOMAKE_OPTIONS = 1.6 foreign - - INCLUDES = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/magick - #INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/magick ---- ImageMagick-5.5.7/Makefile.am.amake 2003-05-15 17:24:39.000000000 +0200 -+++ ImageMagick-5.5.7/Makefile.am 2003-09-10 15:44:00.000000000 +0200 -@@ -2,7 +2,7 @@ - # - - # Don't require all the GNU mandated files --AUTOMAKE_OPTIONS = 1.7.2 dist-zip dist-bzip2 foreign -+AUTOMAKE_OPTIONS = 1.6 dist-zip dist-bzip2 foreign - - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_VERSION = @PACKAGE_VERSION@ diff --git a/ImageMagick-5.5.7-stdin.patch b/ImageMagick-5.5.7-stdin.patch deleted file mode 100644 index 3beb113..0000000 --- a/ImageMagick-5.5.7-stdin.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- ImageMagick-5.5.7/magick/command.c.stdin 2003-09-10 08:59:31.000000000 +0200 -+++ ImageMagick-5.5.7/magick/command.c 2003-09-10 09:01:42.000000000 +0200 -@@ -4410,7 +4410,8 @@ - *client_name, - *option, - *resource_value, -- *server_name; -+ *server_name, -+ c_tmp; - - Display - *display; -@@ -4549,7 +4550,16 @@ - break; - else - if (!isatty(STDIN_FILENO)) -- option=(char *) "-"; -+ { -+ c_tmp = getc(stdin); -+ if(c_tmp != EOF) -+ { -+ ungetc(c_tmp, stdin); -+ option=(char *) "-"; -+ } else -+ option=(char *) "logo:Untitled"; -+ /* option=(char *) "-"; */ -+ } - else - option=(char *) "logo:Untitled"; - if ((strlen(option) == 1) || ((*option != '-') && (*option != '+'))) diff --git a/ImageMagick-6.0.6-hp2xx.patch b/ImageMagick-6.0.6-hp2xx.patch deleted file mode 100644 index 1d62c10..0000000 --- a/ImageMagick-6.0.6-hp2xx.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- ImageMagick-6.0.6/config/delegates.mgk.in.hp2xx 2004-09-01 23:23:12.924364520 +0200 -+++ ImageMagick-6.0.6/config/delegates.mgk.in 2004-09-01 23:28:45.415818136 +0200 -@@ -70,8 +70,16 @@ - - -- -+ - - - diff --git a/ImageMagick-6.0.7-vsnprintf.patch b/ImageMagick-6.0.7-vsnprintf.patch deleted file mode 100644 index 628da20..0000000 --- a/ImageMagick-6.0.7-vsnprintf.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- ImageMagick-6.0.7/magick/studio.h.vsnprintf 2005-03-03 23:05:58.000000000 -0500 -+++ ImageMagick-6.0.7/magick/studio.h 2005-03-03 23:06:36.000000000 -0500 -@@ -161,11 +161,6 @@ - strlcpy(char *,const char *,size_t); - #endif - --#if defined(HAVE_VSNPRINTF) && !defined(HAVE_VSNPRINTF_PROTOTYPE) --extern int -- vsnprintf(char *,size_t,const char *,va_list); --#endif -- - #if defined(__WINDOWS__) || defined(POSIX) - # include - # include diff --git a/ImageMagick-6.2.0-compress.patch b/ImageMagick-6.2.0-compress.patch deleted file mode 100644 index 3b896ed..0000000 --- a/ImageMagick-6.2.0-compress.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- ImageMagick-6.2.0/coders/tiff.c.compress 2005-04-21 15:38:37.378516000 -0400 -+++ ImageMagick-6.2.0/coders/tiff.c 2005-04-21 15:38:58.804069000 -0400 -@@ -1495,7 +1495,6 @@ - compress_tag=COMPRESSION_NONE; - switch (image->compression) - { --#if defined(CCITT_SUPPORT) - case FaxCompression: - { - if (IsMonochromeImage(image,&image->exception) != MagickFalse) -@@ -1508,35 +1507,28 @@ - compress_tag=COMPRESSION_CCITTFAX4; - break; - } --#endif --#if defined(YCBCR_SUPPORT) - case JPEGCompression: - { - compress_tag=COMPRESSION_JPEG; - (void) SetImageDepth(image,8); - break; - } --#endif --#if defined(LZW_SUPPORT) - case LZWCompression: - { - if (image_info->compression == LZWCompression) - compress_tag=COMPRESSION_LZW; /* LZW compression must be explicit */ - break; - } --#endif - case RLECompression: - { - compress_tag=COMPRESSION_PACKBITS; - break; - } --#if defined(ZIP_SUPPORT) - case ZipCompression: - { - compress_tag=COMPRESSION_ADOBE_DEFLATE; - break; - } --#endif - default: - { - compress_tag=COMPRESSION_NONE; diff --git a/ImageMagick-6.2.0-hp2xx.patch b/ImageMagick-6.2.0-hp2xx.patch deleted file mode 100644 index 4b667ce..0000000 --- a/ImageMagick-6.2.0-hp2xx.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- ImageMagick-6.2.0/config/delegates.xml.in.hp2xx 2005-03-16 09:31:42.843768000 -0500 -+++ ImageMagick-6.2.0/config/delegates.xml.in 2005-03-16 09:33:16.544971000 -0500 -@@ -70,8 +70,16 @@ - - -- -+ - - - diff --git a/ImageMagick-6.2.0-lprhack.patch b/ImageMagick-6.2.0-lprhack.patch deleted file mode 100644 index 2a6dda8..0000000 --- a/ImageMagick-6.2.0-lprhack.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ImageMagick-6.2.0/config/delegates.xml.in.lprhack 2005-03-16 09:27:05.564324000 -0500 -+++ ImageMagick-6.2.0/config/delegates.xml.in 2005-03-16 09:28:31.015788000 -0500 -@@ -89,7 +89,7 @@ - "@ConvertDelegate@" -concatenate "%o*.png" "%o"' /> - - -- -+ - - - &5 --echo "$as_me: WARNING: ps/iapi.h: proceeding with the compiler's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: ghostscript/iapi.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: ghostscript/iapi.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: ghostscript/iapi.h: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: ghostscript/iapi.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: ps/iapi.h: present but cannot be compiled" >&5 --echo "$as_me: WARNING: ps/iapi.h: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: ps/iapi.h: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: ps/iapi.h: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: ps/iapi.h: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: ps/iapi.h: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: ps/iapi.h: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: ps/iapi.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: ps/iapi.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: ps/iapi.h: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: ps/iapi.h: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: ps/iapi.h: in the future, the compiler will take precedence" >&2;} -+ { echo "$as_me:$LINENO: WARNING: ghostscript/iapi.h: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: ghostscript/iapi.h: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: ghostscript/iapi.h: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: ghostscript/iapi.h: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: ghostscript/iapi.h: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: ghostscript/iapi.h: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: ghostscript/iapi.h: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: ghostscript/iapi.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: ghostsript/iapi.h: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: ghostscript/iapi.h: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: ghostscript/iapi.h: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: ghostscript/iapi.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX - ## ------------------------------------------ ## -@@ -36638,8 +36638,8 @@ - sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --echo "$as_me:$LINENO: checking for ps/iapi.h" >&5 --echo $ECHO_N "checking for ps/iapi.h... $ECHO_C" >&6 -+echo "$as_me:$LINENO: checking for ghostscript/iapi.h" >&5 -+echo $ECHO_N "checking for ghostscript/iapi.h... $ECHO_C" >&6 - if test "${ac_cv_header_ps_iapi_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else diff --git a/ImageMagick-6.2.1-hp2xx.patch b/ImageMagick-6.2.1-hp2xx.patch deleted file mode 100644 index 6a09c38..0000000 --- a/ImageMagick-6.2.1-hp2xx.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- ImageMagick-6.2.1/config/delegates.xml.in.hp2xx 2005-04-24 23:34:14.481721000 -0400 -+++ ImageMagick-6.2.1/config/delegates.xml.in 2005-04-24 23:34:40.886290000 -0400 -@@ -74,10 +74,7 @@ - @HPGLDecodeDelegate@ -q -m eps -f `basename "%o"` "%i" - mv -f `basename "%o"` "%o - else -- echo "You need to install hp2xx (which is not part of Red Hat Linux) to use" -- echo "HPGL files with ImageMagick." -- echo "Current hp2xx RPM packages for Red Hat Linux can be found at" -- echo "http://rhcontrib.bero.org/search.php in the Applications/Multimedia section." -+ echo "You need to install hp2xx to use HPGL files with ImageMagick." - exit 1 - fi' /> - diff --git a/ImageMagick-6.2.1-local_doc.patch b/ImageMagick-6.2.1-local_doc.patch deleted file mode 100644 index c1535cc..0000000 --- a/ImageMagick-6.2.1-local_doc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ImageMagick-6.1.8/magick/version.h.in.local_doc 2004-12-17 18:28:02.000000000 -0600 -+++ ImageMagick-6.1.8/magick/version.h.in 2005-01-18 10:42:27.712406016 -0600 -@@ -28,7 +28,7 @@ - #define MagickReleaseDate "@PACKAGE_RELEASE_DATE@" - #define MagickVersion MagickPackageName " " MagickLibVersionText " " \ - MagickReleaseDate " " MagickQuantumDepth " " MagickHomeURL --#define MagickHomeURL "http://www.imagemagick.org" -+#define MagickHomeURL "file:/usr/share/ImageMagick-@PACKAGE_VERSION@/doc/index.html" - - extern MagickExport char - *GetMagickHomeURL(void); diff --git a/ImageMagick-6.2.1-pkgconfig.patch b/ImageMagick-6.2.1-pkgconfig.patch deleted file mode 100644 index da80253..0000000 --- a/ImageMagick-6.2.1-pkgconfig.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ImageMagick-6.1.8/Magick++/lib/ImageMagick++.pc.in.purge 2003-11-01 14:02:49.000000000 -0600 -+++ ImageMagick-6.1.8/Magick++/lib/ImageMagick++.pc.in 2005-01-18 12:55:01.000000000 -0600 -@@ -8,5 +8,5 @@ - Version: @PACKAGE_VERSION@ - Description: Magick++ - Convert, Edit, and Compose Images - Requires: ImageMagick --Libs: -L${libdir} @MAGICK_LDFLAGS@ @MAGICK_LIBS@ -lMagick++ --Cflags: -I${includedir} @MAGICK_CPPFLAGS@ -+Libs: -L${libdir} -lMagick++ -+Cflags: -I${includedir} diff --git a/ImageMagick-6.2.5-format-string-again.patch b/ImageMagick-6.2.5-format-string-again.patch deleted file mode 100644 index ce3c769..0000000 --- a/ImageMagick-6.2.5-format-string-again.patch +++ /dev/null @@ -1,181 +0,0 @@ ---- ImageMagick-6.2.5/magick/image.c.format-string-again 2005-10-22 12:17:39.000000000 -0400 -+++ ImageMagick-6.2.5/magick/image.c 2006-01-23 09:15:40.000000000 -0500 -@@ -2847,25 +2847,8 @@ - /* - Rectify multi-image file support. - */ -- (void) CopyMagickString(filename,image_info->filename,MaxTextExtent); -- for (p=strchr(filename,'%'); p != (char *) NULL; p=strchr(p+1,'%')) -- { -- char -- *q; -- -- q=(char *) p+1; -- if (*q == '0') -- (void) strtol(q,&q,10); -- if ((*q == '%') || (*q == 'd') || (*q == 'o') || (*q == 'x')) -- { -- char -- format[MaxTextExtent]; -- -- (void) CopyMagickString(format,p,MaxTextExtent); -- (void) FormatMagickString(p,MaxTextExtent,format,image_info->scene); -- break; -- } -- } -+ (void) FormatMagickStringNumeric(filename,MaxTextExtent, -+ image_info->filename,image_info->scene); - if ((LocaleCompare(filename,image_info->filename) != 0) && - (strchr(filename,'%') == (char *) NULL)) - image_info->adjoin=MagickFalse; ---- ImageMagick-6.2.5/magick/blob.c.format-string-again 2005-09-28 15:00:17.000000000 -0400 -+++ ImageMagick-6.2.5/magick/blob.c 2006-01-23 09:15:40.000000000 -0500 -@@ -2121,25 +2121,8 @@ - /* - Form filename for multi-part images. - */ -- (void) CopyMagickString(filename,image->filename,MaxTextExtent); -- for (p=strchr(filename,'%'); p != (char *) NULL; p=strchr(p+1,'%')) -- { -- char -- *q; -- -- q=p+1; -- if (*q == '0') -- (void) strtol(q,&q,10); -- if ((*q == '%') || (*q == 'd') || (*q == 'o') || (*q == 'x')) -- { -- char -- format[MaxTextExtent]; -- -- (void) CopyMagickString(format,p,MaxTextExtent); -- (void) FormatMagickString(p,MaxTextExtent,format,image->scene); -- break; -- } -- } -+ (void) FormatMagickStringNumeric(filename,MaxTextExtent,image->filename, -+ image->scene); - if (image_info->adjoin == MagickFalse) - if ((image->previous != (Image *) NULL) || - (GetNextImageInList(image) != (Image *) NULL)) ---- ImageMagick-6.2.5/magick/montage.c.format-string-again 2005-10-22 12:17:39.000000000 -0400 -+++ ImageMagick-6.2.5/magick/montage.c 2006-01-23 09:15:40.000000000 -0500 -@@ -531,7 +531,7 @@ - /* - Form filename for multi-part images. - */ -- (void) FormatMagickString(filename,MaxTextExtent, -+ (void) FormatMagickStringNumeric(filename,MaxTextExtent, - image_info->filename,scene); - if (LocaleCompare(filename,image_info->filename) == 0) - (void) FormatMagickString(filename,MaxTextExtent,"%s.%lu", ---- ImageMagick-6.2.5/magick/animate.c.format-string-again 2005-10-23 22:15:16.000000000 -0400 -+++ ImageMagick-6.2.5/magick/animate.c 2006-01-23 09:15:40.000000000 -0500 -@@ -606,7 +606,7 @@ - /* - Form filename for multi-part images. - */ -- (void) FormatMagickString(filename,MaxTextExtent, -+ (void) FormatMagickStringNumeric(filename,MaxTextExtent, - image_info->filename,scene); - if (LocaleCompare(filename,image_info->filename) == 0) - (void) FormatMagickString(filename,MaxTextExtent,"%s[%lu]", ---- ImageMagick-6.2.5/magick/string_.h.format-string-again 2005-10-12 21:59:20.000000000 -0400 -+++ ImageMagick-6.2.5/magick/string_.h 2006-01-23 09:20:47.000000000 -0500 -@@ -62,6 +62,7 @@ - FormatMagickStringList(char *,const size_t,const char *,va_list) - magick_attribute((format (printf,3,0))), - FormatMagickTime(const time_t,const size_t,char *), -+ FormatMagickStringNumeric(char *,const size_t,const char *,int), - LocaleCompare(const char *,const char *), - LocaleNCompare(const char *,const char *,const size_t); - ---- ImageMagick-6.2.5/magick/string.c.format-string-again 2005-10-13 21:03:09.000000000 -0400 -+++ ImageMagick-6.2.5/magick/string.c 2006-01-23 09:15:40.000000000 -0500 -@@ -960,6 +960,75 @@ - % % - % % - % % -+% F o r m a t M a g i c k S t r i n g N u m e r i c % -+% % -+% % -+% % -+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -+% -+% Method FormatMagickStringNumeric formats output for a single numeric -+% argument. It takes into account that the format string given might be -+% untrusted user input, and returns the length of the formatted string. -+% -+% The format of the FormatMagickStringNumeric method is: -+% -+% long FormatMagickStringNumeric(char *string,const size_t length, -+% const char *format,int value) -+% -+% A description of each parameter follows. -+% -+% o string: FormatMagickStringNumeric() returns the formatted string in this -+% character buffer. -+% -+% o length: The maximum length of the string. -+% -+% o format: A string describing the format to use to write the numeric -+% argument. Only the first numeric format identifier is replaced. -+% -+% o value: Numeric value to substitute into format string. -+% -+% -+*/ -+MagickExport long FormatMagickStringNumeric(char *string,const size_t length,const char *format,int value) -+{ -+ char -+ *p; -+ -+ (void) CopyMagickString(string, format, length); -+ -+ for (p=strchr(format,'%'); p != (char *) NULL; p=strchr(p+1,'%')) -+ { -+ char -+ *q; -+ -+ q=(char *) p+1; -+ if (*q == '0') -+ (void) strtol(q,&q,10); -+ if ((*q == '%') || (*q == 'd') || (*q == 'o') || (*q == 'x')) -+ { -+ char -+ c; -+ -+ q++; -+ c=*q; -+ *q='\0'; -+ (void) snprintf(string+(p-format),length-(p-format),p,value); -+ *q=c; -+ (void) ConcatenateMagickString(string,q,length); -+ if (*(q-1) == '%') -+ p++; -+ else -+ break; -+ } -+ } -+ return (long)strlen(string); -+} -+ -+/* -+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -+% % -+% % -+% % - % F o r m a t M a g i c k S t r i n g % - % % - % % ---- ImageMagick-6.2.5/magick/display.c.format-string-again 2005-10-24 20:23:14.000000000 -0400 -+++ ImageMagick-6.2.5/magick/display.c 2006-01-23 09:15:40.000000000 -0500 -@@ -1989,7 +1989,7 @@ - /* - Form filename for multi-part images. - */ -- (void) FormatMagickString(filename,MaxTextExtent, -+ (void) FormatMagickStringNumeric(filename,MaxTextExtent, - image_info->filename,scene); - if (LocaleCompare(filename,image_info->filename) == 0) - (void) FormatMagickString(filename,MaxTextExtent,"%s.%lu", diff --git a/ImageMagick-6.2.5-multilib.patch b/ImageMagick-6.2.5-multilib.patch deleted file mode 100644 index f283b67..0000000 --- a/ImageMagick-6.2.5-multilib.patch +++ /dev/null @@ -1,76 +0,0 @@ ---- ImageMagick-6.2.5/magick/Magick-config.in.multilib 2006-06-02 11:13:32.000000000 -0400 -+++ ImageMagick-6.2.5/magick/Magick-config.in 2006-06-02 11:13:37.000000000 -0400 -@@ -16,28 +16,28 @@ - exit 1 - fi - --while test $# -gt 0; do -+while btest $# -gt 0; do - case $1 in - --prefix) -- echo @PREFIX_DIR@ -+ pkg-config --variable prefix ImageMagick - ;; - --exec-prefix) -- echo @EXEC_PREFIX_DIR@ -+ pkg-config --variable exec_prefix ImageMagick - ;; - --version) -- echo @PACKAGE_VERSION@ -+ pkg-config --modversion ImageMagick - ;; - --cflags) -- echo '@MAGICK_CFLAGS@' -+ pkg-config --cflags ImageMagick - ;; - --cppflags) -- echo '@MAGICK_CPPFLAGS@' -+ pkg-config --cflags ImageMagick - ;; - --ldflags) -- echo '@MAGICK_LDFLAGS@' -+ pkg-config --libs ImageMagick - ;; - --libs) -- echo '@MAGICK_LIBS@' -+ pkg-config --libs ImageMagick - ;; - *) - echo "${usage}" 1>&2 ---- ImageMagick-6.2.5/wand/Wand-config.in.multilib 2006-06-02 11:13:49.000000000 -0400 -+++ ImageMagick-6.2.5/wand/Wand-config.in 2006-06-02 11:13:52.000000000 -0400 -@@ -21,26 +21,25 @@ - while test $# -gt 0; do - case $1 in - --prefix) -- echo @PREFIX_DIR@ -+ pkg-config --variable prefix Wand - ;; - --exec-prefix) -- echo @EXEC_PREFIX_DIR@ -+ pkg-config --variable exec_prefix Wand - ;; - --version) -- echo @PACKAGE_VERSION@ -+ pkg-config --modversion Wand - ;; - --cflags) -- echo "`Magick-config --cflags`" -+ pkg-config --cflags Wand - ;; - --cppflags) -- echo "`Magick-config --cppflags`" -+ pkg-config --cflags Wand - ;; - --ldflags) -- echo "`Magick-config --ldflags`" -- ;; -+ pkg-config --libs Wand -+ ;; - --libs) -- LIBS="-lWand `Magick-config --libs`" -- echo "$LIBS" -+ pkg-config --lbs Wand - ;; - *) - echo "${usage}" 1>&2 diff --git a/ImageMagick-6.2.5-yet-another-overflow.patch b/ImageMagick-6.2.5-yet-another-overflow.patch deleted file mode 100644 index ff437ec..0000000 --- a/ImageMagick-6.2.5-yet-another-overflow.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- ImageMagick-6.2.5/magick/display.c.yet-another-overflow 2006-05-24 11:03:37.000000000 -0400 -+++ ImageMagick-6.2.5/magick/display.c 2006-05-24 11:03:58.000000000 -0400 -@@ -1845,10 +1845,7 @@ - image_number=0; - last_image=0; - last_scene=0; -- image_marker=(unsigned long *) -- AcquireMagickMemory((argc+1)*sizeof(*image_marker)); -- for (i=0; i <= argc; i++) -- image_marker[i]=(unsigned long) argc; -+ image_marker=(unsigned long *) NULL; - option=(char *) NULL; - pend=MagickFalse; - resource_database=(XrmDatabase) NULL; -@@ -1856,9 +1853,6 @@ - server_name=(char *) NULL; - state=0; - status=MagickTrue; -- if (image_marker == (unsigned long *) NULL) -- ThrowDisplayException(ResourceLimitError,"MemoryAllocationFailed", -- strerror(errno)); - /* - Check for server name specified on the command line. - */ -@@ -1867,6 +1861,13 @@ - if (status == MagickFalse) - ThrowDisplayException(ResourceLimitError,"MemoryAllocationFailed", - strerror(errno)); -+ image_marker=(unsigned long *) -+ AcquireMagickMemory((argc+1)*sizeof(*image_marker)); -+ for (i=0; i <= argc; i++) -+ image_marker[i]=(unsigned long) argc; -+ if (image_marker == (unsigned long *) NULL) -+ ThrowDisplayException(ResourceLimitError,"MemoryAllocationFailed", -+ strerror(errno)); - for (i=1; i < (long) argc; i++) - { - /* diff --git a/ImageMagick-6.2.8-CVE-2007-1797.patch b/ImageMagick-6.2.8-CVE-2007-1797.patch deleted file mode 100644 index 69f7e0b..0000000 --- a/ImageMagick-6.2.8-CVE-2007-1797.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- ImageMagick/coders/dcm.c.orig 2007-04-03 18:27:57.000000000 +0200 -+++ ImageMagick/coders/dcm.c 2007-04-03 18:31:16.000000000 +0200 -@@ -2902,6 +2902,8 @@ static Image *ReadDCMImage(const ImageIn - { - data=(unsigned char *) - AcquireMagickMemory((size_t) quantum*(length+1)); -+ if (length > ((~0UL)/quantum)) -+ ThrowReaderException(CorruptImageError,"ImproperImageHeader"); - if (data == (unsigned char *) NULL) - ThrowReaderException(ResourceLimitError, - "MemoryAllocationFailed"); ---- ImageMagick/coders/xwd.c.orig 2007-04-03 19:21:18.000000000 +0200 -+++ ImageMagick/coders/xwd.c 2007-04-03 19:24:36.000000000 +0200 -@@ -236,7 +236,9 @@ static Image *ReadXWDImage(const ImageIn - if (header.header_size < sz_XWDheader) - ThrowReaderException(CorruptImageError,"CorruptImage"); - length=(size_t) header.header_size-sz_XWDheader; -- comment=(char *) AcquireMagickMemory(length+MaxTextExtent); -+ if (length > ((~0UL)/sizeof(*comment))) -+ ThrowReaderException(CorruptImageError,"ImproperImageHeader"); -+ comment=(char *) AcquireMagickMemory((length+1)*sizeof(*comment)); - if (comment == (char *) NULL) - ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); - count=ReadBlob(image,length,(unsigned char *) comment); -@@ -278,8 +281,10 @@ static Image *ReadXWDImage(const ImageIn - XWDColor - color; - -- colors=(XColor *) -- AcquireMagickMemory((size_t) header.ncolors*sizeof(*colors)); -+ length=(size_t) header.ncolors; -+ if (length > ((~0UL)/sizeof(*colors))) -+ ThrowReaderException(CorruptImageError,"ImproperImageHeader"); -+ colors=(XColor *) AcquireMagickMemory(length*sizeof(*colors)); - if (colors == (XColor *) NULL) - ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); - for (i=0; i < (long) header.ncolors; i++) diff --git a/ImageMagick-6.2.8-cve-2006-3743.patch b/ImageMagick-6.2.8-cve-2006-3743.patch deleted file mode 100644 index 139eef1..0000000 --- a/ImageMagick-6.2.8-cve-2006-3743.patch +++ /dev/null @@ -1,112 +0,0 @@ ---- ImageMagick-6.2.2/coders/xcf.c.ormandy 2006-08-23 01:39:53.000000000 -0400 -+++ ImageMagick-6.2.2/coders/xcf.c 2006-08-23 01:40:09.000000000 -0400 -@@ -268,7 +268,7 @@ - % - % - */ --static char *ReadBlobStringWithLongSize(Image *image,char *string) -+static char *ReadBlobStringWithLongSize(Image *image,char *string,size_t max) - { - int - c; -@@ -284,7 +284,7 @@ - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),image->filename); - length = ReadBlobMSBLong(image); -- for (i=0; i < (long) length; i++) -+ for (i=0; i < (long) Min(length, max); i++) - { - c=ReadBlobByte(image); - if (c == EOF) -@@ -693,7 +693,7 @@ - outLayer->width = ReadBlobMSBLong(image); - outLayer->height = ReadBlobMSBLong(image); - outLayer->type = ReadBlobMSBLong(image); -- (void) ReadBlobStringWithLongSize(image, outLayer->name); -+ (void) ReadBlobStringWithLongSize(image, outLayer->name, 1024); - - /* allocate the image for this layer */ - outLayer->image=CloneImage(image,outLayer->width, outLayer->height,MagickTrue, -@@ -1099,7 +1099,7 @@ - /*float factor = (float) */ (void) ReadBlobMSBLong(image); - /* unsigned long digits = */ (void) ReadBlobMSBLong(image); - for (i=0; i<5; i++) -- (void) ReadBlobStringWithLongSize(image, unit_string); -+ (void) ReadBlobStringWithLongSize(image, unit_string, sizeof(unit_string)); - } - break; - ---- ImageMagick-6.2.2/coders/sun.c.ormandy 2006-08-23 01:39:58.000000000 -0400 -+++ ImageMagick-6.2.2/coders/sun.c 2006-08-23 01:40:09.000000000 -0400 -@@ -133,10 +133,10 @@ - % - */ - static MagickBooleanType DecodeImage(const unsigned char *compressed_pixels, -- const size_t length,unsigned char *pixels) -+ const size_t length,unsigned char *pixels,size_t maxpixels) - { - register const unsigned char -- *p; -+ *p, *l; - - register unsigned char - *q; -@@ -152,7 +152,8 @@ - assert(pixels != (unsigned char *) NULL); - p=compressed_pixels; - q=pixels; -- while ((size_t) (p-compressed_pixels) < length) -+ l=q+maxpixels; -+ while ((size_t) (p-compressed_pixels) < length && q < l) - { - byte=(*p++); - if (byte != 128U) -@@ -165,7 +166,7 @@ - count=(ssize_t) (*p++); - if (count > 0) - byte=(*p++); -- while (count >= 0) -+ while (count >= 0 && q < l) - { - *q++=byte; - count--; -@@ -376,6 +377,8 @@ - CloseBlob(image); - return(GetFirstImageInList(image)); - } -+ if ((sun_info.length * sizeof(*sun_data)) / sizeof(*sun_data) != sun_info.length || !sun_info.length) -+ ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); - sun_data=(unsigned char *) - AcquireMagickMemory((size_t) sun_info.length*sizeof(*sun_data)); - if (sun_data == (unsigned char *) NULL) -@@ -393,11 +396,28 @@ - Read run-length encoded raster pixels. - */ - height=sun_info.height; -- bytes_per_line=2*(sun_info.width*sun_info.depth+15)/16; -+ -+ /* calculate bytes per line, verifying no overflow occurs */ -+ bytes_per_line=sun_info.width*sun_info.depth; -+ if (!height || !sun_info.width || !sun_info.depth || bytes_per_line / sun_info.depth != sun_info.width) -+ ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); -+ -+ if ((ULONG_MAX - bytes_per_line) < 15) -+ ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); -+ -+ bytes_per_line += 15; -+ bytes_per_line <<= 1; -+ if (bytes_per_line >> 1 != sun_info.width * sun_info.depth + 15) -+ ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); -+ -+ bytes_per_line >>= 4; -+ if ((bytes_per_line * height) / height != bytes_per_line) -+ ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); -+ - sun_pixels=(unsigned char *) AcquireMagickMemory(bytes_per_line*height); - if (sun_pixels == (unsigned char *) NULL) - ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); -- (void) DecodeImage(sun_data,sun_info.length,sun_pixels); -+ (void) DecodeImage(sun_data,sun_info.length,sun_pixels, bytes_per_line * height); - sun_data=(unsigned char *) RelinquishMagickMemory(sun_data); - } - /* diff --git a/ImageMagick-6.2.8-cve-2006-4144.patch b/ImageMagick-6.2.8-cve-2006-4144.patch deleted file mode 100644 index 45620c2..0000000 --- a/ImageMagick-6.2.8-cve-2006-4144.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- ImageMagick-6.2.8/coders/sgi.c.cve-2006-4144 2006-02-07 22:52:54.000000000 -0500 -+++ ImageMagick-6.2.8/coders/sgi.c 2006-08-23 02:05:52.000000000 -0400 -@@ -410,7 +410,11 @@ - for (i=0; i < (long) (iris_info.rows*iris_info.depth); i++) - offsets[i]=(ssize_t) ReadBlobMSBLong(image); - for (i=0; i < (long) (iris_info.rows*iris_info.depth); i++) -+ { - runlength[i]=ReadBlobMSBLong(image); -+ if (runlength[i] >= (4*(size_t) iris_info.columns+10)) -+ ThrowReaderException(CorruptImageError,"ImproperImageHeader"); -+ } - /* - Check data order. - */ diff --git a/ImageMagick-6.2.8-multilib.patch b/ImageMagick-6.2.8-multilib.patch deleted file mode 100644 index 9063b0b..0000000 --- a/ImageMagick-6.2.8-multilib.patch +++ /dev/null @@ -1,78 +0,0 @@ ---- ImageMagick-6.2.8/magick/Magick-config.in.multilib 2006-05-26 21:58:55.000000000 -0400 -+++ ImageMagick-6.2.8/magick/Magick-config.in 2006-06-09 10:12:09.000000000 -0400 -@@ -15,28 +15,28 @@ - while test $# -gt 0; do - case $1 in - --prefix) -- echo @PREFIX_DIR@ -+ pkg-config --variable prefix ImageMagick - ;; - --exec-prefix) -- echo @EXEC_PREFIX_DIR@ -+ pkg-config --variable exec_prefix ImageMagick - ;; - --version) -- echo @PACKAGE_VERSION@ -+ pkg-config --modversion ImageMagick - ;; - --cflags) -- echo '@MAGICK_CFLAGS@' -+ pkg-config --cflags ImageMagick - ;; - --cxxflags) -- echo '@MAGICK_CXXFLAGS@' -+ pkg-config --cflags ImageMagick - ;; - --cppflags) -- echo '@MAGICK_CPPFLAGS@' -+ pkg-config --cflags ImageMagick - ;; - --ldflags) -- echo '@MAGICK_LDFLAGS@' -+ pkg-config --libs ImageMagick - ;; - --libs) -- echo '@MAGICK_LIBS@ -lWand -lMagick' -+ pkg-config --libs ImageMagick - ;; - *) - echo "${usage}" 1>&2 ---- ImageMagick-6.2.8/wand/Wand-config.in.multilib 2006-05-26 21:58:55.000000000 -0400 -+++ ImageMagick-6.2.8/wand/Wand-config.in 2006-06-09 10:16:55.000000000 -0400 -@@ -15,28 +15,28 @@ - while test $# -gt 0; do - case $1 in - --prefix) -- echo @PREFIX_DIR@ -+ pkg-config --variable prefix Wand - ;; - --exec-prefix) -- echo @EXEC_PREFIX_DIR@ -+ pkg-config --variable exec_prefix Wand - ;; - --version) -- echo @PACKAGE_VERSION@ -+ pkg-config --modversion Wand - ;; - --cflags) -- echo '@MAGICK_CFLAGS@' -+ pkg-config --cflags Wand - ;; - --cxxflags) -- echo '@MAGICK_CXXFLAGS@' -+ pkg-config --cflags Wand - ;; - --cppflags) -- echo '@MAGICK_CPPFLAGS@' -+ pkg-config --cflags Wand - ;; - --ldflags) -- echo '@MAGICK_LDFLAGS@' -+ pkg-config --libs Wand - ;; - --libs) -- echo '@MAGICK_LIBS@ -lWand -lMagick' -+ pkg-config --libs Wand - ;; - *) - echo "${usage}" 1>&2 diff --git a/ImageMagick-6.3.2-perl-liblink.patch b/ImageMagick-6.3.2-perl-liblink.patch deleted file mode 100644 index f4a34d8..0000000 --- a/ImageMagick-6.3.2-perl-liblink.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- ImageMagick-6.3.2/PerlMagick/Makefile.PL.orig 2007-02-25 03:01:28.000000000 +1000 -+++ ImageMagick-6.3.2/PerlMagick/Makefile.PL 2007-03-07 14:19:21.000000000 +1000 -@@ -62,7 +62,7 @@ WriteMakefile - 'INSTALLBIN' => '/usr/bin', - - # Library specification -- 'LIBS' => [ '-L/usr/lib -lfreetype -llcms -ltiff -lfreetype -ljpeg -lfontconfig -lXext -lSM -lICE -lX11 -lXt -lbz2 -lz -lpthread -lm -lpthread' ], -+ 'LIBS' => [ '-L/usr/lib -L../magick/.libs -lMagick -lfreetype -llcms -ltiff -lfreetype -ljpeg -lfontconfig -lXext -lSM -lICE -lX11 -lXt -lbz2 -lz -lpthread -lm -lpthread' ], - - # Perl binary name (if a Perl binary is built) - 'MAP_TARGET' => 'PerlMagick', ---- ImageMagick-6.3.2/PerlMagick/Makefile.PL.in.orig 2006-09-20 00:53:54.000000000 +1000 -+++ ImageMagick-6.3.2/PerlMagick/Makefile.PL.in 2007-03-07 14:20:11.000000000 +1000 -@@ -62,7 +62,7 @@ WriteMakefile - 'INSTALLBIN' => '@BIN_DIR@', - - # Library specification -- 'LIBS' => [ '-L@MAGICKLIBDIR@ @LDFLAGS@ @MAGICK_DEP_LIBS@' ], -+ 'LIBS' => [ '-L@MAGICKLIBDIR@ -L../magick/.libs -lMagick @LDFLAGS@ @MAGICK_DEP_LIBS@' ], - - # Perl binary name (if a Perl binary is built) - 'MAP_TARGET' => 'PerlMagick', diff --git a/ImageMagick-6.3.2-perl-parallel-build.patch b/ImageMagick-6.3.2-perl-parallel-build.patch deleted file mode 100644 index 530927a..0000000 --- a/ImageMagick-6.3.2-perl-parallel-build.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- ImageMagick-6.3.2/PerlMagick/Makefile.am.orig 2007-02-28 01:10:33.000000000 +0100 -+++ ImageMagick-6.3.2/PerlMagick/Makefile.am 2007-02-28 01:12:12.000000000 +0100 -@@ -41,7 +41,8 @@ - - if WITH_PERL_DYNAMIC - --$(PERLMAKEFILE): perl-sources $(PERLMAKEMAKER) -+# add LIBMAGICK in deps to fix parallel make issue -+$(PERLMAKEFILE): perl-sources $(LIBMAGICK) $(PERLMAKEMAKER) - cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS) - - install-exec-perl: $(PERLMAKEFILE) diff --git a/ImageMagick-6.3.5-multilib.patch b/ImageMagick-6.3.5-multilib.patch deleted file mode 100644 index cfb1c84..0000000 --- a/ImageMagick-6.3.5-multilib.patch +++ /dev/null @@ -1,78 +0,0 @@ ---- ImageMagick-6.3.5-9/magick/Magick-config.in 2007-09-20 16:11:57.000000000 +1000 -+++ ImageMagick-6.3.5-9/magick/Magick-config.in 2007-09-20 16:17:18.000000000 +1000 -@@ -15,28 +15,28 @@ fi - while test $# -gt 0; do - case $1 in - --prefix) -- echo @PREFIX_DIR@ -+ pkg-config --variable prefix ImageMagick - ;; - --exec-prefix) -- echo @EXEC_PREFIX_DIR@ -+ pkg-config --variable exec_prefix ImageMagic - ;; - --version) -- echo '@PACKAGE_VERSION@ Q@QuantumDepth@ @MAGICK_HDRI@' -+ pkg-config --modversion ImageMagick - ;; - --cflags) -- echo '@MAGICK_CFLAGS@' -+ pkg-config --cflags ImageMagick - ;; - --cxxflags) -- echo '@MAGICK_CXXFLAGS@' -+ pkg-config --cflags ImageMagick - ;; - --cppflags) -- echo '@MAGICK_CPPFLAGS@' -+ pkg-config --cflags ImageMagick - ;; - --ldflags) -- echo '@MAGICK_LDFLAGS@' -+ pkg-config --libs ImageMagick - ;; - --libs) -- echo '@MAGICK_LIBS@ -lWand -lMagick' -+ pkg-config --libs ImageMagick - ;; - *) - echo "${usage}" 1>&2 ---- ImageMagick-6.3.5-9/wand/Wand-config.in 2007-09-20 16:11:57.000000000 +1000 -+++ ImageMagick-6.3.5-9/wand/Wand-config.in 2007-09-20 16:19:17.000000000 +1000 -@@ -15,28 +15,28 @@ fi - while test $# -gt 0; do - case $1 in - --prefix) -- echo @PREFIX_DIR@ -+ pkg-config --variable prefix Wand - ;; - --exec-prefix) -- echo @EXEC_PREFIX_DIR@ -+ pkg-config --variable exec_prefix Wand - ;; - --version) -- echo '@PACKAGE_VERSION@ Q@QuantumDepth@ @MAGICK_HDRI@' -+ pkg-config --modversion Wand - ;; - --cflags) -- echo '@MAGICK_CFLAGS@' -+ pkg-config --cflags Wand - ;; - --cxxflags) -- echo '@MAGICK_CXXFLAGS@' -+ pkg-config --cflags Wand - ;; - --cppflags) -- echo '@MAGICK_CPPFLAGS@' -+ pkg-config --cflags Wand - ;; - --ldflags) -- echo '@MAGICK_LDFLAGS@' -+ pkg-config --libs Wand - ;; - --libs) -- echo '@MAGICK_LIBS@ -lWand -lMagick' -+ pkg-config --libs Wand - ;; - *) - echo "${usage}" 1>&2 diff --git a/ImageMagick-6.3.5-open.patch b/ImageMagick-6.3.5-open.patch deleted file mode 100644 index 04b5d5e..0000000 --- a/ImageMagick-6.3.5-open.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- ImageMagick-6.3.5-9/magick/delegate.c 2007-09-11 13:20:41.000000000 +1000 -+++ ImageMagick-6.3.5-9/magick/delegate.c 2007-09-18 18:27:31.000000000 +1000 -@@ -769,7 +769,8 @@ static void CopyDelegateFile(const char - /* - Copy source file to destination. - */ -- destination_file=open(destination,O_WRONLY | O_BINARY | O_CREAT); -+ destination_file=open(destination,O_WRONLY | O_BINARY | O_CREAT, -+ S_IRUSR | S_IWUSR | S_IRGRP ); - if (destination_file == -1) - return; - source_file=open(source,O_RDONLY | O_BINARY); diff --git a/ImageMagick-6.3.8-invalid-gerror-use.patch b/ImageMagick-6.3.8-invalid-gerror-use.patch new file mode 100644 index 0000000..65de108 --- /dev/null +++ b/ImageMagick-6.3.8-invalid-gerror-use.patch @@ -0,0 +1,27 @@ +diff -up ImageMagick-6.4.0/coders/svg.c~ ImageMagick-6.4.0/coders/svg.c +--- ImageMagick-6.4.0/coders/svg.c~ 2008-04-26 11:32:26.000000000 +0200 ++++ ImageMagick-6.4.0/coders/svg.c 2008-04-26 11:32:26.000000000 +0200 +@@ -2777,12 +2777,20 @@ static Image *ReadSVGImage(const ImageIn + rsvg_handle_set_dpi_x_y(svg_info, + image->x_resolution == 0.0 ? 72.0 : image->x_resolution, + image->y_resolution == 0.0 ? 72.0 : image->y_resolution); +- error=(GError *) NULL; +- while ((n=ReadBlob(image,MaxTextExtent,message)) != 0) ++ while ((n=ReadBlob(image,MaxTextExtent,message)) != 0) { ++ error=(GError *) NULL; + (void) rsvg_handle_write(svg_info,message,n,&error); ++ if (error != (GError *) NULL) { ++ /* FIXME actually do something with the error */ ++ g_error_free(error); ++ } ++ } ++ error=(GError *) NULL; + rsvg_handle_close(svg_info,&error); +- if (error != (GError *) NULL) ++ if (error != (GError *) NULL) { ++ /* FIXME actually do something with the error */ + g_error_free(error); ++ } + #if defined(MAGICKCORE_CAIRO_DELEGATE) + rsvg_handle_get_dimensions(svg_info,&dimension_info); + image->columns=dimension_info.width*image->x_resolution/72.0; diff --git a/ImageMagick-6.3.8-multilib.patch b/ImageMagick-6.3.8-multilib.patch deleted file mode 100644 index 9666b41..0000000 --- a/ImageMagick-6.3.8-multilib.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff -up ImageMagick-6.3.8/magick/Magick-config.in.BAD ImageMagick-6.3.8/magick/Magick-config.in ---- ImageMagick-6.3.8/magick/Magick-config.in.BAD 2008-01-24 20:02:24.000000000 -0500 -+++ ImageMagick-6.3.8/magick/Magick-config.in 2008-01-24 20:03:59.000000000 -0500 -@@ -28,31 +28,31 @@ while test $# -gt 0; do - prefix=$optarg - ;; - --prefix) -- echo $prefix -+ pkg-config --variable prefix ImageMagick - ;; - --exec-prefix=*) - exec_prefix=$optarg - ;; - --exec-prefix) -- echo $exec_prefix -+ pkg-config --variable exec_prefix ImageMagick - ;; - --version) -- echo '@PACKAGE_VERSION@ Q@QUANTUM_DEPTH@ @MAGICK_HDRI@' -+ pkg-config --modversion ImageMagick - ;; - --cflags) -- echo "-I${includedir} @MAGICK_PCFLAGS@" -+ pkg-config --cflags ImageMagick - ;; - --cxxflags) -- echo '@MAGICK_CXXFLAGS@' -+ pkg-config --cflags ImageMagick - ;; - --cppflags) -- echo '@MAGICK_CPPFLAGS@' -+ pkg-config --cflags ImageMagick - ;; - --ldflags) -- echo '@MAGICK_LDFLAGS@' -+ pkg-config --libs ImageMagick - ;; - --libs) -- echo "-L${libdir} -lWand -lMagick" -+ pkg-config --libs ImageMagick - ;; - *) - echo "${usage}" 1>&2 -diff -up ImageMagick-6.3.8/wand/Wand-config.in.BAD ImageMagick-6.3.8/wand/Wand-config.in ---- ImageMagick-6.3.8/wand/Wand-config.in.BAD 2008-01-24 20:04:08.000000000 -0500 -+++ ImageMagick-6.3.8/wand/Wand-config.in 2008-01-24 20:05:35.000000000 -0500 -@@ -28,31 +28,31 @@ while test $# -gt 0; do - prefix=$optarg - ;; - --prefix) -- echo $prefix -+ pkg-config --variable prefix Wand - ;; - --exec-prefix=*) - exec_prefix=$optarg - ;; - --exec-prefix) -- echo $exec_prefix -+ pkg-config --variable exec_prefix Wand - ;; - --version) -- echo '@PACKAGE_VERSION@ Q@QUANTUM_DEPTH@ @MAGICK_HDRI@' -+ pkg-config --modversion Wand - ;; - --cflags) -- echo "-I${includedir} @MAGICK_PCFLAGS@" -+ pkg-config --cflags Wand - ;; - --cxxflags) -- echo '@MAGICK_CXXFLAGS@' -+ pkg-config --cflags Wand - ;; - --cppflags) -- echo '@MAGICK_CPPFLAGS@' -+ pkg-config --cflags Wand - ;; - --ldflags) -- echo '@MAGICK_LDFLAGS@' -+ pkg-config --libs Wand - ;; - --libs) -- echo "-L${libdir} -lWand -lMagick" -+ pkg-config --libs Wand - ;; - *) - echo "${usage}" 1>&2 diff --git a/ImageMagick-6.4.0-multilib.patch b/ImageMagick-6.4.0-multilib.patch new file mode 100644 index 0000000..ce52c54 --- /dev/null +++ b/ImageMagick-6.4.0-multilib.patch @@ -0,0 +1,185 @@ +diff -up ImageMagick-6.4.0/Magick++/bin/Magick++-config.in~ ImageMagick-6.4.0/Magick++/bin/Magick++-config.in +--- ImageMagick-6.4.0/Magick++/bin/Magick++-config.in~ 2008-04-27 16:25:14.000000000 +0200 ++++ ImageMagick-6.4.0/Magick++/bin/Magick++-config.in 2008-04-27 16:25:14.000000000 +0200 +@@ -7,8 +7,6 @@ + + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ +-includedir=@includedir@ + + usage='Usage: Magick++-config [--cppflags] [--cxxflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version] + +@@ -43,19 +41,19 @@ while test $# -gt 0; do + echo '@PACKAGE_VERSION@ Q@QUANTUM_DEPTH@ @MAGICK_HDRI@' + ;; + --cflags) +- echo "-I${includedir} @MAGICK_PCFLAGS@" ++ pkg-config --cflags Magick++ + ;; + --cxxflags) +- echo '@MAGICK_CXXFLAGS@' ++ pkg-config --cflags Magick++ + ;; + --cppflags) +- echo '@MAGICK_CPPFLAGS@' ++ pkg-config --cflags Magick++ + ;; + --ldflags) +- echo '@MAGICK_LDFLAGS@' ++ pkg-config --libs Magick++ + ;; + --libs) +- echo "-L${libdir} -lMagick++ -lMagickWand -lMagickCore" ++ pkg-config --libs Magick++ + ;; + *) + echo "${usage}" 1>&2 +diff -up ImageMagick-6.4.0/magick/Magick-config.in~ ImageMagick-6.4.0/magick/Magick-config.in +--- ImageMagick-6.4.0/magick/Magick-config.in~ 2008-04-27 16:25:15.000000000 +0200 ++++ ImageMagick-6.4.0/magick/Magick-config.in 2008-04-27 16:25:15.000000000 +0200 +@@ -6,8 +6,6 @@ + + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ +-includedir=@includedir@/ImageMagick + + usage="\ + Usage: Magick-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]" +@@ -40,19 +38,19 @@ while test $# -gt 0; do + echo '@PACKAGE_VERSION@ Q@QUANTUM_DEPTH@ @MAGICK_HDRI@' + ;; + --cflags) +- echo "-I${includedir} @MAGICK_PCFLAGS@" ++ pkg-config --cflags MagickCore + ;; + --cxxflags) +- echo '@MAGICK_CXXFLAGS@' ++ pkg-config --cflags MagickCore + ;; + --cppflags) +- echo '@MAGICK_CPPFLAGS@' ++ pkg-config --cflags MagickCore + ;; + --ldflags) +- echo '@MAGICK_LDFLAGS@' ++ pkg-config --libs MagickCore + ;; + --libs) +- echo "-L${libdir} -lMagickWand -lMagickCore" ++ pkg-config --libs MagickCore + ;; + *) + echo "${usage}" 1>&2 +diff -up ImageMagick-6.4.0/magick/MagickCore-config.in~ ImageMagick-6.4.0/magick/MagickCore-config.in +--- ImageMagick-6.4.0/magick/MagickCore-config.in~ 2008-04-27 16:25:14.000000000 +0200 ++++ ImageMagick-6.4.0/magick/MagickCore-config.in 2008-04-27 16:25:14.000000000 +0200 +@@ -6,8 +6,6 @@ + + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ +-includedir=@includedir@/ImageMagick + + usage="\ + Usage: MagickCore-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]" +@@ -40,19 +38,19 @@ while test $# -gt 0; do + echo '@PACKAGE_VERSION@ Q@QUANTUM_DEPTH@ @MAGICK_HDRI@' + ;; + --cflags) +- echo "-I${includedir} @MAGICK_PCFLAGS@" ++ pkg-config --cflags MagickCore + ;; + --cxxflags) +- echo '@MAGICK_CXXFLAGS@' ++ pkg-config --cflags MagickCore + ;; + --cppflags) +- echo '@MAGICK_CPPFLAGS@' ++ pkg-config --cflags MagickCore + ;; + --ldflags) +- echo '@MAGICK_LDFLAGS@' ++ pkg-config --libs MagickCore + ;; + --libs) +- echo "-L${libdir} -lMagickWand -lMagickCore" ++ pkg-config --libs MagickCore + ;; + *) + echo "${usage}" 1>&2 +diff -up ImageMagick-6.4.0/wand/MagickWand-config.in~ ImageMagick-6.4.0/wand/MagickWand-config.in +--- ImageMagick-6.4.0/wand/MagickWand-config.in~ 2008-04-27 16:25:15.000000000 +0200 ++++ ImageMagick-6.4.0/wand/MagickWand-config.in 2008-04-27 16:25:15.000000000 +0200 +@@ -6,8 +6,6 @@ + + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ +-includedir=@includedir@/ImageMagick + + usage="\ + Usage: MagickWand-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]" +@@ -40,19 +38,19 @@ while test $# -gt 0; do + echo '@PACKAGE_VERSION@ Q@QUANTUM_DEPTH@ @MAGICK_HDRI@' + ;; + --cflags) +- echo "-I${includedir} @MAGICK_PCFLAGS@" ++ pkg-config --cflags MagickWand + ;; + --cxxflags) +- echo '@MAGICK_CXXFLAGS@' ++ pkg-config --cflags MagickWand + ;; + --cppflags) +- echo '@MAGICK_CPPFLAGS@' ++ pkg-config --cflags MagickWand + ;; + --ldflags) +- echo '@MAGICK_LDFLAGS@' ++ pkg-config --libs MagickWand + ;; + --libs) +- echo "-L${libdir} -lMagickWand -lMagickCore" ++ pkg-config --libs MagickWand + ;; + *) + echo "${usage}" 1>&2 +diff -up ImageMagick-6.4.0/wand/Wand-config.in~ ImageMagick-6.4.0/wand/Wand-config.in +--- ImageMagick-6.4.0/wand/Wand-config.in~ 2008-04-27 16:25:15.000000000 +0200 ++++ ImageMagick-6.4.0/wand/Wand-config.in 2008-04-27 16:25:15.000000000 +0200 +@@ -6,8 +6,6 @@ + + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ +-includedir=@includedir@/ImageMagick + + usage="\ + Usage: Wand-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]" +@@ -40,19 +38,19 @@ while test $# -gt 0; do + echo '@PACKAGE_VERSION@ Q@QUANTUM_DEPTH@ @MAGICK_HDRI@' + ;; + --cflags) +- echo "-I${includedir} @MAGICK_PCFLAGS@" ++ pkg-config --cflags MagickWand + ;; + --cxxflags) +- echo '@MAGICK_CXXFLAGS@' ++ pkg-config --cflags MagickWand + ;; + --cppflags) +- echo '@MAGICK_CPPFLAGS@' ++ pkg-config --cflags MagickWand + ;; + --ldflags) +- echo '@MAGICK_LDFLAGS@' ++ pkg-config --libs MagickWand + ;; + --libs) +- echo "-L${libdir} -lMagickWand -lMagickCore" ++ pkg-config --libs MagickWand + ;; + *) + echo "${usage}" 1>&2 diff --git a/ImageMagick-6.4.0-xdg-open.patch b/ImageMagick-6.4.0-xdg-open.patch new file mode 100644 index 0000000..b791a6c --- /dev/null +++ b/ImageMagick-6.4.0-xdg-open.patch @@ -0,0 +1,48 @@ +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 + "" + " " + " " +- " " ++ " " + " " + " " + " " +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 @@ + --> + + +- ++ + + + +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' diff --git a/ImageMagick.spec b/ImageMagick.spec index 7115826..1c9c59c 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,15 +1,15 @@ # ImageMagick has adopted a new Version.Patchlevel version numbering system... # 5.4.0.3 is actually version 5.4.0, Patchlevel 3. -%define VER 6.3.8 -%define Patchlevel 1 -Summary: An X application for displaying and manipulating images. +%define VER 6.4.0 +%define Patchlevel 10 +Summary: An X application for displaying and manipulating images Name: ImageMagick %if "%{Patchlevel}" != "" Version: %{VER}.%{Patchlevel} %else Version: %{VER} %endif -Release: 3%{?dist} +Release: 1%{?dist} License: ImageMagick Group: Applications/Multimedia %if "%{Patchlevel}" != "" @@ -18,20 +18,19 @@ Source: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%{VER}-%{Patchleve Source: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%{version}.tar.bz2 %endif Source1: magick_small.png -Patch1: ImageMagick-6.3.8-multilib.patch -Patch2: ImageMagick-6.3.5-open.patch - - +Patch1: ImageMagick-6.4.0-multilib.patch +Patch2: ImageMagick-6.3.8-invalid-gerror-use.patch +Patch3: ImageMagick-6.4.0-xdg-open.patch Url: http://www.imagemagick.org/ Buildroot: %{_tmppath}/%{name}-%{version}-root -BuildPrereq: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel -BuildPrereq: libtiff-devel, libungif-devel, zlib-devel, perl +BuildRequires: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel +BuildRequires: libtiff-devel, libungif-devel, zlib-devel, perl BuildRequires: freetype-devel >= 2.1 BuildRequires: automake >= 1.7 autoconf >= 2.58 libtool >= 1.5 BuildRequires: ghostscript-devel BuildRequires: perl-devel, perl(ExtUtils::MakeMaker) -BuildRequires: libwmf-devel, jasper-devel +BuildRequires: libwmf-devel, jasper-devel, libtool-ltdl-devel BuildRequires: libX11-devel, libXext-devel, libXt-devel BuildRequires: lcms-devel, libxml2-devel, librsvg2-devel @@ -51,7 +50,7 @@ which use ImageMagick code or APIs, you need to install ImageMagick-devel as well. %package devel -Summary: Static libraries and header files for ImageMagick app development. +Summary: Library links and header files for ImageMagick app development Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: libX11-devel, libXext-devel, libXt-devel @@ -61,11 +60,11 @@ Requires: freetype-devel Requires: libtiff-devel Requires: libjpeg-devel Requires: lcms-devel +Requires: jasper-devel Requires: pkgconfig -Requires: jasper %description devel -ImageMagick-devel contains the static libraries and header files you'll +ImageMagick-devel contains the library links and header files you'll need to develop ImageMagick applications. ImageMagick is an image manipulation program. @@ -78,9 +77,7 @@ however. Summary: ImageMagick perl bindings Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} -Requires: perl >= 5.6.0 -%define perl_vendorarch %(perl -MConfig -le 'print $Config{installvendorarch}') -Prereq: %{perl_vendorarch} +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description perl Perl bindings to ImageMagick. @@ -117,37 +114,46 @@ You don't need to install it if you just want to use ImageMagick, or if you want to develop/compile applications using the ImageMagick C interface, however. + %prep %setup -q -n %{name}-%{VER} %patch1 -p1 -b .multilib -# No longer needed. -# %patch2 -p1 -b .open_args +%patch2 -p1 +%patch3 -p1 +iconv -f ISO-8859-1 -t UTF-8 README.txt > README.txt.tmp +touch -r README.txt README.txt.tmp +mv README.txt.tmp README.txt + %build %configure --enable-shared \ --with-modules \ --with-perl \ - --with-x \ + --with-x \ --with-threads \ --with-magick_plus_plus \ - --with-gslib \ + --with-gslib \ --with-wmf \ --with-lcms \ --with-rsvg \ - --with-xml \ + --with-xml \ --with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='%__cc -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'" \ --without-windows-font-dir \ - --without-dps + --without-dps \ + --without-included-ltdl --with-ltdl-include=%{_includedir} \ + --with-ltdl-lib=%{_libdir} # Disable rpath sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool - make + %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +# fix weird perl Magick.so permissions +chmod 755 $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Image/Magick/Magick.so # perlmagick: fix perl path of demo files %{__perl} -MExtUtils::MakeMaker -e 'MY->fixin(@ARGV)' PerlMagick/demo/*.pl @@ -159,11 +165,11 @@ find $RPM_BUILD_ROOT -name "perllocal.pod" |xargs rm -f # perlmagick: build files list echo "%defattr(-,root,root)" > perl-pkg-files find $RPM_BUILD_ROOT/%{_libdir}/perl* -type f -print \ - | sed "s@^$RPM_BUILD_ROOT@@g" > perl-pkg-files + | sed "s@^$RPM_BUILD_ROOT@@g" > perl-pkg-files find $RPM_BUILD_ROOT%{perl_vendorarch} -type d -print \ - | sed "s@^$RPM_BUILD_ROOT@%dir @g" \ - | grep -v '^%dir %{perl_vendorarch}$' \ - | grep -v '/auto$' >> perl-pkg-files + | sed "s@^$RPM_BUILD_ROOT@%dir @g" \ + | grep -v '^%dir %{perl_vendorarch}$' \ + | grep -v '/auto$' >> perl-pkg-files if [ -z perl-pkg-files ] ; then echo "ERROR: EMPTY FILE LIST" exit -1 @@ -183,12 +189,12 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %define wordsize 32 %endif -mv $RPM_BUILD_ROOT%{_includedir}/magick/magick-config.h \ - $RPM_BUILD_ROOT%{_includedir}/magick/magick-config-%{wordsize}.h +mv $RPM_BUILD_ROOT%{_includedir}/ImageMagick/magick/magick-config.h \ + $RPM_BUILD_ROOT%{_includedir}/ImageMagick/magick/magick-config-%{wordsize}.h -cat >$RPM_BUILD_ROOT%{_includedir}/magick/magick-config.h <$RPM_BUILD_ROOT%{_includedir}/ImageMagick/magick/magick-config.h < @@ -207,6 +213,7 @@ EOF %clean rm -rf $RPM_BUILD_ROOT + %post -p /sbin/ldconfig %post c++ -p /sbin/ldconfig @@ -215,12 +222,13 @@ rm -rf $RPM_BUILD_ROOT %postun c++ -p /sbin/ldconfig + %files %defattr(-,root,root) %doc QuickStart.txt ChangeLog Platforms.txt -%doc README.txt LICENSE NOTICE AUTHORS NEWS -%attr(755,root,root) %{_libdir}/libMagick.so.* -%attr(755,root,root) %{_libdir}/libWand.so.* +%doc README.txt LICENSE NOTICE AUTHORS.txt NEWS.txt +%attr(755,root,root) %{_libdir}/libMagickCore.so.* +%attr(755,root,root) %{_libdir}/libMagickWand.so.* %{_bindir}/[a-z]* %{_libdir}/ImageMagick* %{_datadir}/ImageMagick* @@ -230,16 +238,22 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root) +%{_bindir}/MagickCore-config %{_bindir}/Magick-config +%{_bindir}/MagickWand-config %{_bindir}/Wand-config -%{_libdir}/libMagick.so -%{_libdir}/libWand.so +%{_libdir}/libMagickCore.so +%{_libdir}/libMagickWand.so +%{_libdir}/pkgconfig/MagickCore.pc %{_libdir}/pkgconfig/ImageMagick.pc +%{_libdir}/pkgconfig/MagickWand.pc %{_libdir}/pkgconfig/Wand.pc -%{_includedir}/magick -%{_includedir}/wand +%{_includedir}/ImageMagick/magick +%{_includedir}/ImageMagick/wand %{_mandir}/man1/Magick-config.* +%{_mandir}/man1/MagickCore-config.* %{_mandir}/man1/Wand-config.* +%{_mandir}/man1/MagickWand-config.* %files c++ %defattr(-,root,root) @@ -248,9 +262,10 @@ rm -rf $RPM_BUILD_ROOT %files c++-devel %defattr(-,root,root) %{_bindir}/Magick++-config -%{_includedir}/Magick++ -%{_includedir}/Magick++.h +%{_includedir}/ImageMagick/Magick++ +%{_includedir}/ImageMagick/Magick++.h %{_libdir}/libMagick++.so +%{_libdir}/pkgconfig/Magick++.pc %{_libdir}/pkgconfig/ImageMagick++.pc %{_mandir}/man1/Magick++-config.* @@ -259,7 +274,17 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt + %changelog +* Sat Apr 26 2008 Hans de Goede 6.4.0.10-1 +- New upstream release 6.4.0.10 +- 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 + * Wed Feb 27 2008 Tom "spot" Callaway - 6.3.8.1-3 - Rebuild for perl 5.10 (again) @@ -433,7 +458,7 @@ rm -rf $RPM_BUILD_ROOT * Wed Jun 04 2003 Elliot Lee - rebuilt -* Thu May 29 2003 Tim Powers %{nil}-4 +* Thu May 29 2003 Tim Powers 5.5.6-4 - rebuild for RHEL to fix broken deps * Thu May 15 2003 Tim Powers 5.5.6-3 @@ -540,7 +565,7 @@ rm -rf $RPM_BUILD_ROOT * Mon Oct 22 2001 Bernhard Rosenkraenzer 5.4.0-1 - 5.4.0 - work around build system breakage causing applications to be named - %{_arch}-redhat-linux-foo rather than foo + %%{_arch}-redhat-linux-foo rather than foo * Wed Sep 19 2001 Bernhard Rosenkraenzer 5.3.9-1 - 5.3.9 @@ -640,7 +665,7 @@ rm -rf $RPM_BUILD_ROOT - bootstrap rebuilt to nuke broken libbz2 deps - add Prefix: tag such that the FHS macros work properly -* Wed May 17 2000 Trond Eivind Glomsr�d +* Wed May 17 2000 Trond Eivind Glomsrød - now compiles with bzip2 1.0 - changed buildroot to include version diff --git a/sources b/sources index 63bac82..eeadbf9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bda5a04205662182de2d2b33449491d4 ImageMagick-6.3.8-1.tar.bz2 +2c6215e0ac8468356255e9aefbc9fe94 ImageMagick-6.4.0-10.tar.bz2