SliTaz Repositories

1 Submitted By: Ken Moffat <ken at linuxfromscratch dot org>

2 Date: 2017-01-09

3 Initial Package Version: 6.9.6-3

4 Upstream Status: N/A

5 Origin: Self

6 Description: Allows the libraries of ImageMagick-6 to be installed

7 without the programs or man-pages, and with versioned pkgconfig files

8 so that ImageMagick-7 can be installed alongside this. Do not build

9 perl here if doing this (the version from ImageMagick-7 will use the

10 libraries from 7), and edit anyi cmake programs using this (e.g.

11 inkscape-0.92) so that they look for the -6 pkgconfig files.

12

13 Internally, ImageMagick-7 is a major change, and the names of the

14 libraries and the include directories differ.

15

16 For packages which use a conventional configure script, pass

17 IMAGEMAGICK_CFLAGS=-I/usr/include/ImageMagick-6 and

18 IMAGEMAGICK_LIBS="-lMagickCore-6.Q16HDRI -lMagick++-6.Q16HDRI -lMagickWand-6.Q16HDRI"

19

20 In some places I have had to hardcode -6 because I could not persuade

21 the build system to convert @MAGICK_CORE_VERSION@ in one file or for

22 the names of the files.

23

24 Also, my raw patch deletes wand/Wand.pc.in but gnu patch fails there,

25 believing it is a reversal (not understood, a git patch would be

26 easier if we all had git, mentioned because it will probably happen

27 again if this has to be rediffed for future versions).

28

29 diff -Naur ImageMagick-6.9.6-3.orig/configure ImageMagick-6.9.6-3/configure

30 --- ImageMagick-6.9.6-3.orig/configure 2017-01-07 01:35:18.362869976 +0000

31 +++ ImageMagick-6.9.6-3/configure 2017-01-07 20:50:59.735901975 +0000

32 @@ -37452,7 +37452,7 @@

33 # ==============================================================================

34 # Generate build environment

35 # ==============================================================================

36 -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"

37 +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"

38

39 cat >confcache <<\_ACEOF

40 # This file is a shell script that caches the results of configure

41 diff -Naur ImageMagick-6.9.6-3.orig/configure.ac ImageMagick-6.9.6-3/configure.ac

42 --- ImageMagick-6.9.6-3.orig/configure.ac 2017-01-07 01:35:27.053787793 +0000

43 +++ ImageMagick-6.9.6-3/configure.ac 2017-01-07 20:52:26.205101788 +0000

44 @@ -3835,12 +3835,12 @@

45 config/type.xml \

46 ImageMagick.spec \

47 Magick++/bin/Magick++-config \

48 - magick/ImageMagick.pc \

49 - Magick++/lib/ImageMagick++.pc \

50 - Magick++/lib/Magick++.pc \

51 + magick/ImageMagick-6.pc \

52 + Magick++/lib/ImageMagick++-6.pc \

53 + Magick++/lib/Magick++-6.pc \

54 magick/Magick-config \

55 magick/MagickCore-config \

56 - magick/MagickCore.pc \

57 + magick/MagickCore-6.pc \

58 magick/version.h \

59 Makefile \

60 magick.sh \

61 @@ -3865,9 +3865,9 @@

62 utilities/montage.1 \

63 utilities/stream.1 \

64 wand/MagickWand-config \

65 - wand/MagickWand.pc \

66 + wand/MagickWand-6.pc \

67 wand/Wand-config \

68 - wand/Wand.pc ])

69 + wand/Wand-6.pc ])

70 AC_OUTPUT

71

72 # ==============================================================================

73 diff -Naur ImageMagick-6.9.6-3.orig/magick/ImageMagick-6.pc.in ImageMagick-6.9.6-3/magick/ImageMagick-6.pc.in

74 --- ImageMagick-6.9.6-3.orig/magick/ImageMagick-6.pc.in 1970-01-01 01:00:00.000000000 +0100

