- GraphicsMagick-1.3.5, ABI break (#487605)

- --without-libgs (for now, per upstream advice)
- BR: jasper-devel
epel9
Rex Dieter 16 years ago
parent 50e9f3b564
commit 36716ce701

@ -1 +1 @@
GraphicsMagick-1.1.15.tar.bz2
GraphicsMagick-1.3.5.tar.bz2

@ -1,12 +0,0 @@
diff -up GraphicsMagick-1.1.14/Magick++/lib/Geometry.cpp.BAD GraphicsMagick-1.1.14/Magick++/lib/Geometry.cpp
--- GraphicsMagick-1.1.14/Magick++/lib/Geometry.cpp.BAD 2008-09-11 11:43:45.000000000 -0400
+++ GraphicsMagick-1.1.14/Magick++/lib/Geometry.cpp 2008-09-11 11:43:52.000000000 -0400
@@ -8,7 +8,7 @@
#define MAGICK_IMPLEMENTATION
#include "Magick++/Include.h"
-#include <string>
+#include <cstring>
#include <ctype.h> // for isdigit
#include <strings.h> // for strcpy

@ -1,33 +0,0 @@
diff -up GraphicsMagick-1.1.15/magick/GraphicsMagick-config.in.multilib GraphicsMagick-1.1.15/magick/GraphicsMagick-config.in
--- GraphicsMagick-1.1.15/magick/GraphicsMagick-config.in.multilib 2003-07-12 13:33:04.000000000 -0500
+++ GraphicsMagick-1.1.15/magick/GraphicsMagick-config.in 2009-06-30 10:16:25.398703465 -0500
@@ -30,16 +30,16 @@ while test $# -gt 0; do
echo @PACKAGE_VERSION@
;;
--cflags)
- echo '@CFLAGS@'
+ echo ''
;;
--cppflags)
echo '@MAGICK_API_CPPFLAGS@'
;;
--ldflags)
- echo '@MAGICK_API_LDFLAGS@'
+ echo ''
;;
--libs)
- echo '@MAGICK_API_LIBS@'
+ echo '-lGraphicsMagick'
;;
*)
echo "${usage}" 1>&2
diff -up GraphicsMagick-1.1.15/magick/GraphicsMagick.pc.in.multilib GraphicsMagick-1.1.15/magick/GraphicsMagick.pc.in
--- GraphicsMagick-1.1.15/magick/GraphicsMagick.pc.in.multilib 2007-04-08 20:12:40.000000000 -0500
+++ GraphicsMagick-1.1.15/magick/GraphicsMagick.pc.in 2009-06-30 10:16:15.015703583 -0500
@@ -8,5 +8,5 @@ Name: GraphicsMagick
Version: @PACKAGE_VERSION@
Description: GraphicsMagick image processing library
Requires:
-Libs: @MAGICK_API_LDFLAGS@ @MAGICK_API_LIBS@
+Libs: -lGraphicsMagick
Cflags: -I${includedir} @MAGICK_API_CPPFLAGS@

