rpms
/
ImageMagick
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

work on 6.2.8

This commit is contained in:
Matthias Clasen 2006-06-09 14:25:08 +00:00
parent 970a36d6b3
commit 1c0a761c82
2 changed files with 81 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
ImageMagick-6.2.8-multilib.patch Normal file
View File

@ -0,0 +1,78 @@
--- 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

6
ImageMagick.spec
View File

@ -21,7 +21,7 @@ Source1: magick_small.png
Patch1: ImageMagick-6.2.1-local_doc.patch
Patch2: ImageMagick-6.2.5-format-string-again.patch
Patch3: ImageMagick-6.2.5-yet-another-overflow.patch
Patch4: ImageMagick-6.2.5-multilib.patch
Patch4: ImageMagick-6.2.8-multilib.patch
Url: http://www.imagemagick.org/
Buildroot: %{_tmppath}/%{name}-%{version}-root
@ -116,8 +116,8 @@ however.
%prep
%setup -q -n %{name}-%{VER}
%patch1 -p1 -b .local_doc
%patch2 -p1 -b .format-string-again
%patch3 -p1 -b .yet-another-overflow
#%patch2 -p1 -b .format-string-again
#%patch3 -p1 -b .yet-another-overflow
%patch4 -p1 -b .multilib
%build