75 +++ ImageMagick-6.9.6-3/magick/ImageMagick-6.pc.in 2017-01-07 00:55:17.999483324 +0000

76 @@ -0,0 +1,14 @@

77 +prefix=@prefix@

78 +exec_prefix=@exec_prefix@

79 +libdir=@libdir@

80 +includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@

81 +includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@

82 +libname=MagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@

83 +

84 +Name: ImageMagick-@MAGICK_MAJOR_VERSION@

85 +Description: ImageMagick - convert, edit, and compose images (ABI @MAGICK_ABI_SUFFIX@)

86 +URL: https://www.imagemagick.org

87 +Version: @PACKAGE_VERSION@

88 +Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@

89 +Libs: -L${libdir} -l${libname}

90 +Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@

91 diff -Naur ImageMagick-6.9.6-3.orig/magick/ImageMagick.pc.in ImageMagick-6.9.6-3/magick/ImageMagick.pc.in

92 --- ImageMagick-6.9.6-3.orig/magick/ImageMagick.pc.in 2017-01-07 01:58:35.942633448 +0000

93 +++ ImageMagick-6.9.6-3/magick/ImageMagick.pc.in 1970-01-01 01:00:00.000000000 +0100

94 @@ -1,14 +0,0 @@

95 -prefix=@prefix@

96 -exec_prefix=@exec_prefix@

97 -libdir=@libdir@

98 -includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@

99 -includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@

100 -libname=MagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@

101 -

102 -Name: ImageMagick

103 -Description: ImageMagick - convert, edit, and compose images (ABI @MAGICK_ABI_SUFFIX@)

104 -URL: https://www.imagemagick.org

105 -Version: @PACKAGE_VERSION@

106 -Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@

107 -Libs: -L${libdir} -l${libname}

108 -Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@

109 diff -Naur ImageMagick-6.9.6-3.orig/magick/MagickCore-6.pc.in ImageMagick-6.9.6-3/magick/MagickCore-6.pc.in

110 --- ImageMagick-6.9.6-3.orig/magick/MagickCore-6.pc.in 1970-01-01 01:00:00.000000000 +0100

111 +++ ImageMagick-6.9.6-3/magick/MagickCore-6.pc.in 2017-01-07 22:13:31.500562039 +0000

112 @@ -0,0 +1,15 @@

113 +prefix=@prefix@

114 +exec_prefix=@exec_prefix@

115 +libdir=@libdir@

116 +includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@

117 +includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@

118 +libname=MagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@

119 +moduledir=@libdir@/ImageMagick-@MAGICK_MAJOR_VERSION@.@MAGICK_MINOR_VERSION@.@MAGICK_MICRO_VERSION@/modules-@MAGICK_ABI_SUFFIX@

120 +

121 +Name: MagickCore-@MAGICK_MAJOR_VERSION@

122 +Description: MagickCore - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@)

123 +URL: https://www.imagemagick.org

124 +Version: @PACKAGE_VERSION@

125 +Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@

126 +Libs: -L${libdir} -l${libname}

127 +Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@

128 diff -Naur ImageMagick-6.9.6-3.orig/magick/MagickCore.pc.in ImageMagick-6.9.6-3/magick/MagickCore.pc.in

129 --- ImageMagick-6.9.6-3.orig/magick/MagickCore.pc.in 2016-10-31 00:34:31.000000000 +0000

130 +++ ImageMagick-6.9.6-3/magick/MagickCore.pc.in 1970-01-01 01:00:00.000000000 +0100

131 @@ -1,15 +0,0 @@

132 -prefix=@prefix@

133 -exec_prefix=@exec_prefix@

134 -libdir=@libdir@

135 -includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@

136 -includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@

137 -libname=MagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@

138 -moduledir=@libdir@/ImageMagick-@MAGICK_MAJOR_VERSION@.@MAGICK_MINOR_VERSION@.@MAGICK_MICRO_VERSION@/modules-@MAGICK_ABI_SUFFIX@

