wok-next diff imagemagick6/stuff/patches/ImageMagick-6.9.7-8-libs_only-1.patch @ rev 20187
gpm: typo
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Thu Nov 02 20:06:45 2017 +0100 (2017-11-02) |
| parents | |
| children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/imagemagick6/stuff/patches/ImageMagick-6.9.7-8-libs_only-1.patch Thu Nov 02 20:06:45 2017 +0100 1.3 @@ -0,0 +1,471 @@ 1.4 +Submitted By: Ken Moffat <ken at linuxfromscratch dot org> 1.5 +Date: 2017-01-09 1.6 +Initial Package Version: 6.9.6-3 1.7 +Upstream Status: N/A 1.8 +Origin: Self 1.9 +Description: Allows the libraries of ImageMagick-6 to be installed 1.10 +without the programs or man-pages, and with versioned pkgconfig files 1.11 +so that ImageMagick-7 can be installed alongside this. Do not build 1.12 +perl here if doing this (the version from ImageMagick-7 will use the 1.13 +libraries from 7), and edit anyi cmake programs using this (e.g. 1.14 +inkscape-0.92) so that they look for the -6 pkgconfig files. 1.15 + 1.16 +Internally, ImageMagick-7 is a major change, and the names of the 1.17 +libraries and the include directories differ. 1.18 + 1.19 +For packages which use a conventional configure script, pass 1.20 +IMAGEMAGICK_CFLAGS=-I/usr/include/ImageMagick-6 and 1.21 +IMAGEMAGICK_LIBS="-lMagickCore-6.Q16HDRI -lMagick++-6.Q16HDRI -lMagickWand-6.Q16HDRI" 1.22 + 1.23 +In some places I have had to hardcode -6 because I could not persuade 1.24 +the build system to convert @MAGICK_CORE_VERSION@ in one file or for 1.25 +the names of the files. 1.26 + 1.27 +Also, my raw patch deletes wand/Wand.pc.in but gnu patch fails there, 1.28 +believing it is a reversal (not understood, a git patch would be 1.29 +easier if we all had git, mentioned because it will probably happen 1.30 +again if this has to be rediffed for future versions). 1.31 + 1.32 +diff -Naur ImageMagick-6.9.6-3.orig/configure ImageMagick-6.9.6-3/configure 1.33 +--- ImageMagick-6.9.6-3.orig/configure 2017-01-07 01:35:18.362869976 +0000 1.34 ++++ ImageMagick-6.9.6-3/configure 2017-01-07 20:50:59.735901975 +0000 1.35 +@@ -37452,7 +37452,7 @@ 1.36 + # ============================================================================== 1.37 + # Generate build environment 1.38 + # ============================================================================== 1.39 +-ac_config_files="$ac_config_files common.shi config/configure.xml config/delegates.xml config/ImageMagick.rdf config/MagickCore.dox config/MagickWand.dox config/Magick++.dox config/type-apple.xml config/type-dejavu.xml config/type-ghostscript.xml config/type-windows.xml config/type.xml ImageMagick.spec Magick++/bin/Magick++-config magick/ImageMagick.pc Magick++/lib/ImageMagick++.pc Magick++/lib/Magick++.pc magick/Magick-config magick/MagickCore-config magick/MagickCore.pc magick/version.h Makefile magick.sh PerlMagick/check.sh PerlMagick/default/Magick.pm PerlMagick/Makefile.PL PerlMagick/default/Makefile.PL PerlMagick/quantum/Makefile.PL PerlMagick/quantum/quantum.pm PerlMagick/quantum/quantum.xs PerlMagick/quantum/typemap utilities/animate.1 utilities/compare.1 utilities/composite.1 utilities/conjure.1 utilities/convert.1 utilities/display.1 utilities/identify.1 utilities/ImageMagick.1 utilities/import.1 utilities/mogrify.1 utilities/montage.1 utilities/stream.1 wand/MagickWand-config wand/MagickWand.pc wand/Wand-config wand/Wand.pc" 1.40 ++ac_config_files="$ac_config_files common.shi config/configure.xml config/delegates.xml config/ImageMagick.rdf config/MagickCore.dox config/MagickWand.dox config/Magick++.dox config/type-apple.xml config/type-dejavu.xml config/type-ghostscript.xml config/type-windows.xml config/type.xml ImageMagick.spec Magick++/bin/Magick++-config magick/ImageMagick-6.pc Magick++/lib/ImageMagick++-6.pc Magick++/lib/Magick++-6.pc magick/Magick-config magick/MagickCore-config magick/MagickCore-6.pc magick/version.h Makefile magick.sh PerlMagick/check.sh PerlMagick/default/Magick.pm PerlMagick/Makefile.PL PerlMagick/default/Makefile.PL PerlMagick/quantum/Makefile.PL PerlMagick/quantum/quantum.pm PerlMagick/quantum/quantum.xs PerlMagick/quantum/typemap utilities/animate.1 utilities/compare.1 utilities/composite.1 utilities/conjure.1 utilities/convert.1 utilities/display.1 utilities/identify.1 utilities/ImageMagick.1 utilities/import.1 utilities/mogrify.1 utilities/montage.1 utilities/stream.1 wand/MagickWand-config wand/MagickWand-6.pc wand/Wand-config wand/Wand-6.pc" 1.41 + 1.42 + cat >confcache <<\_ACEOF 1.43 + # This file is a shell script that caches the results of configure 1.44 +diff -Naur ImageMagick-6.9.6-3.orig/configure.ac ImageMagick-6.9.6-3/configure.ac 1.45 +--- ImageMagick-6.9.6-3.orig/configure.ac 2017-01-07 01:35:27.053787793 +0000 1.46 ++++ ImageMagick-6.9.6-3/configure.ac 2017-01-07 20:52:26.205101788 +0000 1.47 +@@ -3835,12 +3835,12 @@ 1.48 + config/type.xml \ 1.49 + ImageMagick.spec \ 1.50 + Magick++/bin/Magick++-config \ 1.51 +- magick/ImageMagick.pc \ 1.52 +- Magick++/lib/ImageMagick++.pc \ 1.53 +- Magick++/lib/Magick++.pc \ 1.54 ++ magick/ImageMagick-6.pc \ 1.55 ++ Magick++/lib/ImageMagick++-6.pc \ 1.56 ++ Magick++/lib/Magick++-6.pc \ 1.57 + magick/Magick-config \ 1.58 + magick/MagickCore-config \ 1.59 +- magick/MagickCore.pc \ 1.60 ++ magick/MagickCore-6.pc \ 1.61 + magick/version.h \ 1.62 + Makefile \ 1.63 + magick.sh \ 1.64 +@@ -3865,9 +3865,9 @@ 1.65 + utilities/montage.1 \ 1.66 + utilities/stream.1 \ 1.67 + wand/MagickWand-config \ 1.68 +- wand/MagickWand.pc \ 1.69 ++ wand/MagickWand-6.pc \ 1.70 + wand/Wand-config \ 1.71 +- wand/Wand.pc ]) 1.72 ++ wand/Wand-6.pc ]) 1.73 + AC_OUTPUT 1.74 + 1.75 + # ============================================================================== 1.76 +diff -Naur ImageMagick-6.9.6-3.orig/magick/ImageMagick-6.pc.in ImageMagick-6.9.6-3/magick/ImageMagick-6.pc.in 1.77 +--- ImageMagick-6.9.6-3.orig/magick/ImageMagick-6.pc.in 1970-01-01 01:00:00.000000000 +0100 1.78 ++++ ImageMagick-6.9.6-3/magick/ImageMagick-6.pc.in 2017-01-07 00:55:17.999483324 +0000 1.79 +@@ -0,0 +1,14 @@ 1.80 ++prefix=@prefix@ 1.81 ++exec_prefix=@exec_prefix@ 1.82 ++libdir=@libdir@ 1.83 ++includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@ 1.84 ++includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@ 1.85 ++libname=MagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ 1.86 ++ 1.87 ++Name: ImageMagick-@MAGICK_MAJOR_VERSION@ 1.88 ++Description: ImageMagick - convert, edit, and compose images (ABI @MAGICK_ABI_SUFFIX@) 1.89 ++URL: https://www.imagemagick.org 1.90 ++Version: @PACKAGE_VERSION@ 1.91 ++Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@ 1.92 ++Libs: -L${libdir} -l${libname} 1.93 ++Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@ 1.94 +diff -Naur ImageMagick-6.9.6-3.orig/magick/ImageMagick.pc.in ImageMagick-6.9.6-3/magick/ImageMagick.pc.in 1.95 +--- ImageMagick-6.9.6-3.orig/magick/ImageMagick.pc.in 2017-01-07 01:58:35.942633448 +0000 1.96 ++++ ImageMagick-6.9.6-3/magick/ImageMagick.pc.in 1970-01-01 01:00:00.000000000 +0100 1.97 +@@ -1,14 +0,0 @@ 1.98 +-prefix=@prefix@ 1.99 +-exec_prefix=@exec_prefix@ 1.100 +-libdir=@libdir@ 1.101 +-includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@ 1.102 +-includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@ 1.103 +-libname=MagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ 1.104 +- 1.105 +-Name: ImageMagick 1.106 +-Description: ImageMagick - convert, edit, and compose images (ABI @MAGICK_ABI_SUFFIX@) 1.107 +-URL: https://www.imagemagick.org 1.108 +-Version: @PACKAGE_VERSION@ 1.109 +-Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@ 1.110 +-Libs: -L${libdir} -l${libname} 1.111 +-Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@ 1.112 +diff -Naur ImageMagick-6.9.6-3.orig/magick/MagickCore-6.pc.in ImageMagick-6.9.6-3/magick/MagickCore-6.pc.in 1.113 +--- ImageMagick-6.9.6-3.orig/magick/MagickCore-6.pc.in 1970-01-01 01:00:00.000000000 +0100 1.114 ++++ ImageMagick-6.9.6-3/magick/MagickCore-6.pc.in 2017-01-07 22:13:31.500562039 +0000 1.115 +@@ -0,0 +1,15 @@ 1.116 ++prefix=@prefix@ 1.117 ++exec_prefix=@exec_prefix@ 1.118 ++libdir=@libdir@ 1.119 ++includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@ 1.120 ++includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@ 1.121 ++libname=MagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ 1.122 ++moduledir=@libdir@/ImageMagick-@MAGICK_MAJOR_VERSION@.@MAGICK_MINOR_VERSION@.@MAGICK_MICRO_VERSION@/modules-@MAGICK_ABI_SUFFIX@ 1.123 ++ 1.124 ++Name: MagickCore-@MAGICK_MAJOR_VERSION@ 1.125 ++Description: MagickCore - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@) 1.126 ++URL: https://www.imagemagick.org 1.127 ++Version: @PACKAGE_VERSION@ 1.128 ++Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@ 1.129 ++Libs: -L${libdir} -l${libname} 1.130 ++Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@ 1.131 +diff -Naur ImageMagick-6.9.6-3.orig/magick/MagickCore.pc.in ImageMagick-6.9.6-3/magick/MagickCore.pc.in 1.132 +--- ImageMagick-6.9.6-3.orig/magick/MagickCore.pc.in 2016-10-31 00:34:31.000000000 +0000 1.133 ++++ ImageMagick-6.9.6-3/magick/MagickCore.pc.in 1970-01-01 01:00:00.000000000 +0100 1.134 +@@ -1,15 +0,0 @@ 1.135 +-prefix=@prefix@ 1.136 +-exec_prefix=@exec_prefix@ 1.137 +-libdir=@libdir@ 1.138 +-includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@ 1.139 +-includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@ 1.140 +-libname=MagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ 1.141 +-moduledir=@libdir@/ImageMagick-@MAGICK_MAJOR_VERSION@.@MAGICK_MINOR_VERSION@.@MAGICK_MICRO_VERSION@/modules-@MAGICK_ABI_SUFFIX@ 1.142 +- 1.143 +-Name: MagickCore 1.144 +-Description: MagickCore - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@) 1.145 +-URL: https://www.imagemagick.org 1.146 +-Version: @PACKAGE_VERSION@ 1.147 +-Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@ 1.148 +-Libs: -L${libdir} -l${libname} 1.149 +-Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@ 1.150 +diff -Naur ImageMagick-6.9.6-3.orig/Magick++/lib/ImageMagick++-6.pc.in ImageMagick-6.9.6-3/Magick++/lib/ImageMagick++-6.pc.in 1.151 +--- ImageMagick-6.9.6-3.orig/Magick++/lib/ImageMagick++-6.pc.in 1970-01-01 01:00:00.000000000 +0100 1.152 ++++ ImageMagick-6.9.6-3/Magick++/lib/ImageMagick++-6.pc.in 2017-01-07 22:11:59.637428232 +0000 1.153 +@@ -0,0 +1,14 @@ 1.154 ++prefix=@prefix@ 1.155 ++exec_prefix=@exec_prefix@ 1.156 ++libdir=@libdir@ 1.157 ++includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@ 1.158 ++includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@ 1.159 ++libname=Magick++-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ 1.160 ++ 1.161 ++Name: ImageMagick++-@MAGICK_MAJOR_VERSION@ 1.162 ++Description: Magick++ - C++ API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@) 1.163 ++Version: @PACKAGE_VERSION@ 1.164 ++Requires: MagickWand-@MAGICK_MAJOR_VERSION@ 1.165 ++Libs: -L${libdir} -l${libname} 1.166 ++Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@ 1.167 ++Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@ 1.168 +diff -Naur ImageMagick-6.9.6-3.orig/Magick++/lib/ImageMagick++.pc.in ImageMagick-6.9.6-3/Magick++/lib/ImageMagick++.pc.in 1.169 +--- ImageMagick-6.9.6-3.orig/Magick++/lib/ImageMagick++.pc.in 2016-10-31 00:34:30.000000000 +0000 1.170 ++++ ImageMagick-6.9.6-3/Magick++/lib/ImageMagick++.pc.in 1970-01-01 01:00:00.000000000 +0100 1.171 +@@ -1,14 +0,0 @@ 1.172 +-prefix=@prefix@ 1.173 +-exec_prefix=@exec_prefix@ 1.174 +-libdir=@libdir@ 1.175 +-includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@ 1.176 +-includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@ 1.177 +-libname=Magick++-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ 1.178 +- 1.179 +-Name: ImageMagick++ 1.180 +-Description: Magick++ - C++ API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@) 1.181 +-Version: @PACKAGE_VERSION@ 1.182 +-Requires: MagickWand 1.183 +-Libs: -L${libdir} -l${libname} 1.184 +-Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@ 1.185 +-Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@ 1.186 +diff -Naur ImageMagick-6.9.6-3.orig/Magick++/lib/Magick++-6.pc.in ImageMagick-6.9.6-3/Magick++/lib/Magick++-6.pc.in 1.187 +--- ImageMagick-6.9.6-3.orig/Magick++/lib/Magick++-6.pc.in 1970-01-01 01:00:00.000000000 +0100 1.188 ++++ ImageMagick-6.9.6-3/Magick++/lib/Magick++-6.pc.in 2017-01-07 21:09:41.641487042 +0000 1.189 +@@ -0,0 +1,14 @@ 1.190 ++prefix=@prefix@ 1.191 ++exec_prefix=@exec_prefix@ 1.192 ++libdir=@libdir@ 1.193 ++includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@ 1.194 ++includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@ 1.195 ++libname=Magick++-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ 1.196 ++ 1.197 ++Name: Magick++-@MAGICK_MAJOR_VERSION@ 1.198 ++Description: Magick++ - C++ API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@) 1.199 ++Version: @PACKAGE_VERSION@ 1.200 ++Requires: MagickWand-@MAGICK_MAJOR_VERSION@ 1.201 ++Libs: -L${libdir} -l${libname} 1.202 ++Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@ 1.203 ++Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@ 1.204 +diff -Naur ImageMagick-6.9.6-3.orig/Magick++/lib/Magick++.pc.in ImageMagick-6.9.6-3/Magick++/lib/Magick++.pc.in 1.205 +--- ImageMagick-6.9.6-3.orig/Magick++/lib/Magick++.pc.in 2016-10-31 00:34:30.000000000 +0000 1.206 ++++ ImageMagick-6.9.6-3/Magick++/lib/Magick++.pc.in 1970-01-01 01:00:00.000000000 +0100 1.207 +@@ -1,14 +0,0 @@ 1.208 +-prefix=@prefix@ 1.209 +-exec_prefix=@exec_prefix@ 1.210 +-libdir=@libdir@ 1.211 +-includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@ 1.212 +-includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@ 1.213 +-libname=Magick++-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ 1.214 +- 1.215 +-Name: Magick++ 1.216 +-Description: Magick++ - C++ API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@) 1.217 +-Version: @PACKAGE_VERSION@ 1.218 +-Requires: MagickWand 1.219 +-Libs: -L${libdir} -l${libname} 1.220 +-Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@ 1.221 +-Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@ 1.222 +diff -Naur ImageMagick-6.9.6-3.orig/Makefile.in ImageMagick-6.9.6-3/Makefile.in 1.223 +--- ImageMagick-6.9.6-3.orig/Makefile.in 2017-01-06 01:07:37.217002803 +0000 1.224 ++++ ImageMagick-6.9.6-3/Makefile.in 2017-01-08 00:24:45.777974561 +0000 1.225 +@@ -302,10 +302,10 @@ 1.226 + config/Magick++.dox config/type-apple.xml \ 1.227 + config/type-dejavu.xml config/type-ghostscript.xml \ 1.228 + config/type-windows.xml config/type.xml ImageMagick.spec \ 1.229 +- Magick++/bin/Magick++-config magick/ImageMagick.pc \ 1.230 +- Magick++/lib/ImageMagick++.pc Magick++/lib/Magick++.pc \ 1.231 ++ Magick++/bin/Magick++-config magick/ImageMagick-6.pc \ 1.232 ++ Magick++/lib/ImageMagick++-6.pc Magick++/lib/Magick++-6.pc \ 1.233 + magick/Magick-config magick/MagickCore-config \ 1.234 +- magick/MagickCore.pc magick/version.h magick.sh \ 1.235 ++ magick/MagickCore-6.pc magick/version.h magick.sh \ 1.236 + PerlMagick/check.sh PerlMagick/default/Magick.pm \ 1.237 + PerlMagick/Makefile.PL PerlMagick/default/Makefile.PL \ 1.238 + PerlMagick/quantum/Makefile.PL PerlMagick/quantum/quantum.pm \ 1.239 +@@ -314,8 +314,8 @@ 1.240 + utilities/conjure.1 utilities/convert.1 utilities/display.1 \ 1.241 + utilities/identify.1 utilities/ImageMagick.1 \ 1.242 + utilities/import.1 utilities/mogrify.1 utilities/montage.1 \ 1.243 +- utilities/stream.1 wand/MagickWand-config wand/MagickWand.pc \ 1.244 +- wand/Wand-config wand/Wand.pc 1.245 ++ utilities/stream.1 wand/MagickWand-config wand/MagickWand-6.pc \ 1.246 ++ wand/Wand-config wand/Wand-6.pc 1.247 + CONFIG_CLEAN_VPATH_FILES = 1.248 + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; 1.249 + am__vpath_adj = case $$p in \ 1.250 +@@ -2471,8 +2471,8 @@ 1.251 + $(srcdir)/tests/Makefile.am $(srcdir)/utilities/Makefile.am \ 1.252 + $(srcdir)/wand/Makefile.am \ 1.253 + $(top_srcdir)/Magick++/bin/Magick++-config.in \ 1.254 +- $(top_srcdir)/Magick++/lib/ImageMagick++.pc.in \ 1.255 +- $(top_srcdir)/Magick++/lib/Magick++.pc.in \ 1.256 ++ $(top_srcdir)/Magick++/lib/ImageMagick++-6.pc.in \ 1.257 ++ $(top_srcdir)/Magick++/lib/Magick++-6.pc.in \ 1.258 + $(top_srcdir)/PerlMagick/Makefile.PL.in \ 1.259 + $(top_srcdir)/PerlMagick/check.sh.in \ 1.260 + $(top_srcdir)/PerlMagick/default/Magick.pm.in \ 1.261 +@@ -2501,10 +2501,10 @@ 1.262 + $(top_srcdir)/config/type-ghostscript.xml.in \ 1.263 + $(top_srcdir)/config/type-windows.xml.in \ 1.264 + $(top_srcdir)/config/type.xml.in \ 1.265 +- $(top_srcdir)/magick/ImageMagick.pc.in \ 1.266 ++ $(top_srcdir)/magick/ImageMagick-6.pc.in \ 1.267 + $(top_srcdir)/magick/Magick-config.in \ 1.268 + $(top_srcdir)/magick/MagickCore-config.in \ 1.269 +- $(top_srcdir)/magick/MagickCore.pc.in \ 1.270 ++ $(top_srcdir)/magick/MagickCore-6.pc.in \ 1.271 + $(top_srcdir)/magick/version.h.in \ 1.272 + $(top_srcdir)/utilities/ImageMagick.1.in \ 1.273 + $(top_srcdir)/utilities/animate.1.in \ 1.274 +@@ -2519,9 +2519,9 @@ 1.275 + $(top_srcdir)/utilities/montage.1.in \ 1.276 + $(top_srcdir)/utilities/stream.1.in \ 1.277 + $(top_srcdir)/wand/MagickWand-config.in \ 1.278 +- $(top_srcdir)/wand/MagickWand.pc.in \ 1.279 ++ $(top_srcdir)/wand/MagickWand-6.pc.in \ 1.280 + $(top_srcdir)/wand/Wand-config.in \ 1.281 +- $(top_srcdir)/wand/Wand.pc.in ChangeLog config/ar-lib \ 1.282 ++ $(top_srcdir)/wand/Wand.pc-6.in ChangeLog config/ar-lib \ 1.283 + config/compile config/config.guess config/config.sub \ 1.284 + config/depcomp config/install-sh config/ltmain.sh \ 1.285 + config/missing config/mkinstalldirs 1.286 +@@ -4185,8 +4185,8 @@ 1.287 + magick/MagickCore-config 1.288 + 1.289 + MAGICK_PKGCONFIG = \ 1.290 +- magick/ImageMagick.pc \ 1.291 +- magick/MagickCore.pc \ 1.292 ++ magick/ImageMagick-6.pc \ 1.293 ++ magick/MagickCore-6.pc \ 1.294 + magick/ImageMagick-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc \ 1.295 + magick/MagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc 1.296 + 1.297 +@@ -4605,9 +4605,9 @@ 1.298 + magick/Magick-config.in \ 1.299 + magick/MagickCore-config.in \ 1.300 + $(MAGICK_MANS) \ 1.301 +- magick/ImageMagick.pc.in \ 1.302 ++ magick/ImageMagick-6.pc.in \ 1.303 + magick/libMagickCore.map \ 1.304 +- magick/MagickCore.pc.in \ 1.305 ++ magick/MagickCore-6.pc.in \ 1.306 + magick/config.h_vms \ 1.307 + magick/mac.c \ 1.308 + magick/nt-base.c \ 1.309 +@@ -4722,8 +4722,8 @@ 1.310 + wand/MagickWand-config 1.311 + 1.312 + WAND_PKGCONFIG = \ 1.313 +- wand/MagickWand.pc \ 1.314 +- wand/Wand.pc \ 1.315 ++ wand/MagickWand-6.pc \ 1.316 ++ wand/Wand-6.pc \ 1.317 + wand/MagickWand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc \ 1.318 + wand/Wand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc 1.319 + 1.320 +@@ -4747,9 +4747,9 @@ 1.321 + wand/ChangeLog \ 1.322 + wand/libMagickWand.map \ 1.323 + wand/MagickWand-config.1 \ 1.324 +- wand/MagickWand.pc.in \ 1.325 ++ wand/MagickWand-6.pc.in \ 1.326 + wand/Wand-config.1 \ 1.327 +- wand/Wand.pc.in 1.328 ++ wand/Wand-6.pc.in 1.329 + 1.330 + WAND_CLEANFILES = 1.331 + MAGICKPP_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/Magick++/lib 1.332 +@@ -4778,8 +4778,8 @@ 1.333 + Magick++/bin/Magick++-config.1 1.334 + 1.335 + MAGICKPP_PKGCONFIG_OPT = \ 1.336 +- Magick++/lib/Magick++.pc \ 1.337 +- Magick++/lib/ImageMagick++.pc \ 1.338 ++ Magick++/lib/Magick++-6.pc \ 1.339 ++ Magick++/lib/ImageMagick++-6.pc \ 1.340 + Magick++/lib/Magick++-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc \ 1.341 + Magick++/lib/ImageMagick++-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc 1.342 + 1.343 +@@ -4796,9 +4796,9 @@ 1.344 + Magick++/README \ 1.345 + Magick++/bin/Magick++-config.1 \ 1.346 + Magick++/bin/Magick++-config.in \ 1.347 +- Magick++/lib/ImageMagick++.pc.in \ 1.348 ++ Magick++/lib/ImageMagick++-6.pc.in \ 1.349 + Magick++/lib/libMagick++.map \ 1.350 +- Magick++/lib/Magick++.pc.in \ 1.351 ++ Magick++/lib/Magick++-6.pc.in \ 1.352 + Magick++/demo/model.miff \ 1.353 + Magick++/demo/smile.miff \ 1.354 + Magick++/demo/smile_anim.miff \ 1.355 +@@ -5286,17 +5286,17 @@ 1.356 + cd $(top_builddir) && $(SHELL) ./config.status $@ 1.357 + Magick++/bin/Magick++-config: $(top_builddir)/config.status $(top_srcdir)/Magick++/bin/Magick++-config.in 1.358 + cd $(top_builddir) && $(SHELL) ./config.status $@ 1.359 +-magick/ImageMagick.pc: $(top_builddir)/config.status $(top_srcdir)/magick/ImageMagick.pc.in 1.360 ++magick/ImageMagick-6.pc: $(top_builddir)/config.status $(top_srcdir)/magick/ImageMagick-6.pc.in 1.361 + cd $(top_builddir) && $(SHELL) ./config.status $@ 1.362 +-Magick++/lib/ImageMagick++.pc: $(top_builddir)/config.status $(top_srcdir)/Magick++/lib/ImageMagick++.pc.in 1.363 ++Magick++/lib/ImageMagick++-6.pc: $(top_builddir)/config.status $(top_srcdir)/Magick++/lib/ImageMagick++-6.pc.in 1.364 + cd $(top_builddir) && $(SHELL) ./config.status $@ 1.365 +-Magick++/lib/Magick++.pc: $(top_builddir)/config.status $(top_srcdir)/Magick++/lib/Magick++.pc.in 1.366 ++Magick++/lib/Magick++-6.pc: $(top_builddir)/config.status $(top_srcdir)/Magick++/lib/Magick++-6.pc.in 1.367 + cd $(top_builddir) && $(SHELL) ./config.status $@ 1.368 + magick/Magick-config: $(top_builddir)/config.status $(top_srcdir)/magick/Magick-config.in 1.369 + cd $(top_builddir) && $(SHELL) ./config.status $@ 1.370 + magick/MagickCore-config: $(top_builddir)/config.status $(top_srcdir)/magick/MagickCore-config.in 1.371 + cd $(top_builddir) && $(SHELL) ./config.status $@ 1.372 +-magick/MagickCore.pc: $(top_builddir)/config.status $(top_srcdir)/magick/MagickCore.pc.in 1.373 ++magick/MagickCore-6.pc: $(top_builddir)/config.status $(top_srcdir)/magick/MagickCore-6.pc.in 1.374 + cd $(top_builddir) && $(SHELL) ./config.status $@ 1.375 + magick/version.h: $(top_builddir)/config.status $(top_srcdir)/magick/version.h.in 1.376 + cd $(top_builddir) && $(SHELL) ./config.status $@ 1.377 +@@ -5344,11 +5344,11 @@ 1.378 + cd $(top_builddir) && $(SHELL) ./config.status $@ 1.379 + wand/MagickWand-config: $(top_builddir)/config.status $(top_srcdir)/wand/MagickWand-config.in 1.380 + cd $(top_builddir) && $(SHELL) ./config.status $@ 1.381 +-wand/MagickWand.pc: $(top_builddir)/config.status $(top_srcdir)/wand/MagickWand.pc.in 1.382 ++wand/MagickWand-6.pc: $(top_builddir)/config.status $(top_srcdir)/wand/MagickWand-6.pc.in 1.383 + cd $(top_builddir) && $(SHELL) ./config.status $@ 1.384 + wand/Wand-config: $(top_builddir)/config.status $(top_srcdir)/wand/Wand-config.in 1.385 + cd $(top_builddir) && $(SHELL) ./config.status $@ 1.386 +-wand/Wand.pc: $(top_builddir)/config.status $(top_srcdir)/wand/Wand.pc.in 1.387 ++wand/Wand-6.pc: $(top_builddir)/config.status $(top_srcdir)/wand/Wand-6.pc.in 1.388 + cd $(top_builddir) && $(SHELL) ./config.status $@ 1.389 + 1.390 + install-codersLTLIBRARIES: $(coders_LTLIBRARIES) 1.391 +@@ -11369,7 +11369,7 @@ 1.392 + install-data-local install-docDATA install-filtersLTLIBRARIES \ 1.393 + install-includeHEADERS install-magickincHEADERS \ 1.394 + install-magickincarchHEADERS install-magickppincHEADERS \ 1.395 +- install-magickpptopincHEADERS install-man \ 1.396 ++ install-magickpptopincHEADERS \ 1.397 + install-pkgconfigDATA install-wandincHEADERS 1.398 + 1.399 + install-dvi: install-dvi-am 1.400 +@@ -11387,6 +11387,8 @@ 1.401 + 1.402 + install-info-am: 1.403 + 1.404 ++install-libs-only: install-libLTLIBRARIES install-data-am 1.405 ++ 1.406 + install-man: install-man1 1.407 + 1.408 + install-pdf: install-pdf-am 1.409 +@@ -11563,7 +11565,7 @@ 1.410 + @WITH_PERL_FALSE@distclean-perl: 1.411 + 1.412 + # create a copy for pc file (ideally the non abi should be symlinked) 1.413 +-%-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc: %.pc 1.414 ++%-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc: %-@MAGICK_MAJOR_VERSION@.pc 1.415 + cp -f $^ $@ 1.416 + 1.417 + all-local: $(MAGICKPP_LOCAL_TARGETS) $(PERLMAGICK_ALL_LOCAL_TARGETS) $(MAINTAINER_TARGETS) 1.418 +diff -Naur ImageMagick-6.9.6-3.orig/wand/MagickWand-6.pc.in ImageMagick-6.9.6-3/wand/MagickWand-6.pc.in 1.419 +--- ImageMagick-6.9.6-3.orig/wand/MagickWand-6.pc.in 1970-01-01 01:00:00.000000000 +0100 1.420 ++++ ImageMagick-6.9.6-3/wand/MagickWand-6.pc.in 2017-01-08 00:37:51.232515933 +0000 1.421 +@@ -0,0 +1,15 @@ 1.422 ++prefix=@prefix@ 1.423 ++exec_prefix=@exec_prefix@ 1.424 ++libdir=@libdir@ 1.425 ++includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@ 1.426 ++includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@ 1.427 ++libname=MagickWand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ 1.428 ++ 1.429 ++Name: MagickWand-@MAGICK_MAJOR_VERSION@ 1.430 ++Description: MagickWand - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@) 1.431 ++URL: https://www.imagemagick.org 1.432 ++Version: @PACKAGE_VERSION@ 1.433 ++Requires: MagickCore-@MAGICK_MAJOR_VERSION@ 1.434 ++Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@ 1.435 ++Libs: -L${libdir} -l${libname} 1.436 ++Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@ 1.437 +diff -Naur ImageMagick-6.9.6-3.orig/wand/MagickWand.pc.in ImageMagick-6.9.6-3/wand/MagickWand.pc.in 1.438 +--- ImageMagick-6.9.6-3.orig/wand/MagickWand.pc.in 2016-10-31 00:34:31.000000000 +0000 1.439 ++++ ImageMagick-6.9.6-3/wand/MagickWand.pc.in 1970-01-01 01:00:00.000000000 +0100 1.440 +@@ -1,15 +0,0 @@ 1.441 +-prefix=@prefix@ 1.442 +-exec_prefix=@exec_prefix@ 1.443 +-libdir=@libdir@ 1.444 +-includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@ 1.445 +-includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@ 1.446 +-libname=MagickWand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ 1.447 +- 1.448 +-Name: MagickWand 1.449 +-Description: MagickWand - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@) 1.450 +-URL: https://www.imagemagick.org 1.451 +-Version: @PACKAGE_VERSION@ 1.452 +-Requires: MagickCore 1.453 +-Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@ 1.454 +-Libs: -L${libdir} -l${libname} 1.455 +-Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@ 1.456 +diff -Naur ImageMagick-6.9.6-3.orig/wand/Wand-6.pc.in ImageMagick-6.9.6-3/wand/Wand-6.pc.in 1.457 +--- ImageMagick-6.9.6-3.orig/wand/Wand-6.pc.in 1970-01-01 01:00:00.000000000 +0100 1.458 ++++ ImageMagick-6.9.6-3/wand/Wand-6.pc.in 2017-01-08 00:39:23.169642808 +0000 1.459 +@@ -0,0 +1,15 @@ 1.460 ++prefix=@prefix@ 1.461 ++exec_prefix=@exec_prefix@ 1.462 ++libdir=@libdir@ 1.463 ++includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@ 1.464 ++includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@ 1.465 ++libname=MagickWand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ 1.466 ++ 1.467 ++Name: MagickWand-6 1.468 ++Description: MagickCore - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@) 1.469 ++URL: https://www.imagemagick.org 1.470 ++Version: @PACKAGE_VERSION@ 1.471 ++Requires: MagickCore-6 1.472 ++Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@ 1.473 ++Libs: -L${libdir} -l${libname} 1.474 ++Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@