diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2007-10-24 08:13:11 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2007-10-24 08:13:11 +0000 |
| commit | 34c2b7c694e615ab257b0f2954943c3cb0661fed (patch) | |
| tree | e94b93328c665f4d296fe7b5691736519501a3e9 /packages/imagemagick | |
| parent | a31d1fd4a686ad35a7b5c543eea00652ffb3e705 (diff) | |
| parent | c5dbf7ed618ff5298a1d811dd9f2d8d4a4de6f55 (diff) | |
merge of '3c08ee728d08c7353d5bf6f79c2c549db74f468d'
and '76ee2f24def774de27e4c0276b7e751d61c31d62'
Diffstat (limited to 'packages/imagemagick')
| -rw-r--r-- | packages/imagemagick/files/binconfig-fixes.patch | 81 | ||||
| -rw-r--r-- | packages/imagemagick/files/makefile-am.patch | 13 |
2 files changed, 94 insertions, 0 deletions
diff --git a/packages/imagemagick/files/binconfig-fixes.patch b/packages/imagemagick/files/binconfig-fixes.patch new file mode 100644 index 0000000000..51797c5326 --- /dev/null +++ b/packages/imagemagick/files/binconfig-fixes.patch @@ -0,0 +1,81 @@ +Index: ImageMagick-6.3.5/Magick++/bin/Magick++-config.in +=================================================================== +--- ImageMagick-6.3.5.orig/Magick++/bin/Magick++-config.in 2007-10-24 08:04:49.000000000 +0100 ++++ ImageMagick-6.3.5/Magick++/bin/Magick++-config.in 2007-10-24 08:07:51.000000000 +0100 +@@ -4,6 +4,9 @@ + # required to use the Magick++ library. + # + # ++prefix=@PREFIX_DIR@ ++exec_prefix=@EXEC_PREFIX_DIR@ ++ + usage='Usage: Magick++-config [--cppflags] [--cxxflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version] + + For example, "magick.cpp" may be compiled to produce "magick" as follows: +@@ -18,10 +21,10 @@ + while test $# -gt 0; do + case $1 in + --prefix) +- echo @PREFIX_DIR@ ++ echo $prefix + ;; + --exec-prefix) +- echo @EXEC_PREFIX_DIR@ ++ echo $exec_prefix + ;; + --version) + echo @PACKAGE_VERSION@ +Index: ImageMagick-6.3.5/magick/Magick-config.in +=================================================================== +--- ImageMagick-6.3.5.orig/magick/Magick-config.in 2007-10-24 08:04:49.000000000 +0100 ++++ ImageMagick-6.3.5/magick/Magick-config.in 2007-10-24 08:07:19.000000000 +0100 +@@ -3,6 +3,9 @@ + # Configure options script for re-calling MagickCore compilation options + # required to use the MagickCore library. + # ++prefix=@PREFIX_DIR@ ++exec_prefix=@EXEC_PREFIX_DIR@ ++ + usage="\ + Usage: Magick-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]" + +@@ -15,10 +18,10 @@ + while test $# -gt 0; do + case $1 in + --prefix) +- echo @PREFIX_DIR@ ++ echo $prefix + ;; + --exec-prefix) +- echo @EXEC_PREFIX_DIR@ ++ echo $exec_prefix + ;; + --version) + echo '@PACKAGE_VERSION@ Q@QuantumDepth@ @MAGICK_HDRI@' +Index: ImageMagick-6.3.5/wand/Wand-config.in +=================================================================== +--- ImageMagick-6.3.5.orig/wand/Wand-config.in 2007-10-24 08:04:49.000000000 +0100 ++++ ImageMagick-6.3.5/wand/Wand-config.in 2007-10-24 08:06:38.000000000 +0100 +@@ -3,6 +3,9 @@ + # Configure options script for re-calling MagickWand compilation options + # required to use the MagickWand library. + # ++prefix=@PREFIX_DIR@ ++exec_prefix=@EXEC_PREFIX_DIR@ ++ + usage="\ + Usage: Wand-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]" + +@@ -15,10 +18,10 @@ + while test $# -gt 0; do + case $1 in + --prefix) +- echo @PREFIX_DIR@ ++ echo $prefix + ;; + --exec-prefix) +- echo @EXEC_PREFIX_DIR@ ++ echo $exec_prefix + ;; + --version) + echo '@PACKAGE_VERSION@ Q@QuantumDepth@ @MAGICK_HDRI@' diff --git a/packages/imagemagick/files/makefile-am.patch b/packages/imagemagick/files/makefile-am.patch new file mode 100644 index 0000000000..7ee6ccb4c9 --- /dev/null +++ b/packages/imagemagick/files/makefile-am.patch @@ -0,0 +1,13 @@ +Index: ImageMagick-6.3.5/Makefile.am +=================================================================== +--- ImageMagick-6.3.5.orig/Makefile.am 2007-10-24 08:03:09.000000000 +0100 ++++ ImageMagick-6.3.5/Makefile.am 2007-10-24 08:03:21.000000000 +0100 +@@ -18,7 +18,7 @@ + + AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) + +-ACLOCAL_AMFLAGS = -Iltdl/m4 -I m4 ++ACLOCAL_AMFLAGS = -I m4 + + MODULECOMMONFLAGS = -no-undefined -export-symbols-regex ".*" -module -avoid-version + |