139 -

140 -Name: MagickCore

141 -Description: MagickCore - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@)

142 -URL: https://www.imagemagick.org

143 -Version: @PACKAGE_VERSION@

144 -Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@

145 -Libs: -L${libdir} -l${libname}

146 -Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@

147 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

148 --- ImageMagick-6.9.6-3.orig/Magick++/lib/ImageMagick++-6.pc.in 1970-01-01 01:00:00.000000000 +0100

149 +++ ImageMagick-6.9.6-3/Magick++/lib/ImageMagick++-6.pc.in 2017-01-07 22:11:59.637428232 +0000

150 @@ -0,0 +1,14 @@

151 +prefix=@prefix@

152 +exec_prefix=@exec_prefix@

153 +libdir=@libdir@

154 +includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@

155 +includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@

156 +libname=Magick++-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@

157 +

158 +Name: ImageMagick++-@MAGICK_MAJOR_VERSION@

159 +Description: Magick++ - C++ API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@)

160 +Version: @PACKAGE_VERSION@

161 +Requires: MagickWand-@MAGICK_MAJOR_VERSION@

162 +Libs: -L${libdir} -l${libname}

163 +Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@

164 +Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@

165 diff -Naur ImageMagick-6.9.6-3.orig/Magick++/lib/ImageMagick++.pc.in ImageMagick-6.9.6-3/Magick++/lib/ImageMagick++.pc.in

166 --- ImageMagick-6.9.6-3.orig/Magick++/lib/ImageMagick++.pc.in 2016-10-31 00:34:30.000000000 +0000

167 +++ ImageMagick-6.9.6-3/Magick++/lib/ImageMagick++.pc.in 1970-01-01 01:00:00.000000000 +0100

168 @@ -1,14 +0,0 @@

169 -prefix=@prefix@

170 -exec_prefix=@exec_prefix@

171 -libdir=@libdir@

172 -includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@

173 -includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@

174 -libname=Magick++-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@

175 -

176 -Name: ImageMagick++

177 -Description: Magick++ - C++ API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@)

178 -Version: @PACKAGE_VERSION@

179 -Requires: MagickWand

180 -Libs: -L${libdir} -l${libname}

181 -Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@

182 -Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@

183 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

184 --- ImageMagick-6.9.6-3.orig/Magick++/lib/Magick++-6.pc.in 1970-01-01 01:00:00.000000000 +0100

185 +++ ImageMagick-6.9.6-3/Magick++/lib/Magick++-6.pc.in 2017-01-07 21:09:41.641487042 +0000

186 @@ -0,0 +1,14 @@

187 +prefix=@prefix@

188 +exec_prefix=@exec_prefix@

189 +libdir=@libdir@

190 +includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@

191 +includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@

192 +libname=Magick++-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@

193 +

194 +Name: Magick++-@MAGICK_MAJOR_VERSION@

195 +Description: Magick++ - C++ API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@)

196 +Version: @PACKAGE_VERSION@

197 +Requires: MagickWand-@MAGICK_MAJOR_VERSION@

198 +Libs: -L${libdir} -l${libname}

199 +Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@

200 +Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@

201 diff -Naur ImageMagick-6.9.6-3.orig/Magick++/lib/Magick++.pc.in ImageMagick-6.9.6-3/Magick++/lib/Magick++.pc.in

202 --- ImageMagick-6.9.6-3.orig/Magick++/lib/Magick++.pc.in 2016-10-31 00:34:30.000000000 +0000

203 +++ ImageMagick-6.9.6-3/Magick++/lib/Magick++.pc.in 1970-01-01 01:00:00.000000000 +0100

204 @@ -1,14 +0,0 @@

205 -prefix=@prefix@

206 -exec_prefix=@exec_prefix@

207 -libdir=@libdir@

208 -includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@

