From 252b0ed307a12929468015e76cae39464883b106 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 9 Mar 2009 11:06:50 +0000 Subject: [PATCH] - New upstream release 6.4.9-6 --- .cvsignore | 2 +- ImageMagick-6.3.8-invalid-gerror-use.patch | 21 ------------ ImageMagick-6.4.0-multilib.patch | 40 +++++++++++----------- ImageMagick.spec | 19 +++++----- sources | 2 +- 5 files changed, 30 insertions(+), 54 deletions(-) delete mode 100644 ImageMagick-6.3.8-invalid-gerror-use.patch diff --git a/.cvsignore b/.cvsignore index 969b796..cd31bdc 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ImageMagick-6.4.5.5-clean.tar.bz2 +ImageMagick-6.4.9-6.tar.bz2 diff --git a/ImageMagick-6.3.8-invalid-gerror-use.patch b/ImageMagick-6.3.8-invalid-gerror-use.patch deleted file mode 100644 index 03f9cd7..0000000 --- a/ImageMagick-6.3.8-invalid-gerror-use.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up ImageMagick-6.4.5/coders/svg.c.orig ImageMagick-6.4.5/coders/svg.c ---- ImageMagick-6.4.5/coders/svg.c.orig 2008-10-10 03:28:08.000000000 +0200 -+++ ImageMagick-6.4.5/coders/svg.c 2008-11-14 13:52:52.000000000 +0100 -@@ -2798,9 +2798,15 @@ static Image *ReadSVGImage(const ImageIn - rsvg_handle_set_dpi_x_y(svg_handle, - 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_handle,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_handle,&error); - if (error != (GError *) NULL) - g_error_free(error); diff --git a/ImageMagick-6.4.0-multilib.patch b/ImageMagick-6.4.0-multilib.patch index f4193f8..859f3d4 100644 --- a/ImageMagick-6.4.0-multilib.patch +++ b/ImageMagick-6.4.0-multilib.patch @@ -1,6 +1,6 @@ -diff -up ImageMagick-6.4.5/Magick++/bin/Magick++-config.in.multilib ImageMagick-6.4.5/Magick++/bin/Magick++-config.in ---- ImageMagick-6.4.5/Magick++/bin/Magick++-config.in.multilib 2008-02-17 19:10:46.000000000 +0100 -+++ ImageMagick-6.4.5/Magick++/bin/Magick++-config.in 2008-11-14 15:19:15.000000000 +0100 +diff -up ImageMagick-6.4.9-6/Magick++/bin/Magick++-config.in.multilib ImageMagick-6.4.9-6/Magick++/bin/Magick++-config.in +--- ImageMagick-6.4.9-6/Magick++/bin/Magick++-config.in.multilib 2008-12-08 20:00:35.000000000 +0100 ++++ ImageMagick-6.4.9-6/Magick++/bin/Magick++-config.in 2009-02-24 10:55:05.000000000 +0100 @@ -7,8 +7,6 @@ prefix=@prefix@ @@ -30,14 +30,14 @@ diff -up ImageMagick-6.4.5/Magick++/bin/Magick++-config.in.multilib ImageMagick- + pkg-config --libs Magick++ ;; --libs) -- echo "-L${libdir} -lMagick++ -lMagickWand -lMagickCore" +- echo "-L${libdir} -lMagick++ -lMagickWand @MAGICK_LIBS@" + pkg-config --libs Magick++ ;; *) echo "${usage}" 1>&2 -diff -up ImageMagick-6.4.5/magick/Magick-config.in.multilib ImageMagick-6.4.5/magick/Magick-config.in ---- ImageMagick-6.4.5/magick/Magick-config.in.multilib 2008-04-28 00:35:32.000000000 +0200 -+++ ImageMagick-6.4.5/magick/Magick-config.in 2008-11-14 15:19:15.000000000 +0100 +diff -up ImageMagick-6.4.9-6/magick/Magick-config.in.multilib ImageMagick-6.4.9-6/magick/Magick-config.in +--- ImageMagick-6.4.9-6/magick/Magick-config.in.multilib 2008-12-08 20:00:35.000000000 +0100 ++++ ImageMagick-6.4.9-6/magick/Magick-config.in 2009-02-24 10:57:33.000000000 +0100 @@ -6,8 +6,6 @@ prefix=@prefix@ @@ -67,14 +67,14 @@ diff -up ImageMagick-6.4.5/magick/Magick-config.in.multilib ImageMagick-6.4.5/ma + pkg-config --libs MagickCore ;; --libs) -- echo "-L${libdir} -lMagickCore" +- echo "-L${libdir} @MAGICK_LIBS@" + pkg-config --libs MagickCore ;; *) echo "${usage}" 1>&2 -diff -up ImageMagick-6.4.5/magick/MagickCore-config.in.multilib ImageMagick-6.4.5/magick/MagickCore-config.in ---- ImageMagick-6.4.5/magick/MagickCore-config.in.multilib 2008-08-16 19:34:36.000000000 +0200 -+++ ImageMagick-6.4.5/magick/MagickCore-config.in 2008-11-14 15:42:54.000000000 +0100 +diff -up ImageMagick-6.4.9-6/magick/MagickCore-config.in.multilib ImageMagick-6.4.9-6/magick/MagickCore-config.in +--- ImageMagick-6.4.9-6/magick/MagickCore-config.in.multilib 2008-12-08 20:00:35.000000000 +0100 ++++ ImageMagick-6.4.9-6/magick/MagickCore-config.in 2009-02-24 11:02:23.000000000 +0100 @@ -6,8 +6,6 @@ prefix=@prefix@ @@ -104,7 +104,7 @@ diff -up ImageMagick-6.4.5/magick/MagickCore-config.in.multilib ImageMagick-6.4. + pkg-config --libs MagickCore ;; --libs) -- echo "-L${libdir} -lMagickCore" +- echo "-L${libdir} @MAGICK_LIBS@" - ;; - --coder-path) - echo "@CODER_PATH@" @@ -115,9 +115,9 @@ diff -up ImageMagick-6.4.5/magick/MagickCore-config.in.multilib ImageMagick-6.4. ;; *) echo "${usage}" 1>&2 -diff -up ImageMagick-6.4.5/wand/MagickWand-config.in.multilib ImageMagick-6.4.5/wand/MagickWand-config.in ---- ImageMagick-6.4.5/wand/MagickWand-config.in.multilib 2008-02-05 19:50:44.000000000 +0100 -+++ ImageMagick-6.4.5/wand/MagickWand-config.in 2008-11-14 15:19:15.000000000 +0100 +diff -up ImageMagick-6.4.9-6/wand/MagickWand-config.in.multilib ImageMagick-6.4.9-6/wand/MagickWand-config.in +--- ImageMagick-6.4.9-6/wand/MagickWand-config.in.multilib 2008-12-08 20:00:35.000000000 +0100 ++++ ImageMagick-6.4.9-6/wand/MagickWand-config.in 2009-02-24 11:01:09.000000000 +0100 @@ -6,8 +6,6 @@ prefix=@prefix@ @@ -147,14 +147,14 @@ diff -up ImageMagick-6.4.5/wand/MagickWand-config.in.multilib ImageMagick-6.4.5/ + pkg-config --libs MagickWand ;; --libs) -- echo "-L${libdir} -lMagickWand -lMagickCore" +- echo "-L${libdir} -lMagickWand @MAGICK_LIBS@" + pkg-config --libs MagickWand ;; *) echo "${usage}" 1>&2 -diff -up ImageMagick-6.4.5/wand/Wand-config.in.multilib ImageMagick-6.4.5/wand/Wand-config.in ---- ImageMagick-6.4.5/wand/Wand-config.in.multilib 2008-02-05 19:50:44.000000000 +0100 -+++ ImageMagick-6.4.5/wand/Wand-config.in 2008-11-14 15:19:15.000000000 +0100 +diff -up ImageMagick-6.4.9-6/wand/Wand-config.in.multilib ImageMagick-6.4.9-6/wand/Wand-config.in +--- ImageMagick-6.4.9-6/wand/Wand-config.in.multilib 2008-12-08 20:00:35.000000000 +0100 ++++ ImageMagick-6.4.9-6/wand/Wand-config.in 2009-02-24 10:54:27.000000000 +0100 @@ -6,8 +6,6 @@ prefix=@prefix@ @@ -184,7 +184,7 @@ diff -up ImageMagick-6.4.5/wand/Wand-config.in.multilib ImageMagick-6.4.5/wand/W + pkg-config --libs MagickWand ;; --libs) -- echo "-L${libdir} -lMagickWand -lMagickCore" +- echo "-L${libdir} -lMagickWand @MAGICK_LIBS@" + pkg-config --libs MagickWand ;; *) diff --git a/ImageMagick.spec b/ImageMagick.spec index da857d7..0118173 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,20 +1,15 @@ -%define VER 6.4.5 -%define Patchlevel 5 +%define VER 6.4.9 +%define Patchlevel 6 Name: ImageMagick Version: %{VER}.%{Patchlevel} -Release: 9%{?dist} +Release: 1%{?dist} Summary: An X application for displaying and manipulating images Group: Applications/Multimedia License: ImageMagick Url: http://www.imagemagick.org/ -# This is: ftp://ftp.ImageMagick.org/pub/%{name}/%{name}-%{VER}-%{Patchlevel}.tar.bz2 -# With the 2 included copies of the non free ArtBrush font removed: -# PerlMagick/t/ttf/input.ttf -# PerlMagick/demo/Generic.ttf -Source0: %{name}-%{version}-clean.tar.bz2 +Source0: ftp://ftp.ImageMagick.org/pub/%{name}/%{name}-%{VER}-%{Patchlevel}.tar.bz2 Patch1: ImageMagick-6.4.0-multilib.patch -Patch2: ImageMagick-6.3.8-invalid-gerror-use.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel @@ -131,9 +126,8 @@ however. %prep -%setup -q -n %{name}-%{VER} +%setup -q -n %{name}-%{VER}-%{Patchlevel} %patch1 -p1 -b .multilib -%patch2 -p1 sed -i 's/libltdl.la/libltdl.so/g' configure iconv -f ISO-8859-1 -t UTF-8 README.txt > README.txt.tmp touch -r README.txt README.txt.tmp @@ -307,6 +301,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Mar 9 2009 Hans de Goede 6.4.9.6-1 +- New upstream release 6.4.9-6 + * Mon Feb 23 2009 Fedora Release Engineering - 6.4.5.5-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/sources b/sources index 558c15e..ce6f22a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f1f95352f69d7c02ed19b0d3e0c806fb ImageMagick-6.4.5.5-clean.tar.bz2 +d65a4cd3cf103d49085a55c90c871854 ImageMagick-6.4.9-6.tar.bz2