@ -1,26 +0,0 @@
--- GraphicsMagick-1.1.7/configure.ac.orig 2006-07-31 00:24:43.000000000 +0200
+++ GraphicsMagick-1.1.7/configure.ac 2006-07-31 00:25:02.000000000 +0200
@@ -1684,8 +1684,8 @@
AC_MSG_RESULT()
failed=0;
passed=0;
- AC_CHECK_HEADER(ps/iapi.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
- AC_CHECK_HEADER(ps/errors.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
+ AC_CHECK_HEADER(ghostscript/iapi.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
+ AC_CHECK_HEADER(ghostscript/errors.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
AC_CHECK_LIB(gs,gsapi_new_instance,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
AC_MSG_CHECKING(if Ghostscript library package is complete)
if test $passed -gt 0
--- GraphicsMagick-1.1.7/magick/delegate.h.orig 2006-07-31 00:25:33.000000000 +0200
+++ GraphicsMagick-1.1.7/magick/delegate.h 2006-07-31 00:25:51.000000000 +0200
@@ -46,8 +46,8 @@
#if defined(MAGICK_IMPLEMENTATION)
#if defined(HasGS)
-#include "ps/iapi.h"
-#include "ps/errors.h"
+#include "ghostscript/iapi.h"
+#include "ghostscript/errors.h"
#endif
#ifndef gs_main_instance_DEFINED

@ -1,24 +0,0 @@
diff -up GraphicsMagick-1.1.10/PerlMagick/Makefile.PL.orig GraphicsMagick-1.1.10/PerlMagick/Makefile.PL
--- GraphicsMagick-1.1.10/PerlMagick/Makefile.PL.orig 2008-01-28 17:48:28.000000000 +0100
+++ GraphicsMagick-1.1.10/PerlMagick/Makefile.PL 2008-01-28 17:48:58.000000000 +0100
@@ -62,7 +62,7 @@ WriteMakefile
'INSTALLBIN' => '/usr/local/bin',
# Library specification
- 'LIBS' => ['-L/usr/local/lib -R/usr/local/lib -L/usr/local/lib -L/usr/local/lib -L/home/glennrp/CVS/ImageMagick/magick -lGraphicsMagick -ljbig -llcms -ltiff -lfreetype -ljasper -ljpeg -lgs -lpng -lfpx -lwmflite -lXext -lSM -lICE -lX11 -lsocket -lnsl -lbz2 -lxml2 -lz -lpthread -lm'],
+ 'LIBS' => ['-L/usr/local/lib -R/usr/local/lib -L/usr/local/lib -L/usr/local/lib -L/home/glennrp/CVS/ImageMagick/magick -L../magick/.libs -lGraphicsMagick -ljbig -llcms -ltiff -lfreetype -ljasper -ljpeg -lgs -lpng -lfpx -lwmflite -lXext -lSM -lICE -lX11 -lsocket -lnsl -lbz2 -lxml2 -lz -lpthread -lm'],
# Perl binary name (if a Perl binary is built)
'MAP_TARGET' => 'PerlMagick',
diff -up GraphicsMagick-1.1.10/PerlMagick/Makefile.PL.in.orig GraphicsMagick-1.1.10/PerlMagick/Makefile.PL.in
--- GraphicsMagick-1.1.10/PerlMagick/Makefile.PL.in.orig 2008-01-28 17:48:34.000000000 +0100
+++ GraphicsMagick-1.1.10/PerlMagick/Makefile.PL.in 2008-01-28 17:48:58.000000000 +0100
@@ -57,7 +57,7 @@ WriteMakefile
'INSTALLBIN' => '@BIN_DIR@',
# Library specification
- 'LIBS' => ['-L@MAGICKLIBDIR@ -lGraphicsMagick @LDFLAGS@ @MAGICK_DEP_LIBS@'],
+ 'LIBS' => ['-L@MAGICKLIBDIR@ -L../magick/.libs -lGraphicsMagick @LDFLAGS@ @MAGICK_DEP_LIBS@'],
# Perl binary name (if a Perl binary is built)
'MAP_TARGET' => 'PerlMagick',

@ -1,15 +1,11 @@
Summary: An ImageMagick fork, offering faster image generation and better quality
Name: GraphicsMagick
Version: 1.1.15
Version: 1.3.5
Release: 1%{?dist}
License: MIT
Group: Applications/Multimedia
Source0: http://downloads.sourceforge.net/sourceforge/graphicsmagick/GraphicsMagick-%{version}.tar.bz2
Patch0: GraphicsMagick-gslib.patch
Patch1: GraphicsMagick-perl.patch
Patch2: GraphicsMagick-1.1.10-gcc43.patch
# hack out multilib issues, esp since we know we're in default search paths
Patch3: GraphicsMagick-1.1.15-multilib.patch
Url: http://www.graphicsmagick.org/
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@ -17,7 +13,7 @@ BuildRequires: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel
BuildRequires: libtiff-devel, libungif-devel, zlib-devel, perl
BuildRequires: freetype-devel >= 2.0.1
BuildRequires: automake >= 1.7 autoconf >= 2.58 libtool >= 1.5
BuildRequires: ghostscript-devel
BuildRequires: jasper-devel
BuildRequires: libwmf-devel, perl-devel
BuildRequires: lcms-devel, libxml2-devel, librsvg2-devel
BuildRequires: libX11-devel libXext-devel libXt-devel
@ -29,14 +25,14 @@ the GraphicsMagick Group to significantly improve the quality and performance
of the software.
%package devel
Summary: Static libraries and header files for GraphicsMagick app development
Summary: Libraries and header files for GraphicsMagick app development
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: ghostscript-devel, bzip2-devel, libtiff-devel, libjpeg-devel
Requires: lcms-devel, pkgconfig, libX11-devel, libXext-devel, libXt-devel
%description devel
GraphicsMagick-devel contains the static libraries and header files you'll
GraphicsMagick-devel contains the Libraries and header files you'll
need to develop GraphicsMagick applications. GraphicsMagick is an image
manipulation program.
@ -76,7 +72,7 @@ Requires: %{name}-c++ = %{version}-%{release}
Requires: %{name}-devel = %{version}-%{release}
%description c++-devel
GraphicsMagick-devel contains the static libraries and header files you'll
GraphicsMagick-devel contains the Libraries and header files you'll
need to develop GraphicsMagick applications using the Magick++ C++ bindings.
GraphicsMagick is an image manipulation program.
@ -89,13 +85,6 @@ however.
%prep
%setup -q
# Disabled, causing segfaults in the gslib code path
#%patch0 -p 1 -b .gslib
%patch1 -p 1 -b .perl
%patch2 -p1 -b .gcc43
%patch3 -p1 -b .multilib
# Regenerating configure script
#autoconf
iconv -f iso-8859-2 -t utf8 < ChangeLog > ChangeLog.utf8
mv -f ChangeLog.utf8 ChangeLog
@ -113,11 +102,9 @@ sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
--with-x \
--with-threads \
--with-magick_plus_plus \
--with-gslib \
--without-gslib \
--with-wmf \
--with-lzw \
--with-lcms \
--with-rsvg \
--with-xml \
--with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='%__cc -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'" \
--with-windows-font-dir=%{_datadir}/fonts/default/TrueType \
@ -205,10 +192,10 @@ rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc Copyright.txt
%doc README.txt AUTHORS
%doc README.txt
%doc %{_datadir}/doc/%{name}/
%attr(755,root,root) %{_libdir}/libGraphicsMagick.so.1*
%attr(755,root,root) %{_libdir}/libGraphicsMagickWand.so.0*
%{_libdir}/libGraphicsMagick.so.3*
%{_libdir}/libGraphicsMagickWand.so.2*
%{_bindir}/[a-z]*
%{_libdir}/GraphicsMagick*
%{_datadir}/GraphicsMagick*
@ -222,18 +209,20 @@ rm -rf %{buildroot}
%{_libdir}/libGraphicsMagickWand.so
%{_libdir}/pkgconfig/GraphicsMagick.pc
%{_libdir}/pkgconfig/GraphicsMagickWand.pc
%{_includedir}/GraphicsMagick/
%dir %{_includedir}/GraphicsMagick/
%{_includedir}/GraphicsMagick/magick/
%{_includedir}/GraphicsMagick/wand/
%{_mandir}/man1/GraphicsMagick-config.*
%{_mandir}/man1/GraphicsMagickWand-config.*
%files c++
%defattr(-,root,root,-)
%{_libdir}/libGraphicsMagick++.so.*
%{_libdir}/libGraphicsMagick++.so.3*
%files c++-devel
%defattr(-,root,root,-)
%{_bindir}/GraphicsMagick++-config
%{_includedir}/GraphicsMagick/Magick++
%{_includedir}/GraphicsMagick/Magick++/
%{_includedir}/GraphicsMagick/Magick++.h
%{_libdir}/libGraphicsMagick++.so
%{_libdir}/pkgconfig/GraphicsMagick++.pc
@ -246,6 +235,11 @@ rm -rf %{buildroot}
%changelog
* Tue Jun 30 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.3.5-1
- GraphicsMagick-1.3.5, ABI break (#487605)
- --without-libgs (for now, per upstream advice)
- BR: jasper-devel
* Tue Jun 30 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.1.15-1
- GraphicsMagick-1.1.15
- fix BuildRoot

@ -1 +1 @@
e8b1393b14356fc2baf0f79db100cce8 GraphicsMagick-1.1.15.tar.bz2
695d94588437ef3a12b971d7ab672d8f GraphicsMagick-1.3.5.tar.bz2

Loading…
Cancel
Save