209 -includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@

210 -libname=Magick++-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@

211 -

212 -Name: Magick++

213 -Description: Magick++ - C++ API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@)

214 -Version: @PACKAGE_VERSION@

215 -Requires: MagickWand

216 -Libs: -L${libdir} -l${libname}

217 -Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@

218 -Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@

219 diff -Naur ImageMagick-6.9.6-3.orig/Makefile.in ImageMagick-6.9.6-3/Makefile.in

220 --- ImageMagick-6.9.6-3.orig/Makefile.in 2017-01-06 01:07:37.217002803 +0000

221 +++ ImageMagick-6.9.6-3/Makefile.in 2017-01-08 00:24:45.777974561 +0000

222 @@ -302,10 +302,10 @@

223 config/Magick++.dox config/type-apple.xml \

224 config/type-dejavu.xml config/type-ghostscript.xml \

225 config/type-windows.xml config/type.xml ImageMagick.spec \

226 - Magick++/bin/Magick++-config magick/ImageMagick.pc \

227 - Magick++/lib/ImageMagick++.pc Magick++/lib/Magick++.pc \

228 + Magick++/bin/Magick++-config magick/ImageMagick-6.pc \

229 + Magick++/lib/ImageMagick++-6.pc Magick++/lib/Magick++-6.pc \

230 magick/Magick-config magick/MagickCore-config \

231 - magick/MagickCore.pc magick/version.h magick.sh \

232 + magick/MagickCore-6.pc magick/version.h magick.sh \

233 PerlMagick/check.sh PerlMagick/default/Magick.pm \

234 PerlMagick/Makefile.PL PerlMagick/default/Makefile.PL \

235 PerlMagick/quantum/Makefile.PL PerlMagick/quantum/quantum.pm \

236 @@ -314,8 +314,8 @@

237 utilities/conjure.1 utilities/convert.1 utilities/display.1 \

238 utilities/identify.1 utilities/ImageMagick.1 \

239 utilities/import.1 utilities/mogrify.1 utilities/montage.1 \

240 - utilities/stream.1 wand/MagickWand-config wand/MagickWand.pc \

241 - wand/Wand-config wand/Wand.pc

242 + utilities/stream.1 wand/MagickWand-config wand/MagickWand-6.pc \

243 + wand/Wand-config wand/Wand-6.pc

244 CONFIG_CLEAN_VPATH_FILES =

245 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;

246 am__vpath_adj = case $$p in \

247 @@ -2471,8 +2471,8 @@

248 $(srcdir)/tests/Makefile.am $(srcdir)/utilities/Makefile.am \

249 $(srcdir)/wand/Makefile.am \

250 $(top_srcdir)/Magick++/bin/Magick++-config.in \

251 - $(top_srcdir)/Magick++/lib/ImageMagick++.pc.in \

252 - $(top_srcdir)/Magick++/lib/Magick++.pc.in \

253 + $(top_srcdir)/Magick++/lib/ImageMagick++-6.pc.in \

254 + $(top_srcdir)/Magick++/lib/Magick++-6.pc.in \

255 $(top_srcdir)/PerlMagick/Makefile.PL.in \

256 $(top_srcdir)/PerlMagick/check.sh.in \

257 $(top_srcdir)/PerlMagick/default/Magick.pm.in \

258 @@ -2501,10 +2501,10 @@

259 $(top_srcdir)/config/type-ghostscript.xml.in \

260 $(top_srcdir)/config/type-windows.xml.in \

261 $(top_srcdir)/config/type.xml.in \

262 - $(top_srcdir)/magick/ImageMagick.pc.in \

263 + $(top_srcdir)/magick/ImageMagick-6.pc.in \

264 $(top_srcdir)/magick/Magick-config.in \

265 $(top_srcdir)/magick/MagickCore-config.in \

266 - $(top_srcdir)/magick/MagickCore.pc.in \

267 + $(top_srcdir)/magick/MagickCore-6.pc.in \

268 $(top_srcdir)/magick/version.h.in \

269 $(top_srcdir)/utilities/ImageMagick.1.in \

270 $(top_srcdir)/utilities/animate.1.in \

271 @@ -2519,9 +2519,9 @@

272 $(top_srcdir)/utilities/montage.1.in \

273 $(top_srcdir)/utilities/stream.1.in \

274 $(top_srcdir)/wand/MagickWand-config.in \

275 - $(top_srcdir)/wand/MagickWand.pc.in \

276 + $(top_srcdir)/wand/MagickWand-6.pc.in \

277 $(top_srcdir)/wand/Wand-config.in \

278 - $(top_srcdir)/wand/Wand.pc.in ChangeLog config/ar-lib \

279 + $(top_srcdir)/wand/Wand.pc-6.in ChangeLog config/ar-lib \

280 config/compile config/config.guess config/config.sub \

281 config/depcomp config/install-sh config/ltmain.sh \

282 config/missing config/mkinstalldirs

283 @@ -4185,8 +4185,8 @@

284 magick/MagickCore-config

285

286 MAGICK_PKGCONFIG = \

287 - magick/ImageMagick.pc \

288 - magick/MagickCore.pc \

289 + magick/ImageMagick-6.pc \

290 + magick/MagickCore-6.pc \

291 magick/ImageMagick-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc \

292 magick/MagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc

293

294 @@ -4605,9 +4605,9 @@

295 magick/Magick-config.in \

296 magick/MagickCore-config.in \

297 $(MAGICK_MANS) \

298 - magick/ImageMagick.pc.in \

299 + magick/ImageMagick-6.pc.in \

300 magick/libMagickCore.map \

301 - magick/MagickCore.pc.in \

302 + magick/MagickCore-6.pc.in \

303 magick/config.h_vms \

304 magick/mac.c \

305 magick/nt-base.c \

306 @@ -4722,8 +4722,8 @@

307 wand/MagickWand-config

308

309 WAND_PKGCONFIG = \

310 - wand/MagickWand.pc \

311 - wand/Wand.pc \

312 + wand/MagickWand-6.pc \

313 + wand/Wand-6.pc \

314 wand/MagickWand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc \

315 wand/Wand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc

316

317 @@ -4747,9 +4747,9 @@

318 wand/ChangeLog \

319 wand/libMagickWand.map \

320 wand/MagickWand-config.1 \

321 - wand/MagickWand.pc.in \

322 + wand/MagickWand-6.pc.in \

323 wand/Wand-config.1 \

324 - wand/Wand.pc.in

325 + wand/Wand-6.pc.in

326

327 WAND_CLEANFILES =

328 MAGICKPP_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/Magick++/lib

329 @@ -4778,8 +4778,8 @@

330 Magick++/bin/Magick++-config.1

331

332 MAGICKPP_PKGCONFIG_OPT = \

333 - Magick++/lib/Magick++.pc \

334 - Magick++/lib/ImageMagick++.pc \

335 + Magick++/lib/Magick++-6.pc \

336 + Magick++/lib/ImageMagick++-6.pc \

337 Magick++/lib/Magick++-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc \

338 Magick++/lib/ImageMagick++-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc

339

340 @@ -4796,9 +4796,9 @@

341 Magick++/README \

342 Magick++/bin/Magick++-config.1 \

343 Magick++/bin/Magick++-config.in \

344 - Magick++/lib/ImageMagick++.pc.in \

345 + Magick++/lib/ImageMagick++-6.pc.in \

346 Magick++/lib/libMagick++.map \

347 - Magick++/lib/Magick++.pc.in \

348 + Magick++/lib/Magick++-6.pc.in \

349 Magick++/demo/model.miff \

350 Magick++/demo/smile.miff \

351 Magick++/demo/smile_anim.miff \

352 @@ -5286,17 +5286,17 @@

353 cd $(top_builddir) && $(SHELL) ./config.status $@

354 Magick++/bin/Magick++-config: $(top_builddir)/config.status $(top_srcdir)/Magick++/bin/Magick++-config.in

355 cd $(top_builddir) && $(SHELL) ./config.status $@

356 -magick/ImageMagick.pc: $(top_builddir)/config.status $(top_srcdir)/magick/ImageMagick.pc.in

357 +magick/ImageMagick-6.pc: $(top_builddir)/config.status $(top_srcdir)/magick/ImageMagick-6.pc.in

358 cd $(top_builddir) && $(SHELL) ./config.status $@

359 -Magick++/lib/ImageMagick++.pc: $(top_builddir)/config.status $(top_srcdir)/Magick++/lib/ImageMagick++.pc.in

360 +Magick++/lib/ImageMagick++-6.pc: $(top_builddir)/config.status $(top_srcdir)/Magick++/lib/ImageMagick++-6.pc.in

361 cd $(top_builddir) && $(SHELL) ./config.status $@

362 -Magick++/lib/Magick++.pc: $(top_builddir)/config.status $(top_srcdir)/Magick++/lib/Magick++.pc.in

363 +Magick++/lib/Magick++-6.pc: $(top_builddir)/config.status $(top_srcdir)/Magick++/lib/Magick++-6.pc.in

364 cd $(top_builddir) && $(SHELL) ./config.status $@

365 magick/Magick-config: $(top_builddir)/config.status $(top_srcdir)/magick/Magick-config.in

366 cd $(top_builddir) && $(SHELL) ./config.status $@

367 magick/MagickCore-config: $(top_builddir)/config.status $(top_srcdir)/magick/MagickCore-config.in

368 cd $(top_builddir) && $(SHELL) ./config.status $@

369 -magick/MagickCore.pc: $(top_builddir)/config.status $(top_srcdir)/magick/MagickCore.pc.in

370 +magick/MagickCore-6.pc: $(top_builddir)/config.status $(top_srcdir)/magick/MagickCore-6.pc.in

371 cd $(top_builddir) && $(SHELL) ./config.status $@

372 magick/version.h: $(top_builddir)/config.status $(top_srcdir)/magick/version.h.in

373 cd $(top_builddir) && $(SHELL) ./config.status $@

374 @@ -5344,11 +5344,11 @@

375 cd $(top_builddir) && $(SHELL) ./config.status $@

376 wand/MagickWand-config: $(top_builddir)/config.status $(top_srcdir)/wand/MagickWand-config.in

377 cd $(top_builddir) && $(SHELL) ./config.status $@

378 -wand/MagickWand.pc: $(top_builddir)/config.status $(top_srcdir)/wand/MagickWand.pc.in

379 +wand/MagickWand-6.pc: $(top_builddir)/config.status $(top_srcdir)/wand/MagickWand-6.pc.in

380 cd $(top_builddir) && $(SHELL) ./config.status $@

381 wand/Wand-config: $(top_builddir)/config.status $(top_srcdir)/wand/Wand-config.in

382 cd $(top_builddir) && $(SHELL) ./config.status $@

383 -wand/Wand.pc: $(top_builddir)/config.status $(top_srcdir)/wand/Wand.pc.in

384 +wand/Wand-6.pc: $(top_builddir)/config.status $(top_srcdir)/wand/Wand-6.pc.in

385 cd $(top_builddir) && $(SHELL) ./config.status $@

386

387 install-codersLTLIBRARIES: $(coders_LTLIBRARIES)

388 @@ -11369,7 +11369,7 @@

389 install-data-local install-docDATA install-filtersLTLIBRARIES \

390 install-includeHEADERS install-magickincHEADERS \

391 install-magickincarchHEADERS install-magickppincHEADERS \

392 - install-magickpptopincHEADERS install-man \

393 + install-magickpptopincHEADERS \

394 install-pkgconfigDATA install-wandincHEADERS

395

396 install-dvi: install-dvi-am

397 @@ -11387,6 +11387,8 @@

398

399 install-info-am:

400

401 +install-libs-only: install-libLTLIBRARIES install-data-am

402 +

403 install-man: install-man1

404

405 install-pdf: install-pdf-am

406 @@ -11563,7 +11565,7 @@

407 @WITH_PERL_FALSE@distclean-perl:

408

409 # create a copy for pc file (ideally the non abi should be symlinked)

410 -%-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc: %.pc

411 +%-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc: %-@MAGICK_MAJOR_VERSION@.pc

412 cp -f $^ $@

413

414 all-local: $(MAGICKPP_LOCAL_TARGETS) $(PERLMAGICK_ALL_LOCAL_TARGETS) $(MAINTAINER_TARGETS)

415 diff -Naur ImageMagick-6.9.6-3.orig/wand/MagickWand-6.pc.in ImageMagick-6.9.6-3/wand/MagickWand-6.pc.in

416 --- ImageMagick-6.9.6-3.orig/wand/MagickWand-6.pc.in 1970-01-01 01:00:00.000000000 +0100

417 +++ ImageMagick-6.9.6-3/wand/MagickWand-6.pc.in 2017-01-08 00:37:51.232515933 +0000

418 @@ -0,0 +1,15 @@

419 +prefix=@prefix@

420 +exec_prefix=@exec_prefix@

421 +libdir=@libdir@

422 +includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@

423 +includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@

424 +libname=MagickWand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@

425 +

426 +Name: MagickWand-@MAGICK_MAJOR_VERSION@

427 +Description: MagickWand - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@)

428 +URL: https://www.imagemagick.org

429 +Version: @PACKAGE_VERSION@

430 +Requires: MagickCore-@MAGICK_MAJOR_VERSION@

431 +Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@

432 +Libs: -L${libdir} -l${libname}

433 +Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@

434 diff -Naur ImageMagick-6.9.6-3.orig/wand/MagickWand.pc.in ImageMagick-6.9.6-3/wand/MagickWand.pc.in

435 --- ImageMagick-6.9.6-3.orig/wand/MagickWand.pc.in 2016-10-31 00:34:31.000000000 +0000

436 +++ ImageMagick-6.9.6-3/wand/MagickWand.pc.in 1970-01-01 01:00:00.000000000 +0100

437 @@ -1,15 +0,0 @@

438 -prefix=@prefix@

439 -exec_prefix=@exec_prefix@

440 -libdir=@libdir@

441 -includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@

442 -includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@

443 -libname=MagickWand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@

444 -

445 -Name: MagickWand

446 -Description: MagickWand - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@)

447 -URL: https://www.imagemagick.org

448 -Version: @PACKAGE_VERSION@

449 -Requires: MagickCore

450 -Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@

451 -Libs: -L${libdir} -l${libname}

452 -Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@

453 diff -Naur ImageMagick-6.9.6-3.orig/wand/Wand-6.pc.in ImageMagick-6.9.6-3/wand/Wand-6.pc.in

454 --- ImageMagick-6.9.6-3.orig/wand/Wand-6.pc.in 1970-01-01 01:00:00.000000000 +0100

455 +++ ImageMagick-6.9.6-3/wand/Wand-6.pc.in 2017-01-08 00:39:23.169642808 +0000

456 @@ -0,0 +1,15 @@

457 +prefix=@prefix@

458 +exec_prefix=@exec_prefix@

459 +libdir=@libdir@

460 +includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@

461 +includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@

462 +libname=MagickWand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@

463 +

464 +Name: MagickWand-6

465 +Description: MagickCore - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@)

466 +URL: https://www.imagemagick.org

467 +Version: @PACKAGE_VERSION@

468 +Requires: MagickCore-6

469 +Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@

470 +Libs: -L${libdir} -l${libname}

471 